From e45b09358ae59f249abd00c3ca364396f8dcd68b Mon Sep 17 00:00:00 2001 From: niftynei Date: Thu, 20 May 2021 16:47:22 -0500 Subject: [PATCH] inflights: relax assertion channel funding_txid is last inflight txid This assertion is not valid if a non-last funding tx is mined --- lightningd/channel.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/lightningd/channel.c b/lightningd/channel.c index b3e25c9ad..c362c6c90 100644 --- a/lightningd/channel.c +++ b/lightningd/channel.c @@ -724,15 +724,9 @@ void channel_fail_forget(struct channel *channel, const char *fmt, ...) struct channel_inflight * channel_current_inflight(const struct channel *channel) { - struct channel_inflight *inflight; /* The last inflight should always be the one in progress */ - inflight = list_tail(&channel->inflights, - struct channel_inflight, - list); - if (inflight) - assert(bitcoin_txid_eq(&channel->funding_txid, - &inflight->funding->txid)); - return inflight; + return list_tail(&channel->inflights, + struct channel_inflight, list); } u32 channel_last_funding_feerate(const struct channel *channel)