Add MessageSendEvent for ClosingComplete and ClosingSig

Author: tnull

lightning/src/ln/channelmanager.rs

@@ -11712,6 +11712,8 @@ where
 						&MessageSendEvent::UpdateHTLCs { .. } => false,
 						&MessageSendEvent::SendRevokeAndACK { .. } => false,
 						&MessageSendEvent::SendClosingSigned { .. } => false,
+						&MessageSendEvent::SendClosingComplete { .. } => false,
+						&MessageSendEvent::SendClosingSig { .. } => false,
 						&MessageSendEvent::SendShutdown { .. } => false,
 						&MessageSendEvent::SendChannelReestablish { .. } => false,
 						&MessageSendEvent::HandleError { .. } => false,

lightning/src/ln/functional_test_utils.rs

@@ -937,6 +937,12 @@ pub fn remove_first_msg_event_to_node(msg_node_id: &PublicKey, msg_events: &mut
 		MessageSendEvent::SendClosingSigned { node_id, .. } => {
 			node_id == msg_node_id
 		},
+		MessageSendEvent::SendClosingComplete { node_id, .. } => {
+			node_id == msg_node_id
+		},
+		MessageSendEvent::SendClosingSig { node_id, .. } => {
+			node_id == msg_node_id
+		},
 		MessageSendEvent::SendShutdown { node_id, .. } => {
 			node_id == msg_node_id
 		},

lightning/src/ln/msgs.rs

@@ -1772,6 +1772,20 @@ pub enum MessageSendEvent {
 		/// The message which should be sent.
 		msg: ClosingSigned,
 	},
+	/// Used to indicate that a `closing_complete` message should be sent to the peer with the given `node_id`.
+	SendClosingComplete {
+		/// The node_id of the node which should receive this message
+		node_id: PublicKey,
+		/// The message which should be sent.
+		msg: ClosingComplete,
+	},
+	/// Used to indicate that a `closing_sig` message should be sent to the peer with the given `node_id`.
+	SendClosingSig {
+		/// The node_id of the node which should receive this message
+		node_id: PublicKey,
+		/// The message which should be sent.
+		msg: ClosingSig,
+	},
 	/// Used to indicate that a shutdown message should be sent to the peer with the given node_id.
 	SendShutdown {
 		/// The node_id of the node which should receive this message

lightning/src/ln/peer_handler.rs

@@ -2557,6 +2557,18 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM
 									&msg.channel_id);
 							self.enqueue_message(&mut *get_peer_for_forwarding!(node_id)?, msg);
 						},
+						MessageSendEvent::SendClosingComplete { ref node_id, ref msg } => {
+							log_debug!(WithContext::from(&self.logger, Some(*node_id), Some(msg.channel_id), None), "Handling SendClosingComplete event in peer_handler for node {} for channel {}",
+									log_pubkey!(node_id),
+									&msg.channel_id);
+							self.enqueue_message(&mut *get_peer_for_forwarding!(node_id)?, msg);
+						},
+						MessageSendEvent::SendClosingSig { ref node_id, ref msg } => {
+							log_debug!(WithContext::from(&self.logger, Some(*node_id), Some(msg.channel_id), None), "Handling SendClosingSig event in peer_handler for node {} for channel {}",
+									log_pubkey!(node_id),
+									&msg.channel_id);
+							self.enqueue_message(&mut *get_peer_for_forwarding!(node_id)?, msg);
+						},
 						MessageSendEvent::SendShutdown { ref node_id, ref msg } => {
 							log_debug!(WithContext::from(&self.logger, Some(*node_id), Some(msg.channel_id), None), "Handling Shutdown event in peer_handler for node {} for channel {}",
 									log_pubkey!(node_id),