connectd: don't gossip dying channels.

Fixes: #6368 Changelog-Fixed: Protocol: we no longer gossip about recently-closed channels (Eclair gets upset with this). Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
ElementsProject · Jul 19, 2023 · 00b8bc9 · 00b8bc9
1 parent 649ae79
commit 00b8bc9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/connectd/gossip_store.c b/connectd/gossip_store.c
@@ -130,8 +130,8 @@ u8 *gossip_store_next(const tal_t *ctx,
 		flags = be16_to_cpu(hdr.flags);
 		ratelimited = (flags & GOSSIP_STORE_RATELIMIT_BIT);
 
-		/* Skip any deleted entries. */
-		if (flags & GOSSIP_STORE_DELETED_BIT) {
+		/* Skip any deleted/dying entries. */
+		if (flags & (GOSSIP_STORE_DELETED_BIT|GOSSIP_STORE_DYING_BIT)) {
 			*off += r + msglen;
 			continue;
 		}

diff --git a/tests/test_gossip.py b/tests/test_gossip.py
@@ -2226,7 +2226,6 @@ def test_gossip_private_updates(node_factory, bitcoind):
     wait_for(lambda: l1.daemon.is_in_log(r'gossip_store_compact_offline: 5 deleted, 3 copied'))
 
 
-@pytest.mark.xfail(strict=True)
 def test_gossip_not_dying(node_factory, bitcoind):
     l1 = node_factory.get_node()
     l2, l3 = node_factory.line_graph(2, wait_for_announce=True)