Cleanup buffer on timeout

node/network/collator-protocol/src/collator_side/mod.rs

@@ -1019,6 +1019,10 @@ pub(crate) async fn run<Context>(
 					.last_connected_at
 					.map_or(false, |timestamp| now - timestamp > RECONNECT_TIMEOUT)
 				{
+					// Remove all advertisements from the buffer if the timeout was hit.
+					// Usually, it shouldn't be necessary as leaves get deactivated, rather
+					// serves as a safeguard against finality lags.
+					state.validator_groups_buf.clear_advertisements();
 					// Returns `None` if connection request is empty.
 					state.last_connected_at =
 						connect_to_validators(&mut ctx, &state.validator_groups_buf).await;

node/network/collator-protocol/src/collator_side/validators_buffer.rs

@@ -153,6 +153,11 @@ impl ValidatorGroupsBuffer {
 		self.should_be_connected.remove(relay_parent);
 	}
 
+	/// Removes all advertisements from the buffer.
+	pub fn clear_advertisements(&mut self) {
+		self.should_be_connected.clear();
+	}
+
 	/// Pushes a new group to the buffer along with advertisement, setting all validators
 	/// bits to 1.
 	///