proposal_meets_depth tracked output always has a proposal

This commit is contained in:
Greg Sanders 2022-12-05 13:11:11 -05:00 committed by Rusty Russell
parent 6044184323
commit 300f732bbe

View File

@ -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(