Fix repair_weight test bad merge failure (#30649)

This commit is contained in:
Ashwin Sekar 2023-03-08 20:23:37 -08:00 committed by GitHub
parent 569c5fd9d6
commit 11e554b922
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 5 deletions

View File

@ -372,10 +372,9 @@ impl RepairWeight {
.copied()
.map(|root| match root {
TreeRoot::Root(r) => r,
TreeRoot::PrunedRoot(r) => panic!(
"New root {} chains to a pruned tree with root {}",
new_root, r
),
TreeRoot::PrunedRoot(r) => {
panic!("New root {new_root} chains to a pruned tree with root {r}")
}
});
// Purge outdated trees from `self.trees`
@ -847,7 +846,7 @@ mod test {
blockstore::{make_chaining_slot_entries, Blockstore},
get_tmp_ledger_path,
},
solana_runtime::{bank::Bank, bank_utils},
solana_runtime::{bank::Bank, bank_utils, contains::Contains},
solana_sdk::hash::Hash,
trees::tr,
};