common/gossmap: digest private channel information too.

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

common/gossmap.c

@@ -602,8 +602,12 @@ static bool map_catchup(struct gossmap *map)
 		type = map_be16(map, off);
 		if (type == WIRE_CHANNEL_ANNOUNCEMENT)
 			add_channel(map, off);
+		else if (type == WIRE_GOSSIP_STORE_PRIVATE_CHANNEL)
+			add_channel(map, off + 2 + 8 + 2);
 		else if (type == WIRE_CHANNEL_UPDATE)
 			update_channel(map, off);
+		else if (type == WIRE_GOSSIP_STORE_PRIVATE_UPDATE)
+			update_channel(map, off + 2 + 2);
 		else if (type == WIRE_GOSSIP_STORE_DELETE_CHAN)
 			remove_channel_by_deletemsg(map, off);
 		else if (type == WIRE_NODE_ANNOUNCEMENT)

tests/test_gossip.py

@@ -1777,7 +1777,6 @@ def test_gossip_store_upgrade_v7_v8(node_factory):
          'features': '80000000000000000000000000'}]
 
 
-@pytest.mark.xfail(strict=True)
 @unittest.skipIf(not DEVELOPER, "devtools are for devs anyway")
 def test_routetool(node_factory):
     """Test that route tool can see unpublished channels"""