ChainMonitorSync

Author: joostjager

lightning/src/chain/chainmonitor.rs

@@ -263,20 +263,22 @@ pub struct ChainMonitor<ChannelSigner: EcdsaChannelSigner, C: Deref, T: Deref, F
 
 /// A synchronous wrapper around [`ChainMonitor`].
 pub struct ChainMonitorSync<ChannelSigner: EcdsaChannelSigner, C: Deref, T: Deref, F: Deref, L: Deref, P: Deref, FS: FutureSpawner>
-	(ChainMonitor<ChannelSigner, C, T, F, L, P, FS>) where C::Target: chain::Filter,
+	(ChainMonitor<ChannelSigner, C, T, F, L, PersistSyncWrapper<P>, FS>) where C::Target: chain::Filter,
         T::Target: BroadcasterInterface,
         F::Target: FeeEstimator,
         L::Target: Logger,
-        P::Target: Persist<ChannelSigner>;
+        P::Target: PersistSync<ChannelSigner>;
 
 impl<ChannelSigner: EcdsaChannelSigner + 'static, C: Deref, T: Deref, F: Deref, L: Deref, P: Deref, FS: FutureSpawner> ChainMonitorSync<ChannelSigner, C, T, F, L, P, FS>
 where C::Target: chain::Filter,
 	    T::Target: BroadcasterInterface,
 	    F::Target: FeeEstimator,
 	    L::Target: Logger,
-	    P::Target: Persist<ChannelSigner> {
+	    P::Target: PersistSync<ChannelSigner> {
 
 	fn new(chain_source: Option<C>, broadcaster: T, logger: L, feeest: F, persister: P, future_spawner: FS) -> Self {
+		let persister = PersistSyncWrapper(persister);
+
 		Self(ChainMonitor::new(chain_source, broadcaster, logger, feeest, persister, future_spawner))
 	}
 }
@@ -1022,6 +1024,48 @@ impl<ChannelSigner: EcdsaChannelSigner, C: Deref, T: Deref, F: Deref, L: Deref,
 	}
 }
 
+/// A synchronous version of [`Persist`].
+pub trait PersistSync<ChannelSigner: EcdsaChannelSigner> {
+	/// A synchronous version of [`Persist::persist_new_channel`].
+	fn persist_new_channel(&self, monitor_name: MonitorName, monitor: &ChannelMonitor<ChannelSigner>) -> Result<(), ()>;
+
+	/// A synchronous version of [`Persist::update_persisted_channel`].
+	fn update_persisted_channel(&self, monitor_name: MonitorName, monitor_update: Option<&ChannelMonitorUpdate>, monitor: &ChannelMonitor<ChannelSigner>) -> Result<(), ()>;
+
+	/// A synchronous version of [`Persist::archive_persisted_channel`].
+	fn archive_persisted_channel(&self, monitor_name: MonitorName);
+}
+
+struct PersistSyncWrapper<P: Deref>(P);
+
+impl<T: Deref> Deref for PersistSyncWrapper<T>  {
+    type Target = Self;
+    fn deref(&self) -> &Self { self }
+}
+
+impl<ChannelSigner: EcdsaChannelSigner, P: Deref> Persist<ChannelSigner> for PersistSyncWrapper<P> where P::Target: PersistSync<ChannelSigner> {
+	fn persist_new_channel(&self, monitor_name: MonitorName, monitor: &ChannelMonitor<ChannelSigner>) -> AsyncResult<'static, ()> {
+		let res = self.0.persist_new_channel(monitor_name, monitor);
+
+		Box::pin(async move {
+			res
+		})
+	}
+
+	fn update_persisted_channel(&self, monitor_name: MonitorName, monitor_update: Option<&ChannelMonitorUpdate>, monitor: &ChannelMonitor<ChannelSigner>)-> AsyncResult<'static, ()>{
+		let res = self.0.update_persisted_channel(monitor_name, monitor_update, monitor);
+		Box::pin(async move {
+			res
+		})
+	}
+
+	fn archive_persisted_channel(&self, monitor_name: MonitorName) -> AsyncVoid {
+		self.0.archive_persisted_channel(monitor_name);
+
+		Box::pin(async move {})
+	}
+}
+
 #[cfg(test)]
 mod tests {
 	use crate::{check_added_monitors, check_closed_event};