Skip to content

Commit 3ec4d52

Browse files
Rename parameter from err_packet to err_contents.
This name is more accurate since the method has been generalized to support malformed HTLCs.
1 parent c1fbb90 commit 3ec4d52

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

lightning/src/ln/channel.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -2899,7 +2899,7 @@ impl<SP: Deref> Channel<SP> where
28992899
/// return `Ok(_)` if preconditions are met. In any case, `Err`s will only be
29002900
/// [`ChannelError::Ignore`].
29012901
fn fail_htlc<L: Deref, E: FailHTLCContents + Clone>(
2902-
&mut self, htlc_id_arg: u64, err_packet: E, mut force_holding_cell: bool,
2902+
&mut self, htlc_id_arg: u64, err_contents: E, mut force_holding_cell: bool,
29032903
logger: &L
29042904
) -> Result<Option<E::Message>, ChannelError> where L::Target: Logger {
29052905
if !matches!(self.context.channel_state, ChannelState::ChannelReady(_)) {
@@ -2966,18 +2966,18 @@ impl<SP: Deref> Channel<SP> where
29662966
}
29672967
}
29682968
log_trace!(logger, "Placing failure for HTLC ID {} in holding cell in channel {}.", htlc_id_arg, &self.context.channel_id());
2969-
self.context.holding_cell_htlc_updates.push(err_packet.to_htlc_update_awaiting_ack(htlc_id_arg));
2969+
self.context.holding_cell_htlc_updates.push(err_contents.to_htlc_update_awaiting_ack(htlc_id_arg));
29702970
return Ok(None);
29712971
}
29722972

29732973
log_trace!(logger, "Failing HTLC ID {} back with {} message in channel {}.", htlc_id_arg,
29742974
E::Message::name(), &self.context.channel_id());
29752975
{
29762976
let htlc = &mut self.context.pending_inbound_htlcs[pending_idx];
2977-
htlc.state = err_packet.clone().to_inbound_htlc_state();
2977+
htlc.state = err_contents.clone().to_inbound_htlc_state();
29782978
}
29792979

2980-
Ok(Some(err_packet.to_message(htlc_id_arg, self.context.channel_id())))
2980+
Ok(Some(err_contents.to_message(htlc_id_arg, self.context.channel_id())))
29812981
}
29822982

29832983
// Message handlers:

0 commit comments

Comments
 (0)