mirrors/rust-lightning
1
0
Fork 0
mirror of https://github.com/lightningdevkit/rust-lightning.git synced 2025-03-10 21:36:17 +01:00
Code Issues Projects Releases Packages Wiki Activity

Skip persistence in the usual case handling channel_reestablish

Browse source 
When we handle an inbound `channel_reestablish` from our peers it
generally doesn't change any state and thus doesn't need a
`ChannelManager` persistence. Here we avoid said persistence where
possible.
This commit is contained in:
Matt Corallo 2023-08-24 20:02:08 +00:00
parent 9078c0dc5c
commit ce94a5ec22
1 changed files with 17 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
lightning/src/ln/channelmanager.rs
View file

@ -6446,7 +6446,7 @@ where
Ok(NotifyOption::DoPersist) Ok(NotifyOption::DoPersist)
} }
fn internal_channel_reestablish(&self, counterparty_node_id: &PublicKey, msg: &msgs::ChannelReestablish) -> Result<(), MsgHandleErrInternal> { fn internal_channel_reestablish(&self, counterparty_node_id: &PublicKey, msg: &msgs::ChannelReestablish) -> Result<NotifyOption, MsgHandleErrInternal> {
let htlc_forwards; let htlc_forwards;
let need_lnd_workaround = { let need_lnd_workaround = {
let per_peer_state = self.per_peer_state.read().unwrap(); let per_peer_state = self.per_peer_state.read().unwrap();
@ -6502,14 +6502,16 @@ where
} }
}; };
let mut persist = NotifyOption::SkipPersistHandleEvents;
if let Some(forwards) = htlc_forwards { if let Some(forwards) = htlc_forwards {
self.forward_htlcs(&mut [forwards][..]); self.forward_htlcs(&mut [forwards][..]);
persist = NotifyOption::DoPersist;
} }
if let Some(channel_ready_msg) = need_lnd_workaround { if let Some(channel_ready_msg) = need_lnd_workaround {
self.internal_channel_ready(counterparty_node_id, &channel_ready_msg)?; self.internal_channel_ready(counterparty_node_id, &channel_ready_msg)?;
} }
Ok(()) Ok(persist)
} }
/// Process pending events from the [`chain::Watch`], returning whether any events were processed. /// Process pending events from the [`chain::Watch`], returning whether any events were processed.
@ -7674,12 +7676,22 @@ where
} }
fn handle_channel_reestablish(&self, counterparty_node_id: &PublicKey, msg: &msgs::ChannelReestablish) { fn handle_channel_reestablish(&self, counterparty_node_id: &PublicKey, msg: &msgs::ChannelReestablish) {
let _persistence_guard = PersistenceNotifierGuard::notify_on_drop(self); let _persistence_guard = PersistenceNotifierGuard::optionally_notify(self, || {
let _ = handle_error!(self, self.internal_channel_reestablish(counterparty_node_id, msg), *counterparty_node_id); let res = self.internal_channel_reestablish(counterparty_node_id, msg);
let persist = match &res {
Err(e) if e.closes_channel() => NotifyOption::DoPersist,
Err(_) => NotifyOption::SkipPersistHandleEvents,
Ok(persist) => *persist,
};
let _ = handle_error!(self, res, *counterparty_node_id);
persist
});
} }
fn peer_disconnected(&self, counterparty_node_id: &PublicKey) { fn peer_disconnected(&self, counterparty_node_id: &PublicKey) {
let _persistence_guard = PersistenceNotifierGuard::notify_on_drop(self); let _persistence_guard = PersistenceNotifierGuard::optionally_notify(
self, || NotifyOption::SkipPersistHandleEvents);
let mut failed_channels = Vec::new(); let mut failed_channels = Vec::new();
let mut per_peer_state = self.per_peer_state.write().unwrap(); let mut per_peer_state = self.per_peer_state.write().unwrap();
let remove_peer = { let remove_peer = {