gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

deprecate fees sysvar (#18960)

Browse Source
This commit is contained in:
Jack May
2021-07-29 10:48:14 -07:00
committed by GitHub
parent da480bdb5f
commit dfbb0c559b
11 changed files with 98 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
runtime/src/bank.rs
View File

@ -1752,6 +1752,7 @@ impl Bank {
}
}
#[allow(deprecated)]
fn update_fees(&self) {
self.update_sysvar_account(&sysvar::fees::id(), |account| {
create_account(
@ -5300,6 +5301,7 @@ impl Bank {
for sysvar_id in &[
sysvar::clock::id(),
sysvar::epoch_schedule::id(),
#[allow(deprecated)]
sysvar::fees::id(),
#[allow(deprecated)]
sysvar::recent_blockhashes::id(),
@ -5574,6 +5576,8 @@ pub(crate) mod tests {
status_cache::MAX_CACHE_ENTRIES,
};
use crossbeam_channel::{bounded, unbounded};
#[allow(deprecated)]
use solana_sdk::sysvar::fees::Fees;
use solana_sdk::{
account::Account,
clock::{DEFAULT_SLOTS_PER_EPOCH, DEFAULT_TICKS_PER_SLOT},
@ -5594,7 +5598,7 @@ pub(crate) mod tests {
},
system_instruction::{self, SystemError},
system_program,
sysvar::{fees::Fees, rewards::Rewards},
sysvar::rewards::Rewards,
timing::duration_as_s,
};
use solana_vote_program::{
@ -9378,6 +9382,7 @@ pub(crate) mod tests {
assert!(stake_delegations.get(&stake_keypair.pubkey()).is_some());
}
#[allow(deprecated)]
#[test]
fn test_bank_fees_account() {
let (mut genesis_config, _) = create_genesis_config(500);
@ -11992,6 +11997,7 @@ pub(crate) mod tests {
&[
sysvar::clock::id(),
sysvar::epoch_schedule::id(),
#[allow(deprecated)]
sysvar::fees::id(),
#[allow(deprecated)]
sysvar::recent_blockhashes::id(),
@ -12103,6 +12109,7 @@ pub(crate) mod tests {
&[
sysvar::clock::id(),
sysvar::epoch_schedule::id(),
#[allow(deprecated)]
sysvar::fees::id(),
#[allow(deprecated)]
sysvar::recent_blockhashes::id(),
@ -13619,9 +13626,11 @@ pub(crate) mod tests {
bank.add_builtin("mock_program1", program_id, mock_ix_processor);
let blockhash = bank.last_blockhash();
let blockhash_sysvar = sysvar::fees::id();
let orig_lamports = bank.get_account(&sysvar::fees::id()).unwrap().lamports();
info!("{:?}", bank.get_account(&sysvar::fees::id()));
#[allow(deprecated)]
let blockhash_sysvar = sysvar::clock::id();
#[allow(deprecated)]
let orig_lamports = bank.get_account(&sysvar::clock::id()).unwrap().lamports();
info!("{:?}", bank.get_account(&sysvar::clock::id()));
let tx = system_transaction::transfer(&mint_keypair, &blockhash_sysvar, 10, blockhash);
assert_eq!(
bank.process_transaction(&tx),
@ -13630,11 +13639,13 @@ pub(crate) mod tests {
InstructionError::ReadonlyLamportChange
))
);
#[allow(deprecated)]
assert_eq!(
bank.get_account(&sysvar::fees::id()).unwrap().lamports(),
bank.get_account(&sysvar::clock::id()).unwrap().lamports(),
orig_lamports
);
info!("{:?}", bank.get_account(&sysvar::fees::id()));
#[allow(deprecated)]
info!("{:?}", bank.get_account(&sysvar::clock::id()));
let accounts = vec![
AccountMeta::new(mint_keypair.pubkey(), true),