From 42330922dd8d5f96dbc0cc6a8e4092500029f89d Mon Sep 17 00:00:00 2001 From: rkrux Date: Tue, 26 May 2026 16:18:25 +0530 Subject: [PATCH] wallet, test: remove -walletrbf startup option from wallet_backwards_compatibility.py --- test/functional/test_framework/wallet_util.py | 1 - test/functional/wallet_backwards_compatibility.py | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/test/functional/test_framework/wallet_util.py b/test/functional/test_framework/wallet_util.py index 18095a3b14a..30d5a3a6414 100755 --- a/test/functional/test_framework/wallet_util.py +++ b/test/functional/test_framework/wallet_util.py @@ -24,7 +24,6 @@ from test_framework.script_util import ( script_to_p2sh_script, ) -WALLETRBF_DEPRECATION_WARNING = "Warning: -walletrbf is deprecated and will be fully removed in the next release." Key = namedtuple('Key', ['privkey', 'pubkey', diff --git a/test/functional/wallet_backwards_compatibility.py b/test/functional/wallet_backwards_compatibility.py index b2a74893306..af50bcdbc12 100755 --- a/test/functional/wallet_backwards_compatibility.py +++ b/test/functional/wallet_backwards_compatibility.py @@ -28,7 +28,6 @@ from test_framework.util import ( assert_greater_than, assert_raises_rpc_error, ) -from test_framework.wallet_util import WALLETRBF_DEPRECATION_WARNING LAST_KEYPOOL_INDEX = 9 # Index of the last derived address with the keypool size of 10 @@ -39,7 +38,7 @@ class BackwardsCompatibilityTest(BitcoinTestFramework): # Add new version after each release: self.extra_args = [ ["-addresstype=bech32", "-whitelist=noban@127.0.0.1"], # Pre-release: use to mine blocks. noban for immediate tx relay - ["-nowallet", "-walletrbf=1", "-addresstype=bech32", "-whitelist=noban@127.0.0.1"], # Pre-release: use to receive coins, swap wallets, etc + ["-nowallet", "-addresstype=bech32", "-whitelist=noban@127.0.0.1"], # Pre-release: use to receive coins, swap wallets, etc ["-nowallet", "-walletrbf=1", "-addresstype=bech32", "-whitelist=noban@127.0.0.1"], # v25.0 ["-nowallet", "-walletrbf=1", "-addresstype=bech32", "-whitelist=noban@127.0.0.1"], # v24.0.1 ["-nowallet", "-walletrbf=1", "-addresstype=bech32", "-whitelist=noban@127.0.0.1"], # v23.0 @@ -350,7 +349,8 @@ class BackwardsCompatibilityTest(BitcoinTestFramework): # Restore the wallet to master load_res = node_master.restorewallet(wallet_name, backup_path) - assert_equal(load_res["warnings"], [WALLETRBF_DEPRECATION_WARNING[9:]]) + # There should be no warnings + assert "warnings" not in load_res wallet = node_master.get_wallet_rpc(wallet_name) info = wallet.getaddressinfo(address)