From bb9ad57a031af510d8cec96fdef231888e9e7860 Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Tue, 20 Oct 2020 14:28:06 +1030 Subject: [PATCH] gossip_store: don't copy old delete markers on startup compact. So we don't have to handle them at load time, either. Signed-off-by: Rusty Russell --- gossipd/gossip_store.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/gossipd/gossip_store.c b/gossipd/gossip_store.c index ed085c380..8357859ae 100644 --- a/gossipd/gossip_store.c +++ b/gossipd/gossip_store.c @@ -218,6 +218,13 @@ static u32 gossip_store_compact_offline(void) msg, msglen)); } + /* Don't write out old tombstones */ + if (fromwire_peektype(msg) == WIRE_GOSSIP_STORE_DELETE_CHAN) { + deleted++; + tal_free(msg); + continue; + } + if (!write_all(new_fd, &hdr, sizeof(hdr)) || !write_all(new_fd, msg, msglen)) { status_broken("gossip_store_compact_offline: writing msg len %zu to new store: %s", @@ -790,9 +797,6 @@ u32 gossip_store_load(struct routing_state *rstate, struct gossip_store *gs) goto badmsg; } break; - case WIRE_GOSSIP_STORE_DELETE_CHAN: - /* No need to copy these */ - break; default: bad = "Unknown message"; goto badmsg;