mirrors/core-lightning
1
0
Fork 0
mirror of https://github.com/ElementsProject/lightning.git synced 2025-01-19 05:44:12 +01:00
Code Issues Projects Releases Wiki Activity

lightningd: opt_var_onion is now a compulsory feature.

Browse Source 
We're about to drop support for legacy.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell 2022-03-08 05:01:36 +10:30
parent 36466af3eb
commit 0db05f6e9c
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lightningd/lightningd.c
View File

@ -815,7 +815,7 @@ static struct feature_set *default_features(const tal_t *ctx)
OPTIONAL_FEATURE(OPT_DATA_LOSS_PROTECT), OPTIONAL_FEATURE(OPT_DATA_LOSS_PROTECT),
OPTIONAL_FEATURE(OPT_UPFRONT_SHUTDOWN_SCRIPT), OPTIONAL_FEATURE(OPT_UPFRONT_SHUTDOWN_SCRIPT),
OPTIONAL_FEATURE(OPT_GOSSIP_QUERIES), OPTIONAL_FEATURE(OPT_GOSSIP_QUERIES),
OPTIONAL_FEATURE(OPT_VAR_ONION), COMPULSORY_FEATURE(OPT_VAR_ONION),
COMPULSORY_FEATURE(OPT_PAYMENT_SECRET), COMPULSORY_FEATURE(OPT_PAYMENT_SECRET),
OPTIONAL_FEATURE(OPT_BASIC_MPP), OPTIONAL_FEATURE(OPT_BASIC_MPP),
OPTIONAL_FEATURE(OPT_GOSSIP_QUERIES_EX), OPTIONAL_FEATURE(OPT_GOSSIP_QUERIES_EX),

2
tests/test_misc.py
View File

@ -1784,7 +1784,7 @@ def test_list_features_only(node_factory):
expected = ['option_data_loss_protect/odd', expected = ['option_data_loss_protect/odd',
'option_upfront_shutdown_script/odd', 'option_upfront_shutdown_script/odd',
'option_gossip_queries/odd', 'option_gossip_queries/odd',
'option_var_onion_optin/odd', 'option_var_onion_optin/even',
'option_gossip_queries_ex/odd', 'option_gossip_queries_ex/odd',
'option_static_remotekey/odd', 'option_static_remotekey/odd',
'option_payment_secret/even', 'option_payment_secret/even',

2
tests/test_plugin.py
View File

@ -1548,7 +1548,7 @@ def test_plugin_feature_announce(node_factory):
# Check the featurebits we've set in the `init` message from # Check the featurebits we've set in the `init` message from
# feature-test.py. # feature-test.py.
assert l1.daemon.is_in_log(r'\[OUT\] 001000022200....{}' assert l1.daemon.is_in_log(r'\[OUT\] 001000022100....{}'
.format(expected_peer_features(extra=[201] + extra))) .format(expected_peer_features(extra=[201] + extra)))
# Check the invoice featurebit we set in feature-test.py # Check the invoice featurebit we set in feature-test.py

4
tests/utils.py
View File

@ -25,7 +25,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, 9, 11, 13, 14, 17, 27] features = [1, 5, 7, 8, 11, 13, 14, 17, 27]
if EXPERIMENTAL_FEATURES: if EXPERIMENTAL_FEATURES:
# OPT_ONION_MESSAGES # OPT_ONION_MESSAGES
features += [39] features += [39]
@ -47,7 +47,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, 9, 11, 13, 14, 17, 27, 55] features = [1, 5, 7, 8, 11, 13, 14, 17, 27, 55]
if EXPERIMENTAL_FEATURES: if EXPERIMENTAL_FEATURES:
# OPT_ONION_MESSAGES # OPT_ONION_MESSAGES
features += [39] features += [39]