df-tests: test_payment_success|failed_persistence

tests/test_pay.py

@@ -6,7 +6,7 @@ from pyln.client import RpcError, Millisatoshi
 from pyln.proto.onion import TlvPayload
 from utils import (
     DEVELOPER, wait_for, only_one, sync_blockheight, TIMEOUT,
-    EXPERIMENTAL_FEATURES, env, VALGRIND
+    EXPERIMENTAL_FEATURES, env, VALGRIND, EXPERIMENTAL_DUAL_FUND
 )
 import copy
 import os
@@ -342,7 +342,13 @@ def test_pay_optional_args(node_factory, compat):
 def test_payment_success_persistence(node_factory, bitcoind, 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'],
+    disconnect = ['+WIRE_COMMITMENT_SIGNED']
+    if EXPERIMENTAL_DUAL_FUND:
+        # We have to add an extra 'wire-commitment-signed' because
+        # dual funding uses this for channel establishment also
+        disconnect = ['=WIRE_COMMITMENT_SIGNED'] + disconnect
+
+    l1 = node_factory.get_node(disconnect=disconnect,
                                options={'dev-no-reconnect': None},
                                may_reconnect=True,
                                feerates=(7500, 7500, 7500, 7500))
@@ -387,7 +393,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'],
+    disconnect = ['+WIRE_COMMITMENT_SIGNED']
+    if EXPERIMENTAL_DUAL_FUND:
+        # We have to add an extra 'wire-commitment-signed' because
+        # dual funding uses this for channel establishment also
+        disconnect = ['=WIRE_COMMITMENT_SIGNED'] + disconnect
+    l1 = node_factory.get_node(disconnect=disconnect,
                                options={'dev-no-reconnect': None},
                                may_reconnect=True,
                                feerates=(7500, 7500, 7500, 7500))