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

lightningd: set the channel_type feature.

Browse Source 
AFAICT we should have been doing this since we started sending and
receiving it, but didn't.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Changelog-Added: Protocol: we now advertize the `option_channel_type` feature (which we actually supported since v0.10.2)
This commit is contained in:
Rusty Russell
2022-07-23 16:25:48 +09:30
committed by neil saitug
parent d5d4e7b019
commit 80a6d9b58e
3 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lightningd/lightningd.c
View File

@@ -827,6 +827,7 @@ static struct feature_set *default_features(const tal_t *ctx)
OPTIONAL_FEATURE(OPT_PAYMENT_METADATA), OPTIONAL_FEATURE(OPT_PAYMENT_METADATA),
OPTIONAL_FEATURE(OPT_SCID_ALIAS), OPTIONAL_FEATURE(OPT_SCID_ALIAS),
OPTIONAL_FEATURE(OPT_ZEROCONF), OPTIONAL_FEATURE(OPT_ZEROCONF),
OPTIONAL_FEATURE(OPT_CHANNEL_TYPE),
#if EXPERIMENTAL_FEATURES #if EXPERIMENTAL_FEATURES
OPTIONAL_FEATURE(OPT_ANCHOR_OUTPUTS), OPTIONAL_FEATURE(OPT_ANCHOR_OUTPUTS),
OPTIONAL_FEATURE(OPT_QUIESCE), OPTIONAL_FEATURE(OPT_QUIESCE),

2
tests/test_misc.py
View File

@@ -1828,11 +1828,13 @@ def test_list_features_only(node_factory):
expected += ['option_shutdown_anysegwit/odd'] expected += ['option_shutdown_anysegwit/odd']
expected += ['option_quiesce/odd'] expected += ['option_quiesce/odd']
expected += ['option_onion_messages/odd'] expected += ['option_onion_messages/odd']
expected += ['option_channel_type/odd']
expected += ['option_scid_alias/odd'] expected += ['option_scid_alias/odd']
expected += ['option_zeroconf/odd'] expected += ['option_zeroconf/odd']
expected += ['supports_open_accept_channel_type'] expected += ['supports_open_accept_channel_type']
else: else:
expected += ['option_shutdown_anysegwit/odd'] expected += ['option_shutdown_anysegwit/odd']
expected += ['option_channel_type/odd']
expected += ['option_scid_alias/odd'] expected += ['option_scid_alias/odd']
expected += ['option_zeroconf/odd'] expected += ['option_zeroconf/odd']
assert features == expected assert features == expected

4
tests/utils.py
View File

@@ -37,7 +37,7 @@ def hex_bits(features):
def expected_peer_features(wumbo_channels=False, extra=[]): def expected_peer_features(wumbo_channels=False, extra=[]):
"""Return the expected peer features hexstring for this configuration""" """Return the expected peer features hexstring for this configuration"""
features = [1, 5, 7, 8, 11, 13, 14, 17, 27, 47, 51] features = [1, 5, 7, 8, 11, 13, 14, 17, 27, 45, 47, 51]
if EXPERIMENTAL_FEATURES: if EXPERIMENTAL_FEATURES:
# OPT_ONION_MESSAGES # OPT_ONION_MESSAGES
features += [39] features += [39]
@@ -59,7 +59,7 @@ def expected_peer_features(wumbo_channels=False, extra=[]):
# features for the 'node' and the 'peer' feature sets # features for the 'node' and the 'peer' feature sets
def expected_node_features(wumbo_channels=False, extra=[]): def expected_node_features(wumbo_channels=False, extra=[]):
"""Return the expected node features hexstring for this configuration""" """Return the expected node features hexstring for this configuration"""
features = [1, 5, 7, 8, 11, 13, 14, 17, 27, 47, 51, 55] features = [1, 5, 7, 8, 11, 13, 14, 17, 27, 45, 47, 51, 55]
if EXPERIMENTAL_FEATURES: if EXPERIMENTAL_FEATURES:
# OPT_ONION_MESSAGES # OPT_ONION_MESSAGES
features += [39] features += [39]