Stop archiving ChannelMonitors

.. as this is now done by the background processor.

Author: tnull

src/chain/bitcoind.rs

@@ -29,7 +29,7 @@ use lightning_block_sync::{
 };
 use serde::Serialize;
 
-use super::{periodically_archive_fully_resolved_monitors, WalletSyncStatus};
+use super::WalletSyncStatus;
 use crate::config::{
 	BitcoindRestClientConfig, Config, FEE_RATE_CACHE_UPDATE_TIMEOUT_SECS, TX_BROADCAST_TIMEOUT_SECS,
 };
@@ -418,14 +418,6 @@ impl BitcoindChainSource {
 					now.elapsed().unwrap().as_millis()
 				);
 				*self.latest_chain_tip.write().unwrap() = Some(tip);
-
-				periodically_archive_fully_resolved_monitors(
-					Arc::clone(&channel_manager),
-					chain_monitor,
-					Arc::clone(&self.kv_store),
-					Arc::clone(&self.logger),
-					Arc::clone(&self.node_metrics),
-				)?;
 			},
 			Ok(_) => {},
 			Err(e) => {

src/chain/electrum.rs

@@ -23,7 +23,7 @@ use lightning::chain::{Confirm, Filter, WatchedOutput};
 use lightning::util::ser::Writeable;
 use lightning_transaction_sync::ElectrumSyncClient;
 
-use super::{periodically_archive_fully_resolved_monitors, WalletSyncStatus};
+use super::WalletSyncStatus;
 use crate::config::{
 	Config, ElectrumSyncConfig, BDK_CLIENT_STOP_GAP, BDK_WALLET_SYNC_TIMEOUT_SECS,
 	FEE_RATE_CACHE_UPDATE_TIMEOUT_SECS, LDK_WALLET_SYNC_TIMEOUT_SECS, TX_BROADCAST_TIMEOUT_SECS,
@@ -245,14 +245,6 @@ impl ElectrumChainSource {
 					Arc::clone(&self.logger),
 				)?;
 			}
-
-			periodically_archive_fully_resolved_monitors(
-				Arc::clone(&channel_manager),
-				Arc::clone(&chain_monitor),
-				Arc::clone(&self.kv_store),
-				Arc::clone(&self.logger),
-				Arc::clone(&self.node_metrics),
-			)?;
 		}
 
 		res

src/chain/esplora.rs

@@ -16,7 +16,7 @@ use lightning::chain::{Confirm, Filter, WatchedOutput};
 use lightning::util::ser::Writeable;
 use lightning_transaction_sync::EsploraSyncClient;
 
-use super::{periodically_archive_fully_resolved_monitors, WalletSyncStatus};
+use super::WalletSyncStatus;
 use crate::config::{
 	Config, EsploraSyncConfig, BDK_CLIENT_CONCURRENCY, BDK_CLIENT_STOP_GAP,
 	BDK_WALLET_SYNC_TIMEOUT_SECS, DEFAULT_ESPLORA_CLIENT_TIMEOUT_SECS,
@@ -265,14 +265,6 @@ impl EsploraChainSource {
 							Arc::clone(&self.logger),
 						)?;
 					}
-
-					periodically_archive_fully_resolved_monitors(
-						Arc::clone(&channel_manager),
-						Arc::clone(&chain_monitor),
-						Arc::clone(&self.kv_store),
-						Arc::clone(&self.logger),
-						Arc::clone(&self.node_metrics),
-					)?;
 					Ok(())
 				},
 				Err(e) => {

src/chain/mod.rs

@@ -486,22 +486,3 @@ impl Filter for ChainSource {
 		}
 	}
 }
-
-fn periodically_archive_fully_resolved_monitors(
-	channel_manager: Arc<ChannelManager>, chain_monitor: Arc<ChainMonitor>,
-	kv_store: Arc<DynStore>, logger: Arc<Logger>, node_metrics: Arc<RwLock<NodeMetrics>>,
-) -> Result<(), Error> {
-	let mut locked_node_metrics = node_metrics.write().unwrap();
-	let cur_height = channel_manager.current_best_block().height;
-	let should_archive = locked_node_metrics
-		.latest_channel_monitor_archival_height
-		.as_ref()
-		.map_or(true, |h| cur_height >= h + RESOLVED_CHANNEL_MONITOR_ARCHIVAL_INTERVAL);
-
-	if should_archive {
-		chain_monitor.archive_fully_resolved_channel_monitors();
-		locked_node_metrics.latest_channel_monitor_archival_height = Some(cur_height);
-		write_node_metrics(&*locked_node_metrics, kv_store, logger)?;
-	}
-	Ok(())
-}