From fb179f2d5eb66469beabecfc9a327fbedc968fd9 Mon Sep 17 00:00:00 2001 From: Dusty Daemon Date: Sat, 5 Aug 2023 22:49:42 -0400 Subject: [PATCH] splicing: Remove dependency on experimental_dual_fund MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Splicing should work automatically on v1 or v2 channels so this requirement isn’t needed. Changelog-None [ Squashed fixup into a single commit --RR ] --- .github/workflows/ci.yaml | 1 - lightningd/options.c | 2 -- tests/utils.py | 2 -- 3 files changed, 5 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 47ccd1906..7e2d20e06 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -270,7 +270,6 @@ jobs: COMPILER: gcc TEST_NETWORK: regtest DEVELOPER: 1 - EXPERIMENTAL_DUAL_FUND: 1 EXPERIMENTAL_SPLICING: 1 steps: - name: Checkout diff --git a/lightningd/options.c b/lightningd/options.c index 2e50a5ce3..e1a30d3e6 100644 --- a/lightningd/options.c +++ b/lightningd/options.c @@ -1197,8 +1197,6 @@ static char *opt_set_splicing(struct lightningd *ld) feature_set_or(ld->our_features, take(feature_set_for_feature(NULL, OPTIONAL_FEATURE(OPT_SPLICE)))); - /* Splicing requires dual-fund to be enabled */ - opt_set_dual_fund(ld); return NULL; } diff --git a/tests/utils.py b/tests/utils.py index b2fe0d9bc..789b7b802 100644 --- a/tests/utils.py +++ b/tests/utils.py @@ -43,7 +43,6 @@ def expected_peer_features(wumbo_channels=False, extra=[]): # option_dual_fund features += [29] if EXPERIMENTAL_SPLICING: - features += [29] # option_dual_fund features += [35] # option_quiesce features += [63] # option_splice return hex_bits(features + extra) @@ -60,7 +59,6 @@ def expected_node_features(wumbo_channels=False, extra=[]): # option_dual_fund features += [29] if EXPERIMENTAL_SPLICING: - features += [29] # option_dual_fund features += [35] # option_quiesce features += [63] # option_splice return hex_bits(features + extra)