f: respond to comments

Author: arik-so

lightning/src/chain/chainmonitor.rs

@@ -639,19 +639,22 @@ where C::Target: chain::Filter,
 	/// Depending on the implementation of [`Persist::archive_persisted_channel`] the monitor
 	/// data could be moved to an archive location or removed entirely.
 	pub fn archive_fully_resolved_channel_monitors(&self) {
-		let mut have_monitors_to_persist_or_prune = false;
-		for (_, monitor_holder) in self.monitors.read().unwrap().iter() {
+		let mut have_monitors_to_prune = false;
+		for (funding_txo, monitor_holder) in self.monitors.read().unwrap().iter() {
 			let logger = WithChannelMonitor::from(&self.logger, &monitor_holder.monitor, None);
-			let (is_fully_resolved, needs_persistence) = monitor_holder.monitor.process_claim_resolution_status(&logger);
-			if is_fully_resolved || needs_persistence {
-				have_monitors_to_persist_or_prune = true;
+			let (is_fully_resolved, needs_persistence) = monitor_holder.monitor.check_and_update_full_resolution_status(&logger);
+			if is_fully_resolved {
+				have_monitors_to_prune = true;
+			}
+			if needs_persistence {
+				self.persister.update_persisted_channel(*funding_txo, None, &monitor_holder.monitor);
 			}
 		}
-		if have_monitors_to_persist_or_prune {
+		if have_monitors_to_prune {
 			let mut monitors = self.monitors.write().unwrap();
 			monitors.retain(|funding_txo, monitor_holder| {
 				let logger = WithChannelMonitor::from(&self.logger, &monitor_holder.monitor, None);
-				let (is_fully_resolved, needs_persistence) = monitor_holder.monitor.process_claim_resolution_status(&logger);
+				let (is_fully_resolved, _) = monitor_holder.monitor.check_and_update_full_resolution_status(&logger);
 				if is_fully_resolved {
 					log_info!(logger,
 						"Archiving fully resolved ChannelMonitor for funding txo {}",
@@ -660,9 +663,6 @@ where C::Target: chain::Filter,
 					self.persister.archive_persisted_channel(*funding_txo);
 					false
 				} else {
-					if needs_persistence {
-						self.persister.update_persisted_channel(*funding_txo, None, &monitor_holder.monitor);
-					}
 					true
 				}
 			});

lightning/src/chain/channelmonitor.rs

@@ -1997,11 +1997,11 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitor<Signer> {
 	/// Additionally updates the empty balances height if necessary.
 	///
 	/// This function returns a tuple of two booleans, the first indicating whether the monitor is
-	/// fully resolved, and the second whether the monitor needs persistence as a consequence of
-	/// checking its claim resolution status.
+	/// fully resolved, and the second whether the monitor needs persistence to ensure it is
+	/// reliably marked as resolved within 4032 blocks.
 	/// The first boolean is true only if [`Self::get_claimable_balances`] has been empty for at least
 	/// 4032 blocks as an additional protection against any bugs resulting in spuriously empty balance sets.
-	pub fn process_claim_resolution_status<L: Logger>(&self, logger: &L) -> (bool, bool) {
+	pub fn check_and_update_full_resolution_status<L: Logger>(&self, logger: &L) -> (bool, bool) {
 		let mut is_all_funds_claimed = self.get_claimable_balances().is_empty();
 		let current_height = self.current_best_block().height;
 		let mut inner = self.inner.lock().unwrap();