f Account for additional traits

Author: tnull

lightning/src/util/sweep.rs

@@ -768,42 +768,30 @@ where
 	}
 }
 
-impl<B: Deref, F: Deref, K: Deref, L: Deref>
-	ReadableArgs<(
-		B,
-		Option<F>,
-		K,
-		L,
-		Box<
-			dyn Fn(&[&SpendableOutputDescriptor]) -> Result<Transaction, ()>
-				+ Send
-				+ Sync
-				+ 'static,
-		>,
-	)> for (BestBlock, OutputSweeper<B, F, K, L>)
+impl<B: Deref, D: Deref, E: Deref, F: Deref, K: Deref, L: Deref, O: Deref>
+	ReadableArgs<(B, E, Option<F>, O, D, K, L)> for (BestBlock, OutputSweeper<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,
 {
 	#[inline]
 	fn read<R: io::Read>(
-		reader: &mut R,
-		args: (
-			B,
-			Option<F>,
-			K,
-			L,
-			Box<
-				dyn Fn(&[&SpendableOutputDescriptor]) -> Result<Transaction, ()>
-					+ Send
-					+ Sync
-					+ 'static,
-			>,
-		),
+		reader: &mut R, args: (B, E, Option<F>, O, D, K, L),
 	) -> Result<Self, DecodeError> {
-		let (broadcaster, chain_data_source, kv_store, logger, spend_outputs_callback) = args;
+		let (
+			broadcaster,
+			fee_estimator,
+			chain_data_source,
+			output_spender,
+			change_destination_source,
+			kv_store,
+			logger,
+		) = args;
 		let state = SweeperState::read(reader)?;
 		let best_block = state.best_block;
 		let sweeper_state = Mutex::new(state);
@@ -812,10 +800,12 @@ where
 			OutputSweeper {
 				sweeper_state,
 				broadcaster,
-				kv_store,
+				fee_estimator,
 				chain_data_source,
+				output_spender,
+				change_destination_source,
+				kv_store,
 				logger,
-				spend_outputs_callback,
 			},
 		))
 	}