Skip to content

Move channel_reestablish log #4469

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
elnosh wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Move channel_reestablish log #4469

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cb0614f
Only log channel_reestablish event when needed
elnosh Mar 6, 2026
a3ba402
remove unnecessary clone in channel.rs
elnosh Mar 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions lightning/src/ln/channel.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12525,9 +12525,9 @@ where
self.context.pending_outbound_htlcs.push(OutboundHTLCOutput {
htlc_id: self.context.next_holder_htlc_id,
amount_msat,
payment_hash: payment_hash.clone(),
payment_hash,
cltv_expiry,
state: OutboundHTLCState::LocalAnnounced(Box::new(onion_routing_packet.clone())),
state: OutboundHTLCState::LocalAnnounced(Box::new(onion_routing_packet)),
source,
blinding_point,
skimmed_fee_msat,
Expand Down
3 changes: 1 addition & 2 deletions lightning/src/ln/channelmanager.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15112,8 +15112,6 @@ impl<
}
}

log_debug!(logger, "Generating channel_reestablish events");

let per_peer_state = self.per_peer_state.read().unwrap();
if let Some(peer_state_mutex) = per_peer_state.get(&counterparty_node_id) {
let mut peer_state_lock = peer_state_mutex.lock().unwrap();
Expand All @@ -15131,6 +15129,7 @@ impl<
let logger = WithChannelContext::from(&self.logger, &chan.context(), None);
match chan.peer_connected_get_handshake(self.chain_hash, &&logger) {
ReconnectionMsg::Reestablish(msg) => {
log_debug!(logger, "Generating channel_reestablish events");
Copy link
Collaborator

@TheBlueMatt TheBlueMatt Mar 9, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

log is wrong now, now we'd already generated the event, and now we're writing this per-channel, which is fine but merits a string update.

pending_msg_events.push(MessageSendEvent::SendChannelReestablish {
node_id: chan.context().get_counterparty_node_id(),
msg,
Expand Down
Loading