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

[lbry] rpc: made invalidate/reconsiderBlock return RPC errors

Browse source
This commit is contained in:
Brannon King 2021-12-29 16:58:17 -05:00
parent 6da78c0bf1
commit 8b11a933c1
1 changed files with 25 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
rpcserver.go
View file

@ -3012,10 +3012,20 @@ func handleInvalidateBlock(s *rpcServer, cmd interface{}, closeChan <-chan struc
hash, err := chainhash.NewHashFromStr(c.BlockHash) hash, err := chainhash.NewHashFromStr(c.BlockHash)
if err != nil { if err != nil {
return nil, err return nil, &btcjson.RPCError{
Code: btcjson.ErrRPCInvalidParameter,
Message: "Unable to parse hash: " + err.Error(),
}
} }
return nil, s.cfg.Chain.InvalidateBlock(hash) err = s.cfg.Chain.InvalidateBlock(hash)
if err != nil {
return nil, &btcjson.RPCError{
Code: btcjson.ErrRPCInternal.Code,
Message: "Unable to invalidate block: " + err.Error(),
}
}
return nil, nil
} }
// handleReconsiderBlock implements the reconsiderblock command // handleReconsiderBlock implements the reconsiderblock command
@ -3024,10 +3034,20 @@ func handleReconsiderBlock(s *rpcServer, cmd interface{}, closeChan <-chan struc
hash, err := chainhash.NewHashFromStr(c.BlockHash) hash, err := chainhash.NewHashFromStr(c.BlockHash)
if err != nil { if err != nil {
return nil, err return nil, &btcjson.RPCError{
Code: btcjson.ErrRPCInvalidParameter,
Message: "Unable to parse hash: " + err.Error(),
}
} }
return nil, s.cfg.Chain.ReconsiderBlock(hash) err = s.cfg.Chain.ReconsiderBlock(hash)
if err != nil {
return nil, &btcjson.RPCError{
Code: btcjson.ErrRPCInternal.Code,
Message: "Unable to reconsider block: " + err.Error(),
}
}
return nil, nil
} }
// handleHelp implements the help command. // handleHelp implements the help command.
@ -4303,7 +4323,7 @@ func (s *rpcServer) processRequest(request *btcjson.Request, isAdmin bool, close
} else { } else {
jsonErr = &btcjson.RPCError{ jsonErr = &btcjson.RPCError{
Code: btcjson.ErrRPCInvalidRequest.Code, Code: btcjson.ErrRPCInvalidRequest.Code,
Message: "Invalid request: malformed", Message: "Invalid request: " + err.Error(),
} }
} }
} }