From fcc100252a08967068ff8289cbef8612c36a7364 Mon Sep 17 00:00:00 2001
From: behzad nouri <behzadnouri@gmail.com>
Date: Tue, 5 Apr 2022 16:02:53 +0000
Subject: [PATCH] removes outdated and flaky test_skip_repair from
 retransmit-stage (#24121)

test_skip_repair in retransmit-stage is no longer relevant because
following: https://github.com/solana-labs/solana/pull/19233
repair packets are filtered out earlier in window-service and so
retransmit stage does not know if a shred is repaired or not.
Also, following turbine peer shuffle changes:
https://github.com/solana-labs/solana/pull/24080
the test has become flaky since it does not take into account how peers
are shuffled for each shred.

(cherry picked from commit 228257149307fc295678ebe42813fdefe3368102)

# Conflicts:
#	core/src/retransmit_stage.rs
---
 core/src/retransmit_stage.rs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/core/src/retransmit_stage.rs b/core/src/retransmit_stage.rs
index da678dac8ea2c6..d21a72a4fe71d6 100644
--- a/core/src/retransmit_stage.rs
+++ b/core/src/retransmit_stage.rs
@@ -528,6 +528,7 @@ impl RetransmitStage {
 
 #[cfg(test)]
 mod tests {
+<<<<<<< HEAD
     use {
         super::*,
         solana_gossip::contact_info::ContactInfo,
@@ -617,6 +618,9 @@ mod tests {
         assert_eq!(packet_batch.packets.len(), 1);
         assert!(!packet_batch.packets[0].meta.repair());
     }
+=======
+    use super::*;
+>>>>>>> 228257149 (removes outdated and flaky test_skip_repair from retransmit-stage (#24121))
 
     #[test]
     fn test_already_received() {