Merge "[FAB-3694] Fix error handling in peer channel cmd"

hyperledger · May 7, 2017 · c346b06 · c346b06
2 parents 3162771 + 2d96232
commit c346b06
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git a/peer/channel/channel.go b/peer/channel/channel.go
@@ -100,10 +100,6 @@ func InitCmdFactory(isOrdererRequired bool) (*ChannelCmdFactory, error) {
 		return common.GetBroadcastClient(orderingEndpoint, tls, caFile)
 	}
 
-	if err != nil {
-		return nil, fmt.Errorf("Error getting broadcast client: %s", err)
-	}
-
 	//for join, we need the endorser as well
 	if isOrdererRequired {
 		cmdFact.EndorserClient, err = common.GetEndorserClient()

diff --git a/peer/channel/create.go b/peer/channel/create.go
@@ -158,7 +158,7 @@ func sendCreateChainTransaction(cf *ChannelCmdFactory) error {
 	var broadcastClient common.BroadcastClient
 	broadcastClient, err = cf.BroadcastFactory()
 	if err != nil {
-		return err
+		return fmt.Errorf("Error getting broadcast client: %s", err)
 	}
 
 	defer broadcastClient.Close()