Skip to content

Commit 3246010

Browse files
Trivial: ChannelManager::read var rename prefactor
Makes an upcoming commit cleaner: when we add a next_hop variable we want to distinguish it from the previous hop.
1 parent d3e9cd0 commit 3246010

1 file changed

Lines changed: 8 additions & 8 deletions

File tree

lightning/src/ln/channelmanager.rs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18637,13 +18637,13 @@ impl<
1863718637
.or_insert_with(Vec::new)
1863818638
.push(update_add_htlc);
1863918639
}
18640-
for (payment_hash, hop_data, outbound_amt_msat) in
18640+
for (payment_hash, prev_hop, outbound_amt_msat) in
1864118641
funded_chan.inbound_forwarded_htlcs()
1864218642
{
1864318643
already_forwarded_htlcs
18644-
.entry((hop_data.channel_id, payment_hash))
18644+
.entry((prev_hop.channel_id, payment_hash))
1864518645
.or_insert_with(Vec::new)
18646-
.push((hop_data, outbound_amt_msat));
18646+
.push((prev_hop, outbound_amt_msat));
1864718647
}
1864818648
}
1864918649
}
@@ -19352,14 +19352,14 @@ impl<
1935219352
if let Some(forwarded_htlcs) =
1935319353
already_forwarded_htlcs.remove(&(*channel_id, payment_hash))
1935419354
{
19355-
for (hop_data, outbound_amt_msat) in forwarded_htlcs {
19355+
for (prev_hop, outbound_amt_msat) in forwarded_htlcs {
1935619356
let new_pending_claim =
1935719357
!pending_claims_to_replay.iter().any(|(src, _, _, _, _, _, _)| {
19358-
matches!(src, HTLCSource::PreviousHopData(hop) if hop.htlc_id == hop_data.htlc_id && hop.channel_id == hop_data.channel_id)
19358+
matches!(src, HTLCSource::PreviousHopData(hop) if hop.htlc_id == prev_hop.htlc_id && hop.channel_id == prev_hop.channel_id)
1935919359
});
1936019360
if new_pending_claim {
1936119361
let counterparty_node_id = monitor.get_counterparty_node_id();
19362-
let is_channel_closed = channel_manager
19362+
let is_downstream_closed = channel_manager
1936319363
.per_peer_state
1936419364
.read()
1936519365
.unwrap()
@@ -19372,10 +19372,10 @@ impl<
1937219372
.contains_key(channel_id)
1937319373
});
1937419374
pending_claims_to_replay.push((
19375-
HTLCSource::PreviousHopData(hop_data),
19375+
HTLCSource::PreviousHopData(prev_hop),
1937619376
payment_preimage,
1937719377
outbound_amt_msat,
19378-
is_channel_closed,
19378+
is_downstream_closed,
1937919379
counterparty_node_id,
1938019380
monitor.get_funding_txo(),
1938119381
*channel_id,

0 commit comments

Comments
 (0)