remove exec_env from ChaincodeDeploymentSpec

- CCContext is extended with flag to indicate if it is a system
  chaincode
- ChaincodeContainerInfo sets container type to SYSTEM when dealing with
  system chaincode and DOCKER for everything else.

FAB-14491

Change-Id: I801e8249dcbc0acb6fc2b48f313c67e11f924129
Signed-off-by: Matthew Sykes <sykesmat@us.ibm.com>

Author: sykesm

core/chaincode/chaincode_support.go

@@ -159,7 +159,7 @@ func createCCMessage(messageType pb.ChaincodeMessage_Type, cid string, txid stri
 // It does not attempt to start the chaincode based on the information from lifecycle, but instead
 // accepts the container information directly in the form of a ChaincodeDeploymentSpec.
 func (cs *ChaincodeSupport) ExecuteLegacyInit(txParams *ccprovider.TransactionParams, cccid *ccprovider.CCContext, spec *pb.ChaincodeDeploymentSpec) (*pb.Response, *pb.ChaincodeEvent, error) {
-	ccci := ccprovider.DeploymentSpecToChaincodeContainerInfo(spec)
+	ccci := ccprovider.DeploymentSpecToChaincodeContainerInfo(spec, cccid.SystemCC)
 	ccci.Version = cccid.Version
 	// FIXME: this is a hack, we shouldn't construct the
 	// packageID manually but rather let lifecycle construct it

core/common/ccprovider/ccprovider.go

@@ -391,6 +391,9 @@ type CCContext struct {
 	// InitRequired indicates whether the chaincode must have 'Init' invoked
 	// before other transactions can proceed.
 	InitRequired bool
+
+	// SystemCC indictes whether or not this is system chaincode.
+	SystemCC bool
 }
 
 //-------- ChaincodeDefinition - interface for ChaincodeData ------
@@ -544,13 +547,17 @@ type ChaincodeProvider interface {
 	Stop(ccci *ChaincodeContainerInfo) error
 }
 
-func DeploymentSpecToChaincodeContainerInfo(cds *pb.ChaincodeDeploymentSpec) *ChaincodeContainerInfo {
-	return &ChaincodeContainerInfo{
+func DeploymentSpecToChaincodeContainerInfo(cds *pb.ChaincodeDeploymentSpec, systemCC bool) *ChaincodeContainerInfo {
+	cci := &ChaincodeContainerInfo{
 		Name:          cds.ChaincodeSpec.ChaincodeId.Name,
 		Version:       cds.ChaincodeSpec.ChaincodeId.Version,
 		Path:          cds.ChaincodeSpec.ChaincodeId.Path,
 		Type:          cds.ChaincodeSpec.Type.String(),
-		ContainerType: cds.ExecEnv.String(),
+		ContainerType: "DOCKER",
 		PackageID:     persistence.PackageID(cds.ChaincodeSpec.ChaincodeId.Name + ":" + cds.ChaincodeSpec.ChaincodeId.Version),
 	}
+	if systemCC {
+		cci.ContainerType = "SYSTEM"
+	}
+	return cci
 }

core/scc/lscc/lscc.go

@@ -192,7 +192,7 @@ func (lscc *LifeCycleSysCC) ChaincodeContainerInfo(channelID, chaincodeName stri
 		return nil, errors.Wrapf(err, "could not get chaincode code")
 	}
 
-	return ccprovider.DeploymentSpecToChaincodeContainerInfo(cds), nil
+	return ccprovider.DeploymentSpecToChaincodeContainerInfo(cds, false), nil
 }
 
 func (lscc *LifeCycleSysCC) ChaincodeDefinition(channelID, chaincodeName string, qe ledger.SimpleQueryExecutor) (ccprovider.ChaincodeDefinition, error) {

core/scc/lscc/lscc_noncc_test.go

@@ -19,7 +19,6 @@ import (
 )
 
 var _ = Describe("LSCC", func() {
-
 	var (
 		l                 *lscc.LifeCycleSysCC
 		fakeSupport       *mock.FileSystemSupport
@@ -84,7 +83,7 @@ var _ = Describe("LSCC", func() {
 		It("returns the chaincode deployment spec for a valid chaincode", func() {
 			ccci, err := l.ChaincodeContainerInfo("", "chaincode-data-name", fakeQueryExecutor)
 			Expect(err).NotTo(HaveOccurred())
-			Expect(ccci).To(Equal(ccprovider.DeploymentSpecToChaincodeContainerInfo(deploymentSpec)))
+			Expect(ccci).To(Equal(ccprovider.DeploymentSpecToChaincodeContainerInfo(deploymentSpec, false)))
 
 			Expect(fakeQueryExecutor.GetStateCallCount()).To(Equal(1))
 			getStateNamespace, getStateCCName := fakeQueryExecutor.GetStateArgsForCall(0)

core/scc/sysccapi.go

@@ -160,14 +160,15 @@ func (p *Provider) deploySysCC(chainID string, ccprov ccprovider.ChaincodeProvid
 	chaincodeID := &pb.ChaincodeID{Path: syscc.Path(), Name: syscc.Name()}
 	spec := &pb.ChaincodeSpec{Type: pb.ChaincodeSpec_Type(pb.ChaincodeSpec_Type_value["GOLANG"]), ChaincodeId: chaincodeID, Input: &pb.ChaincodeInput{Args: syscc.InitArgs()}}
 
-	chaincodeDeploymentSpec := &pb.ChaincodeDeploymentSpec{ExecEnv: pb.ChaincodeDeploymentSpec_SYSTEM, ChaincodeSpec: spec}
+	chaincodeDeploymentSpec := &pb.ChaincodeDeploymentSpec{ChaincodeSpec: spec}
 
 	// XXX This is an ugly hack, version should be tied to the chaincode instance, not he peer binary
 	version := util.GetSysCCVersion()
 
 	cccid := &ccprovider.CCContext{
-		Name:    chaincodeDeploymentSpec.ChaincodeSpec.ChaincodeId.Name,
-		Version: version,
+		Name:     chaincodeDeploymentSpec.ChaincodeSpec.ChaincodeId.Name,
+		Version:  version,
+		SystemCC: true,
 	}
 
 	resp, _, err := ccprov.ExecuteLegacyInit(txParams, cccid, chaincodeDeploymentSpec)

protos/peer/chaincode.pb.go

@@ -76,17 +76,11 @@ message ChaincodeSpec {
 // TODO: Define `codePackage`.
 message ChaincodeDeploymentSpec {
     // Prevent removed tag re-use
-    reserved 2;
-    reserved "effective_date";
-
-    enum ExecutionEnvironment {
-        DOCKER = 0;
-        SYSTEM = 1;
-    }
+    reserved 2, 4;
+    reserved "effective_date", "exec_env";
 
     ChaincodeSpec chaincode_spec = 1;
     bytes code_package = 3;
-    ExecutionEnvironment exec_env=  4;
 
 }