[FAB-9737] Introduce PackageProvider interface

Change-Id: Ic76e26eb9e8d145eb48c2d792c01c87e0e3c538a Signed-off-by: Matthew Sykes <[email protected]>
hyperledger · Apr 27, 2018 · a12d256 · a12d256
1 parent 9d781a1
commit a12d256
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 5 deletions.
diff --git a/core/chaincode/chaincode_support.go b/core/chaincode/chaincode_support.go
@@ -37,6 +37,12 @@ type Runtime interface {
 	Stop(ctxt context.Context, cccid *ccprovider.CCContext, cds *pb.ChaincodeDeploymentSpec) error
 }
 
+// PackageProvider is responsible for getting the chaincode package from
+// the filesystem.
+type PackageProvider interface {
+	GetChaincode(ccname string, ccversion string) (ccprovider.CCPackage, error)
+}
+
 // NewChaincodeSupport creates a new ChaincodeSupport instance
 func NewChaincodeSupport(
 	config *Config,
@@ -45,6 +51,7 @@ func NewChaincodeSupport(
 	ccstartuptimeout time.Duration,
 	caCert []byte,
 	certGenerator CertGenerator,
+	packageProvider PackageProvider,
 ) *ChaincodeSupport {
 	cs := &ChaincodeSupport{
 		caCert:           caCert,
@@ -55,6 +62,7 @@ func NewChaincodeSupport(
 		keepalive:        config.Keepalive,
 		executetimeout:   config.ExecuteTimeout,
 		handlerRegistry:  NewHandlerRegistry(userrunsCC),
+		PackageProvider:  packageProvider,
 	}
 
 	// Keep TestQueries working
@@ -91,6 +99,7 @@ type ChaincodeSupport struct {
 	executetimeout   time.Duration
 	userRunsCC       bool
 	ContainerRuntime Runtime
+	PackageProvider  PackageProvider
 	sccp             sysccprovider.SystemChaincodeProvider
 }
 
@@ -228,7 +237,7 @@ func (cs *ChaincodeSupport) Launch(context context.Context, cccid *ccprovider.CC
 		if cds.CodePackage == nil {
 			//no code bytes for these situations
 			if !(cs.userRunsCC || cds.ExecEnv == pb.ChaincodeDeploymentSpec_SYSTEM) {
-				ccpack, err := ccprovider.GetChaincodeFromFS(cID.Name, cID.Version)
+				ccpack, err := cs.PackageProvider.GetChaincode(cID.Name, cID.Version)
 				if err != nil {
 					return cID, cMsg, err
 				}

diff --git a/core/chaincode/chaincode_support_test.go b/core/chaincode/chaincode_support_test.go
@@ -167,7 +167,7 @@ func initMockPeer(chainIDs ...string) (*ChaincodeSupport, error) {
 	ccprovider.SetChaincodesPath(ccprovider.GetCCsPath())
 	ca, _ := accesscontrol.NewCA()
 	certGenerator := accesscontrol.NewAuthenticator(ca)
-	chaincodeSupport := NewChaincodeSupport(GlobalConfig(), "0.0.0.0:7052", true, ccStartupTimeout, ca.CertBytes(), certGenerator)
+	chaincodeSupport := NewChaincodeSupport(GlobalConfig(), "0.0.0.0:7052", true, ccStartupTimeout, ca.CertBytes(), certGenerator, &ccprovider.CCInfoFSImpl{})
 	SideEffectInitialize(chaincodeSupport)
 	chaincodeSupport.SetSysCCProvider(sccp)
 	chaincodeSupport.executetimeout = time.Duration(1) * time.Second

diff --git a/core/chaincode/exectransaction_test.go b/core/chaincode/exectransaction_test.go
@@ -116,7 +116,7 @@ func initPeer(chainIDs ...string) (net.Listener, *ChaincodeSupport, func(), erro
 	ccprovider.SetChaincodesPath(ccprovider.GetCCsPath())
 	ca, _ := accesscontrol.NewCA()
 	certGenerator := accesscontrol.NewAuthenticator(ca)
-	chaincodeSupport := NewChaincodeSupport(GlobalConfig(), peerAddress, false, ccStartupTimeout, ca.CertBytes(), certGenerator)
+	chaincodeSupport := NewChaincodeSupport(GlobalConfig(), peerAddress, false, ccStartupTimeout, ca.CertBytes(), certGenerator, &ccprovider.CCInfoFSImpl{})
 	chaincodeSupport.SetSysCCProvider(sccp)
 	SideEffectInitialize(chaincodeSupport)
 	pb.RegisterChaincodeSupportServer(grpcServer, chaincodeSupport)

diff --git a/core/chaincode/systemchaincode_test.go b/core/chaincode/systemchaincode_test.go
@@ -121,7 +121,7 @@ func initSysCCTests() (*oldSysCCInfo, net.Listener, *ChaincodeSupport, error) {
 	ccStartupTimeout := time.Duration(5000) * time.Millisecond
 	ca, _ := accesscontrol.NewCA()
 	certGenerator := accesscontrol.NewAuthenticator(ca)
-	chaincodeSupport := NewChaincodeSupport(GlobalConfig(), peerAddress, false, ccStartupTimeout, ca.CertBytes(), certGenerator)
+	chaincodeSupport := NewChaincodeSupport(GlobalConfig(), peerAddress, false, ccStartupTimeout, ca.CertBytes(), certGenerator, &ccprovider.CCInfoFSImpl{})
 	pb.RegisterChaincodeSupportServer(grpcServer, chaincodeSupport)
 
 	go grpcServer.Serve(lis)

diff --git a/core/scc/cscc/configure_test.go b/core/scc/cscc/configure_test.go
@@ -195,7 +195,7 @@ func TestConfigerInvokeJoinChainCorrectParams(t *testing.T) {
 	ccStartupTimeout := time.Duration(30000) * time.Millisecond
 	ca, _ := accesscontrol.NewCA()
 	certGenerator := accesscontrol.NewAuthenticator(ca)
-	chaincode.NewChaincodeSupport(chaincode.GlobalConfig(), peerEndpoint, false, ccStartupTimeout, ca.CertBytes(), certGenerator)
+	chaincode.NewChaincodeSupport(chaincode.GlobalConfig(), peerEndpoint, false, ccStartupTimeout, ca.CertBytes(), certGenerator, &ccprovider.CCInfoFSImpl{})
 
 	// Init the policy checker
 	policyManagerGetter := &policymocks.MockChannelPolicyManagerGetter{

diff --git a/peer/node/start.go b/peer/node/start.go
@@ -595,6 +595,7 @@ func registerChaincodeSupport(grpcServer *comm.GRPCServer, ccEndpoint string, ca
 		ccStartupTimeout,
 		ca.CertBytes(),
 		authenticator,
+		&ccprovider.CCInfoFSImpl{},
 	)
 	chaincode.SideEffectInitialize(chaincodeSupport)