Skip to content

Commit adf4614

Browse files
committed
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.
1 parent 129d0f1 commit adf4614

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

lightning-background-processor/src/lib.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -815,7 +815,7 @@ pub async fn process_events_async<
815815
) -> Result<(), lightning::io::Error>
816816
where
817817
UL::Target: 'static + UtxoLookup,
818-
CF::Target: 'static + chain::Filter + Sync + Send,
818+
CF::Target: 'static + chain::Filter,
819819
T::Target: 'static + BroadcasterInterface,
820820
F::Target: 'static + FeeEstimator,
821821
L::Target: 'static + Logger,
@@ -1001,15 +1001,15 @@ impl BackgroundProcessor {
10011001
D: 'static + Deref,
10021002
O: 'static + Deref,
10031003
K: 'static + Deref,
1004-
OS: 'static + Deref<Target = OutputSweeperSync<T, D, F, CF, K, L, O>> + Send + Sync,
1004+
OS: 'static + Deref<Target = OutputSweeperSync<T, D, F, CF, K, L, O>> + Send,
10051005
>(
10061006
persister: PS, event_handler: EH, chain_monitor: M, channel_manager: CM,
10071007
onion_messenger: Option<OM>, gossip_sync: GossipSync<PGS, RGS, G, UL, L>, peer_manager: PM,
10081008
liquidity_manager: Option<LM>, sweeper: Option<OS>, logger: L, scorer: Option<S>,
10091009
) -> Self
10101010
where
10111011
UL::Target: 'static + UtxoLookup,
1012-
CF::Target: 'static + chain::Filter + Sync + Send,
1012+
CF::Target: 'static + chain::Filter,
10131013
T::Target: 'static + BroadcasterInterface,
10141014
F::Target: 'static + FeeEstimator,
10151015
L::Target: 'static + Logger,

lightning/src/util/sweep.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -346,7 +346,7 @@ where
346346
B::Target: BroadcasterInterface,
347347
D::Target: ChangeDestinationSource,
348348
E::Target: FeeEstimator,
349-
F::Target: Filter + Sync + Send,
349+
F::Target: Filter,
350350
K::Target: KVStore,
351351
L::Target: Logger,
352352
O::Target: OutputSpender,
@@ -368,7 +368,7 @@ where
368368
B::Target: BroadcasterInterface,
369369
D::Target: ChangeDestinationSource,
370370
E::Target: FeeEstimator,
371-
F::Target: Filter + Sync + Send,
371+
F::Target: Filter,
372372
K::Target: KVStore,
373373
L::Target: Logger,
374374
O::Target: OutputSpender,
@@ -916,7 +916,7 @@ where
916916
B::Target: BroadcasterInterface,
917917
D::Target: ChangeDestinationSourceSync,
918918
E::Target: FeeEstimator,
919-
F::Target: Filter + Sync + Send,
919+
F::Target: Filter,
920920
K::Target: KVStore,
921921
L::Target: Logger,
922922
O::Target: OutputSpender,
@@ -930,7 +930,7 @@ where
930930
B::Target: BroadcasterInterface,
931931
D::Target: ChangeDestinationSourceSync,
932932
E::Target: FeeEstimator,
933-
F::Target: Filter + Sync + Send,
933+
F::Target: Filter,
934934
K::Target: KVStore,
935935
L::Target: Logger,
936936
O::Target: OutputSpender,

0 commit comments

Comments
 (0)