Skip to content

Commit

Permalink
Renames fn to update_accounts_hash_for_tests() (solana-labs#28571)
Browse files Browse the repository at this point in the history
  • Loading branch information
@brooksprumo
brooksprumo authored Oct 25, 2022
1 parent 8c57efb commit e79c1cb
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 67 deletions.
9 changes: 3 additions & 6 deletions accounts-bench/src/main.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -120,12 +120,9 @@ fn main() {
} else {
let mut pubkeys: Vec<Pubkey> = vec![];
let mut time = Measure::start("hash");
let results = accounts.accounts_db.update_accounts_hash(
0,
&ancestors,
&EpochSchedule::default(),
&RentCollector::default(),
);
let results = accounts
.accounts_db
.update_accounts_hash_for_tests(0, &ancestors, false, false);
time.stop();
let mut time_store = Measure::start("hash using store");
let results_store = accounts.accounts_db.update_accounts_hash_with_index_option(
Expand Down
18 changes: 6 additions & 12 deletions runtime/benches/accounts.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,12 +94,9 @@ fn test_accounts_hash_bank_hash(bencher: &mut Bencher) {
let slot = 0;
create_test_accounts(&accounts, &mut pubkeys, num_accounts, slot);
let ancestors = Ancestors::from(vec![0]);
let (_, total_lamports) = accounts.accounts_db.update_accounts_hash(
0,
&ancestors,
&EpochSchedule::default(),
&RentCollector::default(),
);
let (_, total_lamports) = accounts
.accounts_db
.update_accounts_hash_for_tests(0, &ancestors, false, false);
let test_hash_calculation = false;
bencher.iter(|| {
assert!(accounts.verify_bank_hash_and_lamports(
Expand Down Expand Up @@ -130,12 +127,9 @@ fn test_update_accounts_hash(bencher: &mut Bencher) {
create_test_accounts(&accounts, &mut pubkeys, 50_000, 0);
let ancestors = Ancestors::from(vec![0]);
bencher.iter(|| {
accounts.accounts_db.update_accounts_hash(
0,
&ancestors,
&EpochSchedule::default(),
&RentCollector::default(),
);
accounts
.accounts_db
.update_accounts_hash_for_tests(0, &ancestors, false, false);
});
}

Expand Down
64 changes: 15 additions & 49 deletions runtime/src/accounts_db.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6920,36 +6920,22 @@ impl AccountsDb {
bank_hash_info.snapshot_hash
}

pub fn update_accounts_hash(
pub fn update_accounts_hash_for_tests(
&self,
slot: Slot,
ancestors: &Ancestors,
epoch_schedule: &EpochSchedule,
rent_collector: &RentCollector,
debug_verify: bool,
is_startup: bool,
) -> (Hash, u64) {
self.update_accounts_hash_with_index_option(
true,
false,
slot,
ancestors,
None,
epoch_schedule,
rent_collector,
false,
)
}

#[cfg(test)]
fn update_accounts_hash_test(&self, slot: Slot, ancestors: &Ancestors) -> (Hash, u64) {
self.update_accounts_hash_with_index_option(
true,
true,
debug_verify,
slot,
ancestors,
None,
&EpochSchedule::default(),
&RentCollector::default(),
true,
is_startup,
)
}

Expand Down Expand Up @@ -11748,18 +11734,8 @@ pub mod tests {

let ancestors = linear_ancestors(latest_slot);
assert_eq!(
daccounts.update_accounts_hash(
latest_slot,
&ancestors,
&EpochSchedule::default(),
&RentCollector::default(),
),
accounts.update_accounts_hash(
latest_slot,
&ancestors,
&EpochSchedule::default(),
&RentCollector::default(),
)
daccounts.update_accounts_hash_for_tests(latest_slot, &ancestors, false, false,),
accounts.update_accounts_hash_for_tests(latest_slot, &ancestors, false, false,)
);
}

Expand Down Expand Up @@ -11915,12 +11891,12 @@ pub mod tests {

let ancestors = linear_ancestors(current_slot);
info!("ancestors: {:?}", ancestors);
let hash = accounts.update_accounts_hash_test(current_slot, &ancestors);
let hash = accounts.update_accounts_hash_for_tests(current_slot, &ancestors, true, true);

accounts.clean_accounts_for_tests();

assert_eq!(
accounts.update_accounts_hash_test(current_slot, &ancestors),
accounts.update_accounts_hash_for_tests(current_slot, &ancestors, true, true),
hash
);

Expand Down Expand Up @@ -12037,12 +12013,7 @@ pub mod tests {
accounts.add_root(current_slot);

accounts.print_accounts_stats("pre_f");
accounts.update_accounts_hash(
4,
&Ancestors::default(),
&EpochSchedule::default(),
&RentCollector::default(),
);
accounts.update_accounts_hash_for_tests(4, &Ancestors::default(), false, false);

let accounts = f(accounts, current_slot);

Expand Down Expand Up @@ -12471,7 +12442,7 @@ pub mod tests {

db.store_uncached(some_slot, &[(&key, &account)]);
db.add_root(some_slot);
db.update_accounts_hash_test(some_slot, &ancestors);
db.update_accounts_hash_for_tests(some_slot, &ancestors, true, true);
assert_matches!(
db.verify_bank_hash_and_lamports(
some_slot,
Expand Down Expand Up @@ -12537,7 +12508,7 @@ pub mod tests {

db.store_uncached(some_slot, &[(&key, &account)]);
db.add_root(some_slot);
db.update_accounts_hash_test(some_slot, &ancestors);
db.update_accounts_hash_for_tests(some_slot, &ancestors, true, true);
assert_matches!(
db.verify_bank_hash_and_lamports(
some_slot,
Expand All @@ -12559,7 +12530,7 @@ pub mod tests {
&solana_sdk::native_loader::create_loadable_account_for_test("foo"),
)],
);
db.update_accounts_hash_test(some_slot, &ancestors);
db.update_accounts_hash_for_tests(some_slot, &ancestors, true, true);
assert_matches!(
db.verify_bank_hash_and_lamports(
some_slot,
Expand Down Expand Up @@ -12592,7 +12563,7 @@ pub mod tests {
.unwrap()
.insert(some_slot, BankHashInfo::default());
db.add_root(some_slot);
db.update_accounts_hash_test(some_slot, &ancestors);
db.update_accounts_hash_for_tests(some_slot, &ancestors, true, true);
assert_matches!(
db.verify_bank_hash_and_lamports(
some_slot,
Expand Down Expand Up @@ -13250,12 +13221,7 @@ pub mod tests {
);

let no_ancestors = Ancestors::default();
accounts.update_accounts_hash(
current_slot,
&no_ancestors,
&EpochSchedule::default(),
&RentCollector::default(),
);
accounts.update_accounts_hash_for_tests(current_slot, &no_ancestors, false, false);
accounts
.verify_bank_hash_and_lamports(
current_slot,
Expand Down

0 comments on commit e79c1cb

Please sign in to comment.