Skip to content

Commit 9aa859f

Browse files
fixup! Add prev_channel_outpoint and prev_counterparty_id to previous hop data
1 parent c156d15 commit 9aa859f

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

lightning/src/ln/channelmanager.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1568,7 +1568,7 @@ impl<ChanSigner: ChannelKeys, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref>
15681568
for forward_info in pending_forwards.drain(..) {
15691569
match forward_info {
15701570
HTLCForwardInfo::AddHTLC { prev_short_channel_id, prev_htlc_id, forward_info,
1571-
prev_channel_outpoint, prev_counterparty_node_id } => {
1571+
prev_channel_outpoint, prev_counterparty_node_id } => {
15721572
let htlc_source = HTLCSource::PreviousHopData(HTLCPreviousHopData {
15731573
short_channel_id: prev_short_channel_id,
15741574
outpoint: prev_channel_outpoint,
@@ -2742,11 +2742,11 @@ impl<ChanSigner: ChannelKeys, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref>
27422742
}) {
27432743
hash_map::Entry::Occupied(mut entry) => {
27442744
entry.get_mut().push(HTLCForwardInfo::AddHTLC { prev_short_channel_id, prev_channel_outpoint,
2745-
prev_htlc_id, forward_info, prev_counterparty_node_id });
2745+
prev_htlc_id, forward_info, prev_counterparty_node_id });
27462746
},
27472747
hash_map::Entry::Vacant(entry) => {
27482748
entry.insert(vec!(HTLCForwardInfo::AddHTLC { prev_short_channel_id, prev_channel_outpoint, prev_htlc_id,
2749-
forward_info, prev_counterparty_node_id }));
2749+
forward_info, prev_counterparty_node_id }));
27502750
}
27512751
}
27522752
}
@@ -2807,7 +2807,7 @@ impl<ChanSigner: ChannelKeys, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref>
28072807
self.fail_holding_cell_htlcs(htlcs_to_fail, msg.channel_id);
28082808
match res {
28092809
Ok((pending_forwards, mut pending_failures, short_channel_id, channel_outpoint,
2810-
counterparty_node_id)) => {
2810+
counterparty_node_id)) => {
28112811
for failure in pending_failures.drain(..) {
28122812
self.fail_htlc_backwards_internal(self.channel_state.lock().unwrap(), failure.0, &failure.1, failure.2);
28132813
}

0 commit comments

Comments
 (0)