Drop chain_source from LSPS1ServiceHandler

We previously considered tracking payment confirmations as part of the
handler. However, we can considerably simplify our logic if we stick
with the current approach of having the LSPs track the payment status
and update us when prompted through events.

Author: tnull

lightning-liquidity/src/lsps1/service.rs

@@ -30,7 +30,6 @@ use crate::prelude::{new_hash_map, HashMap};
 use crate::sync::{Arc, Mutex, RwLock};
 use crate::utils;
 
-use lightning::chain::Filter;
 use lightning::ln::channelmanager::AChannelManager;
 use lightning::ln::msgs::{ErrorAction, LightningError};
 use lightning::sign::EntropySource;
@@ -114,40 +113,35 @@ impl PeerState {
 }
 
 /// The main object allowing to send and receive bLIP-51 / LSPS1 messages.
-pub struct LSPS1ServiceHandler<ES: Deref, CM: Deref + Clone, C: Deref, K: Deref + Clone>
+pub struct LSPS1ServiceHandler<ES: Deref, CM: Deref + Clone, K: Deref + Clone>
 where
 	ES::Target: EntropySource,
 	CM::Target: AChannelManager,
-	C::Target: Filter,
 	K::Target: KVStore,
 {
 	entropy_source: ES,
 	_channel_manager: CM,
-	_chain_source: Option<C>,
 	pending_messages: Arc<MessageQueue>,
 	pending_events: Arc<EventQueue<K>>,
 	per_peer_state: RwLock<HashMap<PublicKey, Mutex<PeerState>>>,
 	config: LSPS1ServiceConfig,
 }
 
-impl<ES: Deref, CM: Deref + Clone, C: Deref, K: Deref + Clone> LSPS1ServiceHandler<ES, CM, C, K>
+impl<ES: Deref, CM: Deref + Clone, K: Deref + Clone> LSPS1ServiceHandler<ES, CM, K>
 where
 	ES::Target: EntropySource,
 	CM::Target: AChannelManager,
-	C::Target: Filter,
 	ES::Target: EntropySource,
 	K::Target: KVStore,
 {
 	/// Constructs a `LSPS1ServiceHandler`.
 	pub(crate) fn new(
 		entropy_source: ES, pending_messages: Arc<MessageQueue>,
-		pending_events: Arc<EventQueue<K>>, channel_manager: CM, chain_source: Option<C>,
-		config: LSPS1ServiceConfig,
+		pending_events: Arc<EventQueue<K>>, channel_manager: CM, config: LSPS1ServiceConfig,
 	) -> Self {
 		Self {
 			entropy_source,
 			_channel_manager: channel_manager,
-			_chain_source: chain_source,
 			pending_messages,
 			pending_events,
 			per_peer_state: RwLock::new(new_hash_map()),
@@ -403,12 +397,11 @@ where
 	}
 }
 
-impl<ES: Deref, CM: Deref + Clone, C: Deref, K: Deref + Clone> LSPSProtocolMessageHandler
-	for LSPS1ServiceHandler<ES, CM, C, K>
+impl<ES: Deref, CM: Deref + Clone, K: Deref + Clone> LSPSProtocolMessageHandler
+	for LSPS1ServiceHandler<ES, CM, K>
 where
 	ES::Target: EntropySource,
 	CM::Target: AChannelManager,
-	C::Target: Filter,
 	K::Target: KVStore,
 {
 	type ProtocolMessage = LSPS1Message;

lightning-liquidity/src/manager.rs

@@ -322,7 +322,7 @@ pub struct LiquidityManager<
 	lsps0_client_handler: LSPS0ClientHandler<ES, K>,
 	lsps0_service_handler: Option<LSPS0ServiceHandler>,
 	#[cfg(lsps1_service)]
-	lsps1_service_handler: Option<LSPS1ServiceHandler<ES, CM, C, K>>,
+	lsps1_service_handler: Option<LSPS1ServiceHandler<ES, CM, K>>,
 	lsps1_client_handler: Option<LSPS1ClientHandler<ES, K>>,
 	lsps2_service_handler: Option<LSPS2ServiceHandler<CM, K, T>>,
 	lsps2_client_handler: Option<LSPS2ClientHandler<ES, K>>,
@@ -509,7 +509,7 @@ where
 		#[cfg(lsps1_service)]
 		let lsps1_service_handler = service_config.as_ref().and_then(|config| {
 			if let Some(number) =
-				<LSPS1ServiceHandler<ES, CM, C, K> as LSPSProtocolMessageHandler>::PROTOCOL_NUMBER
+				<LSPS1ServiceHandler<ES, CM, K> as LSPSProtocolMessageHandler>::PROTOCOL_NUMBER
 			{
 				supported_protocols.push(number);
 			}
@@ -519,7 +519,6 @@ where
 					Arc::clone(&pending_messages),
 					Arc::clone(&pending_events),
 					channel_manager.clone(),
-					chain_source.clone(),
 					config.clone(),
 				)
 			})
@@ -579,7 +578,7 @@ where
 
 	/// Returns a reference to the LSPS1 server-side handler.
 	#[cfg(lsps1_service)]
-	pub fn lsps1_service_handler(&self) -> Option<&LSPS1ServiceHandler<ES, CM, C, K>> {
+	pub fn lsps1_service_handler(&self) -> Option<&LSPS1ServiceHandler<ES, CM, K>> {
 		self.lsps1_service_handler.as_ref()
 	}
 
@@ -1215,7 +1214,7 @@ where
 	#[cfg(lsps1_service)]
 	pub fn lsps1_service_handler(
 		&self,
-	) -> Option<&LSPS1ServiceHandler<ES, CM, C, KVStoreSyncWrapper<KS>>> {
+	) -> Option<&LSPS1ServiceHandler<ES, CM, KVStoreSyncWrapper<KS>>> {
 		self.inner.lsps1_service_handler()
 	}