From 1ddf4bac2c2248cae1816aa4ef5b277d08a89c88 Mon Sep 17 00:00:00 2001
From: Rusty Russell <rusty@rustcorp.com.au>
Date: Fri, 14 Jul 2023 13:59:07 +0930
Subject: [PATCH] pytest: fix flake in
 tests/test_closing.py::test_penalty_rbf_normal[True]

We assume that RBFs will happen in order (txid1, txid2) but that doesn't always happen.

```
        for depth in range(2, 10):
            bitcoind.generate_block(1)
            # l2 should RBF, twice even, one for the l1 main output,
            # one for the l1 HTLC output.
            # Don't assume a specific order!
            start = l2.daemon.logsearch_start
>           txid1 = get_rbf_txid(l2, txid1)

tests/test_closing.py:1671:
...
                            print("({} was previously in logs!)".format(r))
>                   raise TimeoutError('Unable to find "{}" in logs.'.format(exs))
E                   TimeoutError: Unable to find "[re.compile('RBF onchain .*1fe38fe22852baaedccc3a9fd9d897e46bae5b7ca31daf23e0aa456fb235475e')]" in logs.

contrib/pyln-testing/pyln/testing/utils.py:328: TimeoutError
```

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
---
 tests/test_closing.py | 21 +++++----------------
 1 file changed, 5 insertions(+), 16 deletions(-)

diff --git a/tests/test_closing.py b/tests/test_closing.py
index 014d89262..fac3d3280 100644
--- a/tests/test_closing.py
+++ b/tests/test_closing.py
@@ -1656,21 +1656,12 @@ def test_penalty_rbf_normal(node_factory, bitcoind, executor, chainparams, ancho
     assert blocks1 == 0
     assert blocks2 == 0
 
-    def get_rbf_txid(node, txid):
-        line = node.daemon.wait_for_log("RBF onchain .*{}".format(txid))
-        newtxid = re.search(r'with txid ([0-9a-fA-F]*)', line).group(1)
-        return newtxid
-
     # Now the censoring miners generate some blocks.
     for depth in range(2, 10):
         bitcoind.generate_block(1)
         # l2 should RBF, twice even, one for the l1 main output,
         # one for the l1 HTLC output.
-        # Don't assume a specific order!
-        start = l2.daemon.logsearch_start
-        txid1 = get_rbf_txid(l2, txid1)
-        l2.daemon.logsearch_start = start
-        txid2 = get_rbf_txid(l2, txid2)
+        l2.daemon.wait_for_logs(['RBF onchain txid'] * 2)
 
     # Now that the transactions have high fees, independent miners
     # realize they can earn potentially more money by grabbing the
@@ -1682,14 +1673,12 @@ def test_penalty_rbf_normal(node_factory, bitcoind, executor, chainparams, ancho
     bitcoind.generate_block(1, needfeerate=10000000)
 
     # This triggers the final RBF attempt
-    start = l2.daemon.logsearch_start
-    txid1 = get_rbf_txid(l2, txid1)
-    l2.daemon.logsearch_start = start
-    txid2 = get_rbf_txid(l2, txid2)
+    l2.daemon.wait_for_logs(['RBF onchain txid'] * 2)
+
+    # FIXME: Some of those RBFs may not be accepted by bitcoind, we don't bother with txid checks
 
     # Now the non-censoring miners overpower the censoring miners.
-    # FIXME: Some of those RBFs may not be accepted by bitcoind, so just check number in mempool.
-    bitcoind.generate_block(1, wait_for_mempool=len([txid1, txid2]))
+    bitcoind.generate_block(1, wait_for_mempool=2)
     sync_blockheight(bitcoind, [l2])
 
     # And l2 should consider it resolved now.