wallet, test: remove -walletrbf startup option from wallet_backwards_compatibility.py
What the developer wrote
Authored by rkrux
wallet, test: remove -walletrbf startup option from wallet_backwards_compatibility.py
What changed, and why it matters
This is a routine test-only cleanup. It removes an obsolete command-line option (-walletrbf) and its associated deprecation warning from a backwards-compatibility test script. There is no change to the Bitcoin Core wallet or network code that end users run, and no security issue is present.
No action required. This is a non-security test cleanup.
Security signals we found
No strong security signals were identified.
Evidence from the diff
The commit modifies two functional test files. It deletes the WALLETRBF_DEPRECATION_WARNING string from wallet_util.py and removes -walletrbf=1 from the master/pre-release node arguments in wallet_backwards_compatibility.py. The assertion that previously expected the deprecation warning is changed to assert that no ‘warnings’ key exists in the restorewallet response. This is purely a test maintenance patch following the removal of the -walletrbf option.
Changed components
test/functional/test_framework/wallet_util.pytest/functional/wallet_backwards_compatibility.pyInspect captured patch +3 / −4
diff --git a/test/functional/test_framework/wallet_util.py b/test/functional/test_framework/wallet_util.py
index 18095a3b..30d5a3a6 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 b2a74893..af50bcdb 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)
Why this scored 15/100
Community notes
Notes can correct, qualify, or add evidence to the AI analysis. Every note shown here has been validated by a human moderator.
The AI analysis stands alone for now. Submit a note if you can add evidence or important context.