FAB-16124 Remove SysCCProvider as dep everywhere

There are no longer any locations in the code which actually need a
reference to the system cc provider other than LSCC, which is only using
the sysccprovider as a veneer to get at a peer instance.  This change
prepares to remove the SysCCProvider entirely.

Change-Id: I6d468acf55e8d6e454ef2a3b6e3373f1ab4b09ab
Signed-off-by: Jason Yellick <jyellick@us.ibm.com>

Author: Jason Yellick

core/chaincode/chaincode_support_test.go

@@ -152,7 +152,6 @@ func (p *PackageProviderWrapper) GetChaincodeCodePackage(ccci *ccprovider.Chainc
 func initMockPeer(chainIDs ...string) (*peer.Peer, *ChaincodeSupport, func(), error) {
 	peerInstance := &peer.Peer{}
 	sccp := &scc.Provider{
-		Peer:      peerInstance,
 		Whitelist: scc.GlobalWhitelist(),
 	}
 
@@ -177,7 +176,7 @@ func initMockPeer(chainIDs ...string) (*peer.Peer, *ChaincodeSupport, func(), er
 	globalConfig := GlobalConfig()
 	globalConfig.StartupTimeout = 10 * time.Second
 	globalConfig.ExecuteTimeout = 1 * time.Second
-	lsccImpl := lscc.New(map[string]struct{}{"lscc": {}}, sccp, mockAclProvider, peerInstance.GetMSPIDs, newPolicyChecker(peerInstance))
+	lsccImpl := lscc.New(map[string]struct{}{"lscc": {}}, &lscc.PeerShim{Peer: peerInstance}, mockAclProvider, peerInstance.GetMSPIDs, newPolicyChecker(peerInstance))
 	ml := &mock.Lifecycle{}
 	ml.ChaincodeContainerInfoStub = func(_, name string, _ ledger.SimpleQueryExecutor) (*ccprovider.ChaincodeContainerInfo, error) {
 		switch name {

core/chaincode/exectransaction_test.go

@@ -74,7 +74,6 @@ import (
 func initPeer(chainIDs ...string) (*cm.Lifecycle, net.Listener, *ChaincodeSupport, func(), error) {
 	peerInstance := &peer.Peer{}
 	sccp := &scc.Provider{
-		Peer:      peerInstance,
 		Whitelist: scc.GlobalWhitelist(),
 	}
 
@@ -110,7 +109,7 @@ func initPeer(chainIDs ...string) (*cm.Lifecycle, net.Listener, *ChaincodeSuppor
 	pr := platforms.NewRegistry(&golang.Platform{})
 	mockAclProvider := &mock.ACLProvider{}
 	builtinSCCs := map[string]struct{}{"lscc": {}}
-	lsccImpl := lscc.New(builtinSCCs, sccp, mockAclProvider, peerInstance.GetMSPIDs, newPolicyChecker(peerInstance))
+	lsccImpl := lscc.New(builtinSCCs, &lscc.PeerShim{Peer: peerInstance}, mockAclProvider, peerInstance.GetMSPIDs, newPolicyChecker(peerInstance))
 	ml := &cm.Lifecycle{}
 	ml.ChaincodeContainerInfoStub = func(_, name string, _ ledger.SimpleQueryExecutor) (*ccprovider.ChaincodeContainerInfo, error) {
 		switch name {

core/endorser/support.go

@@ -39,7 +39,6 @@ type SupportImpl struct {
 	identity.SignerSerializer
 	Peer             PeerOperations
 	ChaincodeSupport *chaincode.ChaincodeSupport
-	SysCCProvider    *scc.Provider
 	ACLProvider      aclmgmt.ACLProvider
 	BuiltinSCCs      scc.BuiltinSCCs
 }

core/scc/lscc/lscc.go

@@ -12,7 +12,9 @@ import (
 
 	"github.com/golang/protobuf/proto"
 	"github.com/hyperledger/fabric/common/cauthdsl"
+	"github.com/hyperledger/fabric/common/channelconfig"
 	"github.com/hyperledger/fabric/common/flogging"
+	"github.com/hyperledger/fabric/common/policies"
 	"github.com/hyperledger/fabric/core/aclmgmt"
 	"github.com/hyperledger/fabric/core/aclmgmt/resources"
 	"github.com/hyperledger/fabric/core/chaincode/shim"
@@ -21,6 +23,7 @@ import (
 	"github.com/hyperledger/fabric/core/common/sysccprovider"
 	"github.com/hyperledger/fabric/core/ledger"
 	"github.com/hyperledger/fabric/core/ledger/cceventmgmt"
+	"github.com/hyperledger/fabric/core/peer"
 	"github.com/hyperledger/fabric/core/policy"
 	"github.com/hyperledger/fabric/core/scc"
 	"github.com/hyperledger/fabric/internal/ccmetadata"
@@ -147,6 +150,37 @@ type LifeCycleSysCC struct {
 	GetMSPIDs MSPIDsGetter
 }
 
+// PeerShim adapts the peer instance for use with LSCC by providing methods
+// previously provided by the scc provider.  If the lscc code weren't all getting
+// deleted soon, it would probably be worth rewriting it to use these APIs directly
+// rather that go through this shim, but it will be gone soon.
+type PeerShim struct {
+	Peer *peer.Peer
+}
+
+// GetQueryExecutorForLedger returns a query executor for the specified channel
+func (p *PeerShim) GetQueryExecutorForLedger(cid string) (ledger.QueryExecutor, error) {
+	l := p.Peer.GetLedger(cid)
+	if l == nil {
+		return nil, fmt.Errorf("Could not retrieve ledger for channel %s", cid)
+	}
+
+	return l.NewQueryExecutor()
+}
+
+// GetApplicationConfig returns the configtxapplication.SharedConfig for the channel
+// and whether the Application config exists
+func (p *PeerShim) GetApplicationConfig(cid string) (channelconfig.Application, bool) {
+	return p.Peer.GetApplicationConfig(cid)
+}
+
+// Returns the policy manager associated to the passed channel
+// and whether the policy manager exists
+func (p *PeerShim) PolicyManager(channelID string) (policies.Manager, bool) {
+	m := p.Peer.GetPolicyManager(channelID)
+	return m, (m != nil)
+}
+
 // New creates a new instance of the LSCC
 // Typically there is only one of these per peer
 func New(

core/scc/scc_test.go

@@ -11,7 +11,6 @@ import (
 	"testing"
 
 	"github.com/hyperledger/fabric/core/container/ccintf"
-	"github.com/hyperledger/fabric/core/peer"
 	"github.com/hyperledger/fabric/core/scc"
 	"github.com/hyperledger/fabric/core/scc/mock"
 	"github.com/onsi/gomega"
@@ -30,7 +29,6 @@ func init() {
 
 func newTestProvider() *scc.Provider {
 	p := &scc.Provider{
-		Peer: &peer.Peer{},
 		Whitelist: map[string]bool{
 			"invokableExternalButNotCC2CC": true,
 			"invokableCC2CCButNotExternal": true,
@@ -81,15 +79,6 @@ func TestDeploy(t *testing.T) {
 	gt.Eventually(csh.HandleChaincodeStreamCallCount).Should(gomega.Equal(2))
 }
 
-func TestSccProviderImpl_GetQueryExecutorForLedger(t *testing.T) {
-	p := &scc.Provider{
-		Peer: &peer.Peer{},
-	}
-	qe, err := p.GetQueryExecutorForLedger("")
-	assert.Nil(t, qe)
-	assert.Error(t, err)
-}
-
 func TestCreatePluginSysCCs(t *testing.T) {
 	assert.NotPanics(t, func() { scc.CreatePluginSysCCs() }, "expected successful init")
 }

core/scc/sccproviderimpl.go

@@ -7,12 +7,6 @@ SPDX-License-Identifier: Apache-2.0
 package scc
 
 import (
-	"fmt"
-
-	"github.com/hyperledger/fabric/common/channelconfig"
-	"github.com/hyperledger/fabric/common/policies"
-	"github.com/hyperledger/fabric/core/ledger"
-	"github.com/hyperledger/fabric/core/peer"
 	"github.com/pkg/errors"
 )
 
@@ -31,7 +25,6 @@ func (bccs BuiltinSCCs) IsSysCC(name string) bool {
 
 // Provider implements sysccprovider.SystemChaincodeProvider
 type Provider struct {
-	Peer      *peer.Peer
 	SysCCs    []SelfDescribingSysCC
 	Whitelist Whitelist
 }
@@ -47,29 +40,6 @@ func (p *Provider) RegisterSysCC(scc SelfDescribingSysCC) error {
 	return nil
 }
 
-// GetQueryExecutorForLedger returns a query executor for the specified channel
-func (p *Provider) GetQueryExecutorForLedger(cid string) (ledger.QueryExecutor, error) {
-	l := p.Peer.GetLedger(cid)
-	if l == nil {
-		return nil, fmt.Errorf("Could not retrieve ledger for channel %s", cid)
-	}
-
-	return l.NewQueryExecutor()
-}
-
-// GetApplicationConfig returns the configtxapplication.SharedConfig for the channel
-// and whether the Application config exists
-func (p *Provider) GetApplicationConfig(cid string) (channelconfig.Application, bool) {
-	return p.Peer.GetApplicationConfig(cid)
-}
-
-// Returns the policy manager associated to the passed channel
-// and whether the policy manager exists
-func (p *Provider) PolicyManager(channelID string) (policies.Manager, bool) {
-	m := p.Peer.GetPolicyManager(channelID)
-	return m, (m != nil)
-}
-
 func (p *Provider) isWhitelisted(syscc SelfDescribingSysCC) bool {
 	enabled, ok := p.Whitelist[syscc.Name()]
 	return ok && enabled

internal/peer/node/start.go

@@ -410,7 +410,6 @@ func serve(args []string) error {
 	authenticator := accesscontrol.NewAuthenticator(ca)
 
 	sccp := &scc.Provider{
-		Peer:      peerInstance,
 		Whitelist: scc.GlobalWhitelist(),
 	}
 
@@ -427,7 +426,7 @@ func serve(args []string) error {
 		"_lifecycle": {},
 	}
 
-	lsccInst := lscc.New(builtinSCCs, sccp, aclProvider, peerInstance.GetMSPIDs, policyChecker)
+	lsccInst := lscc.New(builtinSCCs, &lscc.PeerShim{Peer: peerInstance}, aclProvider, peerInstance.GetMSPIDs, policyChecker)
 
 	chaincodeHandlerRegistry := chaincode.NewHandlerRegistry(userRunsCC)
 	lifecycleTxQueryExecutorGetter := &chaincode.TxQueryExecutorGetter{
@@ -588,7 +587,6 @@ func serve(args []string) error {
 		SignerSerializer: signingIdentity,
 		Peer:             peerInstance,
 		ChaincodeSupport: chaincodeSupport,
-		SysCCProvider:    sccp,
 		ACLProvider:      aclProvider,
 		BuiltinSCCs:      builtinSCCs,
 	}