Skip to content

Commit 4bbee87

Browse files
Tom Trevethandelta1
authored andcommitted
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 445a913)
1 parent dd0b0f7 commit 4bbee87

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

test/functional/tool_wallet.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -258,8 +258,7 @@ def test_tool_wallet_info_after_transaction(self):
258258
# TODO: Wallet tool info should not write to the wallet file.
259259
# This assertion should be uncommented and succeed:
260260
# assert_equal(timestamp_before, timestamp_after)
261-
if not self.options.descriptors: # ELEMENTS FIXME
262-
assert_equal(shasum_before, shasum_after)
261+
assert_equal(shasum_before, shasum_after)
263262
self.log.debug('Wallet file shasum unchanged\n')
264263

265264
def test_tool_wallet_create_on_existing_wallet(self):
@@ -409,7 +408,7 @@ def test_chainless_conflicts(self):
409408
self.generate(self.nodes[0], 1)
410409

411410
# parent tx
412-
parent_txid = wallet.sendtoaddress(wallet.getnewaddress(), 9, replaceable=True) # ELEMENTS FIXME: replaceable should be true by default, investigate
411+
parent_txid = wallet.sendtoaddress(wallet.getnewaddress(), 9, replaceable=True) # ELEMENTS: walletrbf=0 by default in test_framework wallet config
413412
parent_txid_bytes = bytes.fromhex(parent_txid)[::-1]
414413
conflict_utxo = wallet.gettransaction(txid=parent_txid, verbose=True)["decoded"]["vin"][0]
415414
value = sum([out["value"] for out in wallet.gettransaction(txid=parent_txid, verbose=True)["decoded"]["vout"]]) # ELEMENTS

0 commit comments

Comments
 (0)