FAB-10995 runtime_launcher chaincode spec removal

This CR completes the removal of the chaincode spec from the
runtime_launcher.go file.  There is some additional refactoring,
especially of the test required, but this will follow in a subsequent
CR.

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

Author: Jason Yellick

core/chaincode/chaincode_support.go

@@ -32,7 +32,7 @@ type Runtime interface {
 // Launcher is used to launch chaincode runtimes.
 type Launcher interface {
 	Launch(context context.Context, channelID, chaincodeName string) error
-	LaunchInit(context context.Context, cccid *ccprovider.CCContext, spec *pb.ChaincodeDeploymentSpec) error
+	LaunchInit(context context.Context, ccci *lifecycle.ChaincodeContainerInfo) error
 }
 
 // Lifecycle provides a way to retrieve chaincode definitions and the packages necessary to run them
@@ -129,7 +129,10 @@ func (cs *ChaincodeSupport) LaunchInit(ctx context.Context, cccid *ccprovider.CC
 
 	ctx = context.WithValue(ctx, ccintf.GetCCHandlerKey(), cs)
 
-	return cs.Launcher.LaunchInit(ctx, cccid, spec)
+	ccci := lifecycle.DeploymentSpecToChaincodeContainerInfo(spec)
+	ccci.Version = cccid.Version
+
+	return cs.Launcher.LaunchInit(ctx, ccci)
 }
 
 // Launch starts executing chaincode if it is not already running. This method

core/chaincode/runtime_launcher.go

@@ -10,8 +10,7 @@ import (
 	"time"
 
 	"github.com/hyperledger/fabric/core/chaincode/lifecycle"
-	"github.com/hyperledger/fabric/core/common/ccprovider"
-	pb "github.com/hyperledger/fabric/protos/peer"
+	"github.com/hyperledger/fabric/core/container/inproccontroller"
 	"github.com/pkg/errors"
 	"golang.org/x/net/context"
 )
@@ -38,15 +37,7 @@ type RuntimeLauncher struct {
 
 // LaunchInit launches a container which is not yet defined in the LSCC table
 // This is only necessary for the pre v1.3 lifecycle
-func (r *RuntimeLauncher) LaunchInit(ctx context.Context, cccid *ccprovider.CCContext, spec *pb.ChaincodeDeploymentSpec) error {
-	ccci := &lifecycle.ChaincodeContainerInfo{
-		Name:          spec.Name(),
-		Version:       cccid.Version,
-		Path:          spec.Path(),
-		Type:          spec.CCType(),
-		ContainerType: spec.ExecEnv.String(),
-	}
-
+func (r *RuntimeLauncher) LaunchInit(ctx context.Context, ccci *lifecycle.ChaincodeContainerInfo) error {
 	err := r.start(ctx, ccci)
 	if err != nil {
 		chaincodeLogger.Errorf("start failed: %+v", err)
@@ -80,7 +71,7 @@ func (r *RuntimeLauncher) start(ctx context.Context, ccci *lifecycle.ChaincodeCo
 	var codePackage []byte
 	// Note, it is not actually possible for cds.CodePackage to be non-nil in the real world
 	// But some of the tests rely on the idea that it might be set.
-	if ccci.ContainerType != pb.ChaincodeDeploymentSpec_SYSTEM.String() {
+	if ccci.ContainerType != inproccontroller.ContainerType {
 		var err error
 		codePackage, err = r.PackageProvider.GetChaincodeCodePackage(ccci.Name, ccci.Version)
 		if err != nil {

core/chaincode/runtime_launcher_test.go

@@ -34,6 +34,7 @@ var _ = Describe("RuntimeLauncher", func() {
 		proposal       *pb.Proposal
 		chaincodeID    *pb.ChaincodeID
 		deploymentSpec *pb.ChaincodeDeploymentSpec
+		ccci           *lc.ChaincodeContainerInfo
 
 		runtimeLauncher *chaincode.RuntimeLauncher
 
@@ -122,57 +123,32 @@ var _ = Describe("RuntimeLauncher", func() {
 				Expect(err).To(MatchError("[channel chain-id] failed to get chaincode container info for chaincode-name: king-kong"))
 			})
 		})
+	})
 
-		Context("when the returned deployment spec has a nil chaincode package", func() {
-			BeforeEach(func() {
-			})
-
-			It("gets the package from the package provider", func() {
-				err := runtimeLauncher.Launch(context.Background(), cccid.ChainID, invocationSpec.ChaincodeSpec.Name())
-				Expect(err).NotTo(HaveOccurred())
-
-				Expect(fakePackageProvider.GetChaincodeCodePackageCallCount()).To(Equal(1))
-				name, version := fakePackageProvider.GetChaincodeCodePackageArgsForCall(0)
-				Expect(name).To(Equal("info-name"))
-				Expect(version).To(Equal("info-version"))
-			})
-
-			Context("when getting the package fails", func() {
-				BeforeEach(func() {
-					fakePackageProvider.GetChaincodeCodePackageReturns(nil, errors.New("tangerine"))
-				})
-
-				It("returns a wrapped error", func() {
-					err := runtimeLauncher.Launch(context.Background(), cccid.ChainID, invocationSpec.ChaincodeSpec.Name())
-					Expect(err).To(MatchError("failed to get chaincode package: tangerine"))
-				})
-			})
+	Context("when launch is provided with a deployment spec", func() {
+		BeforeEach(func() {
+			deploymentSpec.CodePackage = []byte("code-package")
+			ccci = lc.DeploymentSpecToChaincodeContainerInfo(deploymentSpec)
 		})
 
-		Context("when launching a system chaincode", func() {
-			BeforeEach(func() {
-				ccciReturnValue.ContainerType = "SYSTEM"
-			})
-
-			It("does not get the codepackage", func() {
-				err := runtimeLauncher.Launch(context.Background(), cccid.ChainID, invocationSpec.ChaincodeSpec.Name())
-				Expect(err).NotTo(HaveOccurred())
-				Expect(fakePackageProvider.GetChaincodeCodePackageCallCount()).To(Equal(0))
-			})
+		It("does not get the deployment spec from lifecycle", func() {
+			err := runtimeLauncher.LaunchInit(context.Background(), ccci)
+			Expect(err).NotTo(HaveOccurred())
+			Expect(fakeLifecycle.ChaincodeContainerInfoCallCount()).To(Equal(0))
 		})
 	})
 
 	It("registers the chaincode as launching", func() {
-		err := runtimeLauncher.LaunchInit(context.Background(), cccid, deploymentSpec)
+		err := runtimeLauncher.LaunchInit(context.Background(), ccci)
 		Expect(err).NotTo(HaveOccurred())
 
 		Expect(fakeRegistry.LaunchingCallCount()).To(Equal(1))
 		cname := fakeRegistry.LaunchingArgsForCall(0)
-		Expect(cname).To(Equal("chaincode-name:context-version"))
+		Expect(cname).To(Equal("chaincode-name:chaincode-version"))
 	})
 
 	It("starts the runtime for the chaincode", func() {
-		err := runtimeLauncher.LaunchInit(context.Background(), cccid, deploymentSpec)
+		err := runtimeLauncher.LaunchInit(context.Background(), ccci)
 		Expect(err).NotTo(HaveOccurred())
 
 		Expect(fakeRuntime.StartCallCount()).To(Equal(1))
@@ -182,7 +158,7 @@ var _ = Describe("RuntimeLauncher", func() {
 			Name:          deploymentSpec.Name(),
 			Path:          deploymentSpec.Path(),
 			Type:          deploymentSpec.CCType(),
-			Version:       cccid.Version,
+			Version:       deploymentSpec.Version(),
 			ContainerType: "DOCKER",
 		}))
 		Expect(codePackage).To(Equal([]byte("code-package")))
@@ -192,15 +168,15 @@ var _ = Describe("RuntimeLauncher", func() {
 		fakeRuntime.StartReturns(nil)
 
 		errCh := make(chan error, 1)
-		go func() { errCh <- runtimeLauncher.LaunchInit(context.Background(), cccid, deploymentSpec) }()
+		go func() { errCh <- runtimeLauncher.LaunchInit(context.Background(), ccci) }()
 
 		Consistently(errCh).ShouldNot(Receive())
 		launchState.Notify(nil)
 		Eventually(errCh).Should(Receive(BeNil()))
 	})
 
 	It("does not deregister the chaincode", func() {
-		err := runtimeLauncher.LaunchInit(context.Background(), cccid, deploymentSpec)
+		err := runtimeLauncher.LaunchInit(context.Background(), ccci)
 		Expect(err).NotTo(HaveOccurred())
 
 		Expect(fakeRegistry.DeregisterCallCount()).To(Equal(0))
@@ -212,8 +188,8 @@ var _ = Describe("RuntimeLauncher", func() {
 		})
 
 		It("returns an error", func() {
-			err := runtimeLauncher.LaunchInit(context.Background(), cccid, deploymentSpec)
-			Expect(err).To(MatchError("failed to register chaincode-name:context-version as launching: gargoyle"))
+			err := runtimeLauncher.LaunchInit(context.Background(), ccci)
+			Expect(err).To(MatchError("failed to register chaincode-name:chaincode-version as launching: gargoyle"))
 		})
 	})
 
@@ -223,12 +199,12 @@ var _ = Describe("RuntimeLauncher", func() {
 		})
 
 		It("returns a wrapped error", func() {
-			err := runtimeLauncher.LaunchInit(context.Background(), cccid, deploymentSpec)
+			err := runtimeLauncher.LaunchInit(context.Background(), ccci)
 			Expect(err).To(MatchError("error starting container: banana"))
 		})
 
 		It("stops the runtime", func() {
-			runtimeLauncher.LaunchInit(context.Background(), cccid, deploymentSpec)
+			runtimeLauncher.LaunchInit(context.Background(), ccci)
 
 			Expect(fakeRuntime.StopCallCount()).To(Equal(1))
 			ctx, ccci := fakeRuntime.StopArgsForCall(0)
@@ -237,17 +213,17 @@ var _ = Describe("RuntimeLauncher", func() {
 				Name:          deploymentSpec.Name(),
 				Path:          deploymentSpec.Path(),
 				Type:          deploymentSpec.CCType(),
-				Version:       cccid.Version,
+				Version:       deploymentSpec.Version(),
 				ContainerType: "DOCKER",
 			}))
 		})
 
 		It("deregisters the chaincode", func() {
-			runtimeLauncher.LaunchInit(context.Background(), cccid, deploymentSpec)
+			runtimeLauncher.LaunchInit(context.Background(), ccci)
 
 			Expect(fakeRegistry.DeregisterCallCount()).To(Equal(1))
 			cname := fakeRegistry.DeregisterArgsForCall(0)
-			Expect(cname).To(Equal("chaincode-name:context-version"))
+			Expect(cname).To(Equal("chaincode-name:chaincode-version"))
 		})
 	})
 
@@ -260,12 +236,12 @@ var _ = Describe("RuntimeLauncher", func() {
 		})
 
 		It("returns an error", func() {
-			err := runtimeLauncher.LaunchInit(context.Background(), cccid, deploymentSpec)
+			err := runtimeLauncher.LaunchInit(context.Background(), ccci)
 			Expect(err).To(MatchError("chaincode registration failed: papaya"))
 		})
 
 		It("stops the runtime", func() {
-			runtimeLauncher.LaunchInit(context.Background(), cccid, deploymentSpec)
+			runtimeLauncher.LaunchInit(context.Background(), ccci)
 
 			Expect(fakeRuntime.StopCallCount()).To(Equal(1))
 			ctx, ccci := fakeRuntime.StopArgsForCall(0)
@@ -274,17 +250,17 @@ var _ = Describe("RuntimeLauncher", func() {
 				Name:          deploymentSpec.Name(),
 				Path:          deploymentSpec.Path(),
 				Type:          deploymentSpec.CCType(),
-				Version:       cccid.Version,
+				Version:       deploymentSpec.Version(),
 				ContainerType: "DOCKER",
 			}))
 		})
 
 		It("deregisters the chaincode", func() {
-			runtimeLauncher.LaunchInit(context.Background(), cccid, deploymentSpec)
+			runtimeLauncher.LaunchInit(context.Background(), ccci)
 
 			Expect(fakeRegistry.DeregisterCallCount()).To(Equal(1))
 			cname := fakeRegistry.DeregisterArgsForCall(0)
-			Expect(cname).To(Equal("chaincode-name:context-version"))
+			Expect(cname).To(Equal("chaincode-name:chaincode-version"))
 		})
 	})
 
@@ -295,12 +271,12 @@ var _ = Describe("RuntimeLauncher", func() {
 		})
 
 		It("returns a meaningful error", func() {
-			err := runtimeLauncher.LaunchInit(context.Background(), cccid, deploymentSpec)
-			Expect(err).To(MatchError("timeout expired while starting chaincode chaincode-name:context-version for transaction"))
+			err := runtimeLauncher.LaunchInit(context.Background(), ccci)
+			Expect(err).To(MatchError("timeout expired while starting chaincode chaincode-name:chaincode-version for transaction"))
 		})
 
 		It("stops the runtime", func() {
-			runtimeLauncher.LaunchInit(context.Background(), cccid, deploymentSpec)
+			runtimeLauncher.LaunchInit(context.Background(), ccci)
 
 			Expect(fakeRuntime.StopCallCount()).To(Equal(1))
 			ctx, ccci := fakeRuntime.StopArgsForCall(0)
@@ -309,17 +285,17 @@ var _ = Describe("RuntimeLauncher", func() {
 				Name:          deploymentSpec.Name(),
 				Path:          deploymentSpec.Path(),
 				Type:          deploymentSpec.CCType(),
-				Version:       cccid.Version,
+				Version:       deploymentSpec.Version(),
 				ContainerType: "DOCKER",
 			}))
 		})
 
 		It("deregisters the chaincode", func() {
-			runtimeLauncher.LaunchInit(context.Background(), cccid, deploymentSpec)
+			runtimeLauncher.LaunchInit(context.Background(), ccci)
 
 			Expect(fakeRegistry.DeregisterCallCount()).To(Equal(1))
 			cname := fakeRegistry.DeregisterArgsForCall(0)
-			Expect(cname).To(Equal("chaincode-name:context-version"))
+			Expect(cname).To(Equal("chaincode-name:chaincode-version"))
 		})
 	})
 
@@ -330,7 +306,7 @@ var _ = Describe("RuntimeLauncher", func() {
 		})
 
 		It("preserves the initial error", func() {
-			err := runtimeLauncher.LaunchInit(context.Background(), cccid, deploymentSpec)
+			err := runtimeLauncher.LaunchInit(context.Background(), ccci)
 			Expect(err).To(MatchError("error starting container: whirled-peas"))
 			Expect(fakeRuntime.StopCallCount()).To(Equal(1))
 		})