FAB-10047 Report error on list instantiated

Presently, the 'peer chaincode list --instantiated' command silently
ignores a request which fails, and simply prints no instantiated
chaincodes.  This CR patches the peer CLI to check for an error response
and to return an error.

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

Author: Jason Yellick

peer/chaincode/list.go

@@ -9,13 +9,14 @@ package chaincode
 import (
 	"bytes"
 	"encoding/hex"
-	"errors"
 	"fmt"
 	"reflect"
 
 	"github.com/golang/protobuf/proto"
+	cb "github.com/hyperledger/fabric/protos/common"
 	pb "github.com/hyperledger/fabric/protos/peer"
 	"github.com/hyperledger/fabric/protos/utils"
+	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 	"golang.org/x/net/context"
 )
@@ -92,7 +93,15 @@ func getChaincodes(cmd *cobra.Command, cf *ChaincodeCmdFactory) error {
 	// list is currently only supported for one peer
 	proposalResponse, err := cf.EndorserClients[0].ProcessProposal(context.Background(), signedProp)
 	if err != nil {
-		return fmt.Errorf("Error endorsing %s: %s", chainFuncName, err)
+		return errors.Errorf("Error endorsing %s: %s", chainFuncName, err)
+	}
+
+	if proposalResponse.Response == nil {
+		return errors.Errorf("Proposal response had nil 'response'")
+	}
+
+	if proposalResponse.Response.Status != int32(cb.Status_SUCCESS) {
+		return errors.Errorf("Bad response: %d - %s", proposalResponse.Response.Status, proposalResponse.Response.Message)
 	}
 
 	cqr := &pb.ChaincodeQueryResponse{}

peer/chaincode/list_test.go

@@ -106,6 +106,40 @@ func TestChaincodeListCmd(t *testing.T) {
 	}
 }
 
+func TestChaincodeListFailure(t *testing.T) {
+	InitMSP()
+
+	signer, err := common.GetDefaultSigner()
+	if err != nil {
+		t.Fatalf("Get default signer error: %s", err)
+	}
+
+	mockResponse := &pb.ProposalResponse{
+		Response:    &pb.Response{Status: 500, Message: "error message"},
+		Endorsement: &pb.Endorsement{},
+	}
+	mockEndorserClients := []pb.EndorserClient{common.GetMockEndorserClient(mockResponse, nil)}
+	mockBroadcastClient := common.GetMockBroadcastClient(nil)
+	mockCF := &ChaincodeCmdFactory{
+		EndorserClients: mockEndorserClients,
+		Signer:          signer,
+		BroadcastClient: mockBroadcastClient,
+	}
+
+	// reset channelID, it might have been set by previous test
+	channelID = ""
+
+	resetFlags()
+
+	// Get instantiated chaincodes
+	instantiatedChaincodesCmd := listCmd(mockCF)
+	args := []string{"--instantiated", "-C", "mychannel"}
+	instantiatedChaincodesCmd.SetArgs(args)
+	err = instantiatedChaincodesCmd.Execute()
+	assert.Error(t, err)
+	assert.Regexp(t, "Bad response: 500 - error message", err.Error())
+}
+
 func TestString(t *testing.T) {
 	id := []byte{1, 2, 3, 4, 5}
 	idBytes := hex.EncodeToString(id)