From 300f732bbe7fe04a2ad800785584b5e8cdf5de4d Mon Sep 17 00:00:00 2001 From: Greg Sanders Date: Mon, 5 Dec 2022 13:11:11 -0500 Subject: [PATCH] proposal_meets_depth tracked output always has a proposal --- onchaind/onchaind.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/onchaind/onchaind.c b/onchaind/onchaind.c index d72724a21e88..8c9e971d7fd9 100644 --- a/onchaind/onchaind.c +++ b/onchaind/onchaind.c @@ -1161,7 +1161,10 @@ static void proposal_should_rbf(struct tracked_output *out) static void proposal_meets_depth(struct tracked_output *out) { - bool is_rbf = false; + assert(out->proposal); + + /* Our own penalty transactions are going to be RBFed. */ + bool is_rbf = proposal_is_rbfable(out->proposal); /* If we simply wanted to ignore it after some depth */ if (!out->proposal->tx) { @@ -1180,10 +1183,6 @@ static void proposal_meets_depth(struct tracked_output *out) tx_type_name(out->tx_type), output_type_name(out->output_type)); - if (out->proposal) - /* Our own penalty transactions are going to be RBFed. */ - is_rbf = proposal_is_rbfable(out->proposal); - wire_sync_write( REQ_FD, take(towire_onchaind_broadcast_tx(