diff options
| author | Sjors Provoost <sjors@sprovoost.nl> | 2020-09-17 20:57:51 +0200 |
|---|---|---|
| committer | Sjors Provoost <sjors@sprovoost.nl> | 2020-09-17 20:59:09 +0200 |
| commit | 0fc1c685e1ca68ca8ed2b35f623bbe6a9fc36d66 (patch) | |
| tree | dfefa94837e1574d504ba9f69032ead9969426be | |
| parent | efc9b85e6f4aa431d308089874a18f0bbdcdd0fd (diff) | |
| download | bitcoin-0fc1c685e1ca68ca8ed2b35f623bbe6a9fc36d66.tar.xz | |
[rpc] send: fix parsing replaceable option
| -rw-r--r-- | src/wallet/rpcwallet.cpp | 2 | ||||
| -rwxr-xr-x | test/functional/wallet_send.py | 8 |
2 files changed, 7 insertions, 3 deletions
diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp index 0191f8372b..1503826752 100644 --- a/src/wallet/rpcwallet.cpp +++ b/src/wallet/rpcwallet.cpp @@ -3995,7 +3995,7 @@ static RPCHelpMan send() int change_position; bool rbf = pwallet->m_signal_rbf; if (options.exists("replaceable")) { - rbf = options["add_to_wallet"].get_bool(); + rbf = options["replaceable"].get_bool(); } CMutableTransaction rawTx = ConstructTransaction(options["inputs"], request.params[0], options["locktime"], rbf); CCoinControl coin_control; diff --git a/test/functional/wallet_send.py b/test/functional/wallet_send.py index b64d2030a4..c5b02ff32a 100755 --- a/test/functional/wallet_send.py +++ b/test/functional/wallet_send.py @@ -328,8 +328,12 @@ class WalletSendTest(BitcoinTestFramework): self.test_send(from_wallet=w0, to_wallet=w1, amount=1, inputs=[utxo1],add_to_wallet=False) self.log.info("Replaceable...") - self.test_send(from_wallet=w0, to_wallet=w1, amount=1, add_to_wallet=False, replaceable=True) - self.test_send(from_wallet=w0, to_wallet=w1, amount=1, add_to_wallet=False, replaceable=False) + res = self.test_send(from_wallet=w0, to_wallet=w1, amount=1, add_to_wallet=True, replaceable=True) + assert res["complete"] + assert_equal(self.nodes[0].gettransaction(res["txid"])["bip125-replaceable"], "yes") + res = self.test_send(from_wallet=w0, to_wallet=w1, amount=1, add_to_wallet=True, replaceable=False) + assert res["complete"] + assert_equal(self.nodes[0].gettransaction(res["txid"])["bip125-replaceable"], "no") self.log.info("Subtract fee from output") self.test_send(from_wallet=w0, to_wallet=w1, amount=1, subtract_fee_from_outputs=[0]) |