rpc: Remove deprecated bumpfee behavior #20891

pull achow101 wants to merge 1 commits into bitcoin:master from achow101:rm-bumpfee-deprecated changing 3 files +5 −36
  1. achow101 commented at 11:15 pm on January 8, 2021: member

    Removes the deprecation message, behavior, and test.

    This was marked for removal in 22.0.

  2. in test/functional/rpc_deprecated.py:7 in 8c39369837 outdated
    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
    


    jonatack commented at 11:19 pm on January 8, 2021:
    0from test_framework.util import assert_raises_rpc_error
    
    0    ifrom test_framework.util import assert_raises_rpc_error
    1          ^
    2SyntaxError: invalid syntax
    

    achow101 commented at 11:19 pm on January 8, 2021:
    oops. fixed
  3. achow101 force-pushed on Jan 8, 2021
  4. in src/wallet/rpcwallet.cpp:3452 in 2bfdf76f23 outdated
    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.");
    


    jonatack commented at 11:32 pm on January 8, 2021:
    Might be good to move the assert_raises_rpc_error test into test/functional/wallet_bumpfee.py (with the new message).

    achow101 commented at 11:59 pm on January 8, 2021:
    Done
  5. jonatack commented at 11:32 pm on January 8, 2021: member
    utACK, modulo test suggestion
  6. Remove deprecated bumpfee behavior ea0a7ec949
  7. achow101 force-pushed on Jan 8, 2021
  8. DrahtBot added the label RPC/REST/ZMQ on Jan 9, 2021
  9. DrahtBot added the label Wallet on Jan 9, 2021
  10. DrahtBot commented at 3:45 am on January 9, 2021: member

    The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.

    Conflicts

    Reviewers, this pull request conflicts with the following ones:

    • #20892 (tests: Run both descriptor and legacy tests within a single test invocation by achow101)
    • #20267 (Disable and fix tests for when BDB is not compiled by achow101)

    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.

  11. hixio-mh commented at 11:25 am on January 10, 2021: none
    Tarik penggabungan diminta #20890
  12. promag commented at 2:11 pm on January 10, 2021: member
    ACK ea0a7ec949f0f7e212f0d8819f7a54cad2258bdd, maybe add need release notes tag.
  13. hendeyk approved
  14. laanwj added the label Needs release note on Jan 19, 2021
  15. laanwj merged this on Jan 19, 2021
  16. laanwj closed this on Jan 19, 2021

  17. sidhujag referenced this in commit b21bc5b270 on Jan 20, 2021
  18. MarcoFalke removed the label Needs release note on Mar 29, 2021
  19. fanquake referenced this in commit 2b2ab9ab78 on Apr 1, 2021
  20. MarcoFalke referenced this in commit db1aca01d5 on May 25, 2021
  21. sidhujag referenced this in commit ddb28d1120 on May 25, 2021
  22. DrahtBot locked this on Aug 16, 2022

github-metadata-mirror

This is a metadata mirror of the GitHub repository bitcoin/bitcoin. This site is not affiliated with GitHub. Content is generated from a GitHub metadata backup.
generated: 2024-11-17 12:12 UTC

This site is hosted by @0xB10C
More mirrored repositories can be found on mirror.b10c.me