From 4e8141aa36e38b0e2b746fc0ed990af16b77a83d Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Sun, 22 Sep 2019 15:25:03 +0930 Subject: [PATCH] features: remove INITIAL_ROUTING_SYNC. It only had an effect if the peer didn't support option_gossip_queries, but still, we don't want a gossip blast any more. Signed-off-by: Rusty Russell --- CHANGELOG.md | 1 + common/features.c | 1 - tests/test_connection.py | 12 ++++++------ tests/test_misc.py | 1 - 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9f5f11cb4..e635a35be 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Protocol: we now retransmit `funding_locked` upon reconnection while closing if there was no update - Plugin: new notifications `sendpay_success` and `sendpay_failure`. - Protocol: we now offer `option_gossip_queries_ex` for finegrained gossip control. +- Protocol: no longer ask for `initial_routing_sync` (only affects ancient peers). ### Changed diff --git a/common/features.c b/common/features.c index f344b9ee0..e357e1dda 100644 --- a/common/features.c +++ b/common/features.c @@ -6,7 +6,6 @@ static const u32 our_localfeatures[] = { OPTIONAL_FEATURE(LOCAL_DATA_LOSS_PROTECT), - OPTIONAL_FEATURE(LOCAL_INITIAL_ROUTING_SYNC), OPTIONAL_FEATURE(LOCAL_UPFRONT_SHUTDOWN_SCRIPT), OPTIONAL_FEATURE(LOCAL_GOSSIP_QUERIES), OPTIONAL_FEATURE(LOCAL_GOSSIP_QUERIES_EX), diff --git a/tests/test_connection.py b/tests/test_connection.py index e461c48e9..4cd4e9432 100644 --- a/tests/test_connection.py +++ b/tests/test_connection.py @@ -1382,9 +1382,9 @@ def test_forget_channel(node_factory): def test_peerinfo(node_factory, bitcoind): l1, l2 = node_factory.line_graph(2, fundchannel=False, opts={'may_reconnect': True}) - lfeatures = '08aa' + lfeatures = '08a2' if EXPERIMENTAL_FEATURES: - lfeatures = '28aa' + lfeatures = '28a2' # Gossiping but no node announcement yet assert l1.rpc.getpeer(l2.info['id'])['connected'] assert len(l1.rpc.getpeer(l2.info['id'])['channels']) == 0 @@ -1637,11 +1637,11 @@ def test_dataloss_protection(node_factory, bitcoind): feerates=(7500, 7500, 7500), allow_broken_log=True) if EXPERIMENTAL_FEATURES: - # features 1, 3, 5, 7, 11 and 13 (0x28aa). - lf = "28aa" + # features 1, 3, 7, 11 and 13 (0x28a2). + lf = "28a2" else: - # features 1, 3, 5, 7 and 11 (0x08aa). - lf = "08aa" + # features 1, 3, 7 and 11 (0x08a2). + lf = "08a2" l1.rpc.connect(l2.info['id'], 'localhost', l2.port) # l1 should send out WIRE_INIT (0010) l1.daemon.wait_for_log(r"\[OUT\] 0010" diff --git a/tests/test_misc.py b/tests/test_misc.py index bd5c98cc0..4dca23bf7 100644 --- a/tests/test_misc.py +++ b/tests/test_misc.py @@ -1444,7 +1444,6 @@ def test_list_features_only(node_factory): features = subprocess.check_output(['lightningd/lightningd', '--list-features-only']).decode('utf-8').splitlines() expected = ['option_data_loss_protect/odd', - 'option_initial_routing_sync/odd', 'option_upfront_shutdown_script/odd', 'option_gossip_queries/odd', 'option_gossip_queries_ex/odd']