From e661d87440e44d28bd435da0fe96ca23b3aada2c Mon Sep 17 00:00:00 2001 From: niftynei Date: Fri, 11 Dec 2020 15:40:57 -0600 Subject: [PATCH] df-tests: fixup expected features for dual-funding channels --- tests/test_connection.py | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/tests/test_connection.py b/tests/test_connection.py index a95f795ea..1bdec84e0 100644 --- a/tests/test_connection.py +++ b/tests/test_connection.py @@ -2699,8 +2699,14 @@ def test_wumbo_channels(node_factory, bitcoind): {'large-channels': None}, {}]) conn = l1.rpc.connect(l2.info['id'], 'localhost', port=l2.port) - assert conn['features'] == expected_peer_features(wumbo_channels=True) - assert only_one(l1.rpc.listpeers(l2.info['id'])['peers'])['features'] == expected_peer_features(wumbo_channels=True) + + expected_features = expected_peer_features(wumbo_channels=True) + if l1.config('experimental-dual-fund'): + expected_features = expected_peer_features(wumbo_channels=True, + extra=[223]) + + assert conn['features'] == expected_features + assert only_one(l1.rpc.listpeers(l2.info['id'])['peers'])['features'] == expected_features # Now, can we open a giant channel? l1.fundwallet(1 << 26) @@ -2762,7 +2768,7 @@ def test_channel_features(node_factory, bitcoind): # We should see features in unconfirmed channels. chan = only_one(only_one(l1.rpc.listpeers()['peers'])['channels']) assert 'option_static_remotekey' in chan['features'] - if EXPERIMENTAL_FEATURES: + if EXPERIMENTAL_FEATURES or l1.config('experimental-dual-fund'): assert 'option_anchor_outputs' in chan['features'] # l2 should agree. @@ -2775,7 +2781,7 @@ def test_channel_features(node_factory, bitcoind): chan = only_one(only_one(l1.rpc.listpeers()['peers'])['channels']) assert 'option_static_remotekey' in chan['features'] - if EXPERIMENTAL_FEATURES: + if EXPERIMENTAL_FEATURES or l1.config('experimental-dual-fund'): assert 'option_anchor_outputs' in chan['features'] # l2 should agree.