From 61cd37d57835b41c922df2938f31058d87965b2a Mon Sep 17 00:00:00 2001 From: Matt Corallo Date: Tue, 13 May 2025 14:59:16 +0000 Subject: [PATCH] Move from bounds on low-level objects to BP `Send` bounds Rather than bounding the traits used in `OutputSweeper`, move the bounds to where we actually require them - a top-level `Send` bound on the `Deref`-to-`OutputSweeper` type itself. --- lightning-background-processor/src/lib.rs | 6 +++--- lightning/src/util/sweep.rs | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lightning-background-processor/src/lib.rs b/lightning-background-processor/src/lib.rs index 57444b2b7e0..239ff3f0c98 100644 --- a/lightning-background-processor/src/lib.rs +++ b/lightning-background-processor/src/lib.rs @@ -807,7 +807,7 @@ pub async fn process_events_async< ) -> Result<(), lightning::io::Error> where UL::Target: 'static + UtxoLookup, - CF::Target: 'static + chain::Filter + Sync + Send, + CF::Target: 'static + chain::Filter, T::Target: 'static + BroadcasterInterface, F::Target: 'static + FeeEstimator, L::Target: 'static + Logger, @@ -991,7 +991,7 @@ impl BackgroundProcessor { D: 'static + Deref, O: 'static + Deref, K: 'static + Deref, - OS: 'static + Deref> + Send + Sync, + OS: 'static + Deref> + Send, >( persister: PS, event_handler: EH, chain_monitor: M, channel_manager: CM, onion_messenger: Option, gossip_sync: GossipSync, peer_manager: PM, @@ -999,7 +999,7 @@ impl BackgroundProcessor { ) -> Self where UL::Target: 'static + UtxoLookup, - CF::Target: 'static + chain::Filter + Sync + Send, + CF::Target: 'static + chain::Filter, T::Target: 'static + BroadcasterInterface, F::Target: 'static + FeeEstimator, L::Target: 'static + Logger, diff --git a/lightning/src/util/sweep.rs b/lightning/src/util/sweep.rs index 6173ff1ec23..0fae91bebc2 100644 --- a/lightning/src/util/sweep.rs +++ b/lightning/src/util/sweep.rs @@ -346,7 +346,7 @@ where B::Target: BroadcasterInterface, D::Target: ChangeDestinationSource, E::Target: FeeEstimator, - F::Target: Filter + Sync + Send, + F::Target: Filter, K::Target: KVStore, L::Target: Logger, O::Target: OutputSpender, @@ -368,7 +368,7 @@ where B::Target: BroadcasterInterface, D::Target: ChangeDestinationSource, E::Target: FeeEstimator, - F::Target: Filter + Sync + Send, + F::Target: Filter, K::Target: KVStore, L::Target: Logger, O::Target: OutputSpender, @@ -914,7 +914,7 @@ where B::Target: BroadcasterInterface, D::Target: ChangeDestinationSourceSync, E::Target: FeeEstimator, - F::Target: Filter + Sync + Send, + F::Target: Filter, K::Target: KVStore, L::Target: Logger, O::Target: OutputSpender, @@ -928,7 +928,7 @@ where B::Target: BroadcasterInterface, D::Target: ChangeDestinationSourceSync, E::Target: FeeEstimator, - F::Target: Filter + Sync + Send, + F::Target: Filter, K::Target: KVStore, L::Target: Logger, O::Target: OutputSpender,