f Cleanup funding tx storage and marking-safe logic a bit

Author: tnull

src/liquidity.rs

@@ -21,7 +21,6 @@ use lightning::ln::channelmanager::{InterceptId, MIN_FINAL_CLTV_EXPIRY_DELTA};
 use lightning::ln::msgs::SocketAddress;
 use lightning::ln::types::ChannelId;
 use lightning::routing::router::{RouteHint, RouteHintHop};
-use lightning::util::errors::APIError;
 use lightning_invoice::{Bolt11Invoice, Bolt11InvoiceDescription, InvoiceBuilder, RoutingFees};
 use lightning_liquidity::events::LiquidityEvent;
 use lightning_liquidity::lsps0::ser::{LSPSDateTime, LSPSRequestId};
@@ -328,52 +327,50 @@ where
 	pub(crate) fn lsps2_store_funding_transaction(
 		&self, user_channel_id: u128, counterparty_node_id: PublicKey, funding_tx: Transaction,
 	) {
-		if !self.is_client_trusts_lsp() {
-			log_debug!(self.logger, "Skipping funding transaction broadcast as client trusts LSP.");
+		if self.lsps2_service.as_ref().map_or(false, |svc| !svc.service_config.client_trusts_lsp) {
+			// Only necessary for client-trusts-LSP flow
 			return;
 		}
-		self.lsps2_service.as_ref().map(|_| {
-			let lsps2_service_handler = self.liquidity_manager.lsps2_service_handler();
-			if let Some(handler) = lsps2_service_handler {
-				handler
-					.store_funding_transaction(user_channel_id, &counterparty_node_id, funding_tx)
-					.unwrap_or_else(|e| {
-						debug_assert!(false, "Failed to store funding transaction: {:?}", e);
-						log_error!(self.logger, "Failed to store funding transaction: {:?}", e);
-					});
-			} else {
-				log_error!(self.logger, "LSPS2 service handler is not available.");
-			}
-		});
+
+		let lsps2_service_handler = self.liquidity_manager.lsps2_service_handler();
+		if let Some(handler) = lsps2_service_handler {
+			handler
+				.store_funding_transaction(user_channel_id, &counterparty_node_id, funding_tx)
+				.unwrap_or_else(|e| {
+					debug_assert!(false, "Failed to store funding transaction: {:?}", e);
+					log_error!(self.logger, "Failed to store funding transaction: {:?}", e);
+				});
+		} else {
+			log_error!(self.logger, "LSPS2 service handler is not available.");
+		}
 	}
 
 	pub(crate) fn lsps2_funding_tx_broadcast_safe(
 		&self, user_channel_id: u128, counterparty_node_id: PublicKey,
 	) {
-		if !self.is_client_trusts_lsp() {
-			log_debug!(self.logger, "Skipping funding transaction broadcast as client trusts LSP.");
+		if self.lsps2_service.as_ref().map_or(false, |svc| !svc.service_config.client_trusts_lsp) {
+			// Only necessary for client-trusts-LSP flow
 			return;
 		}
-		self.lsps2_service.as_ref().map(|_| {
-			let lsps2_service_handler = self.liquidity_manager.lsps2_service_handler();
-			if let Some(handler) = lsps2_service_handler {
-				handler
-					.set_funding_tx_broadcast_safe(user_channel_id, &counterparty_node_id)
-					.unwrap_or_else(|e| {
-						debug_assert!(false, "Failed to store funding transaction: {:?}", e);
-						log_error!(self.logger, "Failed to store funding transaction: {:?}", e);
-					});
-			} else {
-				log_error!(self.logger, "LSPS2 service handler is not available.");
-			}
-		});
-	}
 
-	fn is_client_trusts_lsp(&self) -> bool {
-		if let Some(lsps2_service) = self.lsps2_service.as_ref() {
-			lsps2_service.service_config.client_trusts_lsp
+		let lsps2_service_handler = self.liquidity_manager.lsps2_service_handler();
+		if let Some(handler) = lsps2_service_handler {
+			handler
+				.set_funding_tx_broadcast_safe(user_channel_id, &counterparty_node_id)
+				.unwrap_or_else(|e| {
+					debug_assert!(
+						false,
+						"Failed to mark funding transaction safe to broadcast: {:?}",
+						e
+					);
+					log_error!(
+						self.logger,
+						"Failed to mark funding transaction safe to broadcast: {:?}",
+						e
+					);
+				});
 		} else {
-			false
+			log_error!(self.logger, "LSPS2 service handler is not available.");
 		}
 	}