mirrors/rust-lightning
1
0
Fork 0
mirror of https://github.com/lightningdevkit/rust-lightning.git synced 2025-02-25 07:17:40 +01:00
Code Issues Projects Releases Packages Wiki Activity

Refactor ChainMonitor::update_channel error case

Browse source 
Move the handling of ChannelMonitorUpdateStatus::UnrecoverableError to
the point of error to avoid needing an unwrap later when re-wrapping the
logger.
This commit is contained in:
Jeffrey Czyz 2023-11-29 10:51:33 -06:00
parent e6d8f350fc
commit e21a500668
No known key found for this signature in database
GPG key ID: 3A4E08275D5E96D2
1 changed files with 12 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
lightning/src/chain/chainmonitor.rs
View file

@ -758,8 +758,9 @@ where C::Target: chain::Filter,
fn update_channel(&self, funding_txo: OutPoint, update: &ChannelMonitorUpdate) -> ChannelMonitorUpdateStatus { fn update_channel(&self, funding_txo: OutPoint, update: &ChannelMonitorUpdate) -> ChannelMonitorUpdateStatus {
// Update the monitor that watches the channel referred to by the given outpoint. // Update the monitor that watches the channel referred to by the given outpoint.
let monitors = self.monitors.read().unwrap(); let monitors_lock = self.monitors.read().unwrap();
let ret = match monitors.get(&funding_txo) { let monitors = monitors_lock.deref();
match monitors.get(&funding_txo) {
None => { None => {
log_error!(self.logger, "Failed to update channel monitor: no such monitor registered"); log_error!(self.logger, "Failed to update channel monitor: no such monitor registered");
@ -798,7 +799,15 @@ where C::Target: chain::Filter,
ChannelMonitorUpdateStatus::Completed => { ChannelMonitorUpdateStatus::Completed => {
log_debug!(logger, "Persistence of ChannelMonitorUpdate for channel {} completed", log_funding_info!(monitor)); log_debug!(logger, "Persistence of ChannelMonitorUpdate for channel {} completed", log_funding_info!(monitor));
}, },
ChannelMonitorUpdateStatus::UnrecoverableError => { /* we'll panic in a moment */ }, ChannelMonitorUpdateStatus::UnrecoverableError => {
// Take the monitors lock for writing so that we poison it and any future
// operations going forward fail immediately.
core::mem::drop(monitors);
let _poison = self.monitors.write().unwrap();
let err_str = "ChannelMonitor[Update] persistence failed unrecoverably. This indicates we cannot continue normal operation and must shut down.";
log_error!(logger, "{}", err_str);
panic!("{}", err_str);
},
} }
if update_res.is_err() { if update_res.is_err() {
ChannelMonitorUpdateStatus::InProgress ChannelMonitorUpdateStatus::InProgress
@ -806,21 +815,7 @@ where C::Target: chain::Filter,
persist_res persist_res
} }
} }
};
if let ChannelMonitorUpdateStatus::UnrecoverableError = ret {
let logger = WithChannelMonitor::from(
&self.logger, &monitors.get(&funding_txo).unwrap().monitor
);
// Take the monitors lock for writing so that we poison it and any future
// operations going forward fail immediately.
core::mem::drop(monitors);
let _poison = self.monitors.write().unwrap();
let err_str = "ChannelMonitor[Update] persistence failed unrecoverably. This indicates we cannot continue normal operation and must shut down.";
log_error!(logger, "{}", err_str);
panic!("{}", err_str);
} }
ret
} }
fn release_pending_monitor_events(&self) -> Vec<(OutPoint, Vec<MonitorEvent>, Option<PublicKey>)> { fn release_pending_monitor_events(&self) -> Vec<(OutPoint, Vec<MonitorEvent>, Option<PublicKey>)> {