Merge "[FAB-7236] peer chaincode list installed requires chid"

hyperledger · Dec 11, 2017 · 179f158 · 179f158
2 parents b693731 + 59b86b7
commit 179f158
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 6 deletions.
diff --git a/peer/chaincode/list.go b/peer/chaincode/list.go
@@ -48,7 +48,7 @@ func listCmd(cf *ChaincodeCmdFactory) *cobra.Command {
 }
 
 func getChaincodes(cmd *cobra.Command, cf *ChaincodeCmdFactory) error {
-	if channelID == "" {
+	if getInstantiatedChaincodes && channelID == "" {
 		return errors.New("The required parameter 'channelID' is empty. Rerun the command with -C flag")
 	}
 	var err error

diff --git a/peer/chaincode/list_test.go b/peer/chaincode/list_test.go
@@ -59,11 +59,6 @@ func TestChaincodeListCmd(t *testing.T) {
 
 	args := []string{"--installed"}
 	installedChaincodesCmd.SetArgs(args)
-	err = installedChaincodesCmd.Execute()
-	assert.Error(t, err, "Run chaincode list cmd to get installed chaincodes should fail if invoked without -C flag")
-
-	args = []string{"--installed", "-C", "mychannel"}
-	installedChaincodesCmd.SetArgs(args)
 	if err := installedChaincodesCmd.Execute(); err != nil {
 		t.Errorf("Run chaincode list cmd to get installed chaincodes error:%v", err)
 	}