aljaz/lightning
1
0
Fork 0
mirror of https://github.com/aljazceru/lightning.git synced 2025-12-20 07:34:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

common: offer option_basic_mpp for EXPERIMENTAL_FEATURES.

Browse Source 
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell
2019-12-12 10:25:45 +10:30
committed by Christian Decker
parent 207689c274
commit 5d413e0f79
4 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
common/features.c
View File

@@ -11,6 +11,7 @@ static const u32 our_features[] = {
#if EXPERIMENTAL_FEATURES #if EXPERIMENTAL_FEATURES
OPTIONAL_FEATURE(OPT_VAR_ONION), OPTIONAL_FEATURE(OPT_VAR_ONION),
OPTIONAL_FEATURE(OPT_PAYMENT_SECRET), OPTIONAL_FEATURE(OPT_PAYMENT_SECRET),
OPTIONAL_FEATURE(OPT_BASIC_MPP),
#endif #endif
OPTIONAL_FEATURE(OPT_GOSSIP_QUERIES_EX), OPTIONAL_FEATURE(OPT_GOSSIP_QUERIES_EX),
OPTIONAL_FEATURE(OPT_STATIC_REMOTEKEY), OPTIONAL_FEATURE(OPT_STATIC_REMOTEKEY),

7
tests/test_gossip.py
View File

@@ -2,7 +2,7 @@ from collections import Counter
from fixtures import * # noqa: F401,F403 from fixtures import * # noqa: F401,F403
from fixtures import TEST_NETWORK from fixtures import TEST_NETWORK
from lightning import RpcError from lightning import RpcError
from utils import wait_for, TIMEOUT, only_one, sync_blockheight, expected_features from utils import wait_for, TIMEOUT, only_one, sync_blockheight, expected_features, EXPERIMENTAL_FEATURES
import json import json
import logging import logging
@@ -1450,7 +1450,10 @@ def test_gossip_store_compact_on_load(node_factory, bitcoind):
l2.restart() l2.restart()
wait_for(lambda: l2.daemon.is_in_log(r'gossip_store_compact_offline: [5-8] deleted, 9 copied')) wait_for(lambda: l2.daemon.is_in_log(r'gossip_store_compact_offline: [5-8] deleted, 9 copied'))
wait_for(lambda: l2.daemon.is_in_log(r'gossip_store: Read 1/4/2/0 cannounce/cupdate/nannounce/cdelete from store \(0 deleted\) in 1450 bytes')) if EXPERIMENTAL_FEATURES:
wait_for(lambda: l2.daemon.is_in_log(r'gossip_store: Read 1/4/2/0 cannounce/cupdate/nannounce/cdelete from store \(0 deleted\) in 1452 bytes'))
else:
wait_for(lambda: l2.daemon.is_in_log(r'gossip_store: Read 1/4/2/0 cannounce/cupdate/nannounce/cdelete from store \(0 deleted\) in 1450 bytes'))
def test_gossip_announce_invalid_block(node_factory, bitcoind): def test_gossip_announce_invalid_block(node_factory, bitcoind):

1
tests/test_misc.py
View File

@@ -1721,6 +1721,7 @@ def test_list_features_only(node_factory):
'option_gossip_queries/odd', 'option_gossip_queries/odd',
'option_var_onion_optin/odd', 'option_var_onion_optin/odd',
'option_payment_secret/odd', 'option_payment_secret/odd',
'option_basic_mpp/odd',
'option_gossip_queries_ex/odd', 'option_gossip_queries_ex/odd',
'option_static_remotekey/odd', 'option_static_remotekey/odd',
] ]

4
tests/utils.py
View File

@@ -9,8 +9,8 @@ COMPAT = env("COMPAT", "1") == "1"
def expected_features(): def expected_features():
"""Return the expected features hexstring for this configuration""" """Return the expected features hexstring for this configuration"""
if EXPERIMENTAL_FEATURES: if EXPERIMENTAL_FEATURES:
# features 1, 3, 7, 9, 11, 13 and 15 (0xaaa2). # features 1, 3, 7, 9, 11, 13, 15 and 17 (0x02aaa2).
return "aaa2" return "02aaa2"
else: else:
# features 1, 3, 7, 11 and 13 (0x28a2). # features 1, 3, 7, 11 and 13 (0x28a2).
return "28a2" return "28a2"