Drop useless SCID lookup in claim_funds_from_hop
#1885
Conversation
We have the channel_id available in `prev_hop` so there's no reason to look it up by SCID.
Codecov ReportBase: 90.73% // Head: 90.70% // Decreases project coverage by
Additional details and impacted files@@ Coverage Diff @@
## main #1885 +/- ##
==========================================
- Coverage 90.73% 90.70% -0.03%
==========================================
Files 91 91
Lines 48042 48039 -3
Branches 48042 48039 -3
==========================================
- Hits 43589 43576 -13
- Misses 4453 4463 +10
Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here. ☔ View full report at Codecov. |
| @@ -3729,7 +3729,7 @@ impl<M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelManager<M, T, K, F | |||
| htlc.timer_ticks += 1; | |||
| return htlc.timer_ticks >= MPP_TIMEOUT_TICKS | |||
| }) { | |||
| timed_out_mpp_htlcs.extend(htlcs.into_iter().map(|htlc| (htlc.prev_hop.clone(), payment_hash.clone()))); | |||
| timed_out_mpp_htlcs.extend(htlcs.drain(..).map(|htlc: ClaimableHTLC| (htlc.prev_hop, *payment_hash))); | |||
There was a problem hiding this comment.
Reviewers should have pointed it out :)
There was a problem hiding this comment.
Nice! I'll end up passing the actual inner PeerState to claim_funds_from_hop with #1507, so the counterparty_node_id from short_to_chan_info shouldn't be needed in the function either.
I may race you to that one and change the locking semantics there, but we can probably land 1507 first. |
We have the channel_id available in
prev_hopso there's no reason to look it up by SCID.