Skip to content

Commit 61cd37d

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 f015545 commit 61cd37d

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

lightning-background-processor/src/lib.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -807,7 +807,7 @@ pub async fn process_events_async<
807807
) -> Result<(), lightning::io::Error>
808808
where
809809
UL::Target: 'static + UtxoLookup,
810-
CF::Target: 'static + chain::Filter + Sync + Send,
810+
CF::Target: 'static + chain::Filter,
811811
T::Target: 'static + BroadcasterInterface,
812812
F::Target: 'static + FeeEstimator,
813813
L::Target: 'static + Logger,
@@ -991,15 +991,15 @@ impl BackgroundProcessor {
991991
D: 'static + Deref,
992992
O: 'static + Deref,
993993
K: 'static + Deref,
994-
OS: 'static + Deref<Target = OutputSweeperSync<T, D, F, CF, K, L, O>> + Send + Sync,
994+
OS: 'static + Deref<Target = OutputSweeperSync<T, D, F, CF, K, L, O>> + Send,
995995
>(
996996
persister: PS, event_handler: EH, chain_monitor: M, channel_manager: CM,
997997
onion_messenger: Option<OM>, gossip_sync: GossipSync<PGS, RGS, G, UL, L>, peer_manager: PM,
998998
liquidity_manager: Option<LM>, sweeper: Option<OS>, logger: L, scorer: Option<S>,
999999
) -> Self
10001000
where
10011001
UL::Target: 'static + UtxoLookup,
1002-
CF::Target: 'static + chain::Filter + Sync + Send,
1002+
CF::Target: 'static + chain::Filter,
10031003
T::Target: 'static + BroadcasterInterface,
10041004
F::Target: 'static + FeeEstimator,
10051005
L::Target: 'static + Logger,

lightning/src/util/sweep.rs

+4-4
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,
@@ -914,7 +914,7 @@ where
914914
B::Target: BroadcasterInterface,
915915
D::Target: ChangeDestinationSourceSync,
916916
E::Target: FeeEstimator,
917-
F::Target: Filter + Sync + Send,
917+
F::Target: Filter,
918918
K::Target: KVStore,
919919
L::Target: Logger,
920920
O::Target: OutputSpender,
@@ -928,7 +928,7 @@ where
928928
B::Target: BroadcasterInterface,
929929
D::Target: ChangeDestinationSourceSync,
930930
E::Target: FeeEstimator,
931-
F::Target: Filter + Sync + Send,
931+
F::Target: Filter,
932932
K::Target: KVStore,
933933
L::Target: Logger,
934934
O::Target: OutputSpender,

0 commit comments

Comments
 (0)