Drop Deref indirection for BroadcasterInterface

Reduces generics and verbosity across the codebase, should
provide equivalent behavior.

Author: valentinewallace

lightning-background-processor/src/lib.rs

@@ -286,7 +286,8 @@ impl<
 		G,
 		&'a (dyn UtxoLookup + Send + Sync),
 		L,
-	> where
+	>
+where
 	L::Target: Logger,
 {
 	/// Initializes a new [`GossipSync::Rapid`] variant.
@@ -303,7 +304,8 @@ impl<'a, L: Deref>
 		&'a NetworkGraph<L>,
 		&'a (dyn UtxoLookup + Send + Sync),
 		L,
-	> where
+	>
+where
 	L::Target: Logger,
 {
 	/// Initializes a new [`GossipSync::None`] variant.
@@ -492,10 +494,9 @@ pub const NO_LIQUIDITY_MANAGER: Option<
 				K = &DummyKVStore,
 				TimeProvider = dyn lightning_liquidity::utils::time::TimeProvider + Send + Sync,
 				TP = &(dyn lightning_liquidity::utils::time::TimeProvider + Send + Sync),
-				BroadcasterInterface = dyn lightning::chain::chaininterface::BroadcasterInterface
-				                           + Send
-				                           + Sync,
-				T = &(dyn BroadcasterInterface + Send + Sync),
+				BroadcasterInterface = &(dyn lightning::chain::chaininterface::BroadcasterInterface
+					+ Send
+					+ Sync),
 			> + Send
 			+ Sync,
 	>,
@@ -519,10 +520,9 @@ pub const NO_LIQUIDITY_MANAGER_SYNC: Option<
 				KS = &(dyn lightning::util::persist::KVStoreSync + Send + Sync),
 				TimeProvider = dyn lightning_liquidity::utils::time::TimeProvider + Send + Sync,
 				TP = &(dyn lightning_liquidity::utils::time::TimeProvider + Send + Sync),
-				BroadcasterInterface = dyn lightning::chain::chaininterface::BroadcasterInterface
-				                           + Send
-				                           + Sync,
-				T = &(dyn BroadcasterInterface + Send + Sync),
+				BroadcasterInterface = &(dyn lightning::chain::chaininterface::BroadcasterInterface
+					+ Send
+					+ Sync),
 			> + Send
 			+ Sync,
 	>,
@@ -956,7 +956,7 @@ pub async fn process_events_async<
 	'a,
 	UL: Deref,
 	CF: Deref,
-	T: Deref,
+	T: BroadcasterInterface,
 	F: Deref,
 	G: Deref<Target = NetworkGraph<L>>,
 	L: Deref,
@@ -989,7 +989,6 @@ pub async fn process_events_async<
 where
 	UL::Target: UtxoLookup,
 	CF::Target: chain::Filter,
-	T::Target: BroadcasterInterface,
 	F::Target: FeeEstimator,
 	L::Target: Logger,
 	P::Target: Persist<<CM::Target as AChannelManager>::Signer>,
@@ -1457,7 +1456,7 @@ fn check_and_reset_sleeper<
 pub async fn process_events_async_with_kv_store_sync<
 	UL: Deref,
 	CF: Deref,
-	T: Deref,
+	T: BroadcasterInterface,
 	F: Deref,
 	G: Deref<Target = NetworkGraph<L>>,
 	L: Deref,
@@ -1490,7 +1489,6 @@ pub async fn process_events_async_with_kv_store_sync<
 where
 	UL::Target: UtxoLookup,
 	CF::Target: chain::Filter,
-	T::Target: BroadcasterInterface,
 	F::Target: FeeEstimator,
 	L::Target: Logger,
 	P::Target: Persist<<CM::Target as AChannelManager>::Signer>,
@@ -1571,7 +1569,7 @@ impl BackgroundProcessor {
 		'a,
 		UL: 'static + Deref,
 		CF: 'static + Deref,
-		T: 'static + Deref,
+		T: 'static + BroadcasterInterface,
 		F: 'static + Deref + Send,
 		G: 'static + Deref<Target = NetworkGraph<L>>,
 		L: 'static + Deref + Send,
@@ -1604,7 +1602,6 @@ impl BackgroundProcessor {
 	where
 		UL::Target: 'static + UtxoLookup,
 		CF::Target: 'static + chain::Filter,
-		T::Target: 'static + BroadcasterInterface,
 		F::Target: 'static + FeeEstimator,
 		L::Target: 'static + Logger,
 		P::Target: 'static + Persist<<CM::Target as AChannelManager>::Signer>,

lightning-liquidity/src/lsps2/service.rs

@@ -702,11 +702,10 @@ macro_rules! get_or_insert_peer_state_entry {
 }
 
 /// The main object allowing to send and receive bLIP-52 / LSPS2 messages.
-pub struct LSPS2ServiceHandler<CM: Deref, K: Deref + Clone, T: Deref>
+pub struct LSPS2ServiceHandler<CM: Deref, K: Deref + Clone, T: BroadcasterInterface>
 where
 	CM::Target: AChannelManager,
 	K::Target: KVStore,
-	T::Target: BroadcasterInterface,
 {
 	channel_manager: CM,
 	kv_store: K,
@@ -721,11 +720,10 @@ where
 	persistence_in_flight: AtomicUsize,
 }
 
-impl<CM: Deref, K: Deref + Clone, T: Deref + Clone> LSPS2ServiceHandler<CM, K, T>
+impl<CM: Deref, K: Deref + Clone, T: BroadcasterInterface + Clone> LSPS2ServiceHandler<CM, K, T>
 where
 	CM::Target: AChannelManager,
 	K::Target: KVStore,
-	T::Target: BroadcasterInterface,
 {
 	/// Constructs a `LSPS2ServiceHandler`.
 	pub(crate) fn new(
@@ -2044,12 +2042,11 @@ where
 	}
 }
 
-impl<CM: Deref, K: Deref + Clone, T: Deref + Clone> LSPSProtocolMessageHandler
+impl<CM: Deref, K: Deref + Clone, T: BroadcasterInterface + Clone> LSPSProtocolMessageHandler
 	for LSPS2ServiceHandler<CM, K, T>
 where
 	CM::Target: AChannelManager,
 	K::Target: KVStore,
-	T::Target: BroadcasterInterface,
 {
 	type ProtocolMessage = LSPS2Message;
 	const PROTOCOL_NUMBER: Option<u16> = Some(2);
@@ -2119,20 +2116,19 @@ fn calculate_amount_to_forward_per_htlc(
 
 /// A synchroneous wrapper around [`LSPS2ServiceHandler`] to be used in contexts where async is not
 /// available.
-pub struct LSPS2ServiceHandlerSync<'a, CM: Deref, K: Deref + Clone, T: Deref + Clone>
+pub struct LSPS2ServiceHandlerSync<'a, CM: Deref, K: Deref + Clone, T: BroadcasterInterface + Clone>
 where
 	CM::Target: AChannelManager,
 	K::Target: KVStore,
-	T::Target: BroadcasterInterface,
 {
 	inner: &'a LSPS2ServiceHandler<CM, K, T>,
 }
 
-impl<'a, CM: Deref, K: Deref + Clone, T: Deref + Clone> LSPS2ServiceHandlerSync<'a, CM, K, T>
+impl<'a, CM: Deref, K: Deref + Clone, T: BroadcasterInterface + Clone>
+	LSPS2ServiceHandlerSync<'a, CM, K, T>
 where
 	CM::Target: AChannelManager,
 	K::Target: KVStore,
-	T::Target: BroadcasterInterface,
 {
 	pub(crate) fn from_inner(inner: &'a LSPS2ServiceHandler<CM, K, T>) -> Self {
 		Self { inner }