Skip to content

Commit

Permalink
fixup! lightningd: Add tx_abort routine to lightningd
Browse files Browse the repository at this point in the history
  • Loading branch information
ddustin committed Feb 10, 2024
1 parent ce2255e commit 4aa26ef
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion common/wire_error.c
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ char *sanitize_error(const tal_t *ctx, const u8 *errmsg,
struct channel_id dummy;
u8 *data;
size_t i;
char *tag;
const char *tag;

if (!channel_id)
channel_id = &dummy;
Expand Down
4 changes: 2 additions & 2 deletions lightningd/channel_control.c
Original file line number Diff line number Diff line change
Expand Up @@ -323,6 +323,7 @@ static void handle_splice_abort(struct lightningd *ld,
&inflight->funding->outpoint));

wallet_inflight_del(ld->wallet, channel, inflight);
tal_free(inflight);
}

cc = splice_command_for_chan(ld, channel);
Expand Down Expand Up @@ -366,8 +367,7 @@ static void handle_splice_abort(struct lightningd *ld,
&channel->cid)));
subd_send_fd(ld->connectd, fds[1]);
log_info(channel->log, "Sent the peer fd to channeld");
}
else {
} else {
log_info(channel->log, "peer_start_channeld failed");
close(fds[1]);
}
Expand Down

0 comments on commit 4aa26ef

Please sign in to comment.