remove expected rent collection and rehashing completely

solana-labs · Oct 17, 2022 · b255ed6 · b255ed6
1 parent 54b42e6
commit b255ed6
Show file tree

Hide file tree

Showing 12 changed files with 4 additions and 1,438 deletions.
diff --git a/accounts-bench/src/main.rs b/accounts-bench/src/main.rs
@@ -125,7 +125,6 @@ fn main() {
                 &ancestors,
                 &EpochSchedule::default(),
                 &RentCollector::default(),
-                true,
             );
             time.stop();
             let mut time_store = Measure::start("hash using store");
@@ -137,7 +136,6 @@ fn main() {
                 None,
                 &EpochSchedule::default(),
                 &RentCollector::default(),
-                false,
                 true,
             );
             time_store.stop();

diff --git a/core/src/accounts_hash_verifier.rs b/core/src/accounts_hash_verifier.rs
@@ -232,7 +232,6 @@ impl AccountsHashVerifier {
                     rent_collector: &accounts_package.rent_collector,
                     store_detailed_debug_info_on_failure: false,
                     full_snapshot: None,
-                    enable_rehashing: accounts_package.enable_rehashing,
                 },
                 &sorted_storages,
                 timings,
@@ -255,7 +254,6 @@ impl AccountsHashVerifier {
                         rent_collector: &accounts_package.rent_collector,
                         store_detailed_debug_info_on_failure: false,
                         full_snapshot: None,
-                        enable_rehashing: accounts_package.enable_rehashing,
                     },
                 );
             info!(
@@ -275,7 +273,6 @@ impl AccountsHashVerifier {
                         // now that we've failed, store off the failing contents that produced a bad capitalization
                         store_detailed_debug_info_on_failure: true,
                         full_snapshot: None,
-                        enable_rehashing: accounts_package.enable_rehashing,
                     },
                     &sorted_storages,
                     HashStats::default(),
@@ -564,7 +561,6 @@ mod tests {
                 accounts: Arc::clone(&accounts),
                 epoch_schedule: EpochSchedule::default(),
                 rent_collector: RentCollector::default(),
-                enable_rehashing: true,
             };
 
             AccountsHashVerifier::process_accounts_package(

diff --git a/core/tests/epoch_accounts_hash.rs b/core/tests/epoch_accounts_hash.rs
@@ -320,7 +320,6 @@ fn test_epoch_accounts_hash_basic(test_environment: TestEnvironment) {
                         rent_collector: bank.rent_collector(),
                         store_detailed_debug_info_on_failure: false,
                         full_snapshot: None,
-                        enable_rehashing: true,
                     },
                 )
                 .unwrap();

diff --git a/runtime/benches/accounts.rs b/runtime/benches/accounts.rs
@@ -99,7 +99,6 @@ fn test_accounts_hash_bank_hash(bencher: &mut Bencher) {
         &ancestors,
         &EpochSchedule::default(),
         &RentCollector::default(),
-        true,
     );
     let test_hash_calculation = false;
     bencher.iter(|| {
@@ -112,7 +111,6 @@ fn test_accounts_hash_bank_hash(bencher: &mut Bencher) {
             &RentCollector::default(),
             false,
             false,
-            true,
             false,
         ))
     });
@@ -137,7 +135,6 @@ fn test_update_accounts_hash(bencher: &mut Bencher) {
             &ancestors,
             &EpochSchedule::default(),
             &RentCollector::default(),
-            true,
         );
     });
 }

diff --git a/runtime/src/accounts.rs b/runtime/src/accounts.rs
@@ -787,7 +787,6 @@ impl Accounts {
         debug_verify: bool,
         epoch_schedule: &EpochSchedule,
         rent_collector: &RentCollector,
-        enable_rehashing: bool,
     ) -> u64 {
         let use_index = false;
         let is_startup = true;
@@ -804,7 +803,6 @@ impl Accounts {
                 epoch_schedule,
                 rent_collector,
                 is_startup,
-                enable_rehashing,
             )
             .1
     }
@@ -822,7 +820,6 @@ impl Accounts {
         rent_collector: &RentCollector,
         ignore_mismatch: bool,
         store_detailed_debug_info: bool,
-        enable_rehashing: bool,
         use_bg_thread_pool: bool,
     ) -> bool {
         if let Err(err) = self.accounts_db.verify_bank_hash_and_lamports_new(
@@ -834,7 +831,6 @@ impl Accounts {
             rent_collector,
             ignore_mismatch,
             store_detailed_debug_info,
-            enable_rehashing,
             use_bg_thread_pool,
         ) {
             warn!("verify_bank_hash failed: {:?}, slot: {}", err, slot);

diff --git a/runtime/src/accounts_background_service.rs b/runtime/src/accounts_background_service.rs
@@ -340,8 +340,6 @@ impl SnapshotRequestHandler {
                         rent_collector: snapshot_root_bank.rent_collector(),
                         store_detailed_debug_info_on_failure: false,
                         full_snapshot: None,
-                        enable_rehashing: snapshot_root_bank
-                            .bank_enable_rehashing_on_accounts_hash(),
                     },
                 )
                 .unwrap();