Refactor close_channel to use centralized parsing helpers

Move parsing logic into dedicated helper functions in the api module and update close_channel
handling to use them.

Author: moisesPompilio

ldk-server/src/api/close_channel.rs

@@ -1,26 +1,15 @@
-use crate::api::error::LdkServerError;
-use crate::api::error::LdkServerErrorCode::InvalidRequestError;
+use crate::api::{error::LdkServerError, parse_counterparty_node_id, parse_user_channel_id};
 use crate::service::Context;
-use ldk_node::bitcoin::secp256k1::PublicKey;
-use ldk_node::UserChannelId;
 use ldk_server_protos::api::{CloseChannelRequest, CloseChannelResponse};
-use std::str::FromStr;
 
 pub(crate) const CLOSE_CHANNEL_PATH: &str = "CloseChannel";
 
 pub(crate) fn handle_close_channel_request(
 	context: Context, request: CloseChannelRequest,
 ) -> Result<CloseChannelResponse, LdkServerError> {
-	let user_channel_id =
-		UserChannelId((&request.user_channel_id).parse::<u128>().map_err(|_| {
-			LdkServerError::new(InvalidRequestError, "Invalid UserChannelId.".to_string())
-		})?);
-	let counterparty_node_id = PublicKey::from_str(&request.counterparty_node_id).map_err(|e| {
-		LdkServerError::new(
-			InvalidRequestError,
-			format!("Invalid counterparty node ID, error: {}", e),
-		)
-	})?;
+	let user_channel_id = parse_user_channel_id(&request.user_channel_id)?;
+	let counterparty_node_id = parse_counterparty_node_id(&request.counterparty_node_id)?;
+
 	context.node.close_channel(&user_channel_id, counterparty_node_id)?;
 
 	let response = CloseChannelResponse {};

ldk-server/src/api/mod.rs

@@ -14,3 +14,23 @@ pub(crate) mod onchain_receive;
 pub(crate) mod onchain_send;
 pub(crate) mod open_channel;
 pub(crate) mod update_channel_config;
+
+use crate::api::error::{LdkServerError, LdkServerErrorCode::InvalidRequestError};
+use ldk_node::bitcoin::secp256k1::PublicKey;
+use ldk_node::UserChannelId;
+use std::str::FromStr;
+
+pub fn parse_user_channel_id(id: &str) -> Result<UserChannelId, LdkServerError> {
+	Ok(UserChannelId(id.parse::<u128>().map_err(|_| {
+		LdkServerError::new(InvalidRequestError, "Invalid UserChannelId.".to_string())
+	})?))
+}
+
+pub fn parse_counterparty_node_id(id: &str) -> Result<PublicKey, LdkServerError> {
+	PublicKey::from_str(id).map_err(|e| {
+		LdkServerError::new(
+			InvalidRequestError,
+			format!("Invalid counterparty node ID, error: {}", e),
+		)
+	})
+}