[FAB-9973] Chaincode cmd errors return wrong cc name

Include the actual chaincode name in the error messages
returned by the install, instantiate, package and
upgrade commands.

Also properly format error strings in the enclosing
functions.

Change-Id: I02ac905e6b330e0668a630165cc1227208232b93
Signed-off-by: Gari Singh <gari.r.singh@gmail.com>

Author: mastersingh24

peer/chaincode/install.go

@@ -103,7 +103,7 @@ func genChaincodeDeploymentSpec(cmd *cobra.Command, chaincodeName, chaincodeVers
 
 	cds, err := getChaincodeDeploymentSpec(spec, true)
 	if err != nil {
-		return nil, fmt.Errorf("Error getting chaincode code %s: %s", chainFuncName, err)
+		return nil, fmt.Errorf("error getting chaincode code %s: %s", chaincodeName, err)
 	}
 
 	return cds, nil

peer/chaincode/instantiate.go

@@ -62,36 +62,36 @@ func instantiate(cmd *cobra.Command, cf *ChaincodeCmdFactory) (*protcommon.Envel
 
 	cds, err := getChaincodeDeploymentSpec(spec, false)
 	if err != nil {
-		return nil, fmt.Errorf("Error getting chaincode code %s: %s", chainFuncName, err)
+		return nil, fmt.Errorf("error getting chaincode code %s: %s", chaincodeName, err)
 	}
 
 	creator, err := cf.Signer.Serialize()
 	if err != nil {
-		return nil, fmt.Errorf("Error serializing identity for %s: %s", cf.Signer.GetIdentifier(), err)
+		return nil, fmt.Errorf("error serializing identity for %s: %s", cf.Signer.GetIdentifier(), err)
 	}
 
 	prop, _, err := utils.CreateDeployProposalFromCDS(channelID, cds, creator, policyMarshalled, []byte(escc), []byte(vscc), collectionConfigBytes)
 	if err != nil {
-		return nil, fmt.Errorf("Error creating proposal  %s: %s", chainFuncName, err)
+		return nil, fmt.Errorf("error creating proposal  %s: %s", chainFuncName, err)
 	}
 
 	var signedProp *pb.SignedProposal
 	signedProp, err = utils.GetSignedProposal(prop, cf.Signer)
 	if err != nil {
-		return nil, fmt.Errorf("Error creating signed proposal  %s: %s", chainFuncName, err)
+		return nil, fmt.Errorf("error creating signed proposal  %s: %s", chainFuncName, err)
 	}
 
 	// instantiate is currently only supported for one peer
 	proposalResponse, err := cf.EndorserClients[0].ProcessProposal(context.Background(), signedProp)
 	if err != nil {
-		return nil, fmt.Errorf("Error endorsing %s: %s", chainFuncName, err)
+		return nil, fmt.Errorf("error endorsing %s: %s", chainFuncName, err)
 	}
 
 	if proposalResponse != nil {
 		// assemble a signed transaction (it's an Envelope message)
 		env, err := utils.CreateSignedTx(prop, cf.Signer, proposalResponse)
 		if err != nil {
-			return nil, fmt.Errorf("Could not assemble transaction, err %s", err)
+			return nil, fmt.Errorf("could not assemble transaction, err %s", err)
 		}
 
 		return env, nil

peer/chaincode/package.go

@@ -170,7 +170,7 @@ func chaincodePackage(cmd *cobra.Command, args []string, cdsFact ccDepSpecFactor
 
 	cds, err := cdsFact(spec)
 	if err != nil {
-		return fmt.Errorf("Error getting chaincode code %s: %s", chainFuncName, err)
+		return fmt.Errorf("error getting chaincode code %s: %s", chaincodeName, err)
 	}
 
 	var bytesToWrite []byte
@@ -187,7 +187,7 @@ func chaincodePackage(cmd *cobra.Command, args []string, cdsFact ccDepSpecFactor
 	fileToWrite := args[0]
 	err = ioutil.WriteFile(fileToWrite, bytesToWrite, 0700)
 	if err != nil {
-		logger.Errorf("Failed writing deployment spec to file [%s]: [%s]", fileToWrite, err)
+		logger.Errorf("failed writing deployment spec to file [%s]: [%s]", fileToWrite, err)
 		return err
 	}
 

peer/chaincode/upgrade.go

@@ -60,38 +60,38 @@ func upgrade(cmd *cobra.Command, cf *ChaincodeCmdFactory) (*protcommon.Envelope,
 
 	cds, err := getChaincodeDeploymentSpec(spec, false)
 	if err != nil {
-		return nil, fmt.Errorf("Error getting chaincode code %s: %s", chainFuncName, err)
+		return nil, fmt.Errorf("error getting chaincode code %s: %s", chaincodeName, err)
 	}
 
 	creator, err := cf.Signer.Serialize()
 	if err != nil {
-		return nil, fmt.Errorf("Error serializing identity for %s: %s", cf.Signer.GetIdentifier(), err)
+		return nil, fmt.Errorf("error serializing identity for %s: %s", cf.Signer.GetIdentifier(), err)
 	}
 
 	prop, _, err := utils.CreateUpgradeProposalFromCDS(channelID, cds, creator, policyMarshalled, []byte(escc), []byte(vscc))
 	if err != nil {
-		return nil, fmt.Errorf("Error creating proposal %s: %s", chainFuncName, err)
+		return nil, fmt.Errorf("error creating proposal %s: %s", chainFuncName, err)
 	}
 	logger.Debugf("Get upgrade proposal for chaincode <%v>", spec.ChaincodeId)
 
 	var signedProp *pb.SignedProposal
 	signedProp, err = utils.GetSignedProposal(prop, cf.Signer)
 	if err != nil {
-		return nil, fmt.Errorf("Error creating signed proposal  %s: %s", chainFuncName, err)
+		return nil, fmt.Errorf("error creating signed proposal  %s: %s", chainFuncName, err)
 	}
 
 	// upgrade is currently only supported for one peer
 	proposalResponse, err := cf.EndorserClients[0].ProcessProposal(context.Background(), signedProp)
 	if err != nil {
-		return nil, fmt.Errorf("Error endorsing %s: %s", chainFuncName, err)
+		return nil, fmt.Errorf("error endorsing %s: %s", chainFuncName, err)
 	}
 	logger.Debugf("endorse upgrade proposal, get response <%v>", proposalResponse.Response)
 
 	if proposalResponse != nil {
 		// assemble a signed transaction (it's an Envelope message)
 		env, err := utils.CreateSignedTx(prop, cf.Signer, proposalResponse)
 		if err != nil {
-			return nil, fmt.Errorf("Could not assemble transaction, err %s", err)
+			return nil, fmt.Errorf("could not assemble transaction, err %s", err)
 		}
 		logger.Debug("Get Signed envelope")
 		return env, nil

peer/chaincode/upgrade_test.go

@@ -98,7 +98,7 @@ func TestUpgradeCmdEndorseFail(t *testing.T) {
 		"-v", "anotherversion", "-c", "{\"Function\":\"init\",\"Args\": [\"param\",\"1\"]}"}
 	cmd.SetArgs(args)
 
-	expectErrMsg := fmt.Sprintf("Could not assemble transaction, err Proposal response was not successful, error code %d, msg %s", errCode, errMsg)
+	expectErrMsg := fmt.Sprintf("could not assemble transaction, err Proposal response was not successful, error code %d, msg %s", errCode, errMsg)
 	if err := cmd.Execute(); err == nil {
 		t.Errorf("Run chaincode upgrade cmd error:%v", err)
 	} else {