Adds check for pending funding transaction broadcasts

Author: 1nF0rmed

lightning/src/ln/channel.rs

@@ -1901,6 +1901,12 @@ impl<Signer: Sign> Channel<Signer> {
 		Ok(())
 	}
 
+	/// Returns true if we have a pending funding transaction that is yet to broadcast
+	pub fn is_funding_pending(&self) -> bool {
+		self.funding_transaction.is_some() &&
+				self.channel_state & (ChannelState::FundingCreated as u32) != 0
+	}
+
 	/// Returns a HTLCStats about inbound pending htlcs
 	fn get_inbound_pending_htlc_stats(&self) -> HTLCStats {
 		let mut stats = HTLCStats {

lightning/src/ln/channelmanager.rs

@@ -1329,6 +1329,9 @@ impl<Signer: Sign, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelMana
 	/// Helper function that issues the channel close events
 	fn issue_channel_close_events(&self, channel: &Channel<Signer>, closure_reason: ClosureReason) {
 		let mut pending_events_lock = self.pending_events.lock().unwrap();
+		if channel.is_funding_pending() {
+			pending_events_lock.push(events::Event::DiscardFunding { channel_id: channel.channel_id(), transaction: channel.channel_transaction_parameters.funding_outpoint});
+		}
 		pending_events_lock.push(events::Event::ChannelClosed { channel_id: channel.channel_id(), reason: closure_reason });
 	}
 

lightning/src/ln/functional_test_utils.rs

@@ -763,21 +763,32 @@ macro_rules! check_closed_broadcast {
 	}}
 }
 
-/// Check that a channel's closing channel event has been issued
+/// Check that a channel's closing channel events has been issued
 #[macro_export]
 macro_rules! check_closed_event {
-	($node: expr, $events: expr, $reason: expr) => {{
+	($node: expr, $events: expr, $reason: expr) => {
+		check_closed_event!($node, $events, $reason, false);
+	};
+	($node: expr, $events: expr, $reason: expr, $is_check_discard_funding: expr) => {{
 		let events = $node.node.get_and_clear_pending_events();
 		assert_eq!(events.len(), $events);
 		let expected_reason = $reason;
+		let mut issues_discard_funding = false;
 		for event in events {
 			match event {
 				Event::ChannelClosed { ref reason, .. } => {
 					assert_eq!(*reason, expected_reason);
 				},
+				Event::DiscardFunding { .. } => {
+					issues_discard_funding = true;
+				}
 				_ => panic!("Unexpected event"),
 			}
 		}
+
+		if $is_check_discard_funding {
+			assert!(issues_discard_funding);
+		}
 	}}
 }
 

lightning/src/ln/functional_tests.rs

@@ -8632,7 +8632,7 @@ fn test_pre_lockin_no_chan_closed_update() {
 	let channel_id = ::chain::transaction::OutPoint { txid: funding_created_msg.funding_txid, index: funding_created_msg.funding_output_index }.to_channel_id();
 	nodes[0].node.handle_error(&nodes[1].node.get_our_node_id(), &msgs::ErrorMessage { channel_id, data: "Hi".to_owned() });
 	assert!(nodes[0].chain_monitor.added_monitors.lock().unwrap().is_empty());
-	check_closed_event!(nodes[0], 1, ClosureReason::CounterpartyForceClosed { peer_msg: "Hi".to_string() });
+	check_closed_event!(nodes[0], 2, ClosureReason::CounterpartyForceClosed { peer_msg: "Hi".to_string() }, true);
 }
 
 #[test]