Misc ClosureReason generation cleanups

Here we fix a few cases of swallowing appropriate `ClosureReason`s
and expand `ClosureReason::FundingTimedOut` to include when we
didn't get a channel funded in time, rather than using
`HolderForceClosed`.

Author: TheBlueMatt

lightning/src/events/mod.rs

@@ -356,7 +356,8 @@ pub enum ClosureReason {
 	/// commitment transaction came from our counterparty, but it may also have come from
 	/// a copy of our own `ChannelMonitor`.
 	CommitmentTxConfirmed,
-	/// The funding transaction failed to confirm in a timely manner on an inbound channel.
+	/// The funding transaction failed to confirm in a timely manner on an inbound channel or the
+	/// counterparty failed to fund the channel in a timely manner.
 	FundingTimedOut,
 	/// Closure generated from processing an event, likely a HTLC forward/relay/reception.
 	ProcessingError {

lightning/src/ln/channel.rs

@@ -2957,9 +2957,9 @@ where
 		let commitment_signed = self.context.get_initial_commitment_signed(&self.funding, logger);
 		let commitment_signed = match commitment_signed {
 			Ok(commitment_signed) => commitment_signed,
-			Err(err) => {
+			Err(e) => {
 				self.funding.channel_transaction_parameters.funding_outpoint = None;
-				return Err(ChannelError::Close((err.to_string(), ClosureReason::HolderForceClosed { broadcasted_latest_txn: Some(false) })));
+				return Err(e)
 			},
 		};
 

lightning/src/ln/channelmanager.rs

@@ -7139,7 +7139,7 @@ where
 									log_error!(logger,
 										"Force-closing pending channel with ID {} for not establishing in a timely manner",
 										context.channel_id());
-									let mut close_res = chan.force_shutdown(false, ClosureReason::HolderForceClosed { broadcasted_latest_txn: Some(false) });
+									let mut close_res = chan.force_shutdown(false, ClosureReason::FundingTimedOut);
 									let (funding, context) = chan.funding_and_context_mut();
 									locked_close_channel!(self, peer_state, context, funding, close_res);
 									shutdown_channels.push(close_res);
@@ -8368,14 +8368,10 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
 							&open_channel_msg,
 							user_channel_id, &config, best_block_height,
 							&self.logger,
-						).map_err(|_| MsgHandleErrInternal::from_chan_no_close(
-							ChannelError::Close(
-								(
-									"V2 channel rejected due to sender error".into(),
-									ClosureReason::HolderForceClosed { broadcasted_latest_txn: Some(false) },
-								)
-							), *temporary_channel_id)
-						).map(|channel| {
+						).map_err(|e| {
+							let channel_id = open_channel_msg.common_fields.temporary_channel_id;
+							MsgHandleErrInternal::from_chan_no_close(e, channel_id)
+						}).map(|channel| {
 							let message_send_event =  MessageSendEvent::SendAcceptChannelV2 {
 								node_id: channel.context.get_counterparty_node_id(),
 								msg: channel.accept_inbound_dual_funded_channel()

lightning/src/ln/functional_tests.rs

@@ -11003,7 +11003,7 @@ pub fn test_remove_expired_outbound_unfunded_channels() {
 		},
 		_ => panic!("Unexpected event"),
 	}
-	let reason = ClosureReason::HolderForceClosed { broadcasted_latest_txn: Some(false) };
+	let reason = ClosureReason::FundingTimedOut;
 	check_closed_event(&nodes[0], 1, reason, false, &[node_b_id], 100000);
 }
 
@@ -11067,7 +11067,7 @@ pub fn test_remove_expired_inbound_unfunded_channels() {
 		},
 		_ => panic!("Unexpected event"),
 	}
-	let reason = ClosureReason::HolderForceClosed { broadcasted_latest_txn: Some(false) };
+	let reason = ClosureReason::FundingTimedOut;
 	check_closed_event(&nodes[1], 1, reason, false, &[node_a_id], 100000);
 }
 
@@ -11106,7 +11106,7 @@ pub fn test_channel_close_when_not_timely_accepted() {
 
 	// Since we disconnected from peer and did not connect back within time,
 	// we should have forced-closed the channel by now.
-	let reason = ClosureReason::HolderForceClosed { broadcasted_latest_txn: Some(false) };
+	let reason = ClosureReason::FundingTimedOut;
 	check_closed_event!(nodes[0], 1, reason, [node_b_id], 100000);
 	assert_eq!(nodes[0].node.list_channels().len(), 0);