Skip to content

Commit 7e6fc14

Browse files
Tom Trevethandelta1
authored andcommitted
resolve fixmes in wallet_migration.py: 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 860de3c)
1 parent 4bbee87 commit 7e6fc14

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

test/functional/wallet_migration.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -775,7 +775,7 @@ def test_conflict_txs(self):
775775
self.generate(self.nodes[0], 1)
776776

777777
# parent tx
778-
parent_txid = wallet.sendtoaddress(wallet.getnewaddress(), 9, replaceable=True) # ELEMENTS FIXME: investigate RBF
778+
parent_txid = wallet.sendtoaddress(wallet.getnewaddress(), 9, replaceable=True) # ELEMENTS: walletrbf=0 is set by default in the test_framework wallet config
779779
parent_txid_bytes = bytes.fromhex(parent_txid)[::-1]
780780
conflict_utxo = wallet.gettransaction(txid=parent_txid, verbose=True)["decoded"]["vin"][0]
781781
value = sum([out["value"] for out in wallet.gettransaction(txid=parent_txid, verbose=True)["decoded"]["vout"]]) # ELEMENTS
@@ -977,7 +977,7 @@ def test_preserve_tx_extra_info(self):
977977
# Create tx and bump it to store 'replaced_by_txid' and 'replaces_txid' data within the transactions.
978978
# Additionally, store an extra comment within the original tx.
979979
extra_comment = "don't discard me"
980-
original_tx_id = wallet.sendtoaddress(address=wallet.getnewaddress(), amount=1, comment=extra_comment, replaceable=True) # ELEMENTS FIXME
980+
original_tx_id = wallet.sendtoaddress(address=wallet.getnewaddress(), amount=1, comment=extra_comment, replaceable=True) # ELEMENTS: walletrbf=0 is set by default in the test_framework wallet config
981981
bumped_tx = wallet.bumpfee(txid=original_tx_id)
982982

983983
def check_comments():

0 commit comments

Comments
 (0)