cleanup

anza-xyz · Jan 16, 2025 · 4b73cae · 4b73cae
1 parent 334abba
commit 4b73cae
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 20 deletions.
diff --git a/core/src/repair/repair_generic_traversal.rs b/core/src/repair/repair_generic_traversal.rs
@@ -75,7 +75,6 @@ pub fn get_unknown_last_index(
     unknown_last.sort_by(|(_, _, count1), (_, _, count2)| count2.cmp(count1));
     unknown_last
         .iter()
-        .take(limit)
         .map(|(slot, received, _)| ShredRepairType::HighestShred(*slot, *received))
         .filter(|repair_request| {
             if !outstanding_repairs.contains_key(repair_request) {
@@ -85,6 +84,7 @@ pub fn get_unknown_last_index(
                 false
             }
         })
+        .take(limit)
         .collect()
 }
 

diff --git a/core/src/repair/repair_service.rs b/core/src/repair/repair_service.rs
@@ -430,19 +430,6 @@ impl RepairService {
                     ),
                 };
 
-                // Filter out repair requests that are duplicates and haven't timed out.
-                let repairs = repairs
-                    .into_iter()
-                    .filter(|repair_request| {
-                        if !outstanding_repairs.contains_key(repair_request) {
-                            outstanding_repairs.insert(*repair_request, timestamp());
-                            true
-                        } else {
-                            false
-                        }
-                    })
-                    .collect::<Vec<_>>();
-
                 let mut popular_pruned_forks = repair_weight.get_popular_pruned_forks(
                     root_bank.epoch_stakes_map(),
                     root_bank.epoch_schedule(),
@@ -1225,7 +1212,7 @@ mod test {
                 MAX_CLOSEST_COMPLETION_REPAIRS,
                 &mut RepairTiming::default(),
                 &mut BestRepairsStats::default(),
-                &mut HashMap::new(),
+                &mut HashMap::default(),
             ),
             vec![
                 ShredRepairType::Orphan(2),
@@ -1258,7 +1245,7 @@ mod test {
                 MAX_CLOSEST_COMPLETION_REPAIRS,
                 &mut RepairTiming::default(),
                 &mut BestRepairsStats::default(),
-                &mut HashMap::new(),
+                &mut HashMap::default(),
             ),
             vec![ShredRepairType::HighestShred(0, 0)]
         );
@@ -1316,7 +1303,7 @@ mod test {
                 MAX_CLOSEST_COMPLETION_REPAIRS,
                 &mut RepairTiming::default(),
                 &mut BestRepairsStats::default(),
-                &mut HashMap::new(),
+                &mut HashMap::default(),
             ),
             expected
         );
@@ -1332,7 +1319,7 @@ mod test {
                 MAX_CLOSEST_COMPLETION_REPAIRS,
                 &mut RepairTiming::default(),
                 &mut BestRepairsStats::default(),
-                &mut HashMap::new(),
+                &mut HashMap::default(),
             )[..],
             expected[0..expected.len() - 2]
         );
@@ -1376,7 +1363,7 @@ mod test {
                 MAX_CLOSEST_COMPLETION_REPAIRS,
                 &mut RepairTiming::default(),
                 &mut BestRepairsStats::default(),
-                &mut HashMap::new(),
+                &mut HashMap::default(),
             ),
             expected
         );

diff --git a/core/src/repair/repair_weight.rs b/core/src/repair/repair_weight.rs
@@ -1512,7 +1512,7 @@ mod test {
             bank.epoch_stakes_map(),
             bank.epoch_schedule(),
             1,
-            &mut outstanding_repairs,
+            &mut HashMap::default(),
         );
         assert_eq!(
             repair_weight