FAB-10987 GetChaincodeDeploymentSpec direct call

Presently, the chaincode/lifecycle/lifecycle.go
GetChaincodeDeploymentSpec makes a chaincode invocation of LSCC to
retrieve information which is directly and trivially available.  This CR
passes in a reference to LSCC so that all of the chaincode overhead and
complexity can be eliminated.

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

Author: Jason Yellick

core/chaincode/chaincode_support.go

@@ -48,14 +48,7 @@ type Lifecycle interface {
 	) (ccprovider.ChaincodeDefinition, error)
 
 	// GetChaincodeDeploymentSpec returns the package necessary to launch a chaincode
-	GetChaincodeDeploymentSpec(
-		ctx context.Context,
-		txid string,
-		signedProp *pb.SignedProposal,
-		prop *pb.Proposal,
-		chainID string,
-		chaincodeID string,
-	) (*pb.ChaincodeDeploymentSpec, error)
+	GetChaincodeDeploymentSpec(chainID string, chaincodeID string) (*pb.ChaincodeDeploymentSpec, error)
 }
 
 // ChaincodeSupport responsible for providing interfacing with chaincodes from the Peer.
@@ -78,6 +71,7 @@ func NewChaincodeSupport(
 	caCert []byte,
 	certGenerator CertGenerator,
 	packageProvider PackageProvider,
+	chaincodeStore lifecycle.InstantiatedChaincodeStore,
 	aclProvider ACLProvider,
 	processor Processor,
 	sccp sysccprovider.SystemChaincodeProvider,
@@ -114,8 +108,11 @@ func NewChaincodeSupport(
 		Runtime:         cs.Runtime,
 		Registry:        cs.HandlerRegistry,
 		PackageProvider: packageProvider,
-		Lifecycle:       &lifecycle.Lifecycle{Executor: cs},
-		StartupTimeout:  config.StartupTimeout,
+		Lifecycle: &lifecycle.Lifecycle{
+			Executor:                   cs,
+			InstantiatedChaincodeStore: chaincodeStore,
+		},
+		StartupTimeout: config.StartupTimeout,
 	}
 
 	return cs

core/chaincode/chaincode_support_test.go

@@ -175,13 +175,15 @@ func initMockPeer(chainIDs ...string) (*ChaincodeSupport, error) {
 	config.StartupTimeout = 10 * time.Second
 	config.ExecuteTimeout = 1 * time.Second
 	pr := platforms.NewRegistry(&golang.Platform{})
+	lsccImpl := lscc.New(sccp, mockAclProvider, pr)
 	chaincodeSupport := NewChaincodeSupport(
 		config,
 		"0.0.0.0:7052",
 		true,
 		ca.CertBytes(),
 		certGenerator,
 		&ccprovider.CCInfoFSImpl{},
+		lsccImpl,
 		mockAclProvider,
 		container.NewVMController(
 			map[string]container.VMProvider{
@@ -198,7 +200,7 @@ func initMockPeer(chainIDs ...string) (*ChaincodeSupport, error) {
 
 	ccp := &CCProviderImpl{cs: chaincodeSupport}
 
-	sccp.RegisterSysCC(lscc.New(sccp, mockAclProvider, pr))
+	sccp.RegisterSysCC(lsccImpl)
 
 	globalBlockNum = make(map[string]uint64, len(chainIDs))
 	for _, id := range chainIDs {

core/chaincode/exectransaction_test.go

@@ -129,13 +129,15 @@ func initPeer(chainIDs ...string) (net.Listener, *ChaincodeSupport, func(), erro
 	config := GlobalConfig()
 	config.StartupTimeout = 3 * time.Minute
 	pr := platforms.NewRegistry(&golang.Platform{})
+	lsccImpl := lscc.New(sccp, mockAclProvider, pr)
 	chaincodeSupport := NewChaincodeSupport(
 		config,
 		peerAddress,
 		false,
 		ca.CertBytes(),
 		certGenerator,
 		&ccprovider.CCInfoFSImpl{},
+		lsccImpl,
 		aclmgmt.NewACLProvider(func(string) channelconfig.Resources { return nil }),
 		container.NewVMController(
 			map[string]container.VMProvider{
@@ -152,7 +154,7 @@ func initPeer(chainIDs ...string) (net.Listener, *ChaincodeSupport, func(), erro
 	policy.RegisterPolicyCheckerFactory(&mockPolicyCheckerFactory{})
 
 	ccp := &CCProviderImpl{cs: chaincodeSupport}
-	sccp.RegisterSysCC(lscc.New(sccp, mockAclProvider, pr))
+	sccp.RegisterSysCC(lsccImpl)
 
 	for _, id := range chainIDs {
 		sccp.DeDeploySysCCs(id, ccp)

core/chaincode/lifecycle/lifecycle.go

@@ -21,9 +21,15 @@ type Executor interface {
 	Execute(ctxt context.Context, cccid *ccprovider.CCContext, cis *pb.ChaincodeInvocationSpec) (*pb.Response, *pb.ChaincodeEvent, error)
 }
 
+// InstantiatedChaincodeStore returns information on chaincodes which are instantiated
+type InstantiatedChaincodeStore interface {
+	ChaincodeDeploymentSpec(channelID, chaincodeName string) (*pb.ChaincodeDeploymentSpec, error)
+}
+
 // Lifecycle provides methods to invoke the lifecycle system chaincode.
 type Lifecycle struct {
-	Executor Executor
+	Executor                   Executor
+	InstantiatedChaincodeStore InstantiatedChaincodeStore
 }
 
 // ChaincodeContainerInfo is yet another synonym for the data required to start/stop a chaincode.
@@ -38,42 +44,10 @@ type ChaincodeContainerInfo struct {
 }
 
 // GetChaincodeDeploymentSpec retrieves a chaincode deployment spec for the specified chaincode.
-func (l *Lifecycle) GetChaincodeDeploymentSpec(
-	ctx context.Context,
-	txid string,
-	signedProp *pb.SignedProposal,
-	prop *pb.Proposal,
-	chainID string,
-	chaincodeID string,
-) (*pb.ChaincodeDeploymentSpec, error) {
-	version := util.GetSysCCVersion()
-	cccid := ccprovider.NewCCContext(chainID, "lscc", version, txid, true, signedProp, prop)
-
-	invocationSpec := &pb.ChaincodeInvocationSpec{
-		ChaincodeSpec: &pb.ChaincodeSpec{
-			Type:        pb.ChaincodeSpec_GOLANG,
-			ChaincodeId: &pb.ChaincodeID{Name: cccid.Name},
-			Input: &pb.ChaincodeInput{
-				Args: util.ToChaincodeArgs("getdepspec", chainID, chaincodeID),
-			},
-		},
-	}
-
-	res, _, err := l.Executor.Execute(ctx, cccid, invocationSpec)
-	if err != nil {
-		return nil, errors.Wrapf(err, "getdepspec %s/%s failed", chainID, chaincodeID)
-	}
-	if res.Status != shim.OK {
-		return nil, errors.Errorf("getdepspec %s/%s responded with error: %s", chainID, chaincodeID, res.Message)
-	}
-	if res.Payload == nil {
-		return nil, errors.Errorf("getdepspec %s/%s failed: payload is nil", chainID, chaincodeID)
-	}
-
-	cds := &pb.ChaincodeDeploymentSpec{}
-	err = proto.Unmarshal(res.Payload, cds)
+func (l *Lifecycle) GetChaincodeDeploymentSpec(channelID, chaincodeName string) (*pb.ChaincodeDeploymentSpec, error) {
+	cds, err := l.InstantiatedChaincodeStore.ChaincodeDeploymentSpec(channelID, chaincodeName)
 	if err != nil {
-		return nil, errors.Wrapf(err, "failed to unmarshal deployment spec payload for %s/%s", chainID, chaincodeID)
+		return nil, errors.Wrapf(err, "could not retrieve deployment spec for %s/%s", channelID, chaincodeName)
 	}
 
 	return cds, nil

core/chaincode/lifecycle/lifecycle_suite_test.go

@@ -20,6 +20,11 @@ type executor interface {
 	lifecycle.Executor
 }
 
+//go:generate counterfeiter -o mock/instantiated_cc_store.go --fake-name InstantiatedChaincodeStore . instantiatedChaincodeStore
+type instantiatedChaincodeStore interface {
+	lifecycle.InstantiatedChaincodeStore
+}
+
 func TestLifecycle(t *testing.T) {
 	RegisterFailHandler(Fail)
 	RunSpecs(t, "Lifecycle Suite")

core/chaincode/lifecycle/lifecycle_test.go

@@ -22,113 +22,74 @@ import (
 
 var _ = Describe("Lifecycle", func() {
 	var (
-		fakeExecutor *mock.Executor
-		signedProp   *pb.SignedProposal
-		proposal     *pb.Proposal
-
 		lifecycle *lc.Lifecycle
 	)
 
 	BeforeEach(func() {
-		fakeExecutor = &mock.Executor{}
-		signedProp = &pb.SignedProposal{ProposalBytes: []byte("some-proposal-bytes")}
-		proposal = &pb.Proposal{Payload: []byte("some-payload-bytes")}
-		lifecycle = &lc.Lifecycle{
-			Executor: fakeExecutor,
-		}
 	})
 
 	Describe("GetChaincodeDeploymentSpec", func() {
-		var deploymentSpec *pb.ChaincodeDeploymentSpec
+		var (
+			fakeInstantiatedCCStore *mock.InstantiatedChaincodeStore
+			deploymentSpec          *pb.ChaincodeDeploymentSpec
+		)
 
 		BeforeEach(func() {
 			chaincodeID := &pb.ChaincodeID{Name: "chaincode-name", Version: "chaincode-version"}
 			deploymentSpec = &pb.ChaincodeDeploymentSpec{
 				CodePackage:   []byte("code-package"),
 				ChaincodeSpec: &pb.ChaincodeSpec{ChaincodeId: chaincodeID},
 			}
-			deploymentSpecPayload, err := proto.Marshal(deploymentSpec)
-			Expect(err).NotTo(HaveOccurred())
 
-			response := &pb.Response{Status: shim.OK, Payload: deploymentSpecPayload}
-			fakeExecutor.ExecuteReturns(response, nil, nil)
+			fakeInstantiatedCCStore = &mock.InstantiatedChaincodeStore{}
+			fakeInstantiatedCCStore.ChaincodeDeploymentSpecReturns(deploymentSpec, nil)
+
+			lifecycle = &lc.Lifecycle{
+				InstantiatedChaincodeStore: fakeInstantiatedCCStore,
+			}
 		})
 
 		It("invokes lscc getdepspec with the correct args", func() {
-			cds, err := lifecycle.GetChaincodeDeploymentSpec(context.Background(), "tx-id", signedProp, proposal, "chain-id", "chaincode-id")
+			cds, err := lifecycle.GetChaincodeDeploymentSpec("chain-id", "chaincode-name")
 			Expect(err).NotTo(HaveOccurred())
 			Expect(proto.Equal(cds, deploymentSpec)).To(BeTrue())
 
-			Expect(fakeExecutor.ExecuteCallCount()).To(Equal(1))
-			ctx, cccid, cis := fakeExecutor.ExecuteArgsForCall(0)
-			Expect(ctx).To(Equal(context.Background()))
-			Expect(cccid).To(Equal(ccprovider.NewCCContext("chain-id", "lscc", "latest", "tx-id", true, signedProp, proposal)))
-			Expect(cis).To(Equal(&pb.ChaincodeInvocationSpec{
-				ChaincodeSpec: &pb.ChaincodeSpec{
-					Type:        pb.ChaincodeSpec_GOLANG,
-					ChaincodeId: &pb.ChaincodeID{Name: "lscc"},
-					Input: &pb.ChaincodeInput{
-						Args: util.ToChaincodeArgs("getdepspec", "chain-id", "chaincode-id"),
-					},
-				},
-			}))
-		})
-
-		Context("when the executor fails", func() {
-			BeforeEach(func() {
-				fakeExecutor.ExecuteReturns(nil, nil, errors.New("mango-tango"))
-			})
-
-			It("returns a wrapped error", func() {
-				_, err := lifecycle.GetChaincodeDeploymentSpec(context.Background(), "tx-id", signedProp, proposal, "chain-id", "chaincode-id")
-				Expect(err).To(MatchError("getdepspec chain-id/chaincode-id failed: mango-tango"))
-			})
-		})
-
-		Context("when the executor returns an error response", func() {
-			BeforeEach(func() {
-				response := &pb.Response{
-					Status:  shim.ERROR,
-					Message: "danger-danger",
-				}
-				fakeExecutor.ExecuteReturns(response, nil, nil)
-			})
-
-			It("returns a wrapped error", func() {
-				_, err := lifecycle.GetChaincodeDeploymentSpec(context.Background(), "tx-id", signedProp, proposal, "chain-id", "chaincode-id")
-				Expect(err).To(MatchError("getdepspec chain-id/chaincode-id responded with error: danger-danger"))
-			})
-		})
-
-		Context("when the response contains a nil payload", func() {
-			BeforeEach(func() {
-				response := &pb.Response{Status: shim.OK, Payload: nil}
-				fakeExecutor.ExecuteReturns(response, nil, nil)
-			})
-
-			It("returns a wrapped error", func() {
-				_, err := lifecycle.GetChaincodeDeploymentSpec(context.Background(), "tx-id", signedProp, proposal, "chain-id", "chaincode-id")
-				Expect(err).To(MatchError("getdepspec chain-id/chaincode-id failed: payload is nil"))
-			})
+			Expect(fakeInstantiatedCCStore.ChaincodeDeploymentSpecCallCount()).To(Equal(1))
+			channelID, chaincodeName := fakeInstantiatedCCStore.ChaincodeDeploymentSpecArgsForCall(0)
+			Expect(channelID).To(Equal("chain-id"))
+			Expect(chaincodeName).To(Equal("chaincode-name"))
 		})
 
-		Context("when unmarshaling the payload fails", func() {
+		Context("when the instantiated chaincode store fails", func() {
 			BeforeEach(func() {
-				response := &pb.Response{Status: shim.OK, Payload: []byte("bogus-payload")}
-				fakeExecutor.ExecuteReturns(response, nil, nil)
+				fakeInstantiatedCCStore.ChaincodeDeploymentSpecReturns(nil, errors.New("mango-tango"))
 			})
 
 			It("returns a wrapped error", func() {
-				_, err := lifecycle.GetChaincodeDeploymentSpec(context.Background(), "tx-id", signedProp, proposal, "chain-id", "chaincode-id")
-				Expect(err).To(MatchError(HavePrefix("failed to unmarshal deployment spec payload for chain-id/chaincode-id")))
+				_, err := lifecycle.GetChaincodeDeploymentSpec("chain-id", "chaincode-id")
+				Expect(err).To(MatchError("could not retrieve deployment spec for chain-id/chaincode-id: mango-tango"))
 			})
 		})
 	})
 
 	Describe("GetChaincodeDefinition", func() {
-		var chaincodeData *ccprovider.ChaincodeData
+		var (
+			chaincodeData *ccprovider.ChaincodeData
+
+			fakeExecutor *mock.Executor
+			signedProp   *pb.SignedProposal
+			proposal     *pb.Proposal
+		)
 
 		BeforeEach(func() {
+			fakeExecutor = &mock.Executor{}
+			signedProp = &pb.SignedProposal{ProposalBytes: []byte("some-proposal-bytes")}
+			proposal = &pb.Proposal{Payload: []byte("some-payload-bytes")}
+
+			lifecycle = &lc.Lifecycle{
+				Executor: fakeExecutor,
+			}
+
 			chaincodeData = &ccprovider.ChaincodeData{
 				Name:    "george",
 				Version: "old",