try out sync sweeper wrapper - does not compile

Author: joostjager

lightning/src/sign/mod.rs

@@ -68,6 +68,7 @@ use crate::sign::taproot::TaprootChannelSigner;
 use crate::util::atomic_counter::AtomicCounter;
 use core::convert::TryInto;
 use core::future::Future;
+use core::ops::Deref;
 use core::pin::Pin;
 use core::sync::atomic::{AtomicUsize, Ordering};
 #[cfg(taproot)]
@@ -1005,9 +1006,16 @@ pub trait ChangeDestinationSourceSync {
 }
 
 /// A wrapper around [`ChangeDestinationSource`] to allow for async calls.
-pub struct ChangeDestinationSourceSyncWrapper<T>(T) where T: ChangeDestinationSourceSync;
+pub struct ChangeDestinationSourceSyncWrapper<T>(T) where T: ChangeDestinationSourceSync + Deref;
 
-impl<T: ChangeDestinationSourceSync> ChangeDestinationSource for ChangeDestinationSourceSyncWrapper<T> {
+impl<T: ChangeDestinationSourceSync + Deref> ChangeDestinationSourceSyncWrapper<T> {
+	/// Creates a new [`ChangeDestinationSourceSyncWrapper`].
+	pub fn new(source: T) -> Self {
+		Self(source)
+	}
+}
+
+impl<T: ChangeDestinationSourceSync + Deref> ChangeDestinationSource for ChangeDestinationSourceSyncWrapper<T> {
 	fn get_change_destination_script<'a>(&self) -> AsyncGetChangeDestinationScriptResult<'a, ScriptBuf> {
 		let script = self.0.get_change_destination_script();
 		Box::pin(async move { script })

lightning/src/util/sweep.rs

@@ -15,7 +15,7 @@ use crate::io;
 use crate::ln::msgs::DecodeError;
 use crate::ln::types::ChannelId;
 use crate::prelude::*;
-use crate::sign::{ChangeDestinationSource, OutputSpender, SpendableOutputDescriptor};
+use crate::sign::{ChangeDestinationSource, ChangeDestinationSourceSync, ChangeDestinationSourceSyncWrapper, OutputSpender, SpendableOutputDescriptor};
 use crate::sync::Mutex;
 use crate::util::logger::Logger;
 use crate::util::persist::{
@@ -356,6 +356,60 @@ where
 	logger: L,
 }
 
+pub struct OutputSweeperSync<B: Deref, D: Deref, E: Deref, F: Deref, K: Deref, L: Deref, O: Deref>
+where
+	B::Target: BroadcasterInterface,
+	D::Target: ChangeDestinationSource,
+	E::Target: FeeEstimator,
+	F::Target: Filter + Sync + Send,
+	K::Target: KVStore,
+	L::Target: Logger,
+	O::Target: OutputSpender,
+{
+	sweeper: OutputSweeper<B, D, E, F, K, L, O>,
+}
+
+impl<B: Deref, D: Deref, E: Deref, F: Deref, K: Deref, L: Deref, O: Deref>
+OutputSweeperSync<B, D, E, F, K, L, O>
+where
+	B::Target: BroadcasterInterface,
+	D::Target: ChangeDestinationSource,
+	E::Target: FeeEstimator,
+	F::Target: Filter + Sync + Send,
+	K::Target: KVStore,
+	L::Target: Logger,
+	O::Target: OutputSpender,
+{
+	fn new<DA: ChangeDestinationSourceSync + Deref>(
+		best_block: BestBlock, broadcaster: B, fee_estimator: E, chain_data_source: Option<F>,
+		output_spender: O, change_destination_source: DA, kv_store: K, logger: L,
+	) -> Self {
+		let change_destination_source:  = ChangeDestinationSourceSyncWrapper::new(change_destination_source);
+
+		let sweeper = OutputSweeper::new(
+			best_block, broadcaster, fee_estimator, chain_data_source, output_spender,
+			&change_destination_source, kv_store, logger,
+		);
+		Self { sweeper }
+	}
+
+	/// Regenerates and broadcasts the spending transaction for any outputs that are pending
+	pub fn regenerate_and_broadcast_spend_if_necessary(&self) -> Result<(), ()> {
+		let mut fut = Box::pin(self.sweeper.regenerate_and_broadcast_spend_if_necessary_async());
+		let mut waker = dummy_waker();
+		let mut ctx = task::Context::from_waker(&mut waker);
+		match fut.as_mut().poll(&mut ctx) {
+			task::Poll::Ready(result) => {
+				result
+			},
+			task::Poll::Pending => {
+				// In a sync context, we can't wait for the future to complete.
+				panic!("task not ready");
+			},
+		}
+	}
+}
+
 impl<B: Deref, D: Deref, E: Deref, F: Deref, K: Deref, L: Deref, O: Deref>
 	OutputSweeper<B, D, E, F, K, L, O>
 where