common: offer option_basic_mpp for EXPERIMENTAL_FEATURES.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>

common/features.c

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

tests/test_gossip.py

@@ -2,7 +2,7 @@ from collections import Counter
 from fixtures import *  # noqa: F401,F403
 from fixtures import TEST_NETWORK
 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 logging
@@ -1450,7 +1450,10 @@ def test_gossip_store_compact_on_load(node_factory, bitcoind):
     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: 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):

tests/test_misc.py

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

tests/utils.py

@@ -9,8 +9,8 @@ COMPAT = env("COMPAT", "1") == "1"
 def expected_features():
     """Return the expected features hexstring for this configuration"""
     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:
         # features 1, 3, 7, 11 and 13 (0x28a2).
         return "28a2"