LBRYCommunity/lbcwallet
1
0
Fork 0
Code Issues 5 Pull requests Projects Releases 14 Packages Wiki Activity

Do not error for empty tx comments.

Browse source 
This prevents the server from returning an error when empty strings
are passed as parameters for transaction comments for the
sendfrom/sendmany/sendtoaddress RPCs.  Non-empty strings will still
cause errors since transaction comments are not saved.

Fixes #356.
This commit is contained in:
Josh Rickmar 2016-02-02 09:46:59 -05:00
parent fda2e14b99
commit cc97e063b8
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
rpc/legacyrpc/methods.go
View file

@ -1416,6 +1416,10 @@ func sendPairs(w *wallet.Wallet, amounts map[string]btcutil.Amount,
return txShaStr, nil return txShaStr, nil
} }
func isNilOrEmpty(s *string) bool {
return s == nil || *s == ""
}
// SendFrom handles a sendfrom RPC request by creating a new transaction // SendFrom handles a sendfrom RPC request by creating a new transaction
// spending unspent transaction outputs for a wallet to another payment // spending unspent transaction outputs for a wallet to another payment
// address. Leftover inputs not sent to the payment address or a fee for // address. Leftover inputs not sent to the payment address or a fee for
@ -1426,7 +1430,7 @@ func SendFrom(icmd interface{}, w *wallet.Wallet, chainClient *chain.RPCClient)
// Transaction comments are not yet supported. Error instead of // Transaction comments are not yet supported. Error instead of
// pretending to save them. // pretending to save them.
if cmd.Comment != nil || cmd.CommentTo != nil { if !isNilOrEmpty(cmd.Comment) || !isNilOrEmpty(cmd.CommentTo) {
return nil, &btcjson.RPCError{ return nil, &btcjson.RPCError{
Code: btcjson.ErrRPCUnimplemented, Code: btcjson.ErrRPCUnimplemented,
Message: "Transaction comments are not yet supported", Message: "Transaction comments are not yet supported",
@ -1468,7 +1472,7 @@ func SendMany(icmd interface{}, w *wallet.Wallet) (interface{}, error) {
// Transaction comments are not yet supported. Error instead of // Transaction comments are not yet supported. Error instead of
// pretending to save them. // pretending to save them.
if cmd.Comment != nil { if !isNilOrEmpty(cmd.Comment) {
return nil, &btcjson.RPCError{ return nil, &btcjson.RPCError{
Code: btcjson.ErrRPCUnimplemented, Code: btcjson.ErrRPCUnimplemented,
Message: "Transaction comments are not yet supported", Message: "Transaction comments are not yet supported",
@ -1509,7 +1513,7 @@ func SendToAddress(icmd interface{}, w *wallet.Wallet) (interface{}, error) {
// Transaction comments are not yet supported. Error instead of // Transaction comments are not yet supported. Error instead of
// pretending to save them. // pretending to save them.
if cmd.Comment != nil || cmd.CommentTo != nil { if !isNilOrEmpty(cmd.Comment) || !isNilOrEmpty(cmd.CommentTo) {
return nil, &btcjson.RPCError{ return nil, &btcjson.RPCError{
Code: btcjson.ErrRPCUnimplemented, Code: btcjson.ErrRPCUnimplemented,
Message: "Transaction comments are not yet supported", Message: "Transaction comments are not yet supported",