mirrors/core-lightning
1
0
Fork 0
mirror of https://github.com/ElementsProject/lightning.git synced 2025-02-22 06:41:44 +01:00
Code Issues Projects Releases Wiki Activity

channeld: fix up compilation after conflicting changes.

Browse source 
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell 2023-10-23 16:26:25 +10:30
parent a6e1f19e6d
commit d30f659281
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
channeld/channeld.c
View file

@ -3482,7 +3482,7 @@ static void update_hsmd_with_splice(struct peer *peer, struct inflight *inflight
/* local_upfront_shutdown_script, local_upfront_shutdown_wallet_index, /* local_upfront_shutdown_script, local_upfront_shutdown_wallet_index,
* remote_upfront_shutdown_script aren't allowed to change, so we * remote_upfront_shutdown_script aren't allowed to change, so we
* don't need to gather them */ * don't need to gather them */
msg = towire_hsmd_ready_channel( msg = towire_hsmd_setup_channel(
NULL, NULL,
peer->channel->opener == LOCAL, peer->channel->opener == LOCAL,
inflight->amnt, inflight->amnt,
@ -3500,7 +3500,7 @@ static void update_hsmd_with_splice(struct peer *peer, struct inflight *inflight
wire_sync_write(HSM_FD, take(msg)); wire_sync_write(HSM_FD, take(msg));
msg = wire_sync_read(tmpctx, HSM_FD); msg = wire_sync_read(tmpctx, HSM_FD);
if (!fromwire_hsmd_ready_channel_reply(msg)) if (!fromwire_hsmd_setup_channel_reply(msg))
status_failed(STATUS_FAIL_HSM_IO, "Bad ready_channel_reply %s", status_failed(STATUS_FAIL_HSM_IO, "Bad ready_channel_reply %s",
tal_hex(tmpctx, msg)); tal_hex(tmpctx, msg));
} }