Doc nits

Author: G8XSU

lightning/src/util/persist.rs

@@ -24,7 +24,6 @@ use crate::chain::chainmonitor::{Persist, MonitorUpdateId};
 use crate::sign::{EntropySource, NodeSigner, ecdsa::WriteableEcdsaChannelSigner, SignerProvider};
 use crate::chain::transaction::OutPoint;
 use crate::chain::channelmonitor::{ChannelMonitor, ChannelMonitorUpdate, CLOSED_CHANNEL_UPDATE_ID};
-use crate::chain::ChannelMonitorUpdateStatus;
 use crate::ln::channelmanager::ChannelManager;
 use crate::routing::router::Router;
 use crate::routing::gossip::NetworkGraph;
@@ -347,7 +346,7 @@ where
 ///
 /// # Pruning stale channel updates
 ///
-/// Stale updates are pruned when consolidation threshold is reached according to `maximum_pending_updates`.
+/// Stale updates are pruned when the consolidation threshold is reached according to `maximum_pending_updates`.
 /// Monitor updates in the range between the latest `update_id` and `update_id - maximum_pending_updates`
 /// are deleted.
 /// The `lazy` flag is used on the [`KVStore::remove`] method, so there are no guarantees that the deletions
@@ -630,7 +629,7 @@ where
 			Err(e) => {
 				log_error!(
 					self.logger,
-					"error writing channel monitor {}/{}/{} reason: {}",
+					"Failed to write ChannelMonitor {}/{}/{} reason: {}",
 					CHANNEL_MONITOR_PERSISTENCE_PRIMARY_NAMESPACE,
 					CHANNEL_MONITOR_PERSISTENCE_SECONDARY_NAMESPACE,
 					monitor_name.as_str(),
@@ -672,7 +671,7 @@ where
 					Err(e) => {
 						log_error!(
 							self.logger,
-							"error writing channel monitor update {}/{}/{} reason: {}",
+							"Failed to write ChannelMonitorUpdate {}/{}/{} reason: {}",
 							CHANNEL_MONITOR_UPDATE_PERSISTENCE_PRIMARY_NAMESPACE,
 							monitor_name.as_str(),
 							update_name.as_str(),
@@ -686,27 +685,24 @@ where
 				// In case of channel-close monitor update, we need to read old monitor before persisting
 				// the new one in order to determine the cleanup range.
 				let maybe_old_monitor = match monitor.get_latest_update_id() {
-					CLOSED_CHANNEL_UPDATE_ID => Some(self.read_monitor(&monitor_name)),
+					CLOSED_CHANNEL_UPDATE_ID => self.read_monitor(&monitor_name).ok(),
 					_ => None
 				};
 
 				// We could write this update, but it meets criteria of our design that calls for a full monitor write.
 				let monitor_update_status = self.persist_new_channel(funding_txo, monitor, monitor_update_call_id);
 
-				if let ChannelMonitorUpdateStatus::Completed = monitor_update_status {
+				if let chain::ChannelMonitorUpdateStatus::Completed = monitor_update_status {
 					let cleanup_range = if monitor.get_latest_update_id() == CLOSED_CHANNEL_UPDATE_ID {
-						match maybe_old_monitor {
-							Some(Ok((_, ref old_monitor))) => {
-								let start = old_monitor.get_latest_update_id();
-								// We never persist an update with update_id = CLOSED_CHANNEL_UPDATE_ID
-								let end = cmp::min(
-									start.saturating_add(self.maximum_pending_updates),
-									CLOSED_CHANNEL_UPDATE_ID - 1,
-								);
-								Some((start, end))
-							}
-							_ => None
-						}
+						maybe_old_monitor.map(|(_, ref old_monitor)| {
+							let start = old_monitor.get_latest_update_id();
+							// We never persist an update with update_id = CLOSED_CHANNEL_UPDATE_ID
+							let end = cmp::min(
+								start.saturating_add(self.maximum_pending_updates),
+								CLOSED_CHANNEL_UPDATE_ID - 1,
+							);
+							(start, end)
+						})
 					} else {
 						let end = monitor.get_latest_update_id();
 						let start = end.saturating_sub(self.maximum_pending_updates);
@@ -746,7 +742,7 @@ where
 			) {
 				log_error!(
 					self.logger,
-					"error cleaning up channel monitor updates for monitor {}, reason: {}",
+					"Failed to clean up channel monitor updates for monitor {}, reason: {}",
 					monitor_name.as_str(),
 					e
 				);