gossipd: make sure we correctly move node announcement when *no* channel preceeds it in the gossip store.

We had the test backwards, so we moved it *all the time*.  This bloats our gossip store, as well as
not moving it in the case where we need to.

Signed-off-by: Rusty Russell <[email protected]>
Changelog-Fixed: gossipd: we would occasionally not show a node announcement in listnodes().

Author: rustyrussell

gossipd/gossmap_manage.c

@@ -300,7 +300,7 @@ static void remove_channel(struct gossmap_manage *gm,
 
 		/* Maybe this was the last channel_announcement which preceeded node_announcement? */
 		if (chan->cann_off < node->nann_off
-		    && any_cannounce_preceeds_offset(gossmap, node, chan, node->nann_off)) {
+		    && !any_cannounce_preceeds_offset(gossmap, node, chan, node->nann_off)) {
 			const u8 *nannounce;
 			u32 timestamp;
 

tests/test_gossip.py

@@ -2372,7 +2372,6 @@ def test_incoming_unreasonable(node_factory):
     l3.rpc.listincoming()
 
 
-@pytest.mark.xfail(strict=True)
 def test_gossmap_lost_node(node_factory, bitcoind):
     l1, l2, l3, l4 = node_factory.line_graph(4, wait_for_announce=True)