f Cleanup lsps2_channel_needs_manual_broadcast

Author: tnull

src/event.rs

@@ -511,19 +511,12 @@ where
 				) {
 					Ok(final_tx) => {
 						let needs_manual_broadcast =
-							match self.liquidity_source.as_ref().map(|ls| {
+							self.liquidity_source.as_ref().map_or(false, |ls| {
 								ls.as_ref().lsps2_channel_needs_manual_broadcast(
 									counterparty_node_id,
 									user_channel_id,
 								)
-							}) {
-								Some(Ok(v)) => v,
-								Some(Err(e)) => {
-									log_error!(self.logger, "Failed to determine if channel needs manual broadcast: {:?}", e);
-									false
-								},
-								None => false,
-							};
+							});
 
 						let result = if needs_manual_broadcast {
 							self.liquidity_source.as_ref().map(|ls| {

src/liquidity.rs

@@ -310,22 +310,18 @@ where
 
 	pub(crate) fn lsps2_channel_needs_manual_broadcast(
 		&self, counterparty_node_id: PublicKey, user_channel_id: u128,
-	) -> Result<bool, APIError> {
-		// if we are not in a client_trusts_lsp model, we don't check and just return false
-		if !self.is_client_trusts_lsp() {
-			log_debug!(self.logger, "Skipping funding transaction broadcast as client trusts LSP.");
-			return Ok(false);
-		}
-
-		// if we are in a client_trusts_lsp model, then we check if the LSP has an LSPS2 operation in progress
-		self.lsps2_service.as_ref().map_or(Ok(false), |_| {
-			let lsps2_service_handler = self.liquidity_manager.lsps2_service_handler();
-			if let Some(handler) = lsps2_service_handler {
-				handler.channel_needs_manual_broadcast(user_channel_id, &counterparty_node_id)
-			} else {
-				log_error!(self.logger, "LSPS2 service handler is not available.");
-				Ok(false)
-			}
+	) -> bool {
+		self.lsps2_service.as_ref().map_or(false, |lsps2_service| {
+			lsps2_service.service_config.client_trusts_lsp
+				&& self
+					.liquidity_manager()
+					.lsps2_service_handler()
+					.and_then(|handler| {
+						handler
+							.channel_needs_manual_broadcast(user_channel_id, &counterparty_node_id)
+							.ok()
+					})
+					.unwrap_or(false)
 		})
 	}