Skip to content

Commit 4ae6130

Browse files
authored
remove calculation of slots_per_year
1 parent eee5cab commit 4ae6130

File tree

4 files changed

+7
-6
lines changed

4 files changed

+7
-6
lines changed

Cargo.lock

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

genesis-config/Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ solana-frozen-abi-macro = { workspace = true, optional = true }
2525
solana-hash = { workspace = true }
2626
solana-inflation = { workspace = true }
2727
solana-keypair = { workspace = true }
28-
solana-logger = { workspace = true }
2928
solana-native-token = { workspace = true }
3029
solana-poh-config = { workspace = true }
3130
solana-pubkey = { workspace = true }

rent-collector/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@ solana-clock = { workspace = true }
1717
solana-epoch-schedule = { workspace = true }
1818
solana-frozen-abi = { workspace = true, optional = true }
1919
solana-frozen-abi-macro = { workspace = true, optional = true }
20-
solana-genesis-config = { workspace = true }
2120
solana-pubkey = { workspace = true }
2221
solana-rent = { workspace = true }
2322
solana-sdk-ids = { workspace = true }
2423

2524
[dev-dependencies]
2625
assert_matches = { workspace = true }
26+
solana-genesis-config = { workspace = true }
2727
solana-logger = { workspace = true }
2828
solana-pubkey = { workspace = true, features = ["rand"] }
2929

rent-collector/src/lib.rs

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ use {
66
solana_account::{AccountSharedData, ReadableAccount, WritableAccount},
77
solana_clock::Epoch,
88
solana_epoch_schedule::EpochSchedule,
9-
solana_genesis_config::GenesisConfig,
109
solana_pubkey::Pubkey,
1110
solana_rent::{Rent, RentDue},
1211
solana_sdk_ids::incinerator,
@@ -27,11 +26,15 @@ pub struct RentCollector {
2726

2827
impl Default for RentCollector {
2928
fn default() -> Self {
29+
// slots_per_year derived from GenesisConfig::default() without calculations
30+
// then checked in case it changes
31+
let slots_per_year = 78892314.984;
32+
#[cfg(test)]
33+
assert!(slots_per_year == solana_genesis_config::GenesisConfig::default().slots_per_year());
3034
Self {
3135
epoch: Epoch::default(),
3236
epoch_schedule: EpochSchedule::default(),
33-
// derive default value using GenesisConfig::default()
34-
slots_per_year: GenesisConfig::default().slots_per_year(),
37+
slots_per_year,
3538
rent: Rent::default(),
3639
}
3740
}

0 commit comments

Comments
 (0)