From 13b7ae143269526d5cc7376abbc9428524fc9b96 Mon Sep 17 00:00:00 2001
From: Jeff Biseda <jbiseda@gmail.com>
Date: Thu, 17 Aug 2023 11:11:35 -0700
Subject: [PATCH] legacy repair type cleanup (#32849)

---
 core/src/repair/serve_repair.rs | 32 +++++++++++++++-----------------
 1 file changed, 15 insertions(+), 17 deletions(-)

diff --git a/core/src/repair/serve_repair.rs b/core/src/repair/serve_repair.rs
index b7196575f8..a4fe789e3b 100644
--- a/core/src/repair/serve_repair.rs
+++ b/core/src/repair/serve_repair.rs
@@ -101,9 +101,9 @@ pub enum ShredRepairType {
 impl ShredRepairType {
     pub fn slot(&self) -> Slot {
         match self {
-            ShredRepairType::Orphan(slot) => *slot,
-            ShredRepairType::HighestShred(slot, _) => *slot,
-            ShredRepairType::Shred(slot, _) => *slot,
+            ShredRepairType::Orphan(slot)
+            | ShredRepairType::HighestShred(slot, _)
+            | ShredRepairType::Shred(slot, _) => *slot,
         }
     }
 }
@@ -112,9 +112,8 @@ impl RequestResponse for ShredRepairType {
     type Response = Shred;
     fn num_expected_responses(&self) -> u32 {
         match self {
-            ShredRepairType::Orphan(_) => (MAX_ORPHAN_REPAIR_RESPONSES) as u32,
-            ShredRepairType::HighestShred(_, _) => 1,
-            ShredRepairType::Shred(_, _) => 1,
+            ShredRepairType::Orphan(_) => MAX_ORPHAN_REPAIR_RESPONSES as u32,
+            ShredRepairType::Shred(_, _) | ShredRepairType::HighestShred(_, _) => 1,
         }
     }
     fn verify_response(&self, response_shred: &Shred) -> bool {
@@ -307,18 +306,17 @@ impl RepairProtocol {
     fn max_response_packets(&self) -> usize {
         match self {
             RepairProtocol::WindowIndex { .. }
-            | RepairProtocol::LegacyWindowIndexWithNonce(_, _, _, _)
             | RepairProtocol::HighestWindowIndex { .. }
-            | RepairProtocol::LegacyHighestWindowIndexWithNonce(_, _, _, _)
-            | RepairProtocol::AncestorHashes { .. }
-            | RepairProtocol::LegacyAncestorHashes(_, _, _) => 1,
-            RepairProtocol::Orphan { .. } | RepairProtocol::LegacyOrphanWithNonce(_, _, _) => {
-                MAX_ORPHAN_REPAIR_RESPONSES
-            }
+            | RepairProtocol::AncestorHashes { .. } => 1,
+            RepairProtocol::Orphan { .. } => MAX_ORPHAN_REPAIR_RESPONSES,
             RepairProtocol::Pong(_) => 0, // no response
             RepairProtocol::LegacyWindowIndex(_, _, _)
             | RepairProtocol::LegacyHighestWindowIndex(_, _, _)
-            | RepairProtocol::LegacyOrphan(_, _) => 0, // unsupported
+            | RepairProtocol::LegacyOrphan(_, _)
+            | RepairProtocol::LegacyWindowIndexWithNonce(_, _, _, _)
+            | RepairProtocol::LegacyHighestWindowIndexWithNonce(_, _, _, _)
+            | RepairProtocol::LegacyOrphanWithNonce(_, _, _)
+            | RepairProtocol::LegacyAncestorHashes(_, _, _) => 0, // unsupported
         }
     }
 
@@ -2295,9 +2293,9 @@ mod tests {
         let repair = ShredRepairType::Orphan(9);
         // Ensure new options are addded to this test
         match repair {
-            ShredRepairType::Orphan(_) => (),
-            ShredRepairType::HighestShred(_, _) => (),
-            ShredRepairType::Shred(_, _) => (),
+            ShredRepairType::Orphan(_)
+            | ShredRepairType::HighestShred(_, _)
+            | ShredRepairType::Shred(_, _) => (),
         };
 
         let slot = 9;