Skip to content

Commit f435c34

Browse files
committed
[FAB-8017] Peer CLI fetch cmd error assignment issue
This CR fixes the fetch command's error assignment to ensure the correct errors are being assigned and checked before proceeding. With this fix, the end user will receive the correct error message instead of a error message related to marshaling a nil value. Change-Id: I39a32291357ff01f82e1bbd4df2ef6665f77d50b Signed-off-by: Will Lahti <wtlahti@us.ibm.com>
1 parent 0c3673e commit f435c34

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

peer/channel/fetchconfig.go

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -69,18 +69,18 @@ func fetch(cmd *cobra.Command, args []string, cf *ChannelCmdFactory) error {
6969
case "newest":
7070
block, err = cf.DeliverClient.getNewestBlock()
7171
case "config":
72-
iBlock, err := cf.DeliverClient.getNewestBlock()
73-
if err != nil {
74-
return err
72+
iBlock, err2 := cf.DeliverClient.getNewestBlock()
73+
if err2 != nil {
74+
return err2
7575
}
76-
lc, err := utils.GetLastConfigIndexFromBlock(iBlock)
77-
if err != nil {
78-
return err
76+
lc, err2 := utils.GetLastConfigIndexFromBlock(iBlock)
77+
if err2 != nil {
78+
return err2
7979
}
8080
block, err = cf.DeliverClient.getSpecifiedBlock(lc)
8181
default:
82-
num, err := strconv.Atoi(args[0])
83-
if err != nil {
82+
num, err2 := strconv.Atoi(args[0])
83+
if err2 != nil {
8484
return fmt.Errorf("fetch target illegal: %s", args[0])
8585
}
8686
block, err = cf.DeliverClient.getSpecifiedBlock(uint64(num))

0 commit comments

Comments
 (0)