kill rent calculator (#6625)
This commit is contained in:
@ -7,7 +7,7 @@ use solana_sdk::{
|
||||
entrypoint,
|
||||
entrypoint::SUCCESS,
|
||||
pubkey::Pubkey,
|
||||
rent_calculator,
|
||||
rent,
|
||||
sysvar::{
|
||||
clock::Clock, fees::Fees, rent::Rent, rewards::Rewards, slot_hashes::SlotHashes,
|
||||
stake_history::StakeHistory,
|
||||
@ -42,9 +42,8 @@ fn process_instruction(_program_id: &Pubkey, accounts: &mut [AccountInfo], _data
|
||||
|
||||
let rent = Rent::from_account_info(&accounts[7]).unwrap();
|
||||
assert_eq!(
|
||||
rent.rent_calculator.due(
|
||||
rent_calculator::DEFAULT_LAMPORTS_PER_BYTE_YEAR
|
||||
* rent_calculator::DEFAULT_EXEMPTION_THRESHOLD as u64,
|
||||
rent.due(
|
||||
rent::DEFAULT_LAMPORTS_PER_BYTE_YEAR * rent::DEFAULT_EXEMPTION_THRESHOLD as u64,
|
||||
1,
|
||||
1.0
|
||||
),
|
||||
|
1
programs/move_loader_api/.gitignore
vendored
Normal file
1
programs/move_loader_api/.gitignore
vendored
Normal file
@ -0,0 +1 @@
|
||||
/target/
|
@ -428,7 +428,7 @@ impl MoveProcessor {
|
||||
mod tests {
|
||||
use super::*;
|
||||
use solana_sdk::account::Account;
|
||||
use solana_sdk::rent_calculator::RentCalculator;
|
||||
use solana_sdk::rent::Rent;
|
||||
use solana_sdk::sysvar::rent;
|
||||
|
||||
const BIG_ENOUGH: usize = 10_000;
|
||||
@ -467,7 +467,7 @@ mod tests {
|
||||
let sender_address = AccountAddress::default();
|
||||
let mut program = LibraAccount::create_program(&sender_address, code, vec![]);
|
||||
let rent_id = rent::id();
|
||||
let mut rent_account = rent::create_account(1, &RentCalculator::default());
|
||||
let mut rent_account = rent::create_account(1, &Rent::default());
|
||||
let mut keyed_accounts = vec![
|
||||
KeyedAccount::new(&program.key, true, &mut program.account),
|
||||
KeyedAccount::new(&rent_id, false, &mut rent_account),
|
||||
@ -514,7 +514,7 @@ mod tests {
|
||||
let mut genesis = LibraAccount::create_genesis(1_000_000_000);
|
||||
|
||||
let rent_id = rent::id();
|
||||
let mut rent_account = rent::create_account(1, &RentCalculator::default());
|
||||
let mut rent_account = rent::create_account(1, &Rent::default());
|
||||
let mut keyed_accounts = vec![
|
||||
KeyedAccount::new(&program.key, true, &mut program.account),
|
||||
KeyedAccount::new(&rent_id, false, &mut rent_account),
|
||||
@ -554,7 +554,7 @@ mod tests {
|
||||
let mut genesis = LibraAccount::create_genesis(1_000_000_000);
|
||||
|
||||
let rent_id = rent::id();
|
||||
let mut rent_account = rent::create_account(1, &RentCalculator::default());
|
||||
let mut rent_account = rent::create_account(1, &Rent::default());
|
||||
let mut keyed_accounts = vec![
|
||||
KeyedAccount::new(&program.key, true, &mut program.account),
|
||||
KeyedAccount::new(&rent_id, false, &mut rent_account),
|
||||
@ -629,7 +629,7 @@ mod tests {
|
||||
let sender = &mut sender[0];
|
||||
|
||||
let rent_id = rent::id();
|
||||
let mut rent_account = rent::create_account(1, &RentCalculator::default());
|
||||
let mut rent_account = rent::create_account(1, &Rent::default());
|
||||
let mut keyed_accounts = vec![
|
||||
KeyedAccount::new(&program.key, true, &mut program.account),
|
||||
KeyedAccount::new(&rent_id, false, &mut rent_account),
|
||||
@ -701,7 +701,7 @@ mod tests {
|
||||
let mut program = LibraAccount::create_program(&payee.address, code, vec![]);
|
||||
|
||||
let rent_id = rent::id();
|
||||
let mut rent_account = rent::create_account(1, &RentCalculator::default());
|
||||
let mut rent_account = rent::create_account(1, &Rent::default());
|
||||
let mut keyed_accounts = vec![
|
||||
KeyedAccount::new(&program.key, true, &mut program.account),
|
||||
KeyedAccount::new(&rent_id, false, &mut rent_account),
|
||||
@ -747,7 +747,7 @@ mod tests {
|
||||
let mut genesis = LibraAccount::create_genesis(1_000_000_000);
|
||||
|
||||
let rent_id = rent::id();
|
||||
let mut rent_account = rent::create_account(1, &RentCalculator::default());
|
||||
let mut rent_account = rent::create_account(1, &Rent::default());
|
||||
let mut keyed_accounts = vec![
|
||||
KeyedAccount::new(&program.key, true, &mut program.account),
|
||||
KeyedAccount::new(&rent_id, false, &mut rent_account),
|
||||
@ -791,7 +791,7 @@ mod tests {
|
||||
LibraAccount::create_program(&module.address, &code, vec![&module.account.data]);
|
||||
|
||||
let rent_id = rent::id();
|
||||
let mut rent_account = rent::create_account(1, &RentCalculator::default());
|
||||
let mut rent_account = rent::create_account(1, &Rent::default());
|
||||
let mut keyed_accounts = vec![
|
||||
KeyedAccount::new(&program.key, true, &mut program.account),
|
||||
KeyedAccount::new(&rent_id, false, &mut rent_account),
|
||||
@ -833,7 +833,7 @@ mod tests {
|
||||
let mut payee = LibraAccount::create_unallocated();
|
||||
|
||||
let rent_id = rent::id();
|
||||
let mut rent_account = rent::create_account(1, &RentCalculator::default());
|
||||
let mut rent_account = rent::create_account(1, &Rent::default());
|
||||
let mut keyed_accounts = vec![
|
||||
KeyedAccount::new(&program.key, true, &mut program.account),
|
||||
KeyedAccount::new(&rent_id, false, &mut rent_account),
|
||||
|
@ -328,9 +328,7 @@ pub fn process_instruction(
|
||||
mod tests {
|
||||
use super::*;
|
||||
use bincode::serialize;
|
||||
use solana_sdk::{
|
||||
account::Account, rent_calculator::RentCalculator, sysvar::stake_history::StakeHistory,
|
||||
};
|
||||
use solana_sdk::{account::Account, rent::Rent, sysvar::stake_history::StakeHistory};
|
||||
|
||||
fn process_instruction(instruction: &Instruction) -> Result<(), InstructionError> {
|
||||
let mut accounts: Vec<_> = instruction
|
||||
@ -346,7 +344,7 @@ mod tests {
|
||||
} else if config::check_id(&meta.pubkey) {
|
||||
config::create_account(1, &config::Config::default())
|
||||
} else if sysvar::rent::check_id(&meta.pubkey) {
|
||||
sysvar::rent::create_account(1, &RentCalculator::default())
|
||||
sysvar::rent::create_account(1, &Rent::default())
|
||||
} else {
|
||||
Account::default()
|
||||
}
|
||||
|
@ -219,7 +219,7 @@ pub fn process_instruction(
|
||||
mod tests {
|
||||
use super::*;
|
||||
use solana_sdk::account::Account;
|
||||
use solana_sdk::rent_calculator::RentCalculator;
|
||||
use solana_sdk::rent::Rent;
|
||||
|
||||
// these are for 100% coverage in this file
|
||||
#[test]
|
||||
@ -240,7 +240,7 @@ mod tests {
|
||||
} else if sysvar::slot_hashes::check_id(&meta.pubkey) {
|
||||
sysvar::slot_hashes::create_account(1, &[])
|
||||
} else if sysvar::rent::check_id(&meta.pubkey) {
|
||||
sysvar::rent::create_account(1, &RentCalculator::default())
|
||||
sysvar::rent::create_account(1, &Rent::default())
|
||||
} else {
|
||||
Account::default()
|
||||
}
|
||||
@ -303,8 +303,8 @@ mod tests {
|
||||
|
||||
#[test]
|
||||
fn test_minimum_balance() {
|
||||
let rent_calculator = solana_sdk::rent_calculator::RentCalculator::default();
|
||||
let minimum_balance = rent_calculator.minimum_balance(VoteState::size_of());
|
||||
let rent = solana_sdk::rent::Rent::default();
|
||||
let minimum_balance = rent.minimum_balance(VoteState::size_of());
|
||||
// vote state cheaper than "my $0.02" ;)
|
||||
assert!(minimum_balance as f64 / 10f64.powf(9.0) < 0.02)
|
||||
}
|
||||
|
Reference in New Issue
Block a user