Merge 2549fc6fd1 into merged_master (Bitcoin PR bitcoin/bitcoin#31768)

This commit is contained in:
Tom Trevethan 2026-04-15 15:04:04 +01:00
commit d3434896ea

View file

@ -24,6 +24,7 @@ from test_framework.test_framework import BitcoinTestFramework
from test_framework.descriptors import descsum_create
from test_framework.util import (
assert_equal,
assert_greater_than,
assert_raises_rpc_error,
)
from test_framework.wallet_util import (
@ -705,6 +706,13 @@ class ImportDescriptorsTest(BitcoinTestFramework):
except JSONRPCException as e:
assert e.error["code"] == -4 and "Error: the wallet is currently being used to rescan the blockchain for related transactions. Please call `abortrescan` before changing the passphrase." in e.error["message"]
wallet_info = self.nodes[0].cli("-rpcwallet=encrypted_wallet").getwalletinfo()
try:
duration = wallet_info["scanning"]["duration"]
assert_greater_than(duration, 0)
except Exception:
assert "scanning" not in wallet_info
assert_equal(importing.result(), [{"success": True}])
assert_equal(temp_wallet.getbalance(), encrypted_wallet.getbalance())