test-patch: switch on disconnects depending on EXP_FEATURES

We don't have a way to introspect if a node will be using v2 before the
node has been created, so for now we use the 'crude' "are
EXPERIMENTAL_FEATURES turned on" switch to decide what messages to add
to the disconnects.

Author: niftynei

tests/test_closing.py

@@ -3,7 +3,7 @@
 from pyln.client import RpcError
 from utils import (
     only_one, sync_blockheight, wait_for, DEVELOPER, TIMEOUT, VALGRIND,
-    SLOW_MACHINE, COMPAT
+    SLOW_MACHINE, COMPAT, EXPERIMENTAL_FEATURES
 )
 
 import os
@@ -398,7 +398,13 @@ def test_penalty_inhtlc(node_factory, bitcoind, executor, chainparams):
     """Test penalty transaction with an incoming HTLC"""
     # We suppress each one after first commit; HTLC gets added not fulfilled.
     # Feerates identical so we don't get gratuitous commit to update them
-    disconnects = ['=WIRE_COMMITMENT_SIGNED', '=WIRE_COMMITMENT_SIGNED-nocommit']
+
+    disconnects = ['=WIRE_COMMITMENT_SIGNED-nocommit']
+
+    # FIXME: 'experimental features' is a stand in for 'uses v2 channel open'
+    if EXPERIMENTAL_FEATURES:
+        disconnects = ['=WIRE_COMMITMENT_SIGNED'] + disconnects
+
     l1 = node_factory.get_node(disconnect=disconnects, may_fail=True, feerates=(7500, 7500, 7500), allow_broken_log=True)
     l2 = node_factory.get_node(disconnect=disconnects)
 

tests/test_connection.py

@@ -1593,7 +1593,10 @@ def test_fee_limits(node_factory, bitcoind):
 @unittest.skipIf(not DEVELOPER, "needs DEVELOPER=1")
 def test_update_fee_reconnect(node_factory, bitcoind):
     # Disconnect after first commitsig.
-    disconnects = ['=WIRE_COMMITMENT_SIGNED', '+WIRE_COMMITMENT_SIGNED']
+    # FIXME: use something else to switch on for v2 enabled
+    disconnects = ['+WIRE_COMMITMENT_SIGNED']
+    if EXPERIMENTAL_FEATURES:
+        disconnects = ['=WIRE_COMMITMENT_SIGNED'] + disconnects
     # Feerates identical so we don't get gratuitous commit to update them
     l1 = node_factory.get_node(disconnect=disconnects, may_reconnect=True,
                                feerates=(15000, 15000, 3750))

tests/test_pay.py

@@ -5,7 +5,7 @@
 from pyln.client import RpcError, Millisatoshi
 from utils import (
     DEVELOPER, wait_for, only_one, sync_blockheight, SLOW_MACHINE, TIMEOUT,
-    VALGRIND
+    VALGRIND, EXPERIMENTAL_FEATURES
 )
 
 import concurrent.futures
@@ -373,7 +373,12 @@ def test_payment_success_persistence(node_factory, bitcoind, executor):
 def test_payment_failed_persistence(node_factory, executor):
     # Start two nodes and open a channel.. die during payment.
     # Feerates identical so we don't get gratuitous commit to update them
-    l1 = node_factory.get_node(disconnect=['=WIRE_COMMITMENT_SIGNED', '+WIRE_COMMITMENT_SIGNED'],
+
+    # FIXME: use something else to switch on v2 enablement
+    disconnects = ['+WIRE_COMMITMENT_SIGNED']
+    if EXPERIMENTAL_FEATURES:
+        disconnects = ['=WIRE_COMMITMENT_SIGNED'] + disconnects
+    l1 = node_factory.get_node(disconnect=disconnects,
                                options={'dev-no-reconnect': None},
                                may_reconnect=True,
                                feerates=(7500, 7500, 7500))