GlcoinCore/cln
1
0
Fork 0
mirror of https://github.com/ElementsProject/lightning.git synced 2026-08-13 12:32:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

tests: fix flaky test_simple_close_delay_broadcast mempool race

Browse source 
The test mined a block as soon as 'Broadcasting txid' appeared in l2's
log, but that log fires when CLN calls sendrawtransaction, not when
bitcoind has accepted the tx into its mempool. Under rpcproxy timing the
block could be mined empty, leaving the funding output unspent so
'Resolved FUNDING_TRANSACTION/FUNDING_OUTPUT by MUTUAL_CLOSE' never
logged and the test timed out.

Wait for the tx to enter the mempool before generating the block.

Changelog-None
This commit is contained in:
Níckolas Goline 2026-07-07 18:57:56 -03:00 • committed by daywalker90
parent 2d367bef8b
commit 5ae0705f22
1 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

11
tests/test_closing.py
View file

@ -4358,11 +4358,14 @@ def test_simple_close_delay_broadcast(node_factory, bitcoind, executor):
== 'CLOSINGD_COMPLETE')
assert not l2.daemon.is_in_log('Simple close: delaying broadcast')
# l2 broadcasts immediately; wait until its tx is confirmed.
# We wait for the broadcast log rather than polling getrawmempool(),
# which can miss a just-submitted tx under the rpcproxy timing.
# l2 broadcasts immediately; wait until its tx is actually in the mempool
# before mining. The 'Broadcasting txid' log only means CLN *called*
# sendrawtransaction, not that bitcoind accepted the tx: mining on the log
# alone can produce an empty block under rpcproxy timing, leaving the
# funding output unspent so MUTUAL_CLOSE never resolves. generate_block's
# wait_for_mempool polls until the tx appears, so it can't miss it.
l2.daemon.wait_for_log('Broadcasting txid')
bitcoind.generate_block(1)
bitcoind.generate_block(1, wait_for_mempool=1)
l1.daemon.wait_for_log('Resolved FUNDING_TRANSACTION/FUNDING_OUTPUT by MUTUAL_CLOSE')
l2.daemon.wait_for_log('Resolved FUNDING_TRANSACTION/FUNDING_OUTPUT by MUTUAL_CLOSE')
fut.result(timeout=10)