FAB-10996 Cleanup runtime launcher interface

Presently, the runtime launcher has a dependency on lifecycle that
doesn't actually need to exist.  Instead, the runtime launcher should
simply accept a description of the chaincode to launch.

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

core/chaincode/chaincode_support.go

@@ -31,8 +31,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, ccci *lifecycle.ChaincodeContainerInfo) error
+ Launch(context context.Context, ccci *lifecycle.ChaincodeContainerInfo) error
 }
 
 // Lifecycle provides a way to retrieve chaincode definitions and the packages necessary to run them
@@ -61,6 +60,7 @@ type ChaincodeSupport struct {
  HandlerRegistry *HandlerRegistry
  Launcher Launcher
  sccp sysccprovider.SystemChaincodeProvider
+ Lifecycle Lifecycle
 }
 
 // NewChaincodeSupport creates a new ChaincodeSupport instance.
@@ -91,6 +91,11 @@ func NewChaincodeSupport(
  certGenerator = nil
  }
 
+ cs.Lifecycle = &lifecycle.Lifecycle{
+ Executor: cs,
+ InstantiatedChaincodeStore: chaincodeStore,
+ }
+
  cs.Runtime = &ContainerRuntime{
  CertGenerator: certGenerator,
  Processor: processor,
@@ -108,11 +113,7 @@ func NewChaincodeSupport(
  Runtime: cs.Runtime,
  Registry: cs.HandlerRegistry,
  PackageProvider: packageProvider,
- Lifecycle: &lifecycle.Lifecycle{
- Executor: cs,
- InstantiatedChaincodeStore: chaincodeStore,
- },
- StartupTimeout: config.StartupTimeout,
+ StartupTimeout: config.StartupTimeout,
  }
 
  return cs
@@ -132,7 +133,7 @@ func (cs *ChaincodeSupport) LaunchInit(ctx context.Context, cccid *ccprovider.CC
  ccci := lifecycle.DeploymentSpecToChaincodeContainerInfo(spec)
  ccci.Version = cccid.Version
 
- return cs.Launcher.LaunchInit(ctx, ccci)
+ return cs.Launcher.Launch(ctx, ccci)
 }
 
 // Launch starts executing chaincode if it is not already running. This method
@@ -155,8 +156,14 @@ func (cs *ChaincodeSupport) Launch(ctx context.Context, cccid *ccprovider.CCCont
  // used to support system chaincode. It should really be instantiated with the
  // appropriate reference to ChaincodeSupport.
  ctx = context.WithValue(ctx, ccintf.GetCCHandlerKey(), cs)
+ chaincodeName := spec.GetChaincodeSpec().Name()
+
+ ccci, err := cs.Lifecycle.ChaincodeContainerInfo(cccid.ChainID, chaincodeName)
+ if err != nil {
+ return errors.Wrapf(err, "[channel %s] failed to get chaincode container info for %s", cccid.ChainID, chaincodeName)
+ }
 
- return cs.Launcher.Launch(ctx, cccid.ChainID, spec.ChaincodeSpec.ChaincodeId.Name)
+ return cs.Launcher.Launch(ctx, ccci)
 }
 
 // Stop stops a chaincode if running.

core/chaincode/chaincode_support_test.go

@@ -1047,7 +1047,7 @@ func TestStartAndWaitSuccess(t *testing.T) {
  }
 
  //actual test - everythings good
- err := launcher.start(context.Background(), ccci)
+ err := launcher.Launch(context.Background(), ccci)
  if err != nil {
  t.Fatalf("expected success but failed with error %s", err)
  }
@@ -1080,7 +1080,7 @@ func TestStartAndWaitTimeout(t *testing.T) {
  }
 
  //the actual test - timeout 1000 > 500
- err := launcher.start(context.Background(), ccci)
+ err := launcher.Launch(context.Background(), ccci)
  if err == nil {
  t.Fatalf("expected error but succeeded")
  }
@@ -1112,7 +1112,7 @@ func TestStartAndWaitLaunchError(t *testing.T) {
  }
 
  //actual test - container launch gives error
- err := launcher.start(context.Background(), ccci)
+ err := launcher.Launch(context.Background(), ccci)
  if err == nil {
  t.Fatalf("expected error but succeeded")
  }

core/chaincode/runtime_launcher.go

@@ -31,46 +31,11 @@ type RuntimeLauncher struct {
  Runtime Runtime
  Registry LaunchRegistry
  PackageProvider PackageProvider
- Lifecycle Lifecycle
  StartupTimeout time.Duration
 }
 
-// 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, ccci *lifecycle.ChaincodeContainerInfo) error {
- err := r.start(ctx, ccci)
- if err != nil {
- chaincodeLogger.Errorf("start failed: %+v", err)
- return err
- }
-
- chaincodeLogger.Debug("launch complete")
-
- return nil
-}
-
-// Launch chaincode with the appropriate runtime.
-func (r *RuntimeLauncher) Launch(ctx context.Context, channelID, chaincodeName string) error {
- ccci, err := r.Lifecycle.ChaincodeContainerInfo(channelID, chaincodeName)
- if err != nil {
- return errors.Wrapf(err, "[channel %s] failed to get chaincode container info for %s", channelID, chaincodeName)
- }
-
- err = r.start(ctx, ccci)
- if err != nil {
- chaincodeLogger.Errorf("start failed: %+v", err)
- return err
- }
-
- chaincodeLogger.Debug("launch complete")
-
- return nil
-}
-
-func (r *RuntimeLauncher) start(ctx context.Context, ccci *lifecycle.ChaincodeContainerInfo) error {
+func (r *RuntimeLauncher) Launch(ctx context.Context, ccci *lifecycle.ChaincodeContainerInfo) error {
  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 != inproccontroller.ContainerType {
  var err error
  codePackage, err = r.PackageProvider.GetChaincodeCodePackage(ccci.Name, ccci.Version)
@@ -113,5 +78,6 @@ func (r *RuntimeLauncher) start(ctx context.Context, ccci *lifecycle.ChaincodeCo
  return err
  }
 
+ chaincodeLogger.Debug("launch complete")
  return nil
 }