revert test change

ledger/src/blockstore_processor.rs

@@ -3123,6 +3123,7 @@ pub mod tests {
         let result = process_entries_for_tests_without_scheduler(&bank, vec![entry]);
         bank.freeze();
         let blockhash_ok = bank.last_blockhash();
+        let bankhash_ok = bank.hash();
         assert!(result.is_ok());
 
         declare_process_instruction!(MockBuiltinErr, 1, |invoke_context| {
@@ -3142,7 +3143,6 @@ pub mod tests {
         });
 
         let mut bankhash_err = None;
-        let bankhash_ok = bank.hash();
 
         (0..get_instruction_errors().len()).for_each(|err| {
             let mut bank = Bank::new_for_tests(&genesis_config);

runtime/src/bank.rs

@@ -67,7 +67,6 @@ use {
         slice::ParallelSlice,
         ThreadPool, ThreadPoolBuilder,
     },
-    solana_accounts_db::rent_collector::RENT_EXEMPT_RENT_EPOCH,
     solana_accounts_db::{
         account_overrides::AccountOverrides,
         accounts::{
@@ -90,7 +89,7 @@ use {
         epoch_accounts_hash::EpochAccountsHash,
         nonce_info::{NonceInfo, NoncePartial},
         partitioned_rewards::PartitionedEpochRewardsConfig,
-        rent_collector::{CollectedInfo, RentCollector},
+        rent_collector::{CollectedInfo, RentCollector, RENT_EXEMPT_RENT_EPOCH},
         rent_debits::RentDebits,
         sorted_storages::SortedStorages,
         stake_rewards::{RewardInfo, StakeReward},
@@ -121,7 +120,6 @@ use {
         sysvar_cache::SysvarCache,
         timings::{ExecuteDetailsTimings, ExecuteTimingType, ExecuteTimings},
     },
-    solana_sdk::rent::RentDue,
     solana_sdk::{
         account::{
             create_account_shared_data_with_fields as create_account, from_account, Account,
@@ -161,6 +159,7 @@ use {
         packet::PACKET_DATA_SIZE,
         precompiles::get_precompiles,
         pubkey::Pubkey,
+        rent::RentDue,
         saturating_add_assign,
         signature::{Keypair, Signature},
         slot_hashes::SlotHashes,