no secondary types

Author: joostjager

lightning-background-processor/src/lib.rs

@@ -36,7 +36,7 @@ use lightning::onion_message::messenger::AOnionMessenger;
 use lightning::routing::gossip::{NetworkGraph, P2PGossipSync};
 use lightning::routing::scoring::{ScoreUpdate, WriteableScore};
 use lightning::routing::utxo::UtxoLookup;
-use lightning::sign::{ChangeDestinationSource, OutputSpender};
+use lightning::sign::{ChangeDestinationSourceSync, ChangeDestinationSource, OutputSpender};
 use lightning::util::logger::Logger;
 use lightning::util::persist::{KVStore, Persister};
 use lightning::util::sweep::OutputSweeper;
@@ -946,7 +946,7 @@ impl BackgroundProcessor {
 		PM: 'static + Deref + Send + Sync,
 		S: 'static + Deref<Target = SC> + Send + Sync,
 		SC: for<'b> WriteableScore<'b>,
-		D: 'static + Deref + Send + Sync,
+		D: 'static + Deref + Send + Sync + Sized,
 		O: 'static + Deref + Send + Sync,
 		K: 'static + Deref + Send + Sync,
 		OS: 'static + Deref<Target = OutputSweeper<T, D, F, CF, K, L, O>> + Send + Sync,
@@ -967,7 +967,7 @@ impl BackgroundProcessor {
 		OM::Target: AOnionMessenger + Send + Sync,
 		PM::Target: APeerManager + Send + Sync,
 		O::Target: 'static + OutputSpender + Send + Sync,
-		D::Target: 'static + ChangeDestinationSource + Send + Sync,
+		D::Target: 'static + ChangeDestinationSourceSync + Send + Sync + Sized,
 		K::Target: 'static + KVStore + Send + Sync,
 	{
 		let stop_thread = Arc::new(AtomicBool::new(false));

lightning/src/sign/mod.rs

@@ -1005,19 +1005,9 @@ pub trait ChangeDestinationSourceSync {
 	fn get_change_destination_script(&self) -> Result<ScriptBuf, ()>;
 }
 
-/// A wrapper around [`ChangeDestinationSource`] to allow for async calls.
-pub struct ChangeDestinationSourceSyncWrapper<T>(T) where T: ChangeDestinationSourceSync;
-
-impl<T: ChangeDestinationSourceSync> ChangeDestinationSourceSyncWrapper<T> {
-	/// Creates a new [`ChangeDestinationSourceSyncWrapper`].
-	pub fn new(source: T) -> Self {
-		Self(source)
-	}
-}
-
-impl<T: ChangeDestinationSourceSync> ChangeDestinationSource for ChangeDestinationSourceSyncWrapper<T> {
+impl<T: ChangeDestinationSourceSync> ChangeDestinationSource for T {
 	fn get_change_destination_script<'a>(&self) -> AsyncGetChangeDestinationScriptResult<'a, ScriptBuf> {
-		let script = self.0.get_change_destination_script();
+		let script = self.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, ChangeDestinationSourceSync, ChangeDestinationSourceSyncWrapper, OutputSpender, SpendableOutputDescriptor};
+use crate::sign::{ChangeDestinationSource, ChangeDestinationSourceSync, OutputSpender, SpendableOutputDescriptor};
 use crate::sync::Mutex;
 use crate::util::logger::Logger;
 use crate::util::persist::{
@@ -357,46 +357,31 @@ where
 	logger: L,
 }
 
-pub struct OutputSweeperSync<B: Deref, D: Deref, E: Deref, F: Deref, K: Deref, L: Deref, O: Deref>
+impl<B: Deref, D: Deref + Sized, E: Deref, F: Deref, K: Deref, L: Deref, O: Deref>
+OutputSweeper<B, D, E, F, K, L, O>
 where
 	B::Target: BroadcasterInterface,
-	D::Target: ChangeDestinationSource,
+	D::Target: ChangeDestinationSourceSync + Sized,
 	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>(
+	fn new_sync(
 		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,
+		output_spender: O, change_destination_source: D, kv_store: K, logger: L,
 	) -> Self {
-		let change_destination_source = Arc::new(ChangeDestinationSourceSyncWrapper::new(change_destination_source));
 
-		let sweeper = OutputSweeper::new(
+		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 fut = Box::pin(self.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) {