From 89d9f8fb0ed513238cfb49549a6285327e27753f Mon Sep 17 00:00:00 2001 From: Matt Corallo Date: Sun, 25 Mar 2018 13:20:44 -0400 Subject: [PATCH] Fix update_fee handling, add TODOs --- src/ln/channel.rs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/ln/channel.rs b/src/ln/channel.rs index aa33b88b9..0af02e9c8 100644 --- a/src/ln/channel.rs +++ b/src/ln/channel.rs @@ -765,6 +765,7 @@ impl Channel { let mut htlc_id = 0; let mut htlc_amount_msat = 0; + //TODO: swap_remove since we dont need to maintain ordering here self.pending_htlcs.retain(|ref htlc| { if !htlc.outbound && htlc.payment_hash == payment_hash { if htlc_id != 0 { @@ -796,6 +797,7 @@ impl Channel { let mut htlc_id = 0; let mut htlc_amount_msat = 0; + //TODO: swap_remove since we dont need to maintain ordering here self.pending_htlcs.retain(|ref htlc| { if !htlc.outbound && htlc.payment_hash == *payment_hash { if htlc_id != 0 { @@ -1258,7 +1260,7 @@ impl Channel { if self.channel_outbound { return Err(HandleError{err: "Non-funding remote tried to update channel fee", msg: None}); } - Channel::check_remote_fee(fee_estimator, msg.feerate_per_kw).unwrap(); + Channel::check_remote_fee(fee_estimator, msg.feerate_per_kw)?; self.feerate_per_kw = msg.feerate_per_kw as u64; Ok(()) } -- 2.39.5