Skip to content

Commit

Permalink
rebase cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
bw-solana committed Jan 17, 2025
1 parent 7b96b48 commit c8505e5
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 5 deletions.
4 changes: 2 additions & 2 deletions core/src/repair/repair_generic_traversal.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ use {
repair::{repair_service::RepairService, serve_repair::ShredRepairType},
},
solana_ledger::{blockstore::Blockstore, blockstore_meta::SlotMeta},
solana_sdk::{clock::Slot, hash::Hash, timing::timestamp},
std::collections::{hash_map::Entry, HashMap, HashSet},
solana_sdk::{clock::Slot, hash::Hash},
std::collections::{HashMap, HashSet},
};

struct GenericTraversal<'a> {
Expand Down
5 changes: 2 additions & 3 deletions core/src/repair/repair_weight.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ use {
consensus::{heaviest_subtree_fork_choice::HeaviestSubtreeForkChoice, tree_diff::TreeDiff},
repair::{
repair_generic_traversal::{get_closest_completion, get_unknown_last_index},
repair_service::{BestRepairsStats, RepairService, RepairTiming},
repair_service::{RepairMetrics, RepairService},
repair_weighted_traversal,
serve_repair::ShredRepairType,
},
Expand All @@ -19,10 +19,9 @@ use {
epoch_schedule::{Epoch, EpochSchedule},
hash::Hash,
pubkey::Pubkey,
timing::timestamp,
},
std::{
collections::{hash_map::Entry, HashMap, HashSet, VecDeque},
collections::{HashMap, HashSet, VecDeque},
iter,
},
};
Expand Down

0 comments on commit c8505e5

Please sign in to comment.