FAB-10977 Extract lifecycle to interface

This is step two to remove lifecycle from the chaincode package,
replacing the explicit dependency in the tests on the lifecycle
implementation with a mocked implementation.

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

core/chaincode/chaincode_suite_test.go

@@ -9,7 +9,6 @@ package chaincode_test
 import (
 	commonledger "github.com/hyperledger/fabric/common/ledger"
 	"github.com/hyperledger/fabric/core/chaincode"
-	"github.com/hyperledger/fabric/core/chaincode/lifecycle"
 	"github.com/hyperledger/fabric/core/common/ccprovider"
 	"github.com/hyperledger/fabric/core/container/ccintf"
 	"github.com/hyperledger/fabric/core/ledger"
@@ -54,11 +53,6 @@ type processor interface {
 	chaincode.Processor
 }
 
-//go:generate counterfeiter -o mock/executor.go --fake-name Executor . executor
-type executor interface {
-	lifecycle.Executor
-}
-
 //go:generate counterfeiter -o mock/invoker.go --fake-name Invoker . invoker
 type invoker interface {
 	chaincode.Invoker
@@ -69,6 +63,11 @@ type packageProvider interface {
 	chaincode.PackageProvider
 }
 
+//go:generate counterfeiter -o mock/lifecycle.go --fake-name Lifecycle . lifecycle
+type lifecycle interface {
+	chaincode.Lifecycle
+}
+
 //go:generate counterfeiter -o mock/cc_package.go --fake-name CCPackage . ccpackage
 type ccpackage interface {
 	ccprovider.CCPackage

core/chaincode/chaincode_support.go

@@ -35,6 +35,29 @@ type Launcher interface {
 	LaunchInit(context context.Context, cccid *ccprovider.CCContext, spec *pb.ChaincodeDeploymentSpec) error
 }
 
+// Lifecycle provides a way to retrieve chaincode definitions and the packages necessary to run them
+type Lifecycle interface {
+	// GetChaincodeDefinition returns the details for a chaincode by name
+	GetChaincodeDefinition(
+		ctx context.Context,
+		txid string,
+		signedProp *pb.SignedProposal,
+		prop *pb.Proposal,
+		chainID string,
+		chaincodeID string,
+	) (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)
+}
+
 // ChaincodeSupport responsible for providing interfacing with chaincodes from the Peer.
 type ChaincodeSupport struct {
 	Keepalive       time.Duration

core/chaincode/runtime_launcher.go

@@ -9,7 +9,6 @@ package chaincode
 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/pkg/errors"
@@ -32,7 +31,7 @@ type RuntimeLauncher struct {
 	Runtime         Runtime
 	Registry        LaunchRegistry
 	PackageProvider PackageProvider
-	Lifecycle       *lifecycle.Lifecycle
+	Lifecycle       Lifecycle
 	StartupTimeout  time.Duration
 }