Make RentCollector crate-private, expose rent() directly

Author: joncinque

core/src/banking_stage/consumer.rs

@@ -473,7 +473,7 @@ impl Consumer {
             &mut fee_payer_account,
             0,
             error_counters,
-            &bank.rent_collector().rent,
+            bank.rent(),
             fee,
         )
     }

rpc/src/rpc.rs

@@ -6407,7 +6407,7 @@ pub mod tests {
         let to_pubkey = to.pubkey();
 
         let space = 0;
-        let lamports = bank.rent_collector().rent.minimum_balance(space);
+        let lamports = bank.rent().minimum_balance(space);
         let owner_pubkey = Pubkey::new_unique();
 
         let instruction = TestBuiltinEntrypoint::instruction(

rpc/src/rpc_pubsub.rs

@@ -915,7 +915,7 @@ mod tests {
 
         let balance = {
             let bank = bank_forks.read().unwrap().working_bank();
-            let rent = &bank.rent_collector().rent;
+            let rent = bank.rent();
             rent.minimum_balance(StakeStateV2::size_of())
         };
 
@@ -969,7 +969,7 @@ mod tests {
 
         let balance = {
             let bank = bank_forks.read().unwrap().working_bank();
-            let rent = &bank.rent_collector().rent;
+            let rent = bank.rent();
             rent.minimum_balance(0)
         };
         let tx =

runtime/src/bank.rs

@@ -116,6 +116,7 @@ use {
         invoke_context::BuiltinFunctionWithContext, loaded_programs::ProgramCacheEntry,
     },
     solana_pubkey::Pubkey,
+    solana_rent::Rent,
     solana_reward_info::RewardInfo,
     solana_runtime_transaction::{
         runtime_transaction::RuntimeTransaction, transaction_with_meta::TransactionWithMeta,
@@ -469,7 +470,7 @@ pub struct BankFieldsToSerialize {
     pub collector_id: Pubkey,
     pub collector_fees: u64,
     pub fee_rate_governor: FeeRateGovernor,
-    pub rent_collector: RentCollector,
+    pub(crate) rent_collector: RentCollector,
     pub epoch_schedule: EpochSchedule,
     pub inflation: Inflation,
     pub stakes: Stakes<StakeAccount<Delegation>>,
@@ -4917,9 +4918,9 @@ impl Bank {
         *self.inflation.read().unwrap()
     }
 
-    /// Return the rent collector for this Bank
-    pub fn rent_collector(&self) -> &RentCollector {
-        &self.rent_collector
+    /// Return the rent for this Bank
+    pub fn rent(&self) -> &Rent {
+        &self.rent_collector.rent
     }
 
     /// Return the total capitalization of the Bank

runtime/src/bank/fee_distribution.rs

@@ -153,15 +153,13 @@ impl Bank {
             return Err(DepositFeeError::InvalidAccountOwner);
         }
 
-        let recipient_pre_rent_state =
-            get_account_rent_state(&self.rent_collector().rent, &account);
+        let recipient_pre_rent_state = get_account_rent_state(self.rent(), &account);
         let distribution = account.checked_add_lamports(fees);
         if distribution.is_err() {
             return Err(DepositFeeError::LamportOverflow);
         }
 
-        let recipient_post_rent_state =
-            get_account_rent_state(&self.rent_collector().rent, &account);
+        let recipient_post_rent_state = get_account_rent_state(self.rent(), &account);
         let rent_state_transition_allowed =
             transition_allowed(&recipient_pre_rent_state, &recipient_post_rent_state);
         if !rent_state_transition_allowed {

runtime/src/bank/tests.rs

@@ -3101,7 +3101,7 @@ fn test_bank_cloned_stake_delegations() {
                                             // to have a stake delegation
 
     let (vote_balance, stake_balance) = {
-        let rent = &bank.rent_collector().rent;
+        let rent = bank.rent();
         let vote_rent_exempt_reserve = rent.minimum_balance(VoteState::size_of());
         let stake_rent_exempt_reserve = rent.minimum_balance(StakeStateV2::size_of());
         let minimum_delegation = solana_stake_program::get_minimum_delegation(
@@ -10615,8 +10615,7 @@ fn test_cap_accounts_data_allocations_per_transaction() {
         let instruction = system_instruction::create_account(
             &mint_keypair.pubkey(),
             &keypair.pubkey(),
-            bank.rent_collector()
-                .rent
+            bank.rent()
                 .minimum_balance(MAX_PERMITTED_DATA_LENGTH as usize),
             MAX_PERMITTED_DATA_LENGTH,
             &solana_system_interface::program::id(),

runtime/src/rent_collector.rs

@@ -5,7 +5,7 @@ use {
 
 #[cfg_attr(feature = "frozen-abi", derive(solana_frozen_abi_macro::AbiExample))]
 #[derive(Clone, Debug, PartialEq, serde_derive::Deserialize, serde_derive::Serialize)]
-pub struct RentCollector {
+pub(crate) struct RentCollector {
     pub epoch: Epoch,
     pub epoch_schedule: EpochSchedule,
     pub slots_per_year: f64,

runtime/src/serde_snapshot.rs

@@ -854,7 +854,7 @@ where
         reconstructed_accounts_db_info.accounts_data_len,
     );
 
-    info!("rent_collector: {:?}", bank.rent_collector());
+    info!("rent: {:?}", bank.rent());
     Ok((
         bank,
         ReconstructedBankInfo {

runtime/src/snapshot_package.rs

@@ -3,7 +3,6 @@ use solana_hash::Hash;
 use {
     crate::{
         bank::{Bank, BankFieldsToSerialize, BankHashStats, BankSlotDelta},
-        rent_collector::RentCollector,
         snapshot_hash::SnapshotHash,
     },
     log::*,
@@ -28,7 +27,6 @@ pub struct AccountsPackage {
     pub expected_capitalization: u64,
     pub accounts: Arc<Accounts>,
     pub epoch_schedule: EpochSchedule,
-    pub rent_collector: RentCollector,
 
     /// Supplemental information needed for snapshots
     pub snapshot_info: Option<SupplementalSnapshotInfo>,
@@ -91,7 +89,6 @@ impl AccountsPackage {
             expected_capitalization: bank.capitalization(),
             accounts: bank.accounts(),
             epoch_schedule: bank.epoch_schedule().clone(),
-            rent_collector: bank.rent_collector().clone(),
             snapshot_info,
             enqueued: Instant::now(),
         }
@@ -112,7 +109,6 @@ impl AccountsPackage {
             expected_capitalization: u64::default(),
             accounts: Arc::new(accounts),
             epoch_schedule: EpochSchedule::default(),
-            rent_collector: RentCollector::default(),
             snapshot_info: Some(SupplementalSnapshotInfo {
                 status_cache_slot_deltas: Vec::default(),
                 bank_fields_to_serialize: BankFieldsToSerialize::default_for_tests(),

runtime/tests/stake.rs

@@ -150,7 +150,7 @@ fn test_stake_create_and_split_single_signature() {
     let authorized = Authorized::auto(&staker_pubkey);
 
     let lamports = {
-        let rent = &bank.rent_collector().rent;
+        let rent = bank.rent();
         let rent_exempt_reserve = rent.minimum_balance(StakeStateV2::size_of());
         let minimum_delegation = solana_stake_program::get_minimum_delegation(
             bank.feature_set
@@ -225,7 +225,7 @@ fn test_stake_create_and_split_to_existing_system_account() {
     let authorized = Authorized::auto(&staker_pubkey);
 
     let lamports = {
-        let rent = &bank.rent_collector().rent;
+        let rent = bank.rent();
         let rent_exempt_reserve = rent.minimum_balance(StakeStateV2::size_of());
         let minimum_delegation = solana_stake_program::get_minimum_delegation(
             bank.feature_set
@@ -311,7 +311,7 @@ fn test_stake_account_lifetime() {
     let bank_client = BankClient::new_shared(bank.clone());
 
     let (vote_balance, stake_rent_exempt_reserve, stake_minimum_delegation) = {
-        let rent = &bank.rent_collector().rent;
+        let rent = bank.rent();
         (
             rent.minimum_balance(VoteStateV3::size_of()),
             rent.minimum_balance(StakeStateV2::size_of()),
@@ -631,7 +631,7 @@ fn test_create_stake_account_from_seed() {
 
     let authorized = Authorized::auto(&mint_pubkey);
     let (balance, delegation) = {
-        let rent = &bank.rent_collector().rent;
+        let rent = bank.rent();
         let rent_exempt_reserve = rent.minimum_balance(StakeStateV2::size_of());
         let minimum_delegation = solana_stake_program::get_minimum_delegation(
             bank.feature_set