[FAB-3154] Fix the renaming of getChaincodeBytes

The existing getChaincodeBytes function actually create a deployment
spec, rather than the name implies. This patchset unify those names of
both chaincode spec creation and chaincode deployment spec creation.

https://jira.hyperledger.org/browse/FAB-3154.

Change-Id: I15d783abdb14feb7fb0ee89cadf6512374d07745
Signed-off-by: Baohua Yang <baohyang@cn.ibm.com>

Author: yeasy

peer/chaincode/common.go

@@ -51,8 +51,8 @@ func checkSpec(spec *pb.ChaincodeSpec) error {
 	return platform.ValidateSpec(spec)
 }
 
-// getChaincodeBytes get chaincode deployment spec given the chaincode spec
-func getChaincodeBytes(spec *pb.ChaincodeSpec, crtPkg bool) (*pb.ChaincodeDeploymentSpec, error) {
+// getChaincodeDeploymentSpec get chaincode deployment spec given the chaincode spec
+func getChaincodeDeploymentSpec(spec *pb.ChaincodeSpec, crtPkg bool) (*pb.ChaincodeDeploymentSpec, error) {
 	var codePackageBytes []byte
 	if chaincode.IsDevMode() == false && crtPkg {
 		var err error
@@ -70,7 +70,8 @@ func getChaincodeBytes(spec *pb.ChaincodeSpec, crtPkg bool) (*pb.ChaincodeDeploy
 	return chaincodeDeploymentSpec, nil
 }
 
-func getChaincodeSpecification(cmd *cobra.Command) (*pb.ChaincodeSpec, error) {
+// getChaincodeSpec get chaincode spec from the cli cmd pramameters
+func getChaincodeSpec(cmd *cobra.Command) (*pb.ChaincodeSpec, error) {
 	spec := &pb.ChaincodeSpec{}
 	if err := checkChaincodeCmdParams(cmd); err != nil {
 		return spec, err
@@ -92,7 +93,7 @@ func getChaincodeSpecification(cmd *cobra.Command) (*pb.ChaincodeSpec, error) {
 }
 
 func chaincodeInvokeOrQuery(cmd *cobra.Command, args []string, invoke bool, cf *ChaincodeCmdFactory) (err error) {
-	spec, err := getChaincodeSpecification(cmd)
+	spec, err := getChaincodeSpec(cmd)
 	if err != nil {
 		return err
 	}

peer/chaincode/install.go

@@ -95,12 +95,12 @@ func generateChaincode(cmd *cobra.Command, chaincodeName, chaincodeVersion strin
 		return nil, fmt.Errorf("chaincode %s:%s exists", chaincodeName, chaincodeVersion)
 	}
 
-	spec, err := getChaincodeSpecification(cmd)
+	spec, err := getChaincodeSpec(cmd)
 	if err != nil {
 		return nil, err
 	}
 
-	cds, err := getChaincodeBytes(spec, true)
+	cds, err := getChaincodeDeploymentSpec(spec, true)
 	if err != nil {
 		return nil, fmt.Errorf("Error getting chaincode code %s: %s", chainFuncName, err)
 	}

peer/chaincode/instantiate.go

@@ -49,12 +49,12 @@ func instantiateCmd(cf *ChaincodeCmdFactory) *cobra.Command {
 
 //instantiate the command via Endorser
 func instantiate(cmd *cobra.Command, cf *ChaincodeCmdFactory) (*protcommon.Envelope, error) {
-	spec, err := getChaincodeSpecification(cmd)
+	spec, err := getChaincodeSpec(cmd)
 	if err != nil {
 		return nil, err
 	}
 
-	cds, err := getChaincodeBytes(spec, false)
+	cds, err := getChaincodeDeploymentSpec(spec, false)
 	if err != nil {
 		return nil, fmt.Errorf("Error getting chaincode code %s: %s", chainFuncName, err)
 	}

peer/chaincode/package.go

@@ -44,7 +44,7 @@ const package_desc = "Package the specified chaincode into a deployment spec."
 type ccDepSpecFactory func(spec *pb.ChaincodeSpec) (*pb.ChaincodeDeploymentSpec, error)
 
 func defaultCDSFactory(spec *pb.ChaincodeSpec) (*pb.ChaincodeDeploymentSpec, error) {
-	return getChaincodeBytes(spec, true)
+	return getChaincodeDeploymentSpec(spec, true)
 }
 
 // deployCmd returns the cobra command for Chaincode Deploy
@@ -153,7 +153,7 @@ func chaincodePackage(cmd *cobra.Command, args []string, cdsFact ccDepSpecFactor
 			return err
 		}
 	}
-	spec, err := getChaincodeSpecification(cmd)
+	spec, err := getChaincodeSpec(cmd)
 	if err != nil {
 		return err
 	}

peer/chaincode/upgrade.go

@@ -47,12 +47,12 @@ func upgradeCmd(cf *ChaincodeCmdFactory) *cobra.Command {
 
 //upgrade the command via Endorser
 func upgrade(cmd *cobra.Command, cf *ChaincodeCmdFactory) (*protcommon.Envelope, error) {
-	spec, err := getChaincodeSpecification(cmd)
+	spec, err := getChaincodeSpec(cmd)
 	if err != nil {
 		return nil, err
 	}
 
-	cds, err := getChaincodeBytes(spec, false)
+	cds, err := getChaincodeDeploymentSpec(spec, false)
 	if err != nil {
 		return nil, fmt.Errorf("Error getting chaincode code %s: %s", chainFuncName, err)
 	}