highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2026-06-11 23:30:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

wallet, test: remove -walletrbf startup option from wallet_backwards_compatibility.py

Browse Source
This commit is contained in:
rkrux
2026-05-26 16:18:25 +05:30
parent 8cb6e405d8
commit 42330922dd
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
test/functional/test_framework/wallet_util.py
View File

@@ -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',

6
test/functional/wallet_backwards_compatibility.py
View File

@@ -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)