From 4bbee87c2154b92fd76a6d79fdaf62886937bd54 Mon Sep 17 00:00:00 2001 From: Tom Trevethan Date: Tue, 16 Dec 2025 14:56:44 +0000 Subject: [PATCH] resolve fixmes in tool_wallet.py: wallet file shasum unchanged for both legacy and descriptor wallets. replaceable=True must be set explicitly in sendtoaddress as walletrbf=0 is set by default in the test_framework wallet config (test_framework/util.py:421) (cherry picked from commit 445a913b19ee55cc7560e693445defd531b0b7d2) --- test/functional/tool_wallet.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/test/functional/tool_wallet.py b/test/functional/tool_wallet.py index c4bee49f4c..6663501dff 100755 --- a/test/functional/tool_wallet.py +++ b/test/functional/tool_wallet.py @@ -258,8 +258,7 @@ class ToolWalletTest(BitcoinTestFramework): # TODO: Wallet tool info should not write to the wallet file. # This assertion should be uncommented and succeed: # assert_equal(timestamp_before, timestamp_after) - if not self.options.descriptors: # ELEMENTS FIXME - assert_equal(shasum_before, shasum_after) + assert_equal(shasum_before, shasum_after) self.log.debug('Wallet file shasum unchanged\n') def test_tool_wallet_create_on_existing_wallet(self): @@ -409,7 +408,7 @@ class ToolWalletTest(BitcoinTestFramework): self.generate(self.nodes[0], 1) # parent tx - parent_txid = wallet.sendtoaddress(wallet.getnewaddress(), 9, replaceable=True) # ELEMENTS FIXME: replaceable should be true by default, investigate + parent_txid = wallet.sendtoaddress(wallet.getnewaddress(), 9, replaceable=True) # ELEMENTS: walletrbf=0 by default in test_framework wallet config parent_txid_bytes = bytes.fromhex(parent_txid)[::-1] conflict_utxo = wallet.gettransaction(txid=parent_txid, verbose=True)["decoded"]["vin"][0] value = sum([out["value"] for out in wallet.gettransaction(txid=parent_txid, verbose=True)["decoded"]["vout"]]) # ELEMENTS