Drop Deref indirection for KVStore

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

Unfortunately the same improvement can't be made for KVStoreSync and Persist,
due to the blanket implementation where all KVStoreSync traits implement
Persist resulting in conflicting implementations.

Author: valentinewallace

lightning-background-processor/src/lib.rs

@@ -474,7 +474,6 @@ pub const NO_LIQUIDITY_MANAGER: Option<
 				CM = &DynChannelManager,
 				Filter = dyn chain::Filter + Send + Sync,
 				C = &(dyn chain::Filter + Send + Sync),
-				KVStore = DummyKVStore,
 				K = &DummyKVStore,
 				TimeProvider = dyn lightning_liquidity::utils::time::TimeProvider + Send + Sync,
 				TP = &(dyn lightning_liquidity::utils::time::TimeProvider + Send + Sync),
@@ -955,7 +954,7 @@ pub async fn process_events_async<
 	LM: Deref,
 	D: Deref,
 	O: Deref,
-	K: Deref,
+	K: KVStore,
 	OS: Deref<Target = OutputSweeper<T, D, F, CF, K, L, O>>,
 	S: Deref<Target = SC>,
 	SC: for<'b> WriteableScore<'b>,
@@ -978,7 +977,6 @@ where
 	LM::Target: ALiquidityManager,
 	O::Target: OutputSpender,
 	D::Target: ChangeDestinationSource,
-	K::Target: KVStore,
 {
 	let async_event_handler = |event| {
 		let network_graph = gossip_sync.network_graph();

lightning-liquidity/src/events/event_queue.rs

@@ -12,7 +12,6 @@ use alloc::collections::VecDeque;
 use alloc::vec::Vec;
 
 use core::future::Future;
-use core::ops::Deref;
 use core::task::{Poll, Waker};
 
 use lightning::ln::msgs::DecodeError;
@@ -25,10 +24,7 @@ use lightning::util::wakers::Notifier;
 /// The maximum queue size we allow before starting to drop events.
 pub const MAX_EVENT_QUEUE_SIZE: usize = 1000;
 
-pub(crate) struct EventQueue<K: Deref + Clone>
-where
-	K::Target: KVStore,
-{
+pub(crate) struct EventQueue<K: KVStore + Clone> {
 	state: Mutex<QueueState>,
 	waker: Mutex<Option<Waker>>,
 	#[cfg(feature = "std")]
@@ -37,10 +33,7 @@ where
 	persist_notifier: Arc<Notifier>,
 }
 
-impl<K: Deref + Clone> EventQueue<K>
-where
-	K::Target: KVStore,
-{
+impl<K: KVStore + Clone> EventQueue<K> {
 	pub fn new(
 		queue: VecDeque<LiquidityEvent>, kv_store: K, persist_notifier: Arc<Notifier>,
 	) -> Self {
@@ -164,14 +157,9 @@ struct QueueState {
 
 // A guard type that will notify about new events when dropped.
 #[must_use]
-pub(crate) struct EventQueueNotifierGuard<'a, K: Deref + Clone>(&'a EventQueue<K>)
-where
-	K::Target: KVStore;
-
-impl<'a, K: Deref + Clone> EventQueueNotifierGuard<'a, K>
-where
-	K::Target: KVStore,
-{
+pub(crate) struct EventQueueNotifierGuard<'a, K: KVStore + Clone>(&'a EventQueue<K>);
+
+impl<'a, K: KVStore + Clone> EventQueueNotifierGuard<'a, K> {
 	pub fn enqueue<E: Into<LiquidityEvent>>(&self, event: E) {
 		let mut state_lock = self.0.state.lock().unwrap();
 		if state_lock.queue.len() < MAX_EVENT_QUEUE_SIZE {
@@ -183,10 +171,7 @@ where
 	}
 }
 
-impl<'a, K: Deref + Clone> Drop for EventQueueNotifierGuard<'a, K>
-where
-	K::Target: KVStore,
-{
+impl<'a, K: KVStore + Clone> Drop for EventQueueNotifierGuard<'a, K> {
 	fn drop(&mut self) {
 		let (should_notify, should_persist_notify) = {
 			let state_lock = self.0.state.lock().unwrap();
@@ -208,14 +193,9 @@ where
 	}
 }
 
-struct EventFuture<'a, K: Deref + Clone>(&'a EventQueue<K>)
-where
-	K::Target: KVStore;
+struct EventFuture<'a, K: KVStore + Clone>(&'a EventQueue<K>);
 
-impl<K: Deref + Clone> Future for EventFuture<'_, K>
-where
-	K::Target: KVStore,
-{
+impl<K: KVStore + Clone> Future for EventFuture<'_, K> {
 	type Output = LiquidityEvent;
 
 	fn poll(

lightning-liquidity/src/lsps0/client.rs

@@ -22,22 +22,14 @@ use lightning::util::persist::KVStore;
 
 use bitcoin::secp256k1::PublicKey;
 
-use core::ops::Deref;
-
 /// A message handler capable of sending and handling bLIP-50 / LSPS0 messages.
-pub struct LSPS0ClientHandler<ES: EntropySource, K: Deref + Clone>
-where
-	K::Target: KVStore,
-{
+pub struct LSPS0ClientHandler<ES: EntropySource, K: KVStore + Clone> {
 	entropy_source: ES,
 	pending_messages: Arc<MessageQueue>,
 	pending_events: Arc<EventQueue<K>>,
 }
 
-impl<ES: EntropySource, K: Deref + Clone> LSPS0ClientHandler<ES, K>
-where
-	K::Target: KVStore,
-{
+impl<ES: EntropySource, K: KVStore + Clone> LSPS0ClientHandler<ES, K> {
 	/// Returns a new instance of [`LSPS0ClientHandler`].
 	pub(crate) fn new(
 		entropy_source: ES, pending_messages: Arc<MessageQueue>, pending_events: Arc<EventQueue<K>>,
@@ -87,9 +79,8 @@ where
 	}
 }
 
-impl<ES: EntropySource, K: Deref + Clone> LSPSProtocolMessageHandler for LSPS0ClientHandler<ES, K>
-where
-	K::Target: KVStore,
+impl<ES: EntropySource, K: KVStore + Clone> LSPSProtocolMessageHandler
+	for LSPS0ClientHandler<ES, K>
 {
 	type ProtocolMessage = LSPS0Message;
 	const PROTOCOL_NUMBER: Option<u16> = None;

lightning-liquidity/src/lsps1/client.rs

@@ -30,8 +30,6 @@ use lightning::util::persist::KVStore;
 use bitcoin::secp256k1::PublicKey;
 use bitcoin::Address;
 
-use core::ops::Deref;
-
 /// Client-side configuration options for bLIP-51 / LSPS1 channel requests.
 #[derive(Clone, Debug)]
 pub struct LSPS1ClientConfig {
@@ -47,21 +45,15 @@ struct PeerState {
 }
 
 /// The main object allowing to send and receive bLIP-51 / LSPS1 messages.
-pub struct LSPS1ClientHandler<ES: EntropySource, K: Deref + Clone>
-where
-	K::Target: KVStore,
-{
+pub struct LSPS1ClientHandler<ES: EntropySource, K: KVStore + Clone> {
 	entropy_source: ES,
 	pending_messages: Arc<MessageQueue>,
 	pending_events: Arc<EventQueue<K>>,
 	per_peer_state: RwLock<HashMap<PublicKey, Mutex<PeerState>>>,
 	config: LSPS1ClientConfig,
 }
 
-impl<ES: EntropySource, K: Deref + Clone> LSPS1ClientHandler<ES, K>
-where
-	K::Target: KVStore,
-{
+impl<ES: EntropySource, K: KVStore + Clone> LSPS1ClientHandler<ES, K> {
 	/// Constructs an `LSPS1ClientHandler`.
 	pub(crate) fn new(
 		entropy_source: ES, pending_messages: Arc<MessageQueue>,
@@ -430,9 +422,8 @@ where
 	}
 }
 
-impl<ES: EntropySource, K: Deref + Clone> LSPSProtocolMessageHandler for LSPS1ClientHandler<ES, K>
-where
-	K::Target: KVStore,
+impl<ES: EntropySource, K: KVStore + Clone> LSPSProtocolMessageHandler
+	for LSPS1ClientHandler<ES, K>
 {
 	type ProtocolMessage = LSPS1Message;
 	const PROTOCOL_NUMBER: Option<u16> = Some(1);

lightning-liquidity/src/lsps1/service.rs

@@ -132,11 +132,10 @@ impl PeerState {
 }
 
 /// The main object allowing to send and receive bLIP-51 / LSPS1 messages.
-pub struct LSPS1ServiceHandler<ES: EntropySource, CM: Deref + Clone, C: Deref, K: Deref + Clone>
+pub struct LSPS1ServiceHandler<ES: EntropySource, CM: Deref + Clone, C: Deref, K: KVStore + Clone>
 where
 	CM::Target: AChannelManager,
 	C::Target: Filter,
-	K::Target: KVStore,
 {
 	entropy_source: ES,
 	channel_manager: CM,
@@ -147,12 +146,11 @@ where
 	config: LSPS1ServiceConfig,
 }
 
-impl<ES: EntropySource, CM: Deref + Clone, C: Deref, K: Deref + Clone>
+impl<ES: EntropySource, CM: Deref + Clone, C: Deref, K: KVStore + Clone>
 	LSPS1ServiceHandler<ES, CM, C, K>
 where
 	CM::Target: AChannelManager,
 	C::Target: Filter,
-	K::Target: KVStore,
 {
 	/// Constructs a `LSPS1ServiceHandler`.
 	pub(crate) fn new(
@@ -419,12 +417,11 @@ where
 	}
 }
 
-impl<ES: EntropySource, CM: Deref + Clone, C: Deref, K: Deref + Clone> LSPSProtocolMessageHandler
+impl<ES: EntropySource, CM: Deref + Clone, C: Deref, K: KVStore + Clone> LSPSProtocolMessageHandler
 	for LSPS1ServiceHandler<ES, CM, C, K>
 where
 	CM::Target: AChannelManager,
 	C::Target: Filter,
-	K::Target: KVStore,
 {
 	type ProtocolMessage = LSPS1Message;
 	const PROTOCOL_NUMBER: Option<u16> = Some(1);

lightning-liquidity/src/lsps2/client.rs

@@ -13,7 +13,6 @@ use alloc::string::{String, ToString};
 use lightning::util::persist::KVStore;
 
 use core::default::Default;
-use core::ops::Deref;
 
 use crate::events::EventQueue;
 use crate::lsps0::ser::{LSPSProtocolMessageHandler, LSPSRequestId, LSPSResponseError};
@@ -68,21 +67,15 @@ impl PeerState {
 /// opened. Please refer to the [`bLIP-52 / LSPS2 specification`] for more information.
 ///
 /// [`bLIP-52 / LSPS2 specification`]: https://github.com/lightning/blips/blob/master/blip-0052.md#trust-models
-pub struct LSPS2ClientHandler<ES: EntropySource, K: Deref + Clone>
-where
-	K::Target: KVStore,
-{
+pub struct LSPS2ClientHandler<ES: EntropySource, K: KVStore + Clone> {
 	entropy_source: ES,
 	pending_messages: Arc<MessageQueue>,
 	pending_events: Arc<EventQueue<K>>,
 	per_peer_state: RwLock<HashMap<PublicKey, Mutex<PeerState>>>,
 	config: LSPS2ClientConfig,
 }
 
-impl<ES: EntropySource, K: Deref + Clone> LSPS2ClientHandler<ES, K>
-where
-	K::Target: KVStore,
-{
+impl<ES: EntropySource, K: KVStore + Clone> LSPS2ClientHandler<ES, K> {
 	/// Constructs an `LSPS2ClientHandler`.
 	pub(crate) fn new(
 		entropy_source: ES, pending_messages: Arc<MessageQueue>,
@@ -373,9 +366,8 @@ where
 	}
 }
 
-impl<ES: EntropySource, K: Deref + Clone> LSPSProtocolMessageHandler for LSPS2ClientHandler<ES, K>
-where
-	K::Target: KVStore,
+impl<ES: EntropySource, K: KVStore + Clone> LSPSProtocolMessageHandler
+	for LSPS2ClientHandler<ES, K>
 {
 	type ProtocolMessage = LSPS2Message;
 	const PROTOCOL_NUMBER: Option<u16> = Some(2);

lightning-liquidity/src/lsps2/service.rs

@@ -702,10 +702,9 @@ 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: BroadcasterInterface>
+pub struct LSPS2ServiceHandler<CM: Deref, K: KVStore + Clone, T: BroadcasterInterface>
 where
 	CM::Target: AChannelManager,
-	K::Target: KVStore,
 {
 	channel_manager: CM,
 	kv_store: K,
@@ -720,10 +719,9 @@ where
 	persistence_in_flight: AtomicUsize,
 }
 
-impl<CM: Deref, K: Deref + Clone, T: BroadcasterInterface + Clone> LSPS2ServiceHandler<CM, K, T>
+impl<CM: Deref, K: KVStore + Clone, T: BroadcasterInterface + Clone> LSPS2ServiceHandler<CM, K, T>
 where
 	CM::Target: AChannelManager,
-	K::Target: KVStore,
 {
 	/// Constructs a `LSPS2ServiceHandler`.
 	pub(crate) fn new(
@@ -2042,11 +2040,10 @@ where
 	}
 }
 
-impl<CM: Deref, K: Deref + Clone, T: BroadcasterInterface + Clone> LSPSProtocolMessageHandler
+impl<CM: Deref, K: KVStore + Clone, T: BroadcasterInterface + Clone> LSPSProtocolMessageHandler
 	for LSPS2ServiceHandler<CM, K, T>
 where
 	CM::Target: AChannelManager,
-	K::Target: KVStore,
 {
 	type ProtocolMessage = LSPS2Message;
 	const PROTOCOL_NUMBER: Option<u16> = Some(2);
@@ -2116,19 +2113,21 @@ 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: BroadcasterInterface + Clone>
-where
+pub struct LSPS2ServiceHandlerSync<
+	'a,
+	CM: Deref,
+	K: KVStore + Clone,
+	T: BroadcasterInterface + Clone,
+> where
 	CM::Target: AChannelManager,
-	K::Target: KVStore,
 {
 	inner: &'a LSPS2ServiceHandler<CM, K, T>,
 }
 
-impl<'a, CM: Deref, K: Deref + Clone, T: BroadcasterInterface + Clone>
+impl<'a, CM: Deref, K: KVStore + Clone, T: BroadcasterInterface + Clone>
 	LSPS2ServiceHandlerSync<'a, CM, K, T>
 where
 	CM::Target: AChannelManager,
-	K::Target: KVStore,
 {
 	pub(crate) fn from_inner(inner: &'a LSPS2ServiceHandler<CM, K, T>) -> Self {
 		Self { inner }

lightning-liquidity/src/lsps5/client.rs

@@ -35,8 +35,6 @@ use alloc::collections::VecDeque;
 use alloc::string::String;
 use lightning::util::persist::KVStore;
 
-use core::ops::Deref;
-
 impl PartialEq<LSPSRequestId> for (LSPSRequestId, (LSPS5AppName, LSPS5WebhookUrl)) {
 	fn eq(&self, other: &LSPSRequestId) -> bool {
 		&self.0 == other
@@ -125,21 +123,15 @@ impl PeerState {
 /// [`lsps5.list_webhooks`]: super::msgs::LSPS5Request::ListWebhooks
 /// [`lsps5.remove_webhook`]: super::msgs::LSPS5Request::RemoveWebhook
 /// [`LSPS5Validator`]: super::validator::LSPS5Validator
-pub struct LSPS5ClientHandler<ES: EntropySource, K: Deref + Clone>
-where
-	K::Target: KVStore,
-{
+pub struct LSPS5ClientHandler<ES: EntropySource, K: KVStore + Clone> {
 	pending_messages: Arc<MessageQueue>,
 	pending_events: Arc<EventQueue<K>>,
 	entropy_source: ES,
 	per_peer_state: RwLock<HashMap<PublicKey, Mutex<PeerState>>>,
 	_config: LSPS5ClientConfig,
 }
 
-impl<ES: EntropySource, K: Deref + Clone> LSPS5ClientHandler<ES, K>
-where
-	K::Target: KVStore,
-{
+impl<ES: EntropySource, K: KVStore + Clone> LSPS5ClientHandler<ES, K> {
 	/// Constructs an `LSPS5ClientHandler`.
 	pub(crate) fn new(
 		entropy_source: ES, pending_messages: Arc<MessageQueue>,
@@ -424,9 +416,8 @@ where
 	}
 }
 
-impl<ES: EntropySource, K: Deref + Clone> LSPSProtocolMessageHandler for LSPS5ClientHandler<ES, K>
-where
-	K::Target: KVStore,
+impl<ES: EntropySource, K: KVStore + Clone> LSPSProtocolMessageHandler
+	for LSPS5ClientHandler<ES, K>
 {
 	type ProtocolMessage = LSPS5Message;
 	const PROTOCOL_NUMBER: Option<u16> = Some(5);