Removes the deprecation message, behavior, and test.
This was marked for removal in 22.0.
Removes the deprecation message, behavior, and test.
This was marked for removal in 22.0.
3@@ -4,7 +4,7 @@
4 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
5 """Test deprecation of RPC calls."""
6 from test_framework.test_framework import BitcoinTestFramework
7-from test_framework.util import assert_raises_rpc_error, find_vout_for_address
8+ifrom test_framework.util import assert_raises_rpc_error
0from test_framework.util import assert_raises_rpc_error
0 ifrom test_framework.util import assert_raises_rpc_error
1 ^
2SyntaxError: invalid syntax
3448@@ -3449,10 +3449,7 @@ static RPCHelpMan bumpfee_helper(std::string method_name)
3449 CWallet* const pwallet = wallet.get();
3450
3451 if (pwallet->IsWalletFlagSet(WALLET_FLAG_DISABLE_PRIVATE_KEYS) && !want_psbt) {
3452- if (!pwallet->chain().rpcEnableDeprecated("bumpfee")) {
3453- throw JSONRPCError(RPC_METHOD_DEPRECATED, "Using bumpfee with wallets that have private keys disabled is deprecated. Use psbtbumpfee instead or restart bitcoind with -deprecatedrpc=bumpfee. This functionality will be removed in 0.22");
3454- }
3455- want_psbt = true;
3456+ throw JSONRPCError(RPC_METHOD_DEPRECATED, "bumpfee is not available with wallets that have private keys disabled. Use psbtbumpfee instead.");
The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.
Reviewers, this pull request conflicts with the following ones:
If you consider this pull request important, please also help to review the conflicting pull requests. Ideally, start with the one that should be merged first.