diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2017-06-01 10:47:56 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2017-06-01 10:48:19 +0200 |
| commit | ef2d062c9f723134b430f60ee23c920ec4988194 (patch) | |
| tree | b07dea318014b0314ed30f101e0e7add70ef1af0 | |
| parent | 10e8c0a298b389b9f37f320dbb87df68c4f0454f (diff) | |
| parent | 1b6602fbe66c0205acd4a33b9183080ec500fc72 (diff) | |
| download | bitcoin-ef2d062c9f723134b430f60ee23c920ec4988194.tar.xz | |
Merge #10450: Fix bumpfee rpc "errors" return value
1b6602f Fix bumpfee rpc "errors" return value (Russell Yanofsky)
Tree-SHA512: a55d4dbe28c75f31fde3b7de60479265bb8f3777f432d1db321f1dd848d5274c353f757b09ed3cad9c69c08acbf3906679d27052267db943ab2b19629f79bd81
| -rw-r--r-- | src/wallet/rpcwallet.cpp | 2 | ||||
| -rwxr-xr-x | test/functional/bumpfee.py | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp index ae4f4f37cb..0860d3565c 100644 --- a/src/wallet/rpcwallet.cpp +++ b/src/wallet/rpcwallet.cpp @@ -2909,7 +2909,7 @@ UniValue bumpfee(const JSONRPCRequest& request) UniValue errors(UniValue::VARR); for (const std::string& err: feeBump.getErrors()) errors.push_back(err); - result.push_back(errors); + result.push_back(Pair("errors", errors)); return result; } diff --git a/test/functional/bumpfee.py b/test/functional/bumpfee.py index 54fd7740c1..aaed420690 100755 --- a/test/functional/bumpfee.py +++ b/test/functional/bumpfee.py @@ -88,6 +88,7 @@ def test_simple_bumpfee_succeeds(rbf_node, peer_node, dest_address): sync_mempools((rbf_node, peer_node)) assert rbfid in rbf_node.getrawmempool() and rbfid in peer_node.getrawmempool() bumped_tx = rbf_node.bumpfee(rbfid) + assert_equal(bumped_tx["errors"], []) assert bumped_tx["fee"] - abs(rbftx["fee"]) > 0 # check that bumped_tx propogates, original tx was evicted and has a wallet conflict sync_mempools((rbf_node, peer_node)) |