Skip to content

Commit

Permalink
Moves bank tests back into the runtime to resolve cyclic dependency.
Browse files Browse the repository at this point in the history
  • Loading branch information
@Lichtso
Lichtso committed Apr 18, 2023
1 parent 2290691 commit 99c9b5a
Show file tree
Hide file tree
Showing 5 changed files with 200 additions and 211 deletions.
1 change: 0 additions & 1 deletion Cargo.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion programs/system/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ solana-sdk = { workspace = true }
[dev-dependencies]
assert_matches = { workspace = true }
solana-logger = { workspace = true }
solana-runtime = { workspace = true }

[lib]
crate-type = ["lib"]
Expand Down
209 changes: 1 addition & 208 deletions programs/system/src/system_processor.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -560,24 +560,17 @@ mod tests {
#[allow(deprecated)]
use solana_sdk::{
account::{self, Account, AccountSharedData, ReadableAccount},
client::SyncClient,
fee_calculator::FeeCalculator,
genesis_config::create_genesis_config,
hash::{hash, Hash},
instruction::{AccountMeta, Instruction, InstructionError},
message::Message,
native_token::sol_to_lamports,
nonce::{
self,
state::{
Data as NonceData, DurableNonce, State as NonceState, Versions as NonceVersions,
},
},
nonce_account, recent_blockhashes_account,
signature::{Keypair, Signer},
system_instruction, system_program,
nonce_account, recent_blockhashes_account, system_instruction, system_program,
sysvar::{self, recent_blockhashes::IterItem, rent::Rent},
transaction::TransactionError,
};
use {
super::*,
Expand All @@ -586,8 +579,6 @@ mod tests {
solana_program_runtime::{
invoke_context::mock_process_instruction, with_mock_invoke_context,
},
solana_runtime::{bank::Bank, bank_client::BankClient},
std::sync::Arc,
};

impl From<Pubkey> for Address {
Expand Down Expand Up @@ -1481,204 +1472,6 @@ mod tests {
);
}

#[test]
fn test_allocate() {
let (genesis_config, mint_keypair) = create_genesis_config(sol_to_lamports(1.0));
let bank = Bank::new_for_tests(&genesis_config);
let bank_client = BankClient::new(bank);
let data_len = 2;
let amount = genesis_config.rent.minimum_balance(data_len);

let alice_keypair = Keypair::new();
let alice_pubkey = alice_keypair.pubkey();
let seed = "seed";
let owner = Pubkey::new_unique();
let alice_with_seed = Pubkey::create_with_seed(&alice_pubkey, seed, &owner).unwrap();

bank_client
.transfer_and_confirm(amount, &mint_keypair, &alice_pubkey)
.unwrap();

let allocate_with_seed = Message::new(
&[system_instruction::allocate_with_seed(
&alice_with_seed,
&alice_pubkey,
seed,
data_len as u64,
&owner,
)],
Some(&alice_pubkey),
);

assert!(bank_client
.send_and_confirm_message(&[&alice_keypair], allocate_with_seed)
.is_ok());

let allocate = system_instruction::allocate(&alice_pubkey, data_len as u64);

assert!(bank_client
.send_and_confirm_instruction(&alice_keypair, allocate)
.is_ok());
}

fn with_create_zero_lamport<F>(callback: F)
where
F: Fn(&Bank),
{
solana_logger::setup();

let alice_keypair = Keypair::new();
let bob_keypair = Keypair::new();

let alice_pubkey = alice_keypair.pubkey();
let bob_pubkey = bob_keypair.pubkey();

let program = Pubkey::new_unique();
let collector = Pubkey::new_unique();

let mint_lamports = sol_to_lamports(1.0);
let len1 = 123;
let len2 = 456;

// create initial bank and fund the alice account
let (genesis_config, mint_keypair) = create_genesis_config(mint_lamports);
let bank = Arc::new(Bank::new_for_tests(&genesis_config));
let bank_client = BankClient::new_shared(&bank);
bank_client
.transfer_and_confirm(mint_lamports, &mint_keypair, &alice_pubkey)
.unwrap();

// create zero-lamports account to be cleaned
let account = AccountSharedData::new(0, len1, &program);
let bank = Arc::new(Bank::new_from_parent(&bank, &collector, bank.slot() + 1));
bank.store_account(&bob_pubkey, &account);

// transfer some to bogus pubkey just to make previous bank (=slot) really cleanable
let bank = Arc::new(Bank::new_from_parent(&bank, &collector, bank.slot() + 1));
let bank_client = BankClient::new_shared(&bank);
bank_client
.transfer_and_confirm(
genesis_config.rent.minimum_balance(0),
&alice_keypair,
&Pubkey::new_unique(),
)
.unwrap();

// super fun time; callback chooses to .clean_accounts(None) or not
let bank = Arc::new(Bank::new_from_parent(&bank, &collector, bank.slot() + 1));
callback(&bank);

// create a normal account at the same pubkey as the zero-lamports account
let lamports = genesis_config.rent.minimum_balance(len2);
let bank = Arc::new(Bank::new_from_parent(&bank, &collector, bank.slot() + 1));
let bank_client = BankClient::new_shared(&bank);
let ix = system_instruction::create_account(
&alice_pubkey,
&bob_pubkey,
lamports,
len2 as u64,
&program,
);
let message = Message::new(&[ix], Some(&alice_pubkey));
let r = bank_client.send_and_confirm_message(&[&alice_keypair, &bob_keypair], message);
assert!(r.is_ok());
}

#[test]
fn test_create_zero_lamport_with_clean() {
with_create_zero_lamport(|bank| {
bank.freeze();
bank.squash();
bank.force_flush_accounts_cache();
// do clean and assert that it actually did its job
assert_eq!(4, bank.get_snapshot_storages(None).len());
bank.clean_accounts(None);
assert_eq!(3, bank.get_snapshot_storages(None).len());
});
}

#[test]
fn test_create_zero_lamport_without_clean() {
with_create_zero_lamport(|_| {
// just do nothing; this should behave identically with test_create_zero_lamport_with_clean
});
}

#[test]
fn test_assign_with_seed() {
let (genesis_config, mint_keypair) = create_genesis_config(sol_to_lamports(1.0));
let bank = Bank::new_for_tests(&genesis_config);
let bank_client = BankClient::new(bank);

let alice_keypair = Keypair::new();
let alice_pubkey = alice_keypair.pubkey();
let seed = "seed";
let owner = Pubkey::new_unique();
let alice_with_seed = Pubkey::create_with_seed(&alice_pubkey, seed, &owner).unwrap();

bank_client
.transfer_and_confirm(
genesis_config.rent.minimum_balance(0),
&mint_keypair,
&alice_pubkey,
)
.unwrap();

let assign_with_seed = Message::new(
&[system_instruction::assign_with_seed(
&alice_with_seed,
&alice_pubkey,
seed,
&owner,
)],
Some(&alice_pubkey),
);

assert!(bank_client
.send_and_confirm_message(&[&alice_keypair], assign_with_seed)
.is_ok());
}

#[test]
fn test_system_unsigned_transaction() {
let (genesis_config, alice_keypair) = create_genesis_config(sol_to_lamports(1.0));
let alice_pubkey = alice_keypair.pubkey();
let mallory_keypair = Keypair::new();
let mallory_pubkey = mallory_keypair.pubkey();
let amount = genesis_config.rent.minimum_balance(0);

// Fund to account to bypass AccountNotFound error
let bank = Bank::new_for_tests(&genesis_config);
let bank_client = BankClient::new(bank);
bank_client
.transfer_and_confirm(amount, &alice_keypair, &mallory_pubkey)
.unwrap();

// Erroneously sign transaction with recipient account key
// No signature case is tested by bank `test_zero_signatures()`
let account_metas = vec![
AccountMeta::new(alice_pubkey, false),
AccountMeta::new(mallory_pubkey, true),
];
let malicious_instruction = Instruction::new_with_bincode(
system_program::id(),
&SystemInstruction::Transfer { lamports: amount },
account_metas,
);
assert_eq!(
bank_client
.send_and_confirm_instruction(&mallory_keypair, malicious_instruction)
.unwrap_err()
.unwrap(),
TransactionError::InstructionError(0, InstructionError::MissingRequiredSignature)
);
assert_eq!(
bank_client.get_balance(&alice_pubkey).unwrap(),
sol_to_lamports(1.0) - amount
);
assert_eq!(bank_client.get_balance(&mallory_pubkey).unwrap(), amount);
}

fn process_nonce_instruction(
instruction: Instruction,
expected_result: Result<(), InstructionError>,
Expand Down
2 changes: 1 addition & 1 deletion runtime/src/accounts.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ use {
compute_budget::{self, ComputeBudget},
loaded_programs::{LoadedProgram, LoadedProgramType},
},
solana_system_program::{get_system_account_kind, SystemAccountKind},
solana_sdk::{
account::{Account, AccountSharedData, ReadableAccount, WritableAccount},
account_utils::StateMut,
Expand Down Expand Up @@ -61,6 +60,7 @@ use {
transaction::{Result, SanitizedTransaction, TransactionAccountLocks, TransactionError},
transaction_context::{IndexOfAccount, TransactionAccount},
},
solana_system_program::{get_system_account_kind, SystemAccountKind},
std::{
cmp::Reverse,
collections::{hash_map, BinaryHeap, HashMap, HashSet},
Expand Down
Loading

0 comments on commit 99c9b5a

Please sign in to comment.