remove calculation of slots_per_year

anza-xyz · Feb 17, 2025 · 4ae6130 · 4ae6130
1 parent eee5cab
commit 4ae6130
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/genesis-config/Cargo.toml b/genesis-config/Cargo.toml
@@ -25,7 +25,6 @@ solana-frozen-abi-macro = { workspace = true, optional = true }
 solana-hash = { workspace = true }
 solana-inflation = { workspace = true }
 solana-keypair = { workspace = true }
-solana-logger = { workspace = true }
 solana-native-token = { workspace = true }
 solana-poh-config = { workspace = true }
 solana-pubkey = { workspace = true }

diff --git a/rent-collector/Cargo.toml b/rent-collector/Cargo.toml
@@ -17,13 +17,13 @@ solana-clock = { workspace = true }
 solana-epoch-schedule = { workspace = true }
 solana-frozen-abi = { workspace = true, optional = true }
 solana-frozen-abi-macro = { workspace = true, optional = true }
-solana-genesis-config = { workspace = true }
 solana-pubkey = { workspace = true }
 solana-rent = { workspace = true }
 solana-sdk-ids = { workspace = true }
 
 [dev-dependencies]
 assert_matches = { workspace = true }
+solana-genesis-config = { workspace = true }
 solana-logger = { workspace = true }
 solana-pubkey = { workspace = true, features = ["rand"] }
 

diff --git a/rent-collector/src/lib.rs b/rent-collector/src/lib.rs
@@ -6,7 +6,6 @@ use {
     solana_account::{AccountSharedData, ReadableAccount, WritableAccount},
     solana_clock::Epoch,
     solana_epoch_schedule::EpochSchedule,
-    solana_genesis_config::GenesisConfig,
     solana_pubkey::Pubkey,
     solana_rent::{Rent, RentDue},
     solana_sdk_ids::incinerator,
@@ -27,11 +26,15 @@ pub struct RentCollector {
 
 impl Default for RentCollector {
     fn default() -> Self {
+        // slots_per_year derived from GenesisConfig::default() without calculations
+        // then checked in case it changes
+        let slots_per_year = 78892314.984;
+        #[cfg(test)]
+        assert!(slots_per_year == solana_genesis_config::GenesisConfig::default().slots_per_year());
         Self {
             epoch: Epoch::default(),
             epoch_schedule: EpochSchedule::default(),
-            // derive default value using GenesisConfig::default()
-            slots_per_year: GenesisConfig::default().slots_per_year(),
+            slots_per_year,
             rent: Rent::default(),
         }
     }