diff --git a/gossipd/gossip_store.c b/gossipd/gossip_store.c index d17a4766a..081f0a1b0 100644 --- a/gossipd/gossip_store.c +++ b/gossipd/gossip_store.c @@ -187,11 +187,12 @@ static u32 gossip_store_compact_offline(struct routing_state *rstate) { size_t count = 0, deleted = 0; int old_fd, new_fd; + u64 oldlen, newlen; struct gossip_hdr hdr; u8 oldversion, version = GOSSIP_STORE_VERSION; struct stat st; - old_fd = open(GOSSIP_STORE_FILENAME, O_RDONLY); + old_fd = open(GOSSIP_STORE_FILENAME, O_RDWR); if (old_fd == -1) return 0; @@ -275,11 +276,17 @@ static u32 gossip_store_compact_offline(struct routing_state *rstate) strerror(errno)); goto close_old; } - close(old_fd); if (rename(GOSSIP_STORE_TEMP_FILENAME, GOSSIP_STORE_FILENAME) != 0) { status_broken("gossip_store_compact_offline: 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, false, &oldlen); + close(old_fd); status_debug("gossip_store_compact_offline: %zu deleted, %zu copied", deleted, count); return st.st_mtime; @@ -452,7 +459,7 @@ bool gossip_store_compact(struct gossip_store *gs) { size_t count = 0, deleted = 0; int fd; - u64 off, len = sizeof(gs->version), idx; + u64 off, len = sizeof(gs->version), oldlen, idx; struct offmap *offmap; struct gossip_hdr hdr; struct offmap_iter oit; @@ -563,6 +570,12 @@ bool gossip_store_compact(struct gossip_store *gs) status_debug( "Compaction completed: dropped %zu messages, new count %zu, len %"PRIu64, deleted, count, len); + + /* Write end marker now new one is ready */ + oldlen = gs->len; + append_msg(gs->fd, towire_gossip_store_ended(tmpctx, len), + 0, false, &oldlen); + gs->count = count; gs->deleted = 0; off = gs->len - len; diff --git a/gossipd/gossip_store_wire.csv b/gossipd/gossip_store_wire.csv index ba290f978..1b90e38e9 100644 --- a/gossipd/gossip_store_wire.csv +++ b/gossipd/gossip_store_wire.csv @@ -21,6 +21,9 @@ msgdata,gossip_store_private_update,update,u8,len msgtype,gossip_store_delete_chan,4103 msgdata,gossip_store_delete_chan,scid,short_channel_id, +msgtype,gossip_store_ended,4105 +msgdata,gossip_store_ended,equivalent_offset,u64, + # FIXME: Here for COMPAT with v0.9.0 and before only. msgtype,gossipd_local_add_channel_obs,3503 msgdata,gossipd_local_add_channel_obs,short_channel_id,short_channel_id, diff --git a/gossipd/gossip_store_wiregen.c b/gossipd/gossip_store_wiregen.c index 20bd9666a..d4c464481 100644 --- a/gossipd/gossip_store_wiregen.c +++ b/gossipd/gossip_store_wiregen.c @@ -27,6 +27,7 @@ const char *gossip_store_wire_name(int e) case WIRE_GOSSIP_STORE_PRIVATE_CHANNEL: return "WIRE_GOSSIP_STORE_PRIVATE_CHANNEL"; case WIRE_GOSSIP_STORE_PRIVATE_UPDATE: return "WIRE_GOSSIP_STORE_PRIVATE_UPDATE"; case WIRE_GOSSIP_STORE_DELETE_CHAN: return "WIRE_GOSSIP_STORE_DELETE_CHAN"; + case WIRE_GOSSIP_STORE_ENDED: return "WIRE_GOSSIP_STORE_ENDED"; case WIRE_GOSSIPD_LOCAL_ADD_CHANNEL_OBS: return "WIRE_GOSSIPD_LOCAL_ADD_CHANNEL_OBS"; } @@ -41,6 +42,7 @@ bool gossip_store_wire_is_defined(u16 type) case WIRE_GOSSIP_STORE_PRIVATE_CHANNEL:; case WIRE_GOSSIP_STORE_PRIVATE_UPDATE:; case WIRE_GOSSIP_STORE_DELETE_CHAN:; + case WIRE_GOSSIP_STORE_ENDED:; case WIRE_GOSSIPD_LOCAL_ADD_CHANNEL_OBS:; return true; } @@ -153,6 +155,27 @@ bool fromwire_gossip_store_delete_chan(const void *p, struct short_channel_id *s return cursor != NULL; } +/* WIRE: GOSSIP_STORE_ENDED */ +u8 *towire_gossip_store_ended(const tal_t *ctx, u64 equivalent_offset) +{ + u8 *p = tal_arr(ctx, u8, 0); + + towire_u16(&p, WIRE_GOSSIP_STORE_ENDED); + towire_u64(&p, equivalent_offset); + + return memcheck(p, tal_count(p)); +} +bool fromwire_gossip_store_ended(const void *p, u64 *equivalent_offset) +{ + const u8 *cursor = p; + size_t plen = tal_count(p); + + if (fromwire_u16(&cursor, &plen) != WIRE_GOSSIP_STORE_ENDED) + return false; + *equivalent_offset = fromwire_u64(&cursor, &plen); + return cursor != NULL; +} + /* WIRE: GOSSIPD_LOCAL_ADD_CHANNEL_OBS */ /* FIXME: Here for COMPAT with v0.9.0 and before only. */ u8 *towire_gossipd_local_add_channel_obs(const tal_t *ctx, const struct short_channel_id *short_channel_id, const struct node_id *remote_node_id, struct amount_sat satoshis, const u8 *features) @@ -187,4 +210,4 @@ bool fromwire_gossipd_local_add_channel_obs(const tal_t *ctx, const void *p, str fromwire_u8_array(&cursor, &plen, *features, flen); return cursor != NULL; } -// SHA256STAMP:e57942b41cb479ca181f13cd0bf5cfc6dd4acbb3685618a9679af8ec546a3fcc +// SHA256STAMP:18d52e526a219c3a8bb29c6a29b7bd82880c5befdde88c12424d57cb98a28b17 diff --git a/gossipd/gossip_store_wiregen.h b/gossipd/gossip_store_wiregen.h index 8b7cda627..2ff5bc91b 100644 --- a/gossipd/gossip_store_wiregen.h +++ b/gossipd/gossip_store_wiregen.h @@ -17,6 +17,7 @@ enum gossip_store_wire { WIRE_GOSSIP_STORE_PRIVATE_CHANNEL = 4104, WIRE_GOSSIP_STORE_PRIVATE_UPDATE = 4102, WIRE_GOSSIP_STORE_DELETE_CHAN = 4103, + WIRE_GOSSIP_STORE_ENDED = 4105, /* FIXME: Here for COMPAT with v0.9.0 and before only. */ WIRE_GOSSIPD_LOCAL_ADD_CHANNEL_OBS = 3503, }; @@ -51,6 +52,10 @@ bool fromwire_gossip_store_private_update(const tal_t *ctx, const void *p, u8 ** u8 *towire_gossip_store_delete_chan(const tal_t *ctx, const struct short_channel_id *scid); bool fromwire_gossip_store_delete_chan(const void *p, struct short_channel_id *scid); +/* WIRE: GOSSIP_STORE_ENDED */ +u8 *towire_gossip_store_ended(const tal_t *ctx, u64 equivalent_offset); +bool fromwire_gossip_store_ended(const void *p, u64 *equivalent_offset); + /* WIRE: GOSSIPD_LOCAL_ADD_CHANNEL_OBS */ /* FIXME: Here for COMPAT with v0.9.0 and before only. */ u8 *towire_gossipd_local_add_channel_obs(const tal_t *ctx, const struct short_channel_id *short_channel_id, const struct node_id *remote_node_id, struct amount_sat satoshis, const u8 *features); @@ -58,4 +63,4 @@ bool fromwire_gossipd_local_add_channel_obs(const tal_t *ctx, const void *p, str #endif /* LIGHTNING_GOSSIPD_GOSSIP_STORE_WIREGEN_H */ -// SHA256STAMP:e57942b41cb479ca181f13cd0bf5cfc6dd4acbb3685618a9679af8ec546a3fcc +// SHA256STAMP:18d52e526a219c3a8bb29c6a29b7bd82880c5befdde88c12424d57cb98a28b17 diff --git a/gossipd/test/Makefile b/gossipd/test/Makefile index 4607384de..b9f094911 100644 --- a/gossipd/test/Makefile +++ b/gossipd/test/Makefile @@ -18,6 +18,7 @@ GOSSIPD_TEST_COMMON_OBJS := \ common/setup.o \ common/type_to_string.o \ common/utils.o \ + gossipd/gossip_store_wiregen.o \ wire/peer$(EXP)_wiregen.o \ wire/fromwire.o \ wire/tlvstream.o \ diff --git a/gossipd/test/run-bench-find_route.c b/gossipd/test/run-bench-find_route.c index 7021737e5..476053582 100644 --- a/gossipd/test/run-bench-find_route.c +++ b/gossipd/test/run-bench-find_route.c @@ -39,18 +39,6 @@ bool cupdate_different(struct gossip_store *gs UNNEEDED, /* Generated stub for fmt_wireaddr_without_port */ char *fmt_wireaddr_without_port(const tal_t *ctx UNNEEDED, const struct wireaddr *a UNNEEDED) { fprintf(stderr, "fmt_wireaddr_without_port called!\n"); abort(); } -/* Generated stub for fromwire_gossip_store_channel_amount */ -bool fromwire_gossip_store_channel_amount(const void *p UNNEEDED, struct amount_sat *satoshis UNNEEDED) -{ fprintf(stderr, "fromwire_gossip_store_channel_amount called!\n"); abort(); } -/* Generated stub for fromwire_gossip_store_private_channel */ -bool fromwire_gossip_store_private_channel(const tal_t *ctx UNNEEDED, const void *p UNNEEDED, struct amount_sat *satoshis UNNEEDED, u8 **announcement UNNEEDED) -{ fprintf(stderr, "fromwire_gossip_store_private_channel called!\n"); abort(); } -/* Generated stub for fromwire_gossip_store_private_update */ -bool fromwire_gossip_store_private_update(const tal_t *ctx UNNEEDED, const void *p UNNEEDED, u8 **update UNNEEDED) -{ fprintf(stderr, "fromwire_gossip_store_private_update called!\n"); abort(); } -/* Generated stub for fromwire_gossipd_local_add_channel_obs */ -bool fromwire_gossipd_local_add_channel_obs(const tal_t *ctx UNNEEDED, const void *p UNNEEDED, struct short_channel_id *short_channel_id UNNEEDED, struct node_id *remote_node_id UNNEEDED, struct amount_sat *satoshis UNNEEDED, u8 **features UNNEEDED) -{ fprintf(stderr, "fromwire_gossipd_local_add_channel_obs called!\n"); abort(); } /* Generated stub for fromwire_wireaddr */ bool fromwire_wireaddr(const u8 **cursor UNNEEDED, size_t *max UNNEEDED, struct wireaddr *addr UNNEEDED) { fprintf(stderr, "fromwire_wireaddr called!\n"); abort(); } @@ -99,18 +87,6 @@ char *sanitize_error(const tal_t *ctx UNNEEDED, const u8 *errmsg UNNEEDED, void status_failed(enum status_failreason code UNNEEDED, const char *fmt UNNEEDED, ...) { fprintf(stderr, "status_failed called!\n"); abort(); } -/* Generated stub for towire_gossip_store_channel_amount */ -u8 *towire_gossip_store_channel_amount(const tal_t *ctx UNNEEDED, struct amount_sat satoshis UNNEEDED) -{ fprintf(stderr, "towire_gossip_store_channel_amount called!\n"); abort(); } -/* Generated stub for towire_gossip_store_delete_chan */ -u8 *towire_gossip_store_delete_chan(const tal_t *ctx UNNEEDED, const struct short_channel_id *scid UNNEEDED) -{ fprintf(stderr, "towire_gossip_store_delete_chan called!\n"); abort(); } -/* Generated stub for towire_gossip_store_private_channel */ -u8 *towire_gossip_store_private_channel(const tal_t *ctx UNNEEDED, struct amount_sat satoshis UNNEEDED, const u8 *announcement UNNEEDED) -{ fprintf(stderr, "towire_gossip_store_private_channel called!\n"); abort(); } -/* Generated stub for towire_gossip_store_private_update */ -u8 *towire_gossip_store_private_update(const tal_t *ctx UNNEEDED, const u8 *update UNNEEDED) -{ fprintf(stderr, "towire_gossip_store_private_update called!\n"); abort(); } /* Generated stub for towire_warningfmt */ u8 *towire_warningfmt(const tal_t *ctx UNNEEDED, const struct channel_id *channel UNNEEDED, diff --git a/gossipd/test/run-check_channel_announcement.c b/gossipd/test/run-check_channel_announcement.c index 57c22933d..cc77a3414 100644 --- a/gossipd/test/run-check_channel_announcement.c +++ b/gossipd/test/run-check_channel_announcement.c @@ -42,9 +42,6 @@ bool cupdate_different(struct gossip_store *gs UNNEEDED, /* Generated stub for fmt_wireaddr_without_port */ char *fmt_wireaddr_without_port(const tal_t *ctx UNNEEDED, const struct wireaddr *a UNNEEDED) { fprintf(stderr, "fmt_wireaddr_without_port called!\n"); abort(); } -/* Generated stub for fromwire_gossip_store_private_channel */ -bool fromwire_gossip_store_private_channel(const tal_t *ctx UNNEEDED, const void *p UNNEEDED, struct amount_sat *satoshis UNNEEDED, u8 **announcement UNNEEDED) -{ fprintf(stderr, "fromwire_gossip_store_private_channel called!\n"); abort(); } /* Generated stub for fromwire_wireaddr */ bool fromwire_wireaddr(const u8 **cursor UNNEEDED, size_t *max UNNEEDED, struct wireaddr *addr UNNEEDED) { fprintf(stderr, "fromwire_wireaddr called!\n"); abort(); } @@ -126,9 +123,6 @@ void status_fmt(enum log_level level UNNEEDED, const char *fmt UNNEEDED, ...) { fprintf(stderr, "status_fmt called!\n"); abort(); } -/* Generated stub for towire_gossip_store_channel_amount */ -u8 *towire_gossip_store_channel_amount(const tal_t *ctx UNNEEDED, struct amount_sat satoshis UNNEEDED) -{ fprintf(stderr, "towire_gossip_store_channel_amount called!\n"); abort(); } /* AUTOGENERATED MOCKS END */ int main(int argc, char *argv[]) diff --git a/gossipd/test/run-find_route-specific.c b/gossipd/test/run-find_route-specific.c index e009cdfe0..52256dacb 100644 --- a/gossipd/test/run-find_route-specific.c +++ b/gossipd/test/run-find_route-specific.c @@ -25,18 +25,6 @@ bool cupdate_different(struct gossip_store *gs UNNEEDED, /* Generated stub for fmt_wireaddr_without_port */ char *fmt_wireaddr_without_port(const tal_t *ctx UNNEEDED, const struct wireaddr *a UNNEEDED) { fprintf(stderr, "fmt_wireaddr_without_port called!\n"); abort(); } -/* Generated stub for fromwire_gossip_store_channel_amount */ -bool fromwire_gossip_store_channel_amount(const void *p UNNEEDED, struct amount_sat *satoshis UNNEEDED) -{ fprintf(stderr, "fromwire_gossip_store_channel_amount called!\n"); abort(); } -/* Generated stub for fromwire_gossip_store_private_channel */ -bool fromwire_gossip_store_private_channel(const tal_t *ctx UNNEEDED, const void *p UNNEEDED, struct amount_sat *satoshis UNNEEDED, u8 **announcement UNNEEDED) -{ fprintf(stderr, "fromwire_gossip_store_private_channel called!\n"); abort(); } -/* Generated stub for fromwire_gossip_store_private_update */ -bool fromwire_gossip_store_private_update(const tal_t *ctx UNNEEDED, const void *p UNNEEDED, u8 **update UNNEEDED) -{ fprintf(stderr, "fromwire_gossip_store_private_update called!\n"); abort(); } -/* Generated stub for fromwire_gossipd_local_add_channel_obs */ -bool fromwire_gossipd_local_add_channel_obs(const tal_t *ctx UNNEEDED, const void *p UNNEEDED, struct short_channel_id *short_channel_id UNNEEDED, struct node_id *remote_node_id UNNEEDED, struct amount_sat *satoshis UNNEEDED, u8 **features UNNEEDED) -{ fprintf(stderr, "fromwire_gossipd_local_add_channel_obs called!\n"); abort(); } /* Generated stub for fromwire_wireaddr */ bool fromwire_wireaddr(const u8 **cursor UNNEEDED, size_t *max UNNEEDED, struct wireaddr *addr UNNEEDED) { fprintf(stderr, "fromwire_wireaddr called!\n"); abort(); } @@ -85,18 +73,6 @@ char *sanitize_error(const tal_t *ctx UNNEEDED, const u8 *errmsg UNNEEDED, void status_failed(enum status_failreason code UNNEEDED, const char *fmt UNNEEDED, ...) { fprintf(stderr, "status_failed called!\n"); abort(); } -/* Generated stub for towire_gossip_store_channel_amount */ -u8 *towire_gossip_store_channel_amount(const tal_t *ctx UNNEEDED, struct amount_sat satoshis UNNEEDED) -{ fprintf(stderr, "towire_gossip_store_channel_amount called!\n"); abort(); } -/* Generated stub for towire_gossip_store_delete_chan */ -u8 *towire_gossip_store_delete_chan(const tal_t *ctx UNNEEDED, const struct short_channel_id *scid UNNEEDED) -{ fprintf(stderr, "towire_gossip_store_delete_chan called!\n"); abort(); } -/* Generated stub for towire_gossip_store_private_channel */ -u8 *towire_gossip_store_private_channel(const tal_t *ctx UNNEEDED, struct amount_sat satoshis UNNEEDED, const u8 *announcement UNNEEDED) -{ fprintf(stderr, "towire_gossip_store_private_channel called!\n"); abort(); } -/* Generated stub for towire_gossip_store_private_update */ -u8 *towire_gossip_store_private_update(const tal_t *ctx UNNEEDED, const u8 *update UNNEEDED) -{ fprintf(stderr, "towire_gossip_store_private_update called!\n"); abort(); } /* Generated stub for towire_warningfmt */ u8 *towire_warningfmt(const tal_t *ctx UNNEEDED, const struct channel_id *channel UNNEEDED, diff --git a/gossipd/test/run-find_route.c b/gossipd/test/run-find_route.c index 797ad2a35..609282974 100644 --- a/gossipd/test/run-find_route.c +++ b/gossipd/test/run-find_route.c @@ -25,18 +25,6 @@ bool cupdate_different(struct gossip_store *gs UNNEEDED, /* Generated stub for fmt_wireaddr_without_port */ char *fmt_wireaddr_without_port(const tal_t *ctx UNNEEDED, const struct wireaddr *a UNNEEDED) { fprintf(stderr, "fmt_wireaddr_without_port called!\n"); abort(); } -/* Generated stub for fromwire_gossip_store_channel_amount */ -bool fromwire_gossip_store_channel_amount(const void *p UNNEEDED, struct amount_sat *satoshis UNNEEDED) -{ fprintf(stderr, "fromwire_gossip_store_channel_amount called!\n"); abort(); } -/* Generated stub for fromwire_gossip_store_private_channel */ -bool fromwire_gossip_store_private_channel(const tal_t *ctx UNNEEDED, const void *p UNNEEDED, struct amount_sat *satoshis UNNEEDED, u8 **announcement UNNEEDED) -{ fprintf(stderr, "fromwire_gossip_store_private_channel called!\n"); abort(); } -/* Generated stub for fromwire_gossip_store_private_update */ -bool fromwire_gossip_store_private_update(const tal_t *ctx UNNEEDED, const void *p UNNEEDED, u8 **update UNNEEDED) -{ fprintf(stderr, "fromwire_gossip_store_private_update called!\n"); abort(); } -/* Generated stub for fromwire_gossipd_local_add_channel_obs */ -bool fromwire_gossipd_local_add_channel_obs(const tal_t *ctx UNNEEDED, const void *p UNNEEDED, struct short_channel_id *short_channel_id UNNEEDED, struct node_id *remote_node_id UNNEEDED, struct amount_sat *satoshis UNNEEDED, u8 **features UNNEEDED) -{ fprintf(stderr, "fromwire_gossipd_local_add_channel_obs called!\n"); abort(); } /* Generated stub for fromwire_wireaddr */ bool fromwire_wireaddr(const u8 **cursor UNNEEDED, size_t *max UNNEEDED, struct wireaddr *addr UNNEEDED) { fprintf(stderr, "fromwire_wireaddr called!\n"); abort(); } @@ -85,18 +73,6 @@ char *sanitize_error(const tal_t *ctx UNNEEDED, const u8 *errmsg UNNEEDED, void status_failed(enum status_failreason code UNNEEDED, const char *fmt UNNEEDED, ...) { fprintf(stderr, "status_failed called!\n"); abort(); } -/* Generated stub for towire_gossip_store_channel_amount */ -u8 *towire_gossip_store_channel_amount(const tal_t *ctx UNNEEDED, struct amount_sat satoshis UNNEEDED) -{ fprintf(stderr, "towire_gossip_store_channel_amount called!\n"); abort(); } -/* Generated stub for towire_gossip_store_delete_chan */ -u8 *towire_gossip_store_delete_chan(const tal_t *ctx UNNEEDED, const struct short_channel_id *scid UNNEEDED) -{ fprintf(stderr, "towire_gossip_store_delete_chan called!\n"); abort(); } -/* Generated stub for towire_gossip_store_private_channel */ -u8 *towire_gossip_store_private_channel(const tal_t *ctx UNNEEDED, struct amount_sat satoshis UNNEEDED, const u8 *announcement UNNEEDED) -{ fprintf(stderr, "towire_gossip_store_private_channel called!\n"); abort(); } -/* Generated stub for towire_gossip_store_private_update */ -u8 *towire_gossip_store_private_update(const tal_t *ctx UNNEEDED, const u8 *update UNNEEDED) -{ fprintf(stderr, "towire_gossip_store_private_update called!\n"); abort(); } /* Generated stub for towire_warningfmt */ u8 *towire_warningfmt(const tal_t *ctx UNNEEDED, const struct channel_id *channel UNNEEDED, diff --git a/gossipd/test/run-overlong.c b/gossipd/test/run-overlong.c index 90b24797e..d400aa792 100644 --- a/gossipd/test/run-overlong.c +++ b/gossipd/test/run-overlong.c @@ -25,18 +25,6 @@ bool cupdate_different(struct gossip_store *gs UNNEEDED, /* Generated stub for fmt_wireaddr_without_port */ char *fmt_wireaddr_without_port(const tal_t *ctx UNNEEDED, const struct wireaddr *a UNNEEDED) { fprintf(stderr, "fmt_wireaddr_without_port called!\n"); abort(); } -/* Generated stub for fromwire_gossip_store_channel_amount */ -bool fromwire_gossip_store_channel_amount(const void *p UNNEEDED, struct amount_sat *satoshis UNNEEDED) -{ fprintf(stderr, "fromwire_gossip_store_channel_amount called!\n"); abort(); } -/* Generated stub for fromwire_gossip_store_private_channel */ -bool fromwire_gossip_store_private_channel(const tal_t *ctx UNNEEDED, const void *p UNNEEDED, struct amount_sat *satoshis UNNEEDED, u8 **announcement UNNEEDED) -{ fprintf(stderr, "fromwire_gossip_store_private_channel called!\n"); abort(); } -/* Generated stub for fromwire_gossip_store_private_update */ -bool fromwire_gossip_store_private_update(const tal_t *ctx UNNEEDED, const void *p UNNEEDED, u8 **update UNNEEDED) -{ fprintf(stderr, "fromwire_gossip_store_private_update called!\n"); abort(); } -/* Generated stub for fromwire_gossipd_local_add_channel_obs */ -bool fromwire_gossipd_local_add_channel_obs(const tal_t *ctx UNNEEDED, const void *p UNNEEDED, struct short_channel_id *short_channel_id UNNEEDED, struct node_id *remote_node_id UNNEEDED, struct amount_sat *satoshis UNNEEDED, u8 **features UNNEEDED) -{ fprintf(stderr, "fromwire_gossipd_local_add_channel_obs called!\n"); abort(); } /* Generated stub for fromwire_wireaddr */ bool fromwire_wireaddr(const u8 **cursor UNNEEDED, size_t *max UNNEEDED, struct wireaddr *addr UNNEEDED) { fprintf(stderr, "fromwire_wireaddr called!\n"); abort(); } @@ -85,18 +73,6 @@ char *sanitize_error(const tal_t *ctx UNNEEDED, const u8 *errmsg UNNEEDED, void status_failed(enum status_failreason code UNNEEDED, const char *fmt UNNEEDED, ...) { fprintf(stderr, "status_failed called!\n"); abort(); } -/* Generated stub for towire_gossip_store_channel_amount */ -u8 *towire_gossip_store_channel_amount(const tal_t *ctx UNNEEDED, struct amount_sat satoshis UNNEEDED) -{ fprintf(stderr, "towire_gossip_store_channel_amount called!\n"); abort(); } -/* Generated stub for towire_gossip_store_delete_chan */ -u8 *towire_gossip_store_delete_chan(const tal_t *ctx UNNEEDED, const struct short_channel_id *scid UNNEEDED) -{ fprintf(stderr, "towire_gossip_store_delete_chan called!\n"); abort(); } -/* Generated stub for towire_gossip_store_private_channel */ -u8 *towire_gossip_store_private_channel(const tal_t *ctx UNNEEDED, struct amount_sat satoshis UNNEEDED, const u8 *announcement UNNEEDED) -{ fprintf(stderr, "towire_gossip_store_private_channel called!\n"); abort(); } -/* Generated stub for towire_gossip_store_private_update */ -u8 *towire_gossip_store_private_update(const tal_t *ctx UNNEEDED, const u8 *update UNNEEDED) -{ fprintf(stderr, "towire_gossip_store_private_update called!\n"); abort(); } /* Generated stub for towire_warningfmt */ u8 *towire_warningfmt(const tal_t *ctx UNNEEDED, const struct channel_id *channel UNNEEDED, diff --git a/gossipd/test/run-txout_failure.c b/gossipd/test/run-txout_failure.c index 7f642967d..044e8fed1 100644 --- a/gossipd/test/run-txout_failure.c +++ b/gossipd/test/run-txout_failure.c @@ -13,9 +13,6 @@ bool cupdate_different(struct gossip_store *gs UNNEEDED, /* Generated stub for fmt_wireaddr_without_port */ char *fmt_wireaddr_without_port(const tal_t *ctx UNNEEDED, const struct wireaddr *a UNNEEDED) { fprintf(stderr, "fmt_wireaddr_without_port called!\n"); abort(); } -/* Generated stub for fromwire_gossip_store_private_channel */ -bool fromwire_gossip_store_private_channel(const tal_t *ctx UNNEEDED, const void *p UNNEEDED, struct amount_sat *satoshis UNNEEDED, u8 **announcement UNNEEDED) -{ fprintf(stderr, "fromwire_gossip_store_private_channel called!\n"); abort(); } /* Generated stub for fromwire_wireaddr */ bool fromwire_wireaddr(const u8 **cursor UNNEEDED, size_t *max UNNEEDED, struct wireaddr *addr UNNEEDED) { fprintf(stderr, "fromwire_wireaddr called!\n"); abort(); } @@ -91,9 +88,6 @@ void status_fmt(enum log_level level UNNEEDED, const char *fmt UNNEEDED, ...) { fprintf(stderr, "status_fmt called!\n"); abort(); } -/* Generated stub for towire_gossip_store_channel_amount */ -u8 *towire_gossip_store_channel_amount(const tal_t *ctx UNNEEDED, struct amount_sat satoshis UNNEEDED) -{ fprintf(stderr, "towire_gossip_store_channel_amount called!\n"); abort(); } /* Generated stub for towire_warningfmt */ u8 *towire_warningfmt(const tal_t *ctx UNNEEDED, const struct channel_id *channel UNNEEDED,