fixup tests

Author: instagibbs

tests/test_bookkeeper.py

@@ -399,7 +399,7 @@ def _check_events(node, channel_id, exp_events):
 
     # l1 events
     exp_events = [('channel_open', open_amt * 1000 + lease_fee, 0),
-                  ('onchain_fee', 1224000, 0),
+                  ('onchain_fee', 1320000, 0),
                   ('lease_fee', 0, lease_fee),
                   ('journal_entry', 0, invoice_msat)]
     _check_events(l1, channel_id, exp_events)

tests/test_closing.py

@@ -1070,6 +1070,9 @@ def test_channel_lease_lessor_cheat(node_factory, bitcoind, chainparams):
     # start l2 and force close channel with l1 while l1 is still offline
     l2.start()
     sync_blockheight(bitcoind, [l2])
+    # wait for reconnect, otherwise anysegwit feature bits won't be known
+    wait_for(lambda: len(l1.rpc.listpeers()['peers']) == 1)
+    wait_for(lambda: l1.rpc.listpeers()['peers'][0].get('features', "") == '08a0000a0269a2')
     l2.rpc.close(l1.info['id'], 1, force_lease_closed=True)
     bitcoind.generate_block(1, wait_for_mempool=1)
 
@@ -1147,6 +1150,9 @@ def test_channel_lease_lessee_cheat(node_factory, bitcoind, chainparams):
     # start l1 and force close channel with l2 while l2 is still offline
     l1.start()
     sync_blockheight(bitcoind, [l1])
+    # wait for reconnect, otherwise anysegwit feature bits won't be known
+    wait_for(lambda: len(l1.rpc.listpeers()['peers']) == 1)
+    wait_for(lambda: l1.rpc.listpeers()['peers'][0].get('features', "") == '08a0000a0269a2')
     l1.rpc.close(l2.info['id'], 1, force_lease_closed=True)
     bitcoind.generate_block(1, wait_for_mempool=1)
 

tests/test_connection.py

@@ -792,6 +792,10 @@ def test_reconnect_no_update(node_factory, executor, bitcoind):
 
     # For closingd reconnection
     l1.daemon.start()
+    # wait for reconnect, otherwise anysegwit feature bits won't be known
+    wait_for(lambda: len(l1.rpc.listpeers()['peers']) == 1)
+    wait_for(lambda: l1.rpc.listpeers()['peers'][0].get('features', "") == '08a0000a0269a2')
+
     # Close will trigger the -WIRE_SHUTDOWN and we then wait for the
     # automatic reconnection to trigger the retransmission.
     l1.rpc.close(l2.info['id'], 0)