diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp --- a/src/wallet/rpcwallet.cpp +++ b/src/wallet/rpcwallet.cpp @@ -3465,7 +3465,7 @@ "false) Also select inputs which are watch only\n" " \"lockUnspents\" (boolean, optional, default " "false) Lock selected unspent outputs\n" - " \"reserveChangeKey\" (boolean, optional, default true) " + " \"reserveChangeKey\" (boolean, optional) " "DEPRECATED. Reserves the change output key from the keypool\n" " \"feeRate\" (numeric, optional, default not " "set: makes wallet determine the fee) Set a specific feerate (" + diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h --- a/src/wallet/wallet.h +++ b/src/wallet/wallet.h @@ -988,7 +988,7 @@ int &nChangePosInOut, std::string &strFailReason, bool lockUnspents, const std::set &setSubtractFeeFromOutputs, - CCoinControl coinControl, bool keepReserveKey = false); + CCoinControl coinControl, bool keepReserveKey); bool SignTransaction(CMutableTransaction &tx); /** diff --git a/test/functional/rpc_fundrawtransaction.py b/test/functional/rpc_fundrawtransaction.py --- a/test/functional/rpc_fundrawtransaction.py +++ b/test/functional/rpc_fundrawtransaction.py @@ -709,10 +709,17 @@ # # DEPRECATED, should be removed in v0.20 # Test address reuse option does # - # not work in regular use # + # throws an rpc error when not deprecated # # - assert_raises_rpc_error(-32, "fundrawtransaction -reserveChangeKey is deprecated and will be fully removed in v0.20. To use the -reserveChangeKey option in v0.19, restart bitcoind with -deprecatedrpc=fundrawtransaction.\nProjects should transition to expecting change addresses removed from the keypool before upgrading to v0.20", + assert_raises_rpc_error(-32, "fundrawtransaction -reserveChangeKey " + + "is deprecated and will be fully removed " + + "in v0.20. To use the -reserveChangeKey " + + "option in v0.19, restart bitcoind with " + + "-deprecatedrpc=fundrawtransaction.\n" + + "Projects should transition to expecting " + + "change addresses removed from the keypool " + + "before upgrading to v0.20", self.nodes[3].fundrawtransaction, rawTx, {"reserveChangeKey": False})