From 5472d2e605a6105134c4fab4c75b704344b9e554 Mon Sep 17 00:00:00 2001 From: Jason Davis Date: Wed, 13 Apr 2022 14:55:00 -0500 Subject: [PATCH] Removing redundant EpochSchedule param from fns --- accounts-bench/src/main.rs | 2 -- core/src/accounts_hash_verifier.rs | 1 - runtime/benches/accounts.rs | 3 -- runtime/src/accounts.rs | 4 --- runtime/src/accounts_background_service.rs | 1 - runtime/src/accounts_db.rs | 32 +--------------------- runtime/src/accounts_hash.rs | 1 - runtime/src/bank.rs | 2 -- 8 files changed, 1 insertion(+), 45 deletions(-) diff --git a/accounts-bench/src/main.rs b/accounts-bench/src/main.rs index 987915d8c..5641ddfb8 100644 --- a/accounts-bench/src/main.rs +++ b/accounts-bench/src/main.rs @@ -123,7 +123,6 @@ fn main() { let results = accounts.accounts_db.update_accounts_hash( 0, &ancestors, - &EpochSchedule::default(), &RentCollector::default(), ); time.stop(); @@ -135,7 +134,6 @@ fn main() { &ancestors, None, false, - &EpochSchedule::default(), &RentCollector::default(), false, ); diff --git a/core/src/accounts_hash_verifier.rs b/core/src/accounts_hash_verifier.rs index 6a2f769e3..93fc692fc 100644 --- a/core/src/accounts_hash_verifier.rs +++ b/core/src/accounts_hash_verifier.rs @@ -139,7 +139,6 @@ impl AccountsHashVerifier { check_hash: false, ancestors: None, use_write_cache: false, - epoch_schedule: &accounts_package.epoch_schedule, rent_collector: &accounts_package.rent_collector, }, &sorted_storages, diff --git a/runtime/benches/accounts.rs b/runtime/benches/accounts.rs index 24ad6761d..402082889 100644 --- a/runtime/benches/accounts.rs +++ b/runtime/benches/accounts.rs @@ -112,7 +112,6 @@ fn test_accounts_hash_bank_hash(bencher: &mut Bencher) { let (_, total_lamports) = accounts.accounts_db.update_accounts_hash( 0, &ancestors, - &EpochSchedule::default(), &RentCollector::default(), ); let test_hash_calculation = false; @@ -122,7 +121,6 @@ fn test_accounts_hash_bank_hash(bencher: &mut Bencher) { &ancestors, total_lamports, test_hash_calculation, - &EpochSchedule::default(), &RentCollector::default() )) }); @@ -145,7 +143,6 @@ fn test_update_accounts_hash(bencher: &mut Bencher) { accounts.accounts_db.update_accounts_hash( 0, &ancestors, - &EpochSchedule::default(), &RentCollector::default(), ); }); diff --git a/runtime/src/accounts.rs b/runtime/src/accounts.rs index f3fbdca6b..fdb64e5d9 100644 --- a/runtime/src/accounts.rs +++ b/runtime/src/accounts.rs @@ -747,7 +747,6 @@ impl Accounts { slot: Slot, can_cached_slot_be_unflushed: bool, debug_verify: bool, - epoch_schedule: &EpochSchedule, rent_collector: &RentCollector, ) -> u64 { let use_index = false; @@ -760,7 +759,6 @@ impl Accounts { ancestors, None, can_cached_slot_be_unflushed, - epoch_schedule, rent_collector, is_startup, ) @@ -775,7 +773,6 @@ impl Accounts { ancestors: &Ancestors, total_lamports: u64, test_hash_calculation: bool, - epoch_schedule: &EpochSchedule, rent_collector: &RentCollector, ) -> bool { if let Err(err) = self.accounts_db.verify_bank_hash_and_lamports_new( @@ -783,7 +780,6 @@ impl Accounts { ancestors, total_lamports, test_hash_calculation, - epoch_schedule, rent_collector, ) { warn!("verify_bank_hash failed: {:?}", err); diff --git a/runtime/src/accounts_background_service.rs b/runtime/src/accounts_background_service.rs index 27b3f8568..3d3bea824 100644 --- a/runtime/src/accounts_background_service.rs +++ b/runtime/src/accounts_background_service.rs @@ -233,7 +233,6 @@ impl SnapshotRequestHandler { check_hash, ancestors: None, use_write_cache: false, - epoch_schedule: snapshot_root_bank.epoch_schedule(), rent_collector: snapshot_root_bank.rent_collector(), }, ).unwrap(); diff --git a/runtime/src/accounts_db.rs b/runtime/src/accounts_db.rs index 61dd8ce7c..fde34320d 100644 --- a/runtime/src/accounts_db.rs +++ b/runtime/src/accounts_db.rs @@ -5274,7 +5274,6 @@ impl AccountsDb { &self, slot: Slot, ancestors: &Ancestors, - epoch_schedule: &EpochSchedule, rent_collector: &RentCollector, ) -> (Hash, u64) { self.update_accounts_hash_with_index_option( @@ -5284,7 +5283,6 @@ impl AccountsDb { ancestors, None, false, - epoch_schedule, rent_collector, false, ) @@ -5298,7 +5296,6 @@ impl AccountsDb { ancestors, None, false, - &EpochSchedule::default(), &RentCollector::default(), false, ) @@ -5554,7 +5551,7 @@ impl AccountsDb { Some(slot), ); - self.mark_old_slots_as_dirty(&storages, Some(config.epoch_schedule.slots_per_epoch)); + self.mark_old_slots_as_dirty(&storages, Some(config.rent_collector.epoch_schedule.slots_per_epoch)); sort_time.stop(); let mut timings = HashStats { @@ -5608,7 +5605,6 @@ impl AccountsDb { ancestors: &Ancestors, expected_capitalization: Option, can_cached_slot_be_unflushed: bool, - epoch_schedule: &EpochSchedule, rent_collector: &RentCollector, is_startup: bool, ) -> (Hash, u64) { @@ -5623,7 +5619,6 @@ impl AccountsDb { check_hash, ancestors: Some(ancestors), use_write_cache: can_cached_slot_be_unflushed, - epoch_schedule, rent_collector, }, expected_capitalization, @@ -5831,7 +5826,6 @@ impl AccountsDb { ancestors: &Ancestors, total_lamports: u64, test_hash_calculation: bool, - epoch_schedule: &EpochSchedule, rent_collector: &RentCollector, ) -> Result<(), BankHashVerificationError> { self.verify_bank_hash_and_lamports_new( @@ -5839,7 +5833,6 @@ impl AccountsDb { ancestors, total_lamports, test_hash_calculation, - epoch_schedule, rent_collector, ) } @@ -5851,7 +5844,6 @@ impl AccountsDb { ancestors: &Ancestors, total_lamports: u64, test_hash_calculation: bool, - epoch_schedule: &EpochSchedule, rent_collector: &RentCollector, ) -> Result<(), BankHashVerificationError> { use BankHashVerificationError::*; @@ -5870,7 +5862,6 @@ impl AccountsDb { check_hash, ancestors: Some(ancestors), use_write_cache: can_cached_slot_be_unflushed, - epoch_schedule, rent_collector, }, None, @@ -7630,7 +7621,6 @@ pub mod tests { check_hash, ancestors: None, use_write_cache: false, - epoch_schedule: &EpochSchedule::default(), rent_collector: &RentCollector::default(), }, None, @@ -8019,7 +8009,6 @@ pub mod tests { check_hash: false, ancestors: None, use_write_cache: false, - epoch_schedule: &EpochSchedule::default(), rent_collector: &RentCollector::default(), }, &get_storage_refs(&storages), @@ -8048,7 +8037,6 @@ pub mod tests { check_hash: false, ancestors: None, use_write_cache: false, - epoch_schedule: &EpochSchedule::default(), rent_collector: &RentCollector::default(), }, &get_storage_refs(&storages), @@ -8110,7 +8098,6 @@ pub mod tests { check_hash: false, ancestors: None, use_write_cache: false, - epoch_schedule: &EpochSchedule::default(), rent_collector: &RentCollector::default(), }, &get_storage_refs(&storages), @@ -9481,13 +9468,11 @@ pub mod tests { daccounts.update_accounts_hash( latest_slot, &ancestors, - &EpochSchedule::default(), &RentCollector::default() ), accounts.update_accounts_hash( latest_slot, &ancestors, - &EpochSchedule::default(), &RentCollector::default() ) ); @@ -9771,7 +9756,6 @@ pub mod tests { accounts.update_accounts_hash( 4, &Ancestors::default(), - &EpochSchedule::default(), &RentCollector::default(), ); @@ -9790,7 +9774,6 @@ pub mod tests { &Ancestors::default(), 1222, true, - &EpochSchedule::default(), &RentCollector::default(), ) .unwrap(); @@ -10102,7 +10085,6 @@ pub mod tests { check_hash, ancestors: Some(&ancestors), use_write_cache: false, - epoch_schedule: &EpochSchedule::default(), rent_collector: &RentCollector::default(), }, ) @@ -10134,7 +10116,6 @@ pub mod tests { check_hash, ancestors: Some(&ancestors), use_write_cache: false, - epoch_schedule: &EpochSchedule::default(), rent_collector: &RentCollector::default(), }, ) @@ -10147,7 +10128,6 @@ pub mod tests { check_hash, ancestors: Some(&ancestors), use_write_cache: false, - epoch_schedule: &EpochSchedule::default(), rent_collector: &RentCollector::default(), }, ) @@ -10176,7 +10156,6 @@ pub mod tests { &ancestors, 1, true, - &EpochSchedule::default(), &RentCollector::default() ), Ok(_) @@ -10189,7 +10168,6 @@ pub mod tests { &ancestors, 1, true, - &EpochSchedule::default(), &RentCollector::default() ), Err(MissingBankHash) @@ -10211,7 +10189,6 @@ pub mod tests { &ancestors, 1, true, - &EpochSchedule::default(), &RentCollector::default() ), Err(MismatchedBankHash) @@ -10239,7 +10216,6 @@ pub mod tests { &ancestors, 1, true, - &EpochSchedule::default(), &RentCollector::default() ), Ok(_) @@ -10260,7 +10236,6 @@ pub mod tests { &ancestors, 2, true, - &EpochSchedule::default(), &RentCollector::default() ), Ok(_) @@ -10292,7 +10267,6 @@ pub mod tests { &ancestors, 0, true, - &EpochSchedule::default(), &RentCollector::default() ), Ok(_) @@ -10329,7 +10303,6 @@ pub mod tests { &ancestors, 1, true, - &EpochSchedule::default(), &RentCollector::default() ), Err(MismatchedBankHash) @@ -10938,7 +10911,6 @@ pub mod tests { accounts.update_accounts_hash( current_slot, &no_ancestors, - &EpochSchedule::default(), &RentCollector::default(), ); accounts @@ -10947,7 +10919,6 @@ pub mod tests { &no_ancestors, 22300, true, - &EpochSchedule::default(), &RentCollector::default(), ) .unwrap(); @@ -10959,7 +10930,6 @@ pub mod tests { &no_ancestors, 22300, true, - &EpochSchedule::default(), &RentCollector::default(), ) .unwrap(); diff --git a/runtime/src/accounts_hash.rs b/runtime/src/accounts_hash.rs index 24939a467..1c08a3e1e 100644 --- a/runtime/src/accounts_hash.rs +++ b/runtime/src/accounts_hash.rs @@ -41,7 +41,6 @@ pub struct CalcAccountsHashConfig<'a> { /// does hash calc need to consider account data that exists in the write cache? /// if so, 'ancestors' will be used for this purpose as well as storages. pub use_write_cache: bool, - pub epoch_schedule: &'a EpochSchedule, pub rent_collector: &'a RentCollector, } diff --git a/runtime/src/bank.rs b/runtime/src/bank.rs index 1712878ba..6b87c7581 100644 --- a/runtime/src/bank.rs +++ b/runtime/src/bank.rs @@ -6030,7 +6030,6 @@ impl Bank { &self.ancestors, Some(self.capitalization()), false, - self.epoch_schedule(), &self.rent_collector, is_startup, ); @@ -6056,7 +6055,6 @@ impl Bank { &self.ancestors, Some(self.capitalization()), false, - self.epoch_schedule(), &self.rent_collector, is_startup, );