Revert "fixup test races due to feature negotiation, change output cost"

This reverts commit cc3820e.

Author: instagibbs

tests/test_bookkeeper.py

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

tests/test_closing.py

@@ -8,7 +8,7 @@
     scriptpubkey_addr, calc_lease_fee,
     check_utxos_channel, anchor_expected, check_coin_moves,
     check_balance_snaps, mine_funding_to_announce, check_inspect_channel,
-    first_scid, expected_peer_features
+    first_scid
 )
 
 import os
@@ -1064,9 +1064,6 @@ 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(l2.rpc.listpeers()['peers']) == 1)
-    wait_for(lambda: l2.rpc.listpeers()['peers'][0].get('features', "") == expected_peer_features())
     l2.rpc.close(l1.info['id'], 1, force_lease_closed=True)
     bitcoind.generate_block(1, wait_for_mempool=1)
 
@@ -1144,9 +1141,6 @@ 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', "") == expected_peer_features())
     l1.rpc.close(l2.info['id'], 1, force_lease_closed=True)
     bitcoind.generate_block(1, wait_for_mempool=1)
 

tests/test_connection.py

@@ -792,10 +792,6 @@ 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', "") == expected_peer_features())
-
     # 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)

tests/test_opening.py

@@ -2,8 +2,7 @@
 from fixtures import TEST_NETWORK
 from pyln.client import RpcError, Millisatoshi
 from utils import (
-    only_one, wait_for, sync_blockheight, first_channel_id,
-    calc_lease_fee, check_coin_moves, anchor_expected, expected_peer_features
+    only_one, wait_for, sync_blockheight, first_channel_id, calc_lease_fee, check_coin_moves, anchor_expected
 )
 
 from pathlib import Path
@@ -1635,8 +1634,6 @@ def test_v2_replay_bookkeeping(node_factory, bitcoind):
     ev_tags = [e['tag'] for e in l1.rpc.bkpr_listaccountevents(chan_id)['events']]
     assert 'lease_fee' in ev_tags
 
-    wait_for(lambda: len(l1.rpc.listpeers()['peers']) == 1)
-    wait_for(lambda: l1.rpc.listpeers()['peers'][0].get('features', "") == expected_peer_features())
     l1.rpc.close(l2.info['id'], 1)
     bitcoind.generate_block(6, wait_for_mempool=1)
 

tests/test_plugin.py

@@ -2056,9 +2056,6 @@ def test_coin_movement_notices(node_factory, bitcoind, chainparams):
     chanid_1 = first_channel_id(l2, l1)
     chanid_3 = first_channel_id(l2, l3)
 
-    # Wait until we have the expected features loaded before sending to taproot address
-    wait_for(lambda: len(l2.rpc.listpeers()['peers']) == 2)
-    wait_for(lambda: [x.get("features", None) for x in l2.rpc.listpeers()['peers']] == [expected_peer_features()] * 2)
     l2.rpc.close(chan1)
     l2.daemon.wait_for_logs([
         ' to CLOSINGD_COMPLETE',