From 6a02cfccd7f2630840766ed47afebb9b7bab1441 Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Wed, 31 Jan 2024 16:38:20 +1030 Subject: [PATCH] gossipd: simplify gossip store API. Instead of "new" and "load", we don't really need to "load" anything, so do everything in gossip_store_new. Have it do the compaction/rewrite, and collect the dying records --- gossipd/gossip_store.c | 376 +++++++++++++------------------ gossipd/gossip_store.h | 41 +++- gossipd/gossipd.c | 13 +- gossipd/gossmap_manage.c | 54 +---- gossipd/gossmap_manage.h | 18 +- gossipd/test/run-txout_failure.c | 6 - tests/test_gossip.py | 14 +- 7 files changed, 216 insertions(+), 306 deletions(-) diff --git a/gossipd/gossip_store.c b/gossipd/gossip_store.c index c92d33ddc..d6b218e17 100644 --- a/gossipd/gossip_store.c +++ b/gossipd/gossip_store.c @@ -29,9 +29,6 @@ struct gossip_store { /* Back pointer. */ struct daemon *daemon; - /* This is false when we're loading */ - bool writable; - int fd; u8 version; @@ -186,60 +183,88 @@ static bool upgrade_field(u8 oldversion, return true; } -/* Read gossip store entries, copy non-deleted ones. This code is written - * as simply and robustly as possible! */ -static u32 gossip_store_compact_offline(struct daemon *daemon) +/* Read gossip store entries, copy non-deleted ones. Check basic + * validity, but this code is written as simply and robustly as + * possible! + * + * Returns fd of new store. + */ +static int gossip_store_compact(struct daemon *daemon, + u64 *total_len, + bool *populated, + struct chan_dying **dying) { - size_t count = 0, deleted = 0; + size_t cannounces = 0, cupdates = 0, nannounces = 0, deleted = 0; int old_fd, new_fd; - u64 oldlen, newlen; + u64 old_len, cur_off; struct gossip_hdr hdr; u8 oldversion, version = GOSSIP_STORE_VER; struct stat st; + bool prev_chan_ann = false; + struct timeabs start = time_now(); + const char *bad; + *populated = false; + old_len = 0; + + new_fd = open(GOSSIP_STORE_TEMP_FILENAME, O_RDWR|O_TRUNC|O_CREAT, 0600); + if (new_fd < 0) { + status_failed(STATUS_FAIL_INTERNAL_ERROR, + "Opening new gossip_store file: %s", + strerror(errno)); + } + + if (!write_all(new_fd, &version, sizeof(version))) { + status_failed(STATUS_FAIL_INTERNAL_ERROR, + "Writing new gossip_store file: %s", + strerror(errno)); + } + *total_len = sizeof(version); + + /* RDWR since we add closed marker at end! */ old_fd = open(GOSSIP_STORE_FILENAME, O_RDWR); - if (old_fd == -1) - return 0; + if (old_fd == -1) { + if (errno == ENOENT) + goto rename_new; + + status_failed(STATUS_FAIL_INTERNAL_ERROR, + "Reading gossip_store file: %s", + strerror(errno)); + }; if (fstat(old_fd, &st) != 0) { status_broken("Could not stat gossip_store: %s", strerror(errno)); - goto close_old; - } - - new_fd = open(GOSSIP_STORE_TEMP_FILENAME, O_RDWR|O_TRUNC|O_CREAT, 0600); - if (new_fd < 0) { - status_broken( - "Could not open file for gossip_store compaction"); - goto close_old; + goto rename_new; } if (!read_all(old_fd, &oldversion, sizeof(oldversion)) || (oldversion != version && !can_upgrade(oldversion))) { status_broken("gossip_store_compact: bad version"); - goto close_and_delete; + goto rename_new; } - if (!write_all(new_fd, &version, sizeof(version))) { - status_broken("gossip_store_compact_offline: writing version to store: %s", - strerror(errno)); - goto close_and_delete; - } + cur_off = old_len = sizeof(oldversion); - /* Read everything, write non-deleted ones to new_fd */ + /* Read everything, write non-deleted ones to new_fd. If something goes wrong, + * we end up with truncated store. */ while (read_all(old_fd, &hdr, sizeof(hdr))) { size_t msglen; u8 *msg; + /* Partial writes can happen, and we simply truncate */ msglen = be16_to_cpu(hdr.len); msg = tal_arr(NULL, u8, msglen); if (!read_all(old_fd, msg, msglen)) { - status_broken("gossip_store_compact_offline: reading msg len %zu from store: %s", - msglen, strerror(errno)); + status_unusual("gossip_store_compact: store ends early at %"PRIu64, + old_len); tal_free(msg); - goto close_and_delete; + goto rename_new; } + cur_off = old_len; + old_len += sizeof(hdr) + msglen; + if (be16_to_cpu(hdr.flags) & GOSSIP_STORE_DELETED_BIT) { deleted++; tal_free(msg); @@ -249,18 +274,18 @@ static u32 gossip_store_compact_offline(struct daemon *daemon) /* Check checksum (upgrade would overwrite, so do it now) */ if (be32_to_cpu(hdr.crc) != crc32c(be32_to_cpu(hdr.timestamp), msg, msglen)) { - status_broken("gossip_store_compact_offline: checksum verification failed? %08x should be %08x", + bad = tal_fmt(tmpctx, "checksum verification failed? %08x should be %08x", be32_to_cpu(hdr.crc), crc32c(be32_to_cpu(hdr.timestamp), msg, msglen)); - tal_free(msg); - goto close_and_delete; + goto badmsg; } if (oldversion != version) { if (!upgrade_field(oldversion, daemon, be16_to_cpu(hdr.flags), &msg)) { tal_free(msg); - goto close_and_delete; + bad = "upgrade of store failed"; + goto badmsg; } /* It can tell us to delete record entirely. */ @@ -283,94 +308,130 @@ static u32 gossip_store_compact_offline(struct daemon *daemon) continue; } + switch (fromwire_peektype(msg)) { + case WIRE_GOSSIP_STORE_CHANNEL_AMOUNT: + /* Previous channel_announcement may have been deleted */ + if (prev_chan_ann) + cannounces++; + prev_chan_ann = false; + break; + case WIRE_CHANNEL_ANNOUNCEMENT: + if (prev_chan_ann) { + bad = "channel_announcement without amount"; + goto badmsg; + } + prev_chan_ann = true; + break; + case WIRE_GOSSIP_STORE_CHAN_DYING: { + struct chan_dying cd; + + if (!fromwire_gossip_store_chan_dying(msg, + &cd.scid, + &cd.deadline)) { + bad = "Bad gossip_store_chan_dying"; + goto badmsg; + } + /* By convention, these offsets are *after* header */ + cd.gossmap_offset = *total_len + sizeof(hdr); + tal_arr_expand(dying, cd); + break; + } + case WIRE_CHANNEL_UPDATE: + cupdates++; + break; + case WIRE_NODE_ANNOUNCEMENT: + nannounces++; + break; + default: + bad = "Unknown message"; + goto badmsg; + } + 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", + status_failed(STATUS_FAIL_INTERNAL_ERROR, + "gossip_store_compact: writing msg len %zu to new store: %s", msglen, strerror(errno)); - tal_free(msg); - goto close_and_delete; } tal_free(msg); - count++; + *total_len += sizeof(hdr) + msglen; } - if (close(new_fd) != 0) { - status_broken("gossip_store_compact_offline: closing new store: %s", - strerror(errno)); - goto close_old; + + assert(*total_len == lseek(new_fd, 0, SEEK_END)); + + /* Unlikely, but a channel_announcement without an amount: we just truncate. */ + if (prev_chan_ann) { + bad = "channel_announcement without amount"; + goto badmsg; } + + /* If we have any contents, and the file is less than 1 hour + * old, say "seems good" */ + if (st.st_mtime > time_now().ts.tv_sec - 3600 && *total_len > 1) { + *populated = true; + } + +rename_new: if (rename(GOSSIP_STORE_TEMP_FILENAME, GOSSIP_STORE_FILENAME) != 0) { - status_broken("gossip_store_compact_offline: rename failed: %s", + status_failed(STATUS_FAIL_INTERNAL_ERROR, + "gossip_store_compact: rename failed: %s", strerror(errno)); } /* Create end marker now new file exists. */ - oldlen = lseek(old_fd, SEEK_END, 0); - newlen = lseek(new_fd, SEEK_END, 0); - append_msg(old_fd, towire_gossip_store_ended(tmpctx, newlen), - 0, &oldlen); - close(old_fd); - status_debug("gossip_store_compact_offline: %zu deleted, %zu copied", - deleted, count); - return st.st_mtime; + if (old_fd != -1) { + append_msg(old_fd, towire_gossip_store_ended(tmpctx, *total_len), + 0, &old_len); + close(old_fd); + } -close_and_delete: - close(new_fd); -close_old: - close(old_fd); - unlink(GOSSIP_STORE_TEMP_FILENAME); - return 0; + status_debug("Store compact time: %"PRIu64" msec", + time_to_msec(time_between(time_now(), start))); + status_debug("gossip_store: Read %zu/%zu/%zu/%zu cannounce/cupdate/nannounce/delete from store in %"PRIu64" bytes, now %"PRIu64" bytes (populated=%s)", + cannounces, cupdates, nannounces, deleted, + old_len, *total_len, + *populated ? "true": "false"); + return new_fd; + +badmsg: + /* We truncate */ + status_broken("gossip_store: %s (offset %"PRIu64"). Moving to %s.corrupt and truncating", + bad, cur_off, GOSSIP_STORE_FILENAME); + + rename(GOSSIP_STORE_FILENAME, GOSSIP_STORE_FILENAME ".corrupt"); + if (lseek(new_fd, 0, SEEK_SET) != 0 + || !write_all(new_fd, &version, sizeof(version))) { + status_failed(STATUS_FAIL_INTERNAL_ERROR, + "Overwriting new gossip_store file: %s", + strerror(errno)); + } + *total_len = sizeof(version); + goto rename_new; } -struct gossip_store *gossip_store_new(struct daemon *daemon) +struct gossip_store *gossip_store_new(const tal_t *ctx, + struct daemon *daemon, + bool *populated, + struct chan_dying **dying) { - struct gossip_store *gs = tal(daemon, struct gossip_store); - gs->writable = true; - gs->timestamp = gossip_store_compact_offline(daemon); - gs->fd = open(GOSSIP_STORE_FILENAME, O_RDWR|O_CREAT, 0600); - if (gs->fd < 0) - status_failed(STATUS_FAIL_INTERNAL_ERROR, - "Opening gossip_store store: %s", - strerror(errno)); + struct gossip_store *gs = tal(ctx, struct gossip_store); + gs->daemon = daemon; - gs->len = sizeof(gs->version); - + *dying = tal_arr(ctx, struct chan_dying, 0); + gs->fd = gossip_store_compact(daemon, &gs->len, populated, dying); tal_add_destructor(gs, gossip_store_destroy); - - /* Try to read the version, write it if this is a new file, or truncate - * if the version doesn't match */ - if (read(gs->fd, &gs->version, sizeof(gs->version)) - == sizeof(gs->version)) { - /* Version match? All good */ - if (gs->version == GOSSIP_STORE_VER) - return gs; - - status_unusual("Gossip store version %u not %u: removing", - gs->version, GOSSIP_STORE_VER); - if (ftruncate(gs->fd, 0) != 0) - status_failed(STATUS_FAIL_INTERNAL_ERROR, - "Truncating store: %s", strerror(errno)); - /* Subtle: we are at offset 1, move back to start! */ - if (lseek(gs->fd, 0, SEEK_SET) != 0) - status_failed(STATUS_FAIL_INTERNAL_ERROR, - "Seeking to start of store: %s", - strerror(errno)); - } - /* Empty file, write version byte */ - gs->version = GOSSIP_STORE_VER; - if (write(gs->fd, &gs->version, sizeof(gs->version)) - != sizeof(gs->version)) - status_failed(STATUS_FAIL_INTERNAL_ERROR, - "Writing version to store: %s", strerror(errno)); return gs; } +int gossip_store_get_fd(const struct gossip_store *gs) +{ + return gs->fd; +} + u64 gossip_store_add(struct gossip_store *gs, const u8 *gossip_msg, u32 timestamp) { u64 off = gs->len; - /* Should never get here during loading! */ - assert(gs->writable); - if (!append_msg(gs->fd, gossip_msg, timestamp, &gs->len)) { status_broken("Failed writing to gossip store: %s", strerror(errno)); @@ -448,9 +509,6 @@ u64 gossip_store_set_flag(struct gossip_store *gs, } hdr; u64 hdr_off = offset - sizeof(struct gossip_hdr); - /* Should never get here during loading! */ - assert(gs->writable); - /* Should never try to overwrite version */ assert(offset > sizeof(struct gossip_hdr)); @@ -528,125 +586,3 @@ void gossip_store_set_timestamp(struct gossip_store *gs, u64 offset, u32 timesta "Failed writing header to re-timestamp @%"PRIu64": %s", offset, strerror(errno)); } - -u32 gossip_store_load(struct gossip_store *gs) -{ - struct gossip_hdr hdr; - u32 msglen, checksum; - u8 *msg; - struct amount_sat satoshis; - const char *bad; - size_t stats[] = {0, 0, 0, 0}; - struct timeabs start = time_now(); - size_t deleted = 0; - u8 *chan_ann = NULL; - - /* FIXME: Do compaction here, and check checksums, etc then.. */ - gs->writable = false; - while (pread(gs->fd, &hdr, sizeof(hdr), gs->len) == sizeof(hdr)) { - msglen = be16_to_cpu(hdr.len); - checksum = be32_to_cpu(hdr.crc); - msg = tal_arr(tmpctx, u8, msglen); - - if (pread(gs->fd, msg, msglen, gs->len+sizeof(hdr)) != msglen) { - bad = "gossip_store: truncated file?"; - goto corrupt; - } - - if (checksum != crc32c(be32_to_cpu(hdr.timestamp), msg, msglen)) { - bad = tal_fmt(tmpctx, "Checksum verification failed: %08x should be %08x", - checksum, crc32c(be32_to_cpu(hdr.timestamp), msg, msglen)); - goto badmsg; - } - - /* Skip deleted entries */ - if (be16_to_cpu(hdr.flags) & GOSSIP_STORE_DELETED_BIT) { - deleted++; - goto next; - } - - switch (fromwire_peektype(msg)) { - case WIRE_GOSSIP_STORE_CHANNEL_AMOUNT: - if (!fromwire_gossip_store_channel_amount(msg, - &satoshis)) { - bad = "Bad gossip_store_channel_amount"; - goto badmsg; - } - /* Previous channel_announcement may have been deleted */ - if (!chan_ann) - break; - chan_ann = NULL; - stats[0]++; - break; - case WIRE_CHANNEL_ANNOUNCEMENT: - if (chan_ann) { - bad = "channel_announcement without amount"; - goto badmsg; - } - /* Save for channel_amount (next msg) (not tmpctx, it gets cleaned!) */ - chan_ann = tal_steal(gs, msg); - break; - case WIRE_GOSSIP_STORE_CHAN_DYING: { - struct short_channel_id scid; - u32 deadline; - - if (!fromwire_gossip_store_chan_dying(msg, &scid, &deadline)) { - bad = "Bad gossip_store_chan_dying"; - goto badmsg; - } - if (!gossmap_manage_channel_dying(gs->daemon->gm, gs->len, deadline, scid)) { - bad = "Invalid gossip_store_chan_dying"; - goto badmsg; - } - break; - } - case WIRE_CHANNEL_UPDATE: - stats[1]++; - break; - case WIRE_NODE_ANNOUNCEMENT: - stats[2]++; - break; - default: - bad = "Unknown message"; - goto badmsg; - } - - next: - gs->len += sizeof(hdr) + msglen; - clean_tmpctx(); - } - - if (chan_ann) { - tal_free(chan_ann); - bad = "dangling channel_announcement"; - goto corrupt; - } - - goto out; - -badmsg: - bad = tal_fmt(tmpctx, "%s (%s)", bad, tal_hex(tmpctx, msg)); - -corrupt: - status_broken("gossip_store: %s. Moving to %s.corrupt and truncating", - bad, GOSSIP_STORE_FILENAME); - - /* FIXME: Debug partial truncate case. */ - rename(GOSSIP_STORE_FILENAME, GOSSIP_STORE_FILENAME ".corrupt"); - close(gs->fd); - gs->fd = open(GOSSIP_STORE_FILENAME, O_RDWR|O_TRUNC|O_CREAT, 0600); - if (gs->fd < 0 || !write_all(gs->fd, &gs->version, sizeof(gs->version))) - status_failed(STATUS_FAIL_INTERNAL_ERROR, - "Truncating new store file: %s", strerror(errno)); - gs->len = 1; - gs->timestamp = 0; -out: - gs->writable = true; - status_debug("total store load time: %"PRIu64" msec", - time_to_msec(time_between(time_now(), start))); - status_debug("gossip_store: Read %zu/%zu/%zu/%zu cannounce/cupdate/nannounce/cdelete from store (%zu deleted) in %"PRIu64" bytes", - stats[0], stats[1], stats[2], stats[3], deleted, - gs->len); - - return gs->timestamp; -} diff --git a/gossipd/gossip_store.h b/gossipd/gossip_store.h index 50ec5bd44..374a7181c 100644 --- a/gossipd/gossip_store.h +++ b/gossipd/gossip_store.h @@ -13,20 +13,43 @@ */ struct gossip_store; -struct broadcastable; struct daemon; -struct routing_state; -struct gossip_store *gossip_store_new(struct daemon *daemon); +/* For channels we find dying in the store, on load. They are < 12 + * blocks closed. */ +struct chan_dying { + struct short_channel_id scid; + /* Offset of dying marker in the gossip_store */ + u64 gossmap_offset; + /* Blockheight where it's supposed to be deleted. */ + u32 deadline; +}; /** - * Load the initial gossip store, if any. - * - * @param gs The `gossip_store` to read from - * - * Returns the last-modified time of the store, or 0 if it was created new. + * Load the gossip_store + * @ctx: the context to allocate from + * @daemon: the daemon context + * @populated: set to false if store is empty/obviously partial. + * @dying: an array of channels we found dying markers for. */ -u32 gossip_store_load(struct gossip_store *gs); +struct gossip_store *gossip_store_new(const tal_t *ctx, + struct daemon *daemon, + bool *populated, + struct chan_dying **dying); + +/** + * Get the fd from the gossip_store. + * @gs: the gossip_store. + * + * Used by gossmap_manage to create a gossmap. + */ +int gossip_store_get_fd(const struct gossip_store *gs); + +/** + * Get the (refreshed!) gossmap from the gossip_store. + * @gs: gossip store + */ +struct gossmap *gossip_store_gossmap(struct gossip_store *gs); /** * Append a gossip message to the gossip_store diff --git a/gossipd/gossipd.c b/gossipd/gossipd.c index 247d7bdb3..778e48cd6 100644 --- a/gossipd/gossipd.c +++ b/gossipd/gossipd.c @@ -412,6 +412,7 @@ bool timestamp_reasonable(const struct daemon *daemon, u32 timestamp) static void gossip_init(struct daemon *daemon, const u8 *msg) { u32 *dev_gossip_time; + struct chan_dying *dying; if (!fromwire_gossipd_init(daemon, msg, &chainparams, @@ -431,13 +432,13 @@ static void gossip_init(struct daemon *daemon, const u8 *msg) tal_free(dev_gossip_time); } - daemon->gs = gossip_store_new(daemon); - /* Gossmap manager starts up */ - daemon->gm = gossmap_manage_new(daemon, daemon); + daemon->gs = gossip_store_new(daemon, + daemon, + &daemon->gossip_store_populated, + &dying); - /* Load stored gossip messages (FIXME: API sucks)*/ - daemon->gossip_store_populated = - (gossip_store_load(daemon->gs) != 0); + /* Gossmap manager starts up */ + daemon->gm = gossmap_manage_new(daemon, daemon, take(dying)); /* Fire up the seeker! */ daemon->seeker = new_seeker(daemon); diff --git a/gossipd/gossmap_manage.c b/gossipd/gossmap_manage.c index 3857d9b01..e540eb009 100644 --- a/gossipd/gossmap_manage.c +++ b/gossipd/gossmap_manage.c @@ -47,13 +47,6 @@ struct pending_nannounce { const struct node_id *source_peer; }; -struct dying_channel { - struct short_channel_id scid; - /* Offset of dying marker in the gossip_store */ - u64 gossmap_offset; - u32 deadline_blockheight; -}; - struct cannounce_map { UINTMAP(struct pending_cannounce *) map; size_t count; @@ -89,7 +82,7 @@ struct gossmap_manage { struct txout_failures *txf; /* Blockheights of scids to remove */ - struct dying_channel *dying_channels; + struct chan_dying *dying_channels; /* Occasional check for dead channels */ struct oneshot *prune_timer; @@ -392,15 +385,12 @@ static void report_bad_update(struct gossmap *map, } struct gossmap_manage *gossmap_manage_new(const tal_t *ctx, - struct daemon *daemon) + struct daemon *daemon, + struct chan_dying *dying_channels TAKES) { struct gossmap_manage *gm = tal(ctx, struct gossmap_manage); - gm->fd = open(GOSSIP_STORE_FILENAME, O_RDWR); - if (gm->fd < 0) - status_failed(STATUS_FAIL_INTERNAL_ERROR, - "Opening gossip_store store: %s", - strerror(errno)); + gm->fd = gossip_store_get_fd(daemon->gs); gm->raw_gossmap = gossmap_load_fd(gm, gm->fd, report_bad_update, NULL, gm); assert(gm->raw_gossmap); gm->daemon = daemon; @@ -411,7 +401,7 @@ struct gossmap_manage *gossmap_manage_new(const tal_t *ctx, gm->early_cupdates = tal_arr(gm, struct pending_cupdate *, 0); gm->pending_nannounces = tal_arr(gm, struct pending_nannounce *, 0); gm->txf = txout_failures_new(gm, daemon); - gm->dying_channels = tal_arr(gm, struct dying_channel, 0); + gm->dying_channels = tal_dup_talarr(gm, struct chan_dying, dying_channels); start_prune_timer(gm); return gm; @@ -1107,7 +1097,7 @@ void gossmap_manage_new_block(struct gossmap_manage *gm, u32 new_blockheight) } for (size_t i = 0; i < tal_count(gm->dying_channels); i++) { - if (gm->dying_channels[i].deadline_blockheight > new_blockheight) + if (gm->dying_channels[i].deadline > new_blockheight) continue; kill_spent_channel(gm, gossmap, gm->dying_channels[i].scid); @@ -1125,8 +1115,7 @@ void gossmap_manage_channel_spent(struct gossmap_manage *gm, struct gossmap_chan *chan; const struct gossmap_node *me; const u8 *msg; - u32 deadline; - u64 off; + struct chan_dying cd; struct gossmap *gossmap = gossmap_manage_get_gossmap(gm); chan = gossmap_find_chan(gossmap, &scid); @@ -1145,7 +1134,8 @@ void gossmap_manage_channel_spent(struct gossmap_manage *gm, * - once its funding output has been spent OR reorganized out: * - SHOULD forget a channel after a 12-block delay. */ - deadline = blockheight + 12; + cd.deadline = blockheight + 12; + cd.scid = scid; /* Remember locally so we can kill it in 12 blocks */ status_debug("channel %s closing soon due" @@ -1153,9 +1143,9 @@ void gossmap_manage_channel_spent(struct gossmap_manage *gm, type_to_string(tmpctx, struct short_channel_id, &scid)); /* Save to gossip_store in case we restart */ - msg = towire_gossip_store_chan_dying(tmpctx, &scid, deadline); - off = gossip_store_add(gm->daemon->gs, msg, 0); - gossmap_manage_channel_dying(gm, off, deadline, scid); + msg = towire_gossip_store_chan_dying(tmpctx, &cd.scid, cd.deadline); + cd.gossmap_offset = gossip_store_add(gm->daemon->gs, msg, 0); + tal_arr_expand(&gm->dying_channels, cd); /* Mark it dying, so we don't gossip it */ gossip_store_set_flag(gm->daemon->gs, chan->cann_off, @@ -1179,26 +1169,6 @@ struct gossmap *gossmap_manage_get_gossmap(struct gossmap_manage *gm) return gm->raw_gossmap; } -bool gossmap_manage_channel_dying(struct gossmap_manage *gm, - u64 gossmap_offset, - u32 deadline, - struct short_channel_id scid) -{ - struct dying_channel dead; - struct gossmap *gossmap = gossmap_manage_get_gossmap(gm); - - /* Can't kill missing channels! */ - if (!gossmap_find_chan(gossmap, &scid)) - return false; - - dead.deadline_blockheight = deadline; - dead.gossmap_offset = gossmap_offset; - dead.scid = scid; - - tal_arr_expand(&gm->dying_channels, dead); - return true; -} - /* BOLT #7: * - if the `gossip_queries` feature is negotiated: * - MUST NOT relay any gossip messages it did not generate itself, diff --git a/gossipd/gossmap_manage.h b/gossipd/gossmap_manage.h index 6396778aa..1749f025a 100644 --- a/gossipd/gossmap_manage.h +++ b/gossipd/gossmap_manage.h @@ -4,9 +4,11 @@ struct daemon; struct gossmap_manage; +struct chan_dying; struct gossmap_manage *gossmap_manage_new(const tal_t *ctx, - struct daemon *daemon); + struct daemon *daemon, + struct chan_dying *dying_channels TAKES); /** * gossmap_manage_channel_announcement: process an incoming channel_announcement @@ -86,20 +88,6 @@ void gossmap_manage_channel_spent(struct gossmap_manage *gm, u32 blockheight, struct short_channel_id scid); -/** - * gossmap_manage_channel_dying: dying channel loaded from store. - * @gm: the gossmap_manage context - * @offset: the offset of the dying marker in the store. - * @deadline: the blockheight it is to expire - * @scid: the short_channel_id - * - * Returns false if this channel does not exist (already dead!). - */ -bool gossmap_manage_channel_dying(struct gossmap_manage *gm, - u64 gossmap_offset, - u32 deadline, - struct short_channel_id scid); - /** * gossmap_manage_get_gossmap: get the (refreshed!) gossmap * @gm: the gossmap_manage context diff --git a/gossipd/test/run-txout_failure.c b/gossipd/test/run-txout_failure.c index 017523fd6..522ef342a 100644 --- a/gossipd/test/run-txout_failure.c +++ b/gossipd/test/run-txout_failure.c @@ -30,12 +30,6 @@ bool blinding_next_pubkey(const struct pubkey *pk UNNEEDED, { fprintf(stderr, "blinding_next_pubkey called!\n"); abort(); } /* AUTOGENERATED MOCKS END */ -/* NOOP stub for gossip_store_new */ -struct gossip_store *gossip_store_new(struct daemon *daemon UNNEEDED) -{ - return NULL; -} - int main(int argc, char *argv[]) { struct txout_failures *txf; diff --git a/tests/test_gossip.py b/tests/test_gossip.py index a80a185f9..5c61bfa77 100644 --- a/tests/test_gossip.py +++ b/tests/test_gossip.py @@ -1168,7 +1168,7 @@ def test_gossip_store_load(node_factory): l1.start() # May preceed the Started msg waited for in 'start'. - wait_for(lambda: l1.daemon.is_in_log(r'gossip_store: Read 1/1/1/0 cannounce/cupdate/nannounce/cdelete from store \(0 deleted\) in 778 bytes')) + wait_for(lambda: l1.daemon.is_in_log('Read 1/1/1/0 cannounce/cupdate/nannounce/delete from store in 800 bytes, now 778 bytes')) assert not l1.daemon.is_in_log('gossip_store.*truncating') @@ -1236,7 +1236,7 @@ def test_gossip_store_load_announce_before_update(node_factory): l1.start() # May preceed the Started msg waited for in 'start'. - wait_for(lambda: l1.daemon.is_in_log(r'gossip_store: Read 1/1/1/0 cannounce/cupdate/nannounce/cdelete from store \(0 deleted\) in 778 bytes')) + wait_for(lambda: l1.daemon.is_in_log('Read 1/1/1/1 cannounce/cupdate/nannounce/delete from store in 950 bytes, now 778 bytes')) assert not l1.daemon.is_in_log('gossip_store.*truncating') @@ -1253,8 +1253,8 @@ def test_gossip_store_load_amount_truncated(node_factory): l1.start() # May preceed the Started msg waited for in 'start'. - wait_for(lambda: l1.daemon.is_in_log(r'gossip_store: dangling channel_announcement. Moving to gossip_store.corrupt and truncating')) - wait_for(lambda: l1.daemon.is_in_log(r'gossip_store: Read 0/0/0/0 cannounce/cupdate/nannounce/cdelete from store \(0 deleted\) in 1 bytes')) + wait_for(lambda: l1.daemon.is_in_log(r'\*\*BROKEN\*\* gossipd: gossip_store: channel_announcement without amount \(offset 1\). Moving to gossip_store.corrupt and truncating')) + wait_for(lambda: l1.daemon.is_in_log(r'gossip_store: Read 0/0/0/0 cannounce/cupdate/nannounce/delete from store in 467 bytes, now 1 bytes \(populated=false\)')) assert os.path.exists(os.path.join(l1.daemon.lightning_dir, TEST_NETWORK, 'gossip_store.corrupt')) @@ -1614,7 +1614,7 @@ def test_gossip_store_load_no_channel_update(node_factory): l1.start() # May preceed the Started msg waited for in 'start'. - wait_for(lambda: l1.daemon.is_in_log(r'gossipd: gossip_store: Read 1/0/1/0 cannounce/cupdate/nannounce/cdelete from store \(0 deleted\) in 628 bytes')) + wait_for(lambda: l1.daemon.is_in_log('Read 1/0/1/0 cannounce/cupdate/nannounce/delete from store in 650 bytes, now 628 bytes')) assert not os.path.exists(os.path.join(l1.daemon.lightning_dir, TEST_NETWORK, 'gossip_store.corrupt')) @@ -1629,9 +1629,7 @@ def test_gossip_store_compact_on_load(node_factory, bitcoind): l2.restart() # These appear before we're fully started, so will already in log: - l2.daemon.is_in_log(r'gossip_store_compact_offline: 2 deleted, 9 copied') - - assert l2.daemon.is_in_log(r'gossip_store: Read 2/4/3/0 cannounce/cupdate/nannounce/cdelete from store \(0 deleted\)') + assert l2.daemon.is_in_log('gossip_store: Read 2/4/3/2 cannounce/cupdate/nannounce/delete from store') def test_gossip_announce_invalid_block(node_factory, bitcoind):