LBRYCommunity/lbcd
1
0
Fork 0
Code Issues 17 Pull requests 4 Projects Releases 28 Packages Wiki Activity

Improve btcctl handling of empty RPC data returns.

Browse source 
There are several RPCs which do not return any data on success.  btcctl
was improperly treating this as an error condition.
This commit is contained in:
Dave Collins 2014-05-13 15:24:00 -05:00
parent ce142e8ca2
commit d6f7adeba8
1 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
util/btcctl/btcctl.go
View file

@ -38,7 +38,6 @@ type handlerData struct {
// Errors used in the various handlers. // Errors used in the various handlers.
var ( var (
ErrNoData = errors.New("No data returned.")
ErrNoDisplayHandler = errors.New("No display handler specified.") ErrNoDisplayHandler = errors.New("No display handler specified.")
ErrUsage = errors.New("btcctl usage") // Real usage is shown. ErrUsage = errors.New("btcctl usage") // Real usage is shown.
) )
@ -792,10 +791,6 @@ func send(cfg *config, msg []byte) (interface{}, error) {
return nil, reply.Error return nil, reply.Error
} }
if reply.Result == nil {
return nil, ErrNoData
}
return reply.Result, nil return reply.Result, nil
} }
@ -869,9 +864,12 @@ func commandHandler(cfg *config, command string, data *handlerData, args []strin
// Display the results of the JSON-RPC command using the provided // Display the results of the JSON-RPC command using the provided
// display handler. // display handler.
if reply != nil {
err = data.displayHandler(reply) err = data.displayHandler(reply)
if err != nil { if err != nil {
return err return err
}
} }
return nil return nil