f async

Author: joostjager

lightning/src/sign/mod.rs

@@ -1000,7 +1000,12 @@ pub trait ChangeDestinationSourceSync {
 }
 
 /// A wrapper around [`ChangeDestinationSource`] to allow for async calls.
+#[cfg(any(test, feature = "_test_utils"))]
 pub struct ChangeDestinationSourceSyncWrapper<T: Deref>(T)
+where
+	T::Target: ChangeDestinationSourceSync;
+#[cfg(not(any(test, feature = "_test_utils")))]
+pub(crate) struct ChangeDestinationSourceSyncWrapper<T: Deref>(T)
 where
 	T::Target: ChangeDestinationSourceSync;
 

lightning/src/util/sweep.rs

@@ -962,7 +962,8 @@ where
 		Self { sweeper: Arc::new(sweeper) }
 	}
 
-	/// Regenerates and broadcasts the spending transaction for any outputs that are pending
+	/// Regenerates and broadcasts the spending transaction for any outputs that are pending. Wraps
+	/// [`OutputSweeper::regenerate_and_broadcast_spend_if_necessary`].
 	pub fn regenerate_and_broadcast_spend_if_necessary(&self) -> Result<(), ()> {
 		let mut fut = Box::pin(self.sweeper.regenerate_and_broadcast_spend_if_necessary());
 		let mut waker = dummy_waker();
@@ -976,7 +977,7 @@ where
 		}
 	}
 
-	/// Tells the sweeper to track the given outputs descriptors.
+	/// Tells the sweeper to track the given outputs descriptors. Wraps [`OutputSweeper::track_spendable_outputs`].
 	pub fn track_spendable_outputs(
 		&self, output_descriptors: Vec<SpendableOutputDescriptor>, channel_id: Option<ChannelId>,
 		exclude_static_outputs: bool, delay_until_height: Option<u32>,
@@ -989,13 +990,13 @@ where
 		)
 	}
 
-	/// Returns a list of the currently tracked spendable outputs.
+	/// Returns a list of the currently tracked spendable outputs. Wraps [`OutputSweeper::tracked_spendable_outputs`].
 	pub fn tracked_spendable_outputs(&self) -> Vec<TrackedSpendableOutput> {
 		self.sweeper.tracked_spendable_outputs()
 	}
 
 	/// Returns the inner async sweeper for testing purposes.
-	// #[cfg(test)]
+	#[cfg(any(test, feature = "_test_utils"))]
 	pub fn sweeper_async(
 		&self,
 	) -> Arc<OutputSweeper<B, Arc<ChangeDestinationSourceSyncWrapper<D>>, E, F, K, L, O>> {