diff --git a/lightningd/channel_control.c b/lightningd/channel_control.c index a1f6b085a..2c92afbe9 100644 --- a/lightningd/channel_control.c +++ b/lightningd/channel_control.c @@ -425,7 +425,6 @@ static unsigned channel_msg(struct subd *sd, const u8 *msg, const int *fds) void peer_start_channeld(struct channel *channel, struct per_peer_state *pps, const u8 *fwd_msg, - const struct wally_psbt *psbt, bool reconnected) { u8 *initmsg; diff --git a/lightningd/channel_control.h b/lightningd/channel_control.h index 300b16a19..735e73e1c 100644 --- a/lightningd/channel_control.h +++ b/lightningd/channel_control.h @@ -13,7 +13,6 @@ struct peer; void peer_start_channeld(struct channel *channel, struct per_peer_state *pps, const u8 *fwd_msg, - const struct wally_psbt *psbt, bool reconnected); /* Returns true if subd told, otherwise false. */ diff --git a/lightningd/dual_open_control.c b/lightningd/dual_open_control.c index fb2537c91..daa376c2b 100644 --- a/lightningd/dual_open_control.c +++ b/lightningd/dual_open_control.c @@ -54,7 +54,7 @@ static void handle_signed_psbt(struct lightningd *ld, peer_start_channeld(rcvd->channel, rcvd->pps, rcvd->commitment_msg, - psbt, false); + false); } /* ~Map of the Territory~ @@ -945,7 +945,7 @@ static void opener_commit_received(struct subd *dualopend, wallet_channel_save(uc->fc->cmd->ld->wallet, channel); peer_start_channeld(channel, pps, - NULL, psbt, false); + NULL, false); was_pending(command_success(uc->fc->cmd, response)); goto cleanup; diff --git a/lightningd/opening_control.c b/lightningd/opening_control.c index 68b1cb28f..d9f4ff273 100644 --- a/lightningd/opening_control.c +++ b/lightningd/opening_control.c @@ -414,7 +414,7 @@ static void opening_funder_finished(struct subd *openingd, const u8 *resp, wallet_penalty_base_add(ld->wallet, channel->dbid, pbase); funding_success(channel); - peer_start_channeld(channel, pps, NULL, NULL, false); + peer_start_channeld(channel, pps, NULL, false); cleanup: subd_release_channel(openingd, fc->uc); @@ -529,7 +529,7 @@ static void opening_fundee_finished(struct subd *openingd, wallet_penalty_base_add(ld->wallet, channel->dbid, pbase); /* On to normal operation! */ - peer_start_channeld(channel, pps, fwd_msg, NULL, false); + peer_start_channeld(channel, pps, fwd_msg, false); subd_release_channel(openingd, uc); uc->open_daemon = NULL; diff --git a/lightningd/peer_control.c b/lightningd/peer_control.c index 9394e2a3a..f533bb19d 100644 --- a/lightningd/peer_control.c +++ b/lightningd/peer_control.c @@ -1091,8 +1091,7 @@ peer_connected_hook_cb(struct peer_connected_hook_payload *payload STEALS, channel->peer->addr = addr; peer_start_channeld(channel, payload->pps, - NULL, channel->psbt, - true); + NULL, true); tal_free(payload); return; diff --git a/lightningd/test/run-invoice-select-inchan.c b/lightningd/test/run-invoice-select-inchan.c index ec5256a58..ff4347cba 100644 --- a/lightningd/test/run-invoice-select-inchan.c +++ b/lightningd/test/run-invoice-select-inchan.c @@ -505,7 +505,6 @@ struct channel *peer_normal_channel(struct peer *peer UNNEEDED) void peer_start_channeld(struct channel *channel UNNEEDED, struct per_peer_state *pps UNNEEDED, const u8 *fwd_msg UNNEEDED, - const struct wally_psbt *psbt UNNEEDED, bool reconnected UNNEEDED) { fprintf(stderr, "peer_start_channeld called!\n"); abort(); } /* Generated stub for peer_start_closingd */ diff --git a/wallet/db_postgres_sqlgen.c b/wallet/db_postgres_sqlgen.c index 2576a6f42..faeff38f6 100644 --- a/wallet/db_postgres_sqlgen.c +++ b/wallet/db_postgres_sqlgen.c @@ -1774,4 +1774,4 @@ struct db_query db_postgres_queries[] = { #endif /* LIGHTNINGD_WALLET_GEN_DB_POSTGRES */ -// SHA256STAMP:62ee429e3f1823a6f5db9358e3bd25b0b48f1dc7cf78bd22b921f601cde15950 +// SHA256STAMP:3c65fc6d5dc492c13d1e7e91f7ca224e1a032237d3cf98b63d93d0e180665c3a diff --git a/wallet/db_sqlite3_sqlgen.c b/wallet/db_sqlite3_sqlgen.c index 3d41ebe8d..f1a5ee023 100644 --- a/wallet/db_sqlite3_sqlgen.c +++ b/wallet/db_sqlite3_sqlgen.c @@ -1774,4 +1774,4 @@ struct db_query db_sqlite3_queries[] = { #endif /* LIGHTNINGD_WALLET_GEN_DB_SQLITE3 */ -// SHA256STAMP:62ee429e3f1823a6f5db9358e3bd25b0b48f1dc7cf78bd22b921f601cde15950 +// SHA256STAMP:3c65fc6d5dc492c13d1e7e91f7ca224e1a032237d3cf98b63d93d0e180665c3a diff --git a/wallet/statements_gettextgen.po b/wallet/statements_gettextgen.po index 568500e15..372e90ed4 100644 --- a/wallet/statements_gettextgen.po +++ b/wallet/statements_gettextgen.po @@ -1166,7 +1166,7 @@ msgstr "" msgid "not a valid SQL statement" msgstr "" -#: wallet/test/run-wallet.c:1382 +#: wallet/test/run-wallet.c:1381 msgid "INSERT INTO channels (id) VALUES (1);" msgstr "" -# SHA256STAMP:419f856dc814241824978c8fef801df3a6b7bcf6239990810a17e6f35ca9b3df +# SHA256STAMP:0d3e9063d3a2e50eff73f42254c423cbbe75e3603a8f9a21aab99d1a56168736 diff --git a/wallet/test/run-wallet.c b/wallet/test/run-wallet.c index bda43df43..bd8afe093 100644 --- a/wallet/test/run-wallet.c +++ b/wallet/test/run-wallet.c @@ -600,7 +600,6 @@ void peer_memleak_done(struct command *cmd UNNEEDED, struct subd *leaker UNNEEDE void peer_start_channeld(struct channel *channel UNNEEDED, struct per_peer_state *pps UNNEEDED, const u8 *fwd_msg UNNEEDED, - const struct wally_psbt *psbt UNNEEDED, bool reconnected UNNEEDED) { fprintf(stderr, "peer_start_channeld called!\n"); abort(); } /* Generated stub for peer_start_closingd */