X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning%2Fsrc%2Fchain%2Fchainmonitor.rs;h=b47fd39087b3dbe92a29d1507b2ee8c952db3e96;hb=0ffa4b3579522c411be925203f192e26b0dd665e;hp=162482835fc2edd8788cd2bbedc67fd501c6024f;hpb=3fb329b004aa5107750ef87dfd2d1766badc705e;p=rust-lightning

diff --git a/lightning/src/chain/chainmonitor.rs b/lightning/src/chain/chainmonitor.rs
index 16248283..b47fd390 100644
--- a/lightning/src/chain/chainmonitor.rs
+++ b/lightning/src/chain/chainmonitor.rs
@@ -148,7 +148,7 @@ pub trait Persist<ChannelSigner: WriteableEcdsaChannelSigner> {
 	/// The [`ChannelMonitorUpdate::update_id`] or [`ChannelMonitor::get_latest_update_id`] uniquely
 	/// links this call to [`ChainMonitor::channel_monitor_updated`].
 	/// For [`Persist::update_persisted_channel`], it is only necessary to call [`ChainMonitor::channel_monitor_updated`]
-	/// when an [`ChannelMonitorUpdate`] is provided and when you return [`ChannelMonitorUpdateStatus::InProgress`].
+	/// when a [`ChannelMonitorUpdate`] is provided and when you return [`ChannelMonitorUpdateStatus::InProgress`].
 	///
 	/// See [`Writeable::write`] on [`ChannelMonitor`] for writing out a `ChannelMonitor`,
 	/// [`Writeable::write`] on [`ChannelMonitorUpdate`] for writing out an update, and
@@ -301,7 +301,7 @@ where C::Target: chain::Filter,
 		monitor_state: &MonitorHolder<ChannelSigner>
 	) -> Result<(), ()> where FN: Fn(&ChannelMonitor<ChannelSigner>, &TransactionData) -> Vec<TransactionOutputs> {
 		let monitor = &monitor_state.monitor;
-		let logger = WithChannelMonitor::from(&self.logger, &monitor);
+		let logger = WithChannelMonitor::from(&self.logger, &monitor, None);
 		let mut txn_outputs;
 		{
 			txn_outputs = process(monitor, txdata);
@@ -312,7 +312,7 @@ where C::Target: chain::Filter,
 						log_funding_info!(monitor)
 					),
 				ChannelMonitorUpdateStatus::InProgress => {
-					log_debug!(logger, "Channel Monitor sync for channel {} in progress.", log_funding_info!(monitor));
+					log_trace!(logger, "Channel Monitor sync for channel {} in progress.", log_funding_info!(monitor));
 				},
 				ChannelMonitorUpdateStatus::UnrecoverableError => {
 					return Err(());
@@ -599,7 +599,7 @@ where C::Target: chain::Filter,
 	pub fn archive_fully_resolved_channel_monitors(&self) {
 		let mut have_monitors_to_prune = false;
 		for (_, monitor_holder) in self.monitors.read().unwrap().iter() {
-			let logger = WithChannelMonitor::from(&self.logger, &monitor_holder.monitor);
+			let logger = WithChannelMonitor::from(&self.logger, &monitor_holder.monitor, None);
 			if monitor_holder.monitor.is_fully_resolved(&logger) {
 				have_monitors_to_prune = true;
 			}
@@ -607,7 +607,7 @@ where C::Target: chain::Filter,
 		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);
+				let logger = WithChannelMonitor::from(&self.logger, &monitor_holder.monitor, None);
 				if monitor_holder.monitor.is_fully_resolved(&logger) {
 					log_info!(logger,
 						"Archiving fully resolved ChannelMonitor for funding txo {}",
@@ -715,7 +715,7 @@ where C::Target: chain::Filter,
 	    P::Target: Persist<ChannelSigner>,
 {
 	fn watch_channel(&self, funding_outpoint: OutPoint, monitor: ChannelMonitor<ChannelSigner>) -> Result<ChannelMonitorUpdateStatus, ()> {
-		let logger = WithChannelMonitor::from(&self.logger, &monitor);
+		let logger = WithChannelMonitor::from(&self.logger, &monitor, None);
 		let mut monitors = self.monitors.write().unwrap();
 		let entry = match monitors.entry(funding_outpoint) {
 			hash_map::Entry::Occupied(_) => {
@@ -773,7 +773,7 @@ where C::Target: chain::Filter,
 			},
 			Some(monitor_state) => {
 				let monitor = &monitor_state.monitor;
-				let logger = WithChannelMonitor::from(&self.logger, &monitor);
+				let logger = WithChannelMonitor::from(&self.logger, &monitor, None);
 				log_trace!(logger, "Updating ChannelMonitor to id {} for channel {}", update.update_id, log_funding_info!(monitor));
 				let update_res = monitor.update_monitor(update, &self.broadcaster, &self.fee_estimator, &self.logger);
 
@@ -992,7 +992,6 @@ mod tests {
 		let nodes = create_network(2, &node_cfgs, &node_chanmgrs);
 		create_announced_chan_between_nodes(&nodes, 0, 1);
 
-		chanmon_cfgs[0].persister.chain_sync_monitor_persistences.lock().unwrap().clear();
 		chanmon_cfgs[0].persister.set_update_ret(ChannelMonitorUpdateStatus::UnrecoverableError);
 
 		assert!(std::panic::catch_unwind(|| {