aljaz/lightning
1
0
Fork 0
mirror of https://github.com/aljazceru/lightning.git synced 2025-12-19 15:14:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

splicing: Remove dependency on experimental_dual_fund

Browse Source 
Splicing should work automatically on v1 or v2 channels so this requirement isn’t needed.

Changelog-None
[ Squashed fixup into a single commit --RR ]
This commit is contained in:
Dusty Daemon
2023-08-05 22:49:42 -04:00
committed by GitHub
parent 620a61ee09
commit fb179f2d5e
3 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.github/workflows/ci.yaml vendored
View File

@@ -270,7 +270,6 @@ jobs:
COMPILER: gcc COMPILER: gcc
TEST_NETWORK: regtest TEST_NETWORK: regtest
DEVELOPER: 1 DEVELOPER: 1
EXPERIMENTAL_DUAL_FUND: 1
EXPERIMENTAL_SPLICING: 1 EXPERIMENTAL_SPLICING: 1
steps: steps:
- name: Checkout - name: Checkout

2
lightningd/options.c
View File

@@ -1197,8 +1197,6 @@ static char *opt_set_splicing(struct lightningd *ld)
feature_set_or(ld->our_features, feature_set_or(ld->our_features,
take(feature_set_for_feature(NULL, take(feature_set_for_feature(NULL,
OPTIONAL_FEATURE(OPT_SPLICE)))); OPTIONAL_FEATURE(OPT_SPLICE))));
/* Splicing requires dual-fund to be enabled */
opt_set_dual_fund(ld);
return NULL; return NULL;
} }

2
tests/utils.py
View File

@@ -43,7 +43,6 @@ def expected_peer_features(wumbo_channels=False, extra=[]):
# option_dual_fund # option_dual_fund
features += [29] features += [29]
if EXPERIMENTAL_SPLICING: if EXPERIMENTAL_SPLICING:
features += [29] # option_dual_fund
features += [35] # option_quiesce features += [35] # option_quiesce
features += [63] # option_splice features += [63] # option_splice
return hex_bits(features + extra) return hex_bits(features + extra)
@@ -60,7 +59,6 @@ def expected_node_features(wumbo_channels=False, extra=[]):
# option_dual_fund # option_dual_fund
features += [29] features += [29]
if EXPERIMENTAL_SPLICING: if EXPERIMENTAL_SPLICING:
features += [29] # option_dual_fund
features += [35] # option_quiesce features += [35] # option_quiesce
features += [63] # option_splice features += [63] # option_splice
return hex_bits(features + extra) return hex_bits(features + extra)