f Account for force_close_without_broadcasting being dropped

Author: tnull

bindings/ldk_node.udl

@@ -383,7 +383,7 @@ enum PaymentFailureReason {
 [Enum]
 interface ClosureReason {
 	CounterpartyForceClosed(UntrustedString peer_msg);
-	HolderForceClosed(boolean? broadcasted_latest_txn);
+	HolderForceClosed(boolean? broadcasted_latest_txn, string message);
 	LegacyCooperativeClosure();
 	CounterpartyInitiatedCooperativeClosure();
 	LocallyInitiatedCooperativeClosure();

src/event.rs

@@ -545,7 +545,7 @@ where
 					Err(err) => {
 						log_error!(self.logger, "Failed to create funding transaction: {}", err);
 						self.channel_manager
-							.force_close_without_broadcasting_txn(
+							.force_close_broadcasting_latest_txn(
 								&temporary_channel_id,
 								&counterparty_node_id,
 								"Failed to create funding transaction".to_string(),
@@ -1084,7 +1084,7 @@ where
 						log_error!(self.logger, "Rejecting inbound announced channel from peer {} due to missing configuration: {}", counterparty_node_id, err);
 
 						self.channel_manager
-							.force_close_without_broadcasting_txn(
+							.force_close_broadcasting_latest_txn(
 								&temporary_channel_id,
 								&counterparty_node_id,
 								"Channel request rejected".to_string(),
@@ -1128,7 +1128,7 @@ where
 								required_amount_sats,
 							);
 							self.channel_manager
-								.force_close_without_broadcasting_txn(
+								.force_close_broadcasting_latest_txn(
 									&temporary_channel_id,
 									&counterparty_node_id,
 									"Channel request rejected".to_string(),
@@ -1145,7 +1145,7 @@ where
 							counterparty_node_id,
 						);
 						self.channel_manager
-							.force_close_without_broadcasting_txn(
+							.force_close_broadcasting_latest_txn(
 								&temporary_channel_id,
 								&counterparty_node_id,
 								"Channel request rejected".to_string(),

src/io/test_utils.rs

@@ -145,18 +145,19 @@ pub(crate) fn do_test_store<K: KVStore + Sync>(store_0: &K, store_1: &K) {
 
 	// Force close because cooperative close doesn't result in any persisted
 	// updates.
+	let message = "Channel force-closed".to_owned();
 	nodes[0]
 		.node
 		.force_close_broadcasting_latest_txn(
 			&nodes[0].node.list_channels()[0].channel_id,
 			&nodes[1].node.get_our_node_id(),
-			"whoops".to_string(),
+			message.clone(),
 		)
 		.unwrap();
 	check_closed_event!(
 		nodes[0],
 		1,
-		ClosureReason::HolderForceClosed { broadcasted_latest_txn: Some(true) },
+		ClosureReason::HolderForceClosed { broadcasted_latest_txn: Some(true), message },
 		[nodes[1].node.get_our_node_id()],
 		100000
 	);

src/lib.rs

@@ -1316,35 +1316,16 @@ impl Node {
 			open_channels.iter().find(|c| c.user_channel_id == user_channel_id.0)
 		{
 			if force {
-				if self.config.anchor_channels_config.as_ref().map_or(false, |acc| {
-					acc.trusted_peers_no_reserve.contains(&counterparty_node_id)
-				}) {
-					self.channel_manager
-						.force_close_without_broadcasting_txn(
-							&channel_details.channel_id,
-							&counterparty_node_id,
-							force_close_reason.unwrap_or_default(),
-						)
-						.map_err(|e| {
-							log_error!(
-								self.logger,
-								"Failed to force-close channel to trusted peer: {:?}",
-								e
-							);
-							Error::ChannelClosingFailed
-						})?;
-				} else {
-					self.channel_manager
-						.force_close_broadcasting_latest_txn(
-							&channel_details.channel_id,
-							&counterparty_node_id,
-							force_close_reason.unwrap_or_default(),
-						)
-						.map_err(|e| {
-							log_error!(self.logger, "Failed to force-close channel: {:?}", e);
-							Error::ChannelClosingFailed
-						})?;
-				}
+				self.channel_manager
+					.force_close_broadcasting_latest_txn(
+						&channel_details.channel_id,
+						&counterparty_node_id,
+						force_close_reason.unwrap_or_default(),
+					)
+					.map_err(|e| {
+						log_error!(self.logger, "Failed to force-close channel: {:?}", e);
+						Error::ChannelClosingFailed
+					})?;
 			} else {
 				self.channel_manager
 					.close_channel(&channel_details.channel_id, &counterparty_node_id)