From 4326c089279511f818caffc656104fec5171708a Mon Sep 17 00:00:00 2001 From: niftynei Date: Tue, 19 Jul 2022 17:04:38 +0930 Subject: [PATCH] test nit: wait_for_mempool cleanup Wait for mempool=1 before making a block --- tests/test_connection.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/tests/test_connection.py b/tests/test_connection.py index 1dc6fbfb9..af0421142 100644 --- a/tests/test_connection.py +++ b/tests/test_connection.py @@ -934,8 +934,7 @@ def test_shutdown_awaiting_lockin(node_factory, bitcoind): chanid = l1.rpc.fundchannel(l2.info['id'], 10**6)['channel_id'] # Technically, this is async to fundchannel. - l1.daemon.wait_for_log('sendrawtx exit 0') - bitcoind.generate_block(1) + bitcoind.generate_block(1, wait_for_mempool=1) l1.rpc.close(chanid) @@ -951,9 +950,8 @@ def test_shutdown_awaiting_lockin(node_factory, bitcoind): # CLOSINGD_COMPLETE may come first). l1.daemon.wait_for_logs(['sendrawtx exit 0', ' to CLOSINGD_COMPLETE']) l2.daemon.wait_for_logs(['sendrawtx exit 0', ' to CLOSINGD_COMPLETE']) - assert bitcoind.rpc.getmempoolinfo()['size'] == 1 - bitcoind.generate_block(1) + bitcoind.generate_block(1, wait_for_mempool=1) l1.daemon.wait_for_log(' to ONCHAIN') l2.daemon.wait_for_log(' to ONCHAIN')