f - wait two timer ticks instead of one

Author: jkczyz

lightning/src/onion_message/messenger.rs

@@ -166,22 +166,27 @@ enum OnionMessageBuffer {
 	/// Messages for a node connected as a peer.
 	ConnectedPeer(VecDeque<OnionMessage>),
 
-	/// Messages for a node that is not yet connected.
-	PendingConnection(VecDeque<OnionMessage>, Option<NodeAnnouncement>),
+	/// Messages for a node that is not yet connected, which are dropped after a certain number of
+	/// timer ticks defined in OnionMessenger::release_pending_connections and tracked here.
+	PendingConnection(VecDeque<OnionMessage>, Option<NodeAnnouncement>, usize),
 }
 
 impl OnionMessageBuffer {
+	fn pending_connection(node_announcement: NodeAnnouncement) -> Self {
+		Self::PendingConnection(VecDeque::new(), Some(node_announcement), 0)
+	}
+
 	fn pending_messages(&self) -> &VecDeque<OnionMessage> {
 		match self {
 			OnionMessageBuffer::ConnectedPeer(pending_messages) => pending_messages,
-			OnionMessageBuffer::PendingConnection(pending_messages, _) => pending_messages,
+			OnionMessageBuffer::PendingConnection(pending_messages, _, _) => pending_messages,
 		}
 	}
 
 	fn enqueue_message(&mut self, message: OnionMessage) {
 		let pending_messages = match self {
 			OnionMessageBuffer::ConnectedPeer(pending_messages) => pending_messages,
-			OnionMessageBuffer::PendingConnection(pending_messages, _) => pending_messages,
+			OnionMessageBuffer::PendingConnection(pending_messages, _, _) => pending_messages,
 		};
 
 		pending_messages.push_back(message);
@@ -190,7 +195,7 @@ impl OnionMessageBuffer {
 	fn dequeue_message(&mut self) -> Option<OnionMessage> {
 		let pending_messages = match self {
 			OnionMessageBuffer::ConnectedPeer(pending_messages) => pending_messages,
-			OnionMessageBuffer::PendingConnection(pending_messages, _) => pending_messages,
+			OnionMessageBuffer::PendingConnection(pending_messages, _, _) => pending_messages,
 		};
 
 		pending_messages.pop_front()
@@ -200,14 +205,14 @@ impl OnionMessageBuffer {
 	fn release_pending_messages(&mut self) -> VecDeque<OnionMessage> {
 		let pending_messages = match self {
 			OnionMessageBuffer::ConnectedPeer(pending_messages) => pending_messages,
-			OnionMessageBuffer::PendingConnection(pending_messages, _) => pending_messages,
+			OnionMessageBuffer::PendingConnection(pending_messages, _, _) => pending_messages,
 		};
 
 		core::mem::take(pending_messages)
 	}
 
 	fn mark_connected(&mut self) {
-		if let OnionMessageBuffer::PendingConnection(pending_messages, _) = self {
+		if let OnionMessageBuffer::PendingConnection(pending_messages, _, _) = self {
 			let mut new_pending_messages = VecDeque::new();
 			core::mem::swap(pending_messages, &mut new_pending_messages);
 			*self = OnionMessageBuffer::ConnectedPeer(new_pending_messages);
@@ -652,7 +657,9 @@ where
 					if node_announcement.contents.features.supports_onion_messages() {
 						self.message_buffers.lock().unwrap()
 							.entry(first_node_id)
-							.or_insert_with(|| OnionMessageBuffer::PendingConnection(VecDeque::new(), Some(node_announcement.clone())))
+							.or_insert_with(
+								|| OnionMessageBuffer::pending_connection(node_announcement.clone())
+							)
 							.enqueue_message(onion_message);
 						log_trace!(
 							self.logger, "Buffered onion message waiting on peer connection {}: {:?}",
@@ -797,22 +804,23 @@ where
 	}
 
 	fn release_pending_connections(&self) -> Vec<NodeAnnouncement> {
+		const MAX_TIMER_TICKS: usize = 2;
 		let mut message_buffers = self.message_buffers.lock().unwrap();
 
-		// Drop any pending recipients since the last call to avoid retaining buffered messages for
+		// Drop any pending recipients over MAX_TIMER_TICKS to avoid retaining buffered messages for
 		// too long.
 		message_buffers.retain(|_, recipient| match recipient {
-			OnionMessageBuffer::PendingConnection(_, None) => false,
-			OnionMessageBuffer::PendingConnection(_, Some(_)) => true,
+			OnionMessageBuffer::PendingConnection(_, _, ticks) => *ticks < MAX_TIMER_TICKS,
 			_ => true,
 		});
 
-		// Release node announcements for pending recipients so that their buffered messages are
-		// dropped the next time this method is called.
+		// Release node announcements and increment a timer tick for pending recipients so that
+		// their buffered messages are dropped at MAX_TIMER_TICKS.
 		message_buffers
 			.values_mut()
 			.filter_map(|recipient| match recipient {
-				OnionMessageBuffer::PendingConnection(_, node_announcement) => {
+				OnionMessageBuffer::PendingConnection(_, node_announcement, ticks) => {
+					*ticks += 1;
 					node_announcement.take()
 				},
 				_ => None,