mirrors/rust-lightning
1
0
Fork 0
mirror of https://github.com/lightningdevkit/rust-lightning.git synced 2025-01-19 05:43:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix update_fee handling, add TODOs

Browse Source
This commit is contained in:
Matt Corallo 2018-03-25 13:20:44 -04:00
parent 942d760b83
commit 89d9f8fb0e
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/ln/channel.rs
View File

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