Merge "[FAB-12121] Invoke to return useful CLI error response" into r…

…elease-1.3
hyperledger · Oct 7, 2018 · 389949d · 389949d
2 parents 5edfc76 + 90d0727
commit 389949d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/peer/chaincode/common.go b/peer/chaincode/common.go
@@ -125,7 +125,7 @@ func chaincodeInvokeOrQuery(cmd *cobra.Command, invoke bool, cf *ChaincodeCmdFac
 			return errors.WithMessage(err, "error while unmarshaling chaincode action")
 		}
 		if proposalResp.Endorsement == nil {
-			return errors.Errorf("endorsement failure during invoke. chaincode result: %v", ca.Response)
+			return errors.Errorf("endorsement failure during invoke. response: %v", proposalResp.Response)
 		}
 		logger.Infof("Chaincode invoke successful. result: %v", ca.Response)
 	} else {

diff --git a/peer/chaincode/invoke_test.go b/peer/chaincode/invoke_test.go
@@ -218,7 +218,7 @@ func TestInvokeCmdEndorsementFailure(t *testing.T) {
 		err = cmd.Execute()
 		assert.Error(t, err)
 		assert.Contains(t, err.Error(), "endorsement failure during invoke")
-		assert.Contains(t, err.Error(), fmt.Sprintf("chaincode result: status:%d payload:\"%s\"", ccRespStatus[i], ccRespPayload[i]))
+		assert.Contains(t, err.Error(), fmt.Sprintf("response: status:%d payload:\"%s\"", ccRespStatus[i], ccRespPayload[i]))
 	}
 }