blockworks-foundation
/
solana
mirror of https://github.com/blockworks-foundation/solana.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

use bank's epoch_schedule accessor internally (#24918)

This commit is contained in:
apfitzge 2022-05-04 13:52:48 -05:00 committed by GitHub
parent eae9a66531
commit 0ca54db524
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
runtime/src/bank.rs
View File

@ -2292,7 +2292,7 @@ impl Bank {
} }
pub fn first_normal_epoch(&self) -> Epoch { pub fn first_normal_epoch(&self) -> Epoch {
self.epoch_schedule.first_normal_epoch self.epoch_schedule().first_normal_epoch
} }
pub fn freeze_lock(&self) -> RwLockReadGuard<Hash> { pub fn freeze_lock(&self) -> RwLockReadGuard<Hash> {
@ -2383,7 +2383,7 @@ impl Bank {
} else { } else {
self.epoch() self.epoch()
}; };
let first_slot_in_epoch = self.epoch_schedule.get_first_slot_in_epoch(epoch); let first_slot_in_epoch = self.epoch_schedule().get_first_slot_in_epoch(epoch);
Some((first_slot_in_epoch, self.clock().epoch_start_timestamp)) Some((first_slot_in_epoch, self.clock().epoch_start_timestamp))
}; };
let max_allowable_drift = if self let max_allowable_drift = if self
@ -2431,8 +2431,8 @@ impl Bank {
let clock = sysvar::clock::Clock { let clock = sysvar::clock::Clock {
slot: self.slot, slot: self.slot,
epoch_start_timestamp, epoch_start_timestamp,
epoch: self.epoch_schedule.get_epoch(self.slot), epoch: self.epoch_schedule().get_epoch(self.slot),
leader_schedule_epoch: self.epoch_schedule.get_leader_schedule_epoch(self.slot), leader_schedule_epoch: self.epoch_schedule().get_leader_schedule_epoch(self.slot),
unix_timestamp, unix_timestamp,
}; };
self.update_sysvar_account(&sysvar::clock::id(), |account| { self.update_sysvar_account(&sysvar::clock::id(), |account| {
@ -2549,7 +2549,7 @@ impl Bank {
fn update_epoch_schedule(&self) { fn update_epoch_schedule(&self) {
self.update_sysvar_account(&sysvar::epoch_schedule::id(), |account| { self.update_sysvar_account(&sysvar::epoch_schedule::id(), |account| {
create_account( create_account(
&self.epoch_schedule, self.epoch_schedule(),
self.inherit_specially_retained_account_fields(account), self.inherit_specially_retained_account_fields(account),
) )
}); });
@ -2572,7 +2572,7 @@ impl Bank {
// period: time that has passed as a fraction of a year, basically the length of // period: time that has passed as a fraction of a year, basically the length of
// an epoch as a fraction of a year // an epoch as a fraction of a year
// calculated as: slots_elapsed / (slots / year) // calculated as: slots_elapsed / (slots / year)
self.epoch_schedule.get_slots_in_epoch(prev_epoch) as f64 / self.slots_per_year self.epoch_schedule().get_slots_in_epoch(prev_epoch) as f64 / self.slots_per_year
} }
// Calculates the starting-slot for inflation from the activation slot. // Calculates the starting-slot for inflation from the activation slot.
@ -2598,12 +2598,12 @@ impl Bank {
fn get_inflation_num_slots(&self) -> u64 { fn get_inflation_num_slots(&self) -> u64 {
let inflation_activation_slot = self.get_inflation_start_slot(); let inflation_activation_slot = self.get_inflation_start_slot();
// Normalize inflation_start to align with the start of rewards accrual. // Normalize inflation_start to align with the start of rewards accrual.
let inflation_start_slot = self.epoch_schedule.get_first_slot_in_epoch( let inflation_start_slot = self.epoch_schedule().get_first_slot_in_epoch(
self.epoch_schedule self.epoch_schedule()
.get_epoch(inflation_activation_slot) .get_epoch(inflation_activation_slot)
.saturating_sub(1), .saturating_sub(1),
); );
self.epoch_schedule.get_first_slot_in_epoch(self.epoch()) - inflation_start_slot self.epoch_schedule().get_first_slot_in_epoch(self.epoch()) - inflation_start_slot
} }
pub fn slot_in_year_for_inflation(&self) -> f64 { pub fn slot_in_year_for_inflation(&self) -> f64 {
@ -3457,7 +3457,7 @@ impl Bank {
self.rent_collector = RentCollector::new( self.rent_collector = RentCollector::new(
self.epoch, self.epoch,
&self.epoch_schedule, self.epoch_schedule(),
self.slots_per_year, self.slots_per_year,
&genesis_config.rent, &genesis_config.rent,
); );
@ -6516,13 +6516,13 @@ impl Bank {
/// Return the number of slots per epoch for the given epoch /// Return the number of slots per epoch for the given epoch
pub fn get_slots_in_epoch(&self, epoch: Epoch) -> u64 { pub fn get_slots_in_epoch(&self, epoch: Epoch) -> u64 {
self.epoch_schedule.get_slots_in_epoch(epoch) self.epoch_schedule().get_slots_in_epoch(epoch)
} }
/// returns the epoch for which this bank's leader_schedule_slot_offset and slot would /// returns the epoch for which this bank's leader_schedule_slot_offset and slot would
/// need to cache leader_schedule /// need to cache leader_schedule
pub fn get_leader_schedule_epoch(&self, slot: Slot) -> Epoch { pub fn get_leader_schedule_epoch(&self, slot: Slot) -> Epoch {
self.epoch_schedule.get_leader_schedule_epoch(slot) self.epoch_schedule().get_leader_schedule_epoch(slot)
} }
/// a bank-level cache of vote accounts and stake delegation info /// a bank-level cache of vote accounts and stake delegation info
@ -6628,7 +6628,7 @@ impl Bank {
/// ( slot/slots_per_epoch, slot % slots_per_epoch ) /// ( slot/slots_per_epoch, slot % slots_per_epoch )
/// ///
pub fn get_epoch_and_slot_index(&self, slot: Slot) -> (Epoch, SlotIndex) { pub fn get_epoch_and_slot_index(&self, slot: Slot) -> (Epoch, SlotIndex) {
self.epoch_schedule.get_epoch_and_slot_index(slot) self.epoch_schedule().get_epoch_and_slot_index(slot)
} }
pub fn get_epoch_info(&self) -> EpochInfo { pub fn get_epoch_info(&self) -> EpochInfo {