SDK cleanup to reduce featurization (#5856)
This commit is contained in:
@ -8,7 +8,7 @@ use solana_sdk::{
|
||||
|
||||
entrypoint!(process_instruction);
|
||||
fn process_instruction(_program_id: &Pubkey, accounts: &mut [AccountInfo], _data: &[u8]) -> u32 {
|
||||
match Clock::from(&accounts[2]) {
|
||||
match Clock::from_account_info(&accounts[2]) {
|
||||
Some(clock) => {
|
||||
info!("slot, segment, epoch, stakers_epoch");
|
||||
info!(
|
||||
|
@ -179,7 +179,7 @@ pub fn process_instruction(
|
||||
me.delegate_stake(
|
||||
vote,
|
||||
stake,
|
||||
&sysvar::clock_account::from_keyed_account(&rest[1])?,
|
||||
&sysvar::clock::from_keyed_account(&rest[1])?,
|
||||
&config::from_keyed_account(&rest[2])?,
|
||||
)
|
||||
}
|
||||
@ -209,7 +209,7 @@ pub fn process_instruction(
|
||||
me.withdraw(
|
||||
lamports,
|
||||
&mut to,
|
||||
&sysvar::clock_account::from_keyed_account(&sysvar[0])?,
|
||||
&sysvar::clock::from_keyed_account(&sysvar[0])?,
|
||||
&sysvar::stake_history::from_keyed_account(&sysvar[1])?,
|
||||
)
|
||||
}
|
||||
@ -221,7 +221,7 @@ pub fn process_instruction(
|
||||
let vote = &mut vote[0];
|
||||
let clock = &rest[0];
|
||||
|
||||
me.deactivate_stake(vote, &sysvar::clock_account::from_keyed_account(&clock)?)
|
||||
me.deactivate_stake(vote, &sysvar::clock::from_keyed_account(&clock)?)
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -238,7 +238,7 @@ mod tests {
|
||||
.iter()
|
||||
.map(|meta| {
|
||||
if sysvar::clock::check_id(&meta.pubkey) {
|
||||
sysvar::clock_account::new(1, 0, 0, 0, 0)
|
||||
sysvar::clock::new_account(1, 0, 0, 0, 0)
|
||||
} else if sysvar::rewards::check_id(&meta.pubkey) {
|
||||
sysvar::rewards::create_account(1, 0.0, 0.0)
|
||||
} else if sysvar::stake_history::check_id(&meta.pubkey) {
|
||||
@ -336,7 +336,7 @@ mod tests {
|
||||
KeyedAccount::new(
|
||||
&sysvar::clock::id(),
|
||||
false,
|
||||
&mut sysvar::clock_account::new(1, 0, 0, 0, 0)
|
||||
&mut sysvar::clock::new_account(1, 0, 0, 0, 0)
|
||||
),
|
||||
KeyedAccount::new(
|
||||
&config::id(),
|
||||
|
@ -42,7 +42,7 @@ pub fn process_instruction(
|
||||
// This instruction must be signed by `me`
|
||||
Err(InstructionError::InvalidArgument)?;
|
||||
}
|
||||
let clock = sysvar::clock_account::from_keyed_account(&rest[0])?;
|
||||
let clock = sysvar::clock::from_keyed_account(&rest[0])?;
|
||||
storage_account.submit_mining_proof(
|
||||
sha_state,
|
||||
segment_index,
|
||||
@ -56,7 +56,7 @@ pub fn process_instruction(
|
||||
// This instruction must be signed by `me`
|
||||
Err(InstructionError::InvalidArgument)?;
|
||||
}
|
||||
let clock = sysvar::clock_account::from_keyed_account(&rest[0])?;
|
||||
let clock = sysvar::clock::from_keyed_account(&rest[0])?;
|
||||
storage_account.advertise_storage_recent_blockhash(hash, segment, clock)
|
||||
}
|
||||
StorageInstruction::ClaimStorageReward => {
|
||||
@ -68,7 +68,7 @@ pub fn process_instruction(
|
||||
let (rewards_pools, owner) = rest.split_at_mut(1);
|
||||
|
||||
let rewards = sysvar::rewards::from_keyed_account(&rewards[0])?;
|
||||
let clock = sysvar::clock_account::from_keyed_account(&clock[0])?;
|
||||
let clock = sysvar::clock::from_keyed_account(&clock[0])?;
|
||||
let mut owner = StorageAccount::new(*owner[0].unsigned_key(), &mut owner[0].account);
|
||||
|
||||
storage_account.claim_storage_reward(&mut rewards_pools[0], clock, rewards, &mut owner)
|
||||
@ -84,7 +84,7 @@ pub fn process_instruction(
|
||||
Err(InstructionError::InvalidArgument)?;
|
||||
}
|
||||
let me_id = storage_account.id;
|
||||
let clock = sysvar::clock_account::from_keyed_account(&clock[0])?;
|
||||
let clock = sysvar::clock::from_keyed_account(&clock[0])?;
|
||||
let mut rest: Vec<_> = rest
|
||||
.iter_mut()
|
||||
.map(|keyed_account| {
|
||||
|
@ -15,8 +15,7 @@ use solana_sdk::pubkey::Pubkey;
|
||||
use solana_sdk::signature::{Keypair, KeypairUtil, Signature};
|
||||
use solana_sdk::system_instruction;
|
||||
use solana_sdk::sysvar::clock::{self, Clock};
|
||||
use solana_sdk::sysvar::rewards::Rewards;
|
||||
use solana_sdk::sysvar::{clock_account, rewards};
|
||||
use solana_sdk::sysvar::rewards::{self, Rewards};
|
||||
use solana_storage_api::id;
|
||||
use solana_storage_api::storage_contract::StorageAccount;
|
||||
use solana_storage_api::storage_contract::{ProofStatus, StorageContract, STORAGE_ACCOUNT_SPACE};
|
||||
@ -124,8 +123,8 @@ fn test_proof_bounds() {
|
||||
Hash::default(),
|
||||
);
|
||||
// the proof is for segment 0, need to move the slot into segment 2
|
||||
let mut clock_account = clock_account::new(1, 0, 0, 0, 0);
|
||||
Clock::to(
|
||||
let mut clock_account = clock::new_account(1, 0, 0, 0, 0);
|
||||
Clock::to_account(
|
||||
&Clock {
|
||||
slot: DEFAULT_SLOTS_PER_SEGMENT * 2,
|
||||
segment: 2,
|
||||
@ -152,7 +151,7 @@ fn test_serialize_overflow() {
|
||||
let clock_id = clock::id();
|
||||
let mut keyed_accounts = Vec::new();
|
||||
let mut user_account = Account::default();
|
||||
let mut clock_account = clock_account::new(1, 0, 0, 0, 0);
|
||||
let mut clock_account = clock::new_account(1, 0, 0, 0, 0);
|
||||
keyed_accounts.push(KeyedAccount::new(&pubkey, true, &mut user_account));
|
||||
keyed_accounts.push(KeyedAccount::new(&clock_id, false, &mut clock_account));
|
||||
|
||||
@ -177,8 +176,8 @@ fn test_invalid_accounts_len() {
|
||||
Hash::default(),
|
||||
);
|
||||
// move tick height into segment 1
|
||||
let mut clock_account = clock_account::new(1, 0, 0, 0, 0);
|
||||
Clock::to(
|
||||
let mut clock_account = clock::new_account(1, 0, 0, 0, 0);
|
||||
Clock::to_account(
|
||||
&Clock {
|
||||
slot: 16,
|
||||
segment: 1,
|
||||
@ -237,8 +236,8 @@ fn test_submit_mining_ok() {
|
||||
Hash::default(),
|
||||
);
|
||||
// move slot into segment 1
|
||||
let mut clock_account = clock_account::new(1, 0, 0, 0, 0);
|
||||
Clock::to(
|
||||
let mut clock_account = clock::new_account(1, 0, 0, 0, 0);
|
||||
Clock::to_account(
|
||||
&Clock {
|
||||
slot: DEFAULT_SLOTS_PER_SEGMENT,
|
||||
segment: 1,
|
||||
|
@ -154,7 +154,7 @@ pub fn process_instruction(
|
||||
vote_state::process_vote(
|
||||
me,
|
||||
&sysvar::slot_hashes::from_keyed_account(&slot_hashes_and_clock[0])?,
|
||||
&sysvar::clock_account::from_keyed_account(&slot_hashes_and_clock[1])?,
|
||||
&sysvar::clock::from_keyed_account(&slot_hashes_and_clock[1])?,
|
||||
other_signers,
|
||||
&vote,
|
||||
)
|
||||
@ -188,7 +188,7 @@ mod tests {
|
||||
.iter()
|
||||
.map(|meta| {
|
||||
if sysvar::clock::check_id(&meta.pubkey) {
|
||||
sysvar::clock_account::new(1, 0, 0, 0, 0)
|
||||
sysvar::clock::new_account(1, 0, 0, 0, 0)
|
||||
} else if sysvar::slot_hashes::check_id(&meta.pubkey) {
|
||||
sysvar::slot_hashes::create_account(1, &[])
|
||||
} else {
|
||||
|
Reference in New Issue
Block a user