more wrapping

Author: joostjager

lightning-background-processor/src/lib.rs

@@ -1006,7 +1006,6 @@ impl BackgroundProcessor {
 					L,
 					P,
 					ES,
-					FS,
 				>,
 			>
 			+ Send
@@ -1023,7 +1022,6 @@ impl BackgroundProcessor {
 		O: 'static + Deref,
 		K: 'static + Deref,
 		OS: 'static + Deref<Target = OutputSweeperSync<T, D, F, CF, K, L, O>> + Send,
-		FS: FutureSpawner,
 	>(
 		persister: PS, event_handler: EH, chain_monitor: M, channel_manager: CM,
 		onion_messenger: Option<OM>, gossip_sync: GossipSync<PGS, RGS, G, UL, L>, peer_manager: PM,

lightning/src/chain/chainmonitor.rs

@@ -324,6 +324,7 @@ where
 	P::Target: PersistSync<ChannelSigner>,
 	ES::Target: EntropySource,
 {
+	/// Create a new `ChainMonitorSync` instance.
 	pub fn new(
 		chain_source: Option<C>, broadcaster: T, logger: L, feeest: F, persister: P,
 		entropy_source: ES, our_peerstorage_encryption_key: PeerStorageKey,
@@ -357,6 +358,13 @@ where
 	pub fn list_pending_monitor_updates(&self) -> HashMap<ChannelId, Vec<u64>> {
 		self.0.list_pending_monitor_updates()
 	}
+
+	/// See [`ChainMonitor::get_monitor`].
+	pub fn get_monitor(
+		&self, channel_id: ChannelId,
+	) -> Result<LockedChannelMonitor<'_, ChannelSigner>, ()> {
+		self.0.get_monitor(channel_id)
+	}
 }
 
 impl<
@@ -458,6 +466,32 @@ where
 	}
 }
 
+impl<
+		ChannelSigner: EcdsaChannelSigner + 'static,
+		C: Deref,
+		T: Deref,
+		F: Deref,
+		L: Deref,
+		P: Deref,
+		ES: Deref,
+	> chain::Listen for ChainMonitorSync<ChannelSigner, C, T, F, L, P, ES>
+where
+	C::Target: chain::Filter,
+	T::Target: BroadcasterInterface,
+	F::Target: FeeEstimator,
+	L::Target: Logger,
+	P::Target: PersistSync<ChannelSigner>,
+	ES::Target: EntropySource,
+{
+	fn filtered_block_connected(&self, header: &Header, txdata: &TransactionData, height: u32) {
+		self.0.filtered_block_connected(header, txdata, height);
+	}
+
+	fn block_disconnected(&self, header: &Header, height: u32) {
+		self.0.block_disconnected(header, height);
+	}
+}
+
 impl<
 		ChannelSigner: EcdsaChannelSigner + 'static,
 		C: Deref,

lightning/src/util/async_poll.rs

@@ -131,6 +131,7 @@ pub trait FutureSpawner: Send + Sync + 'static {
 	fn spawn<T: Future<Output = ()> + Send + 'static>(&self, future: T);
 }
 
+/// A no-op implementation of `FutureSpawner` for synchronous contexts.
 pub struct FutureSpawnerSync {}
 
 impl FutureSpawner for FutureSpawnerSync {

lightning/src/util/persist.rs

@@ -685,6 +685,7 @@ where
 	BI::Target: BroadcasterInterface,
 	FE::Target: FeeEstimator,
 {
+	/// Constructs a new [`MonitorUpdatingPersister`].
 	pub fn new(
 		kv_store: K, logger: L, maximum_pending_updates: u64, entropy_source: ES,
 		signer_provider: SP, broadcaster: BI, fee_estimator: FE,
@@ -701,6 +702,7 @@ where
 		Self { state: Arc::new(state) }
 	}
 
+	/// Pass through to [`MonitorUpdatingPersisterState::read_all_channel_monitors_with_updates`].
 	pub async fn read_all_channel_monitors_with_updates(
 		&self,
 	) -> Result<
@@ -710,11 +712,13 @@ where
 		self.state.read_all_channel_monitors_with_updates().await
 	}
 
+	/// Pass through to [`MonitorUpdatingPersisterState::cleanup_stale_updates`].
 	pub async fn cleanup_stale_updates(&self, lazy: bool) -> Result<(), io::Error> {
 		self.state.cleanup_stale_updates(lazy).await
 	}
 }
 
+/// A synchronous version of [`MonitorUpdatingPersister`].
 pub struct MonitorUpdatingPersisterSync<
 	K: Deref,
 	L: Deref,
@@ -776,6 +780,7 @@ where
 	BI::Target: BroadcasterInterface,
 	FE::Target: FeeEstimator,
 {
+	/// Constructs a new [`MonitorUpdatingPersisterSync`].
 	pub fn new(
 		kv_store: K, logger: L, maximum_pending_updates: u64, entropy_source: ES,
 		signer_provider: SP, broadcaster: BI, fee_estimator: FE,
@@ -793,6 +798,7 @@ where
 		Self(persister)
 	}
 
+	/// An synchronous version of [`MonitorUpdatingPersister::read_all_channel_monitors_with_updates`].
 	pub fn read_all_channel_monitors_with_updates(
 		&self,
 	) -> Result<
@@ -810,6 +816,7 @@ where
 		}
 	}
 
+	/// A synchronous version of [`MonitorUpdatingPersister::cleanup_stale_updates`].
 	pub fn cleanup_stale_updates(&self, lazy: bool) -> Result<(), io::Error> {
 		let mut fut = Box::pin(self.0.cleanup_stale_updates(lazy));
 		let mut waker = dummy_waker();