diff --git a/tests/test_connection.py b/tests/test_connection.py index c69b35bee..7b4f435f9 100644 --- a/tests/test_connection.py +++ b/tests/test_connection.py @@ -1891,7 +1891,10 @@ def test_multifunding_simple(node_factory, bitcoind): "amount": 50000}] l1.rpc.multifundchannel(destinations) - bitcoind.generate_block(6, wait_for_mempool=1) + bitcoind.generate_block(1, wait_for_mempool=1) + # Don't have others reject channel_announcement as too far in future. + sync_blockheight(bitcoind, [l1, l2, l3, l4]) + bitcoind.generate_block(5) for node in [l1, l2, l3, l4]: node.daemon.wait_for_log(r'to CHANNELD_NORMAL') @@ -3471,6 +3474,8 @@ def test_wumbo_channels(node_factory, bitcoind): # Get that mined, and announced. bitcoind.generate_block(6, wait_for_mempool=1) + # Make sure l3 is ready to receive channel announcement! + sync_blockheight(bitcoind, [l1, l2, l3]) # Connect l3, get gossip. l3.rpc.connect(l1.info['id'], 'localhost', port=l1.port) diff --git a/tests/test_gossip.py b/tests/test_gossip.py index beaba2267..552c118f5 100644 --- a/tests/test_gossip.py +++ b/tests/test_gossip.py @@ -1090,6 +1090,8 @@ def test_gossip_lease_rates(node_factory, bitcoind): l1.rpc.connect(l2.info['id'], 'localhost', l2.port) l1.fundchannel(l2, 10**6) + # Don't have l2 reject channel_announcement as too far in future. + sync_blockheight(bitcoind, [l1, l2]) # Announce depth is ALWAYS 6 blocks bitcoind.generate_block(5) diff --git a/tests/test_splicing.py b/tests/test_splicing.py index 87a3cf499..019eaaf29 100644 --- a/tests/test_splicing.py +++ b/tests/test_splicing.py @@ -5,7 +5,7 @@ import pytest import unittest import time from utils import ( - wait_for, TEST_NETWORK, first_scid, only_one + sync_blockheight, wait_for, TEST_NETWORK, first_scid, only_one ) @@ -313,7 +313,10 @@ def test_splice_stuck_htlc(node_factory, bitcoind, executor): assert len(list(mempool.keys())) == 1 assert result['txid'] in list(mempool.keys()) - bitcoind.generate_block(6, wait_for_mempool=1) + bitcoind.generate_block(1, wait_for_mempool=1) + # Don't have l2, l3 reject channel_announcement as too far in future. + sync_blockheight(bitcoind, [l1, l2, l3]) + bitcoind.generate_block(5) l2.daemon.wait_for_log(r'CHANNELD_AWAITING_SPLICE to CHANNELD_NORMAL') l1.daemon.wait_for_log(r'CHANNELD_AWAITING_SPLICE to CHANNELD_NORMAL')