FAB-10978 Remove spec from container_runtime

The container runtime currently takes both a cccid and a deployment
spec.  And pulls some information from each.  Instead, it should take a
structure which contains exactly the information it needs.

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

Author: Jason Yellick

core/chaincode/chaincode_suite_test.go

@@ -63,8 +63,10 @@ type packageProvider interface {
 	chaincode.PackageProvider
 }
 
-//go:generate counterfeiter -o mock/lifecycle.go --fake-name Lifecycle . lifecycle
-type lifecycle interface {
+// This is a bit weird, we need to import the chaincode/lifecycle package, but there is an error,
+// even if we alias it to another name, so, calling 'lifecycleIface' instead of 'lifecycle'
+//go:generate counterfeiter -o mock/lifecycle.go --fake-name Lifecycle . lifecycleIface
+type lifecycleIface interface {
 	chaincode.Lifecycle
 }
 

core/chaincode/chaincode_support.go

@@ -25,8 +25,8 @@ import (
 
 // Runtime is used to manage chaincode runtime instances.
 type Runtime interface {
-	Start(ctxt context.Context, cccid *ccprovider.CCContext, cds *pb.ChaincodeDeploymentSpec) error
-	Stop(ctxt context.Context, cccid *ccprovider.CCContext, cds *pb.ChaincodeDeploymentSpec) error
+	Start(ctxt context.Context, ccci *lifecycle.ChaincodeContainerInfo, codePackage []byte) error
+	Stop(ctxt context.Context, ccci *lifecycle.ChaincodeContainerInfo) error
 }
 
 // Launcher is used to launch chaincode runtimes.
@@ -164,7 +164,13 @@ func (cs *ChaincodeSupport) Stop(ctx context.Context, cccid *ccprovider.CCContex
 	cname := cccid.GetCanonicalName()
 	defer cs.HandlerRegistry.Deregister(cname)
 
-	err := cs.Runtime.Stop(ctx, cccid, cds)
+	err := cs.Runtime.Stop(ctx, &lifecycle.ChaincodeContainerInfo{
+		Name:          cds.Name(),
+		Version:       cccid.Version,
+		Path:          cds.Path(),
+		Type:          cds.CCType(),
+		ContainerType: getVMType(cds),
+	})
 	if err != nil {
 		return err
 	}

core/chaincode/chaincode_support_test.go

@@ -30,6 +30,7 @@ import (
 	"github.com/hyperledger/fabric/core/aclmgmt/mocks"
 	"github.com/hyperledger/fabric/core/aclmgmt/resources"
 	"github.com/hyperledger/fabric/core/chaincode/accesscontrol"
+	"github.com/hyperledger/fabric/core/chaincode/lifecycle"
 	"github.com/hyperledger/fabric/core/chaincode/mock"
 	"github.com/hyperledger/fabric/core/chaincode/platforms"
 	"github.com/hyperledger/fabric/core/chaincode/platforms/golang"
@@ -960,7 +961,7 @@ func getHistory(t *testing.T, chainID, ccname string, ccSide *mockpeer.MockCCCom
 func getLaunchConfigs(t *testing.T, cr *ContainerRuntime) {
 	gt := NewGomegaWithT(t)
 	ccContext := ccprovider.NewCCContext("dummyChannelId", "mycc", "v0", "dummyTxid", false, nil, nil)
-	lc, err := cr.LaunchConfig(ccContext.GetCanonicalName(), pb.ChaincodeSpec_GOLANG)
+	lc, err := cr.LaunchConfig(ccContext.GetCanonicalName(), pb.ChaincodeSpec_GOLANG.String())
 	if err != nil {
 		t.Fatalf("calling getLaunchConfigs() failed with error %s", err)
 	}
@@ -991,7 +992,7 @@ func getLaunchConfigs(t *testing.T, cr *ContainerRuntime) {
 	}
 
 	cr.CertGenerator = nil // disable TLS
-	lc, err = cr.LaunchConfig(ccContext.GetCanonicalName(), pb.ChaincodeSpec_NODE)
+	lc, err = cr.LaunchConfig(ccContext.GetCanonicalName(), pb.ChaincodeSpec_NODE.String())
 	assert.NoError(t, err)
 	args = lc.Args
 
@@ -1003,7 +1004,7 @@ func getLaunchConfigs(t *testing.T, cr *ContainerRuntime) {
 		t.Fatalf("calling getLaunchConfigs() should have returned the start command for node.js chaincode, but got %v", args)
 	}
 
-	lc, err = cr.LaunchConfig(ccContext.GetCanonicalName(), pb.ChaincodeSpec_GOLANG)
+	lc, err = cr.LaunchConfig(ccContext.GetCanonicalName(), pb.ChaincodeSpec_GOLANG.String())
 	assert.NoError(t, err)
 
 	envs = lc.Envs
@@ -1020,7 +1021,7 @@ func getLaunchConfigs(t *testing.T, cr *ContainerRuntime) {
 func TestStartAndWaitSuccess(t *testing.T) {
 	handlerRegistry := NewHandlerRegistry(false)
 	fakeRuntime := &mock.Runtime{}
-	fakeRuntime.StartStub = func(_ context.Context, _ *ccprovider.CCContext, _ *pb.ChaincodeDeploymentSpec) error {
+	fakeRuntime.StartStub = func(_ context.Context, _ *lifecycle.ChaincodeContainerInfo, _ []byte) error {
 		handlerRegistry.Ready("testcc:0")
 		return nil
 	}
@@ -1045,7 +1046,7 @@ func TestStartAndWaitSuccess(t *testing.T) {
 //test timeout error
 func TestStartAndWaitTimeout(t *testing.T) {
 	fakeRuntime := &mock.Runtime{}
-	fakeRuntime.StartStub = func(_ context.Context, _ *ccprovider.CCContext, _ *pb.ChaincodeDeploymentSpec) error {
+	fakeRuntime.StartStub = func(_ context.Context, _ *lifecycle.ChaincodeContainerInfo, _ []byte) error {
 		time.Sleep(time.Second)
 		return nil
 	}
@@ -1070,7 +1071,7 @@ func TestStartAndWaitTimeout(t *testing.T) {
 //test container return error
 func TestStartAndWaitLaunchError(t *testing.T) {
 	fakeRuntime := &mock.Runtime{}
-	fakeRuntime.StartStub = func(_ context.Context, _ *ccprovider.CCContext, _ *pb.ChaincodeDeploymentSpec) error {
+	fakeRuntime.StartStub = func(_ context.Context, _ *lifecycle.ChaincodeContainerInfo, _ []byte) error {
 		return errors.New("Bad lunch; upset stomach")
 	}
 

core/chaincode/container_runtime.go

@@ -13,8 +13,8 @@ import (
 	"strings"
 
 	"github.com/hyperledger/fabric/core/chaincode/accesscontrol"
+	"github.com/hyperledger/fabric/core/chaincode/lifecycle"
 	"github.com/hyperledger/fabric/core/chaincode/platforms"
-	"github.com/hyperledger/fabric/core/common/ccprovider"
 	"github.com/hyperledger/fabric/core/container"
 	"github.com/hyperledger/fabric/core/container/ccintf"
 	"github.com/hyperledger/fabric/core/container/dockercontroller"
@@ -47,10 +47,10 @@ type ContainerRuntime struct {
 }
 
 // Start launches chaincode in a runtime environment.
-func (c *ContainerRuntime) Start(ctxt context.Context, cccid *ccprovider.CCContext, cds *pb.ChaincodeDeploymentSpec) error {
-	cname := cccid.GetCanonicalName()
+func (c *ContainerRuntime) Start(ctxt context.Context, ccci *lifecycle.ChaincodeContainerInfo, codePackage []byte) error {
+	cname := ccci.Name + ":" + ccci.Version
 
-	lc, err := c.LaunchConfig(cname, cds.ChaincodeSpec.Type)
+	lc, err := c.LaunchConfig(cname, ccci.Type)
 	if err != nil {
 		return err
 	}
@@ -61,43 +61,41 @@ func (c *ContainerRuntime) Start(ctxt context.Context, cccid *ccprovider.CCConte
 
 	scr := container.StartContainerReq{
 		Builder: &container.PlatformBuilder{
-			Type:             cds.CCType(),
-			Name:             cds.Name(),
-			Version:          cds.Version(),
-			Path:             cds.Path(),
-			CodePackage:      cds.Bytes(),
+			Type:             ccci.Type,
+			Name:             ccci.Name,
+			Version:          ccci.Version,
+			Path:             ccci.Path,
+			CodePackage:      codePackage,
 			PlatformRegistry: c.PlatformRegistry,
 		},
 		Args:          lc.Args,
 		Env:           lc.Envs,
 		FilesToUpload: lc.Files,
 		CCID: ccintf.CCID{
-			Name:    cds.ChaincodeSpec.ChaincodeId.Name,
-			Version: cccid.Version,
+			Name:    ccci.Name,
+			Version: ccci.Version,
 		},
 	}
 
-	vmtype := getVMType(cds)
-
-	if err := c.Processor.Process(ctxt, vmtype, scr); err != nil {
+	if err := c.Processor.Process(ctxt, ccci.ContainerType, scr); err != nil {
 		return errors.WithMessage(err, "error starting container")
 	}
 
 	return nil
 }
 
 // Stop terminates chaincode and its container runtime environment.
-func (c *ContainerRuntime) Stop(ctxt context.Context, cccid *ccprovider.CCContext, cds *pb.ChaincodeDeploymentSpec) error {
+func (c *ContainerRuntime) Stop(ctxt context.Context, ccci *lifecycle.ChaincodeContainerInfo) error {
 	scr := container.StopContainerReq{
 		CCID: ccintf.CCID{
-			Name:    cds.ChaincodeSpec.ChaincodeId.Name,
-			Version: cccid.Version,
+			Name:    ccci.Name,
+			Version: ccci.Version,
 		},
 		Timeout:    0,
 		Dontremove: false,
 	}
 
-	if err := c.Processor.Process(ctxt, getVMType(cds), scr); err != nil {
+	if err := c.Processor.Process(ctxt, ccci.ContainerType, scr); err != nil {
 		return errors.WithMessage(err, "error stopping container")
 	}
 
@@ -138,19 +136,19 @@ type LaunchConfig struct {
 }
 
 // LaunchConfig creates the LaunchConfig for chaincode running in a container.
-func (c *ContainerRuntime) LaunchConfig(cname string, ccType pb.ChaincodeSpec_Type) (*LaunchConfig, error) {
+func (c *ContainerRuntime) LaunchConfig(cname string, ccType string) (*LaunchConfig, error) {
 	var lc LaunchConfig
 
 	// common environment variables
 	lc.Envs = append(c.CommonEnv, "CORE_CHAINCODE_ID_NAME="+cname)
 
 	// language specific arguments
 	switch ccType {
-	case pb.ChaincodeSpec_GOLANG, pb.ChaincodeSpec_CAR:
+	case pb.ChaincodeSpec_GOLANG.String(), pb.ChaincodeSpec_CAR.String():
 		lc.Args = []string{"chaincode", fmt.Sprintf("-peer.address=%s", c.PeerAddress)}
-	case pb.ChaincodeSpec_JAVA:
+	case pb.ChaincodeSpec_JAVA.String():
 		lc.Args = []string{"/root/chaincode-java/start", "--peerAddress", c.PeerAddress}
-	case pb.ChaincodeSpec_NODE:
+	case pb.ChaincodeSpec_NODE.String():
 		lc.Args = []string{"/bin/sh", "-c", fmt.Sprintf("cd /usr/local/src; npm start -- --peer.address %s", c.PeerAddress)}
 	default:
 		return nil, errors.Errorf("unknown chaincodeType: %s", ccType)