Refactor CloseChannel API to remove force close functionality

Author: moisesPompilio

ldk-server-protos/src/api.rs

@@ -270,9 +270,7 @@ pub struct UpdateChannelConfigRequest {
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct UpdateChannelConfigResponse {}
 /// Closes the channel specified by given request.
-/// See more:
-/// - <https://docs.rs/ldk-node/latest/ldk_node/struct.Node.html#method.close_channel>
-/// - <https://docs.rs/ldk-node/latest/ldk_node/struct.Node.html#method.force_close_channel>
+/// See more: <https://docs.rs/ldk-node/latest/ldk_node/struct.Node.html#method.close_channel>
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct CloseChannelRequest {
@@ -282,12 +280,6 @@ pub struct CloseChannelRequest {
 	/// The hex-encoded public key of the node to close a channel with.
 	#[prost(string, tag = "2")]
 	pub counterparty_node_id: ::prost::alloc::string::String,
-	/// Whether to force close the specified channel.
-	#[prost(bool, optional, tag = "3")]
-	pub force_close: ::core::option::Option<bool>,
-	/// The reason for force-closing, can only be set while force closing a channel.
-	#[prost(string, optional, tag = "4")]
-	pub force_close_reason: ::core::option::Option<::prost::alloc::string::String>,
 }
 /// The response `content` for the `CloseChannel` API, when HttpStatusCode is OK (200).
 /// When HttpStatusCode is not OK (non-200), the response `content` contains a serialized `ErrorResponse`.

ldk-server-protos/src/proto/api.proto

@@ -261,29 +261,19 @@ message UpdateChannelConfigResponse {
 }
 
 // Closes the channel specified by given request.
-// See more:
-// - https://docs.rs/ldk-node/latest/ldk_node/struct.Node.html#method.close_channel
-// - https://docs.rs/ldk-node/latest/ldk_node/struct.Node.html#method.force_close_channel
+// See more: https://docs.rs/ldk-node/latest/ldk_node/struct.Node.html#method.close_channel
 message CloseChannelRequest {
 
   // The local `user_channel_id` of this channel.
   string user_channel_id = 1;
 
   // The hex-encoded public key of the node to close a channel with.
   string counterparty_node_id = 2;
-
-  // Whether to force close the specified channel.
-  optional bool force_close = 3;
-
-  // The reason for force-closing, can only be set while force closing a channel.
-  optional string force_close_reason = 4;
 }
 
 // The response `content` for the `CloseChannel` API, when HttpStatusCode is OK (200).
 // When HttpStatusCode is not OK (non-200), the response `content` contains a serialized `ErrorResponse`.
-message CloseChannelResponse {
-
-}
+message CloseChannelResponse {}
 
 // Returns a list of known channels.
 // See more: https://docs.rs/ldk-node/latest/ldk_node/struct.Node.html#method.list_channels

ldk-server/src/api/close_channel.rs

@@ -21,15 +21,7 @@ pub(crate) fn handle_close_channel_request(
 			format!("Invalid counterparty node ID, error: {}", e),
 		)
 	})?;
-
-	match request.force_close {
-		Some(true) => context.node.force_close_channel(
-			&user_channel_id,
-			counterparty_node_id,
-			request.force_close_reason,
-		)?,
-		_ => context.node.close_channel(&user_channel_id, counterparty_node_id)?,
-	};
+	context.node.close_channel(&user_channel_id, counterparty_node_id)?;
 
 	let response = CloseChannelResponse {};
 	Ok(response)