FAB-10976 Move lifecycle to its own package

Because of some errors with cyclical imports for the chaincode package
tests which are not written as _test packages, we need to define a
structure to represent a chaincode which is not the
ChaincodeDeploymentSpec but which is also not inside of the chaincode
package.  Defining this in the lifecycle portion makes sense, so as a
prerequisite, moving lifecycle from the chaincode package, to a
subpackage called lifecycle.

Note: This introduces some stuttering, that will be remedied in a later
CR.

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

Author: Jason Yellick

core/chaincode/chaincode_suite_test.go

@@ -9,6 +9,7 @@ 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"
@@ -55,7 +56,7 @@ type processor interface {
 
 //go:generate counterfeiter -o mock/executor.go --fake-name Executor . executor
 type executor interface {
-	chaincode.Executor
+	lifecycle.Executor
 }
 
 //go:generate counterfeiter -o mock/invoker.go --fake-name Invoker . invoker

core/chaincode/chaincode_support.go

@@ -12,6 +12,7 @@ import (
 
 	"github.com/golang/protobuf/proto"
 	"github.com/hyperledger/fabric/common/util"
+	"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/common/sysccprovider"
@@ -90,7 +91,7 @@ func NewChaincodeSupport(
 		Runtime:         cs.Runtime,
 		Registry:        cs.HandlerRegistry,
 		PackageProvider: packageProvider,
-		Lifecycle:       &Lifecycle{Executor: cs},
+		Lifecycle:       &lifecycle.Lifecycle{Executor: cs},
 		StartupTimeout:  config.StartupTimeout,
 	}
 
@@ -155,7 +156,7 @@ func (cs *ChaincodeSupport) HandleChaincodeStream(ctxt context.Context, stream c
 
 	handler := &Handler{
 		Invoker:                    cs,
-		DefinitionGetter:           &Lifecycle{Executor: cs},
+		DefinitionGetter:           &lifecycle.Lifecycle{Executor: cs},
 		Keepalive:                  cs.Keepalive,
 		Registry:                   cs.HandlerRegistry,
 		ACLProvider:                cs.ACLProvider,

core/chaincode/lifecycle.go renamed to core/chaincode/lifecycle/lifecycle.go

@@ -4,7 +4,7 @@ Copyright IBM Corp. All Rights Reserved.
 SPDX-License-Identifier: Apache-2.0
 */
 
-package chaincode
+package lifecycle
 
 import (
 	"github.com/golang/protobuf/proto"

core/chaincode/lifecycle/lifecycle_suite_test.go

@@ -0,0 +1,26 @@
+/*
+Copyright IBM Corp. All Rights Reserved.
+
+SPDX-License-Identifier: Apache-2.0
+*/
+
+package lifecycle_test
+
+import (
+	"github.com/hyperledger/fabric/core/chaincode/lifecycle"
+
+	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/gomega"
+
+	"testing"
+)
+
+//go:generate counterfeiter -o mock/executor.go --fake-name Executor . executor
+type executor interface {
+	lifecycle.Executor
+}
+
+func TestLifecycle(t *testing.T) {
+	RegisterFailHandler(Fail)
+	RunSpecs(t, "Lifecycle Suite")
+}

core/chaincode/lifecycle_test.go renamed to core/chaincode/lifecycle/lifecycle_test.go

@@ -4,13 +4,13 @@ Copyright IBM Corp. All Rights Reserved.
 SPDX-License-Identifier: Apache-2.0
 */
 
-package chaincode_test
+package lifecycle_test
 
 import (
 	"github.com/golang/protobuf/proto"
 	"github.com/hyperledger/fabric/common/util"
-	"github.com/hyperledger/fabric/core/chaincode"
-	"github.com/hyperledger/fabric/core/chaincode/mock"
+	lc "github.com/hyperledger/fabric/core/chaincode/lifecycle"
+	"github.com/hyperledger/fabric/core/chaincode/lifecycle/mock"
 	"github.com/hyperledger/fabric/core/chaincode/shim"
 	"github.com/hyperledger/fabric/core/common/ccprovider"
 	pb "github.com/hyperledger/fabric/protos/peer"
@@ -26,14 +26,14 @@ var _ = Describe("Lifecycle", func() {
 		signedProp   *pb.SignedProposal
 		proposal     *pb.Proposal
 
-		lifecycle *chaincode.Lifecycle
+		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 = &chaincode.Lifecycle{
+		lifecycle = &lc.Lifecycle{
 			Executor: fakeExecutor,
 		}
 	})

core/chaincode/lifecycle/mock/executor.go

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

core/chaincode/runtime_launcher.go

@@ -13,6 +13,7 @@ import (
 	"github.com/hyperledger/fabric/common/util"
 	"github.com/hyperledger/fabric/core/chaincode"
 	"github.com/hyperledger/fabric/core/chaincode/fake"
+	lc "github.com/hyperledger/fabric/core/chaincode/lifecycle"
 	"github.com/hyperledger/fabric/core/chaincode/mock"
 	"github.com/hyperledger/fabric/core/chaincode/shim"
 	"github.com/hyperledger/fabric/core/common/ccprovider"
@@ -74,7 +75,7 @@ var _ = Describe("RuntimeLauncher", func() {
 		}
 		fakeExecutor = &mock.Executor{}
 		fakeExecutor.ExecuteReturns(cdsResponse, nil, nil)
-		lifecycle := &chaincode.Lifecycle{
+		lifecycle := &lc.Lifecycle{
 			Executor: fakeExecutor,
 		}
 

core/chaincode/runtime_launcher_test.go

@@ -14,6 +14,7 @@ import (
 	"github.com/hyperledger/fabric/core/aclmgmt"
 	"github.com/hyperledger/fabric/core/aclmgmt/resources"
 	"github.com/hyperledger/fabric/core/chaincode"
+	lc "github.com/hyperledger/fabric/core/chaincode/lifecycle"
 	"github.com/hyperledger/fabric/core/common/ccprovider"
 	"github.com/hyperledger/fabric/core/handlers/decoration"
 	. "github.com/hyperledger/fabric/core/handlers/endorsement/api/identities"
@@ -148,7 +149,7 @@ func (s *SupportImpl) GetChaincodeDefinition(ctx context.Context, chainID string
 	if txsim != nil {
 		ctxt = context.WithValue(ctx, chaincode.TXSimulatorKey, txsim)
 	}
-	lifecycle := &chaincode.Lifecycle{
+	lifecycle := &lc.Lifecycle{
 		Executor: s.ChaincodeSupport,
 	}
 	return lifecycle.GetChaincodeDefinition(ctxt, txid, signedProp, prop, chainID, chaincodeID)