Remove StakeState::get_rent_exempt_reserve()
This commit is contained in:
parent
7791319374
commit
533eadd024
|
@ -135,7 +135,7 @@ fn main() -> Result<(), Box<dyn error::Error>> {
|
|||
.to_string();
|
||||
// stake account
|
||||
let default_bootstrap_validator_stake_lamports = &sol_to_lamports(0.5)
|
||||
.max(StakeState::get_rent_exempt_reserve(&rent))
|
||||
.max(rent.minimum_balance(StakeState::size_of()))
|
||||
.to_string();
|
||||
|
||||
let default_target_tick_duration =
|
||||
|
@ -430,7 +430,7 @@ fn main() -> Result<(), Box<dyn error::Error>> {
|
|||
let bootstrap_validator_stake_lamports = rent_exempt_check(
|
||||
&matches,
|
||||
"bootstrap_validator_stake_lamports",
|
||||
StakeState::get_rent_exempt_reserve(&rent),
|
||||
rent.minimum_balance(StakeState::size_of()),
|
||||
)?;
|
||||
|
||||
let bootstrap_stake_authorized_pubkey =
|
||||
|
|
|
@ -107,7 +107,7 @@ pub fn create_and_add_stakes(
|
|||
|
||||
let mut address_generator = AddressGenerator::new(&authorized.staker, &stake::program::id());
|
||||
|
||||
let stake_rent_reserve = StakeState::get_rent_exempt_reserve(&genesis_config.rent);
|
||||
let stake_rent_reserve = genesis_config.rent.minimum_balance(StakeState::size_of());
|
||||
|
||||
for unlock in unlocks {
|
||||
let lamports = unlock.amount(stakes_lamports);
|
||||
|
@ -193,7 +193,7 @@ mod tests {
|
|||
.iter()
|
||||
.all(|(_pubkey, account)| account.lamports <= granularity
|
||||
|| account.lamports - granularity
|
||||
<= StakeState::get_rent_exempt_reserve(&genesis_config.rent)));
|
||||
<= genesis_config.rent.minimum_balance(StakeState::size_of())));
|
||||
}
|
||||
|
||||
// #[ignore]
|
||||
|
@ -238,7 +238,7 @@ mod tests {
|
|||
..Rent::default()
|
||||
};
|
||||
|
||||
let reserve = StakeState::get_rent_exempt_reserve(&rent);
|
||||
let reserve = rent.minimum_balance(StakeState::size_of());
|
||||
let staker_reserve = rent.minimum_balance(0);
|
||||
|
||||
// verify that a small remainder ends up in the last stake
|
||||
|
|
|
@ -1043,7 +1043,7 @@ fn main() {
|
|||
.max(VoteState::get_rent_exempt_reserve(&rent))
|
||||
.to_string();
|
||||
let default_bootstrap_validator_stake_lamports = &sol_to_lamports(0.5)
|
||||
.max(StakeState::get_rent_exempt_reserve(&rent))
|
||||
.max(rent.minimum_balance(StakeState::size_of()))
|
||||
.to_string();
|
||||
|
||||
let matches = App::new(crate_name!())
|
||||
|
@ -2227,7 +2227,7 @@ fn main() {
|
|||
value_t_or_exit!(arg_matches, "bootstrap_validator_lamports", u64);
|
||||
let bootstrap_validator_stake_lamports =
|
||||
value_t_or_exit!(arg_matches, "bootstrap_validator_stake_lamports", u64);
|
||||
let minimum_stake_lamports = StakeState::get_rent_exempt_reserve(&rent);
|
||||
let minimum_stake_lamports = rent.minimum_balance(StakeState::size_of());
|
||||
if bootstrap_validator_stake_lamports < minimum_stake_lamports {
|
||||
eprintln!(
|
||||
"Error: insufficient --bootstrap-validator-stake-lamports. \
|
||||
|
|
|
@ -21,7 +21,7 @@ const VALIDATOR_LAMPORTS: u64 = 42;
|
|||
|
||||
// fun fact: rustc is very close to make this const fn.
|
||||
pub fn bootstrap_validator_stake_lamports() -> u64 {
|
||||
StakeState::get_rent_exempt_reserve(&Rent::default())
|
||||
Rent::default().minimum_balance(StakeState::size_of())
|
||||
}
|
||||
|
||||
// Number of lamports automatically used for genesis accounts
|
||||
|
|
|
@ -4,7 +4,6 @@ use {
|
|||
clock::{Clock, Epoch, UnixTimestamp},
|
||||
instruction::InstructionError,
|
||||
pubkey::Pubkey,
|
||||
rent::Rent,
|
||||
stake::{
|
||||
config::Config,
|
||||
instruction::{LockupArgs, StakeError},
|
||||
|
@ -79,10 +78,6 @@ impl StakeState {
|
|||
200 // see test_size_of
|
||||
}
|
||||
|
||||
pub fn get_rent_exempt_reserve(rent: &Rent) -> u64 {
|
||||
rent.minimum_balance(Self::size_of())
|
||||
}
|
||||
|
||||
pub fn stake(&self) -> Option<Stake> {
|
||||
match self {
|
||||
StakeState::Stake(_meta, stake) => Some(*stake),
|
||||
|
|
Loading…
Reference in New Issue