blockworks-foundation
/
solana-with-rpc-optimizations
mirror of https://github.com/blockworks-foundation/solana-with-rpc-optimizations.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Replace superfluous integration tests with needed one

This commit is contained in:
Tyera Eulberg 2019-03-05 13:11:20 -07:00 committed by Tyera Eulberg
parent 6ff2572ebe
commit b67ac22336
2 changed files with 56 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
programs/system/src/lib.rs
View File

@ -85,7 +85,7 @@ pub fn entrypoint(
trace!("process_instruction: {:?}", syscall);
trace!("keyed_accounts: {:?}", keyed_accounts);
// all system instructions require that accounts_keys[0] be a signer
// All system instructions require that accounts_keys[0] be a signer
if keyed_accounts[FROM_ACCOUNT_INDEX].signer_key().is_none() {
info!("account[from] is unsigned");
Err(ProgramError::InvalidArgument)?;
@ -145,14 +145,16 @@ mod tests {
assert_eq!(to_owner, new_program_owner);
assert_eq!(to_userdata, [0, 0]);
// Attempt to move more tokens than remaining in from_account
// Attempt to create account with more tokens than remaining in from_account
let to = Keypair::new().pubkey();
let mut to_account = Account::new(0, 0, Pubkey::default());
let unchanged_account = to_account.clone();
keyed_accounts = [
KeyedAccount::new(&from, true, &mut from_account),
KeyedAccount::new(&to, false, &mut to_account),
];
let result = move_tokens(&mut keyed_accounts, 100);
assert!(result.is_err());
let result = create_system_account(&mut keyed_accounts, 100, 2, new_program_owner);
assert_eq!(result, Err(SystemError::ResultWithNegativeTokens));
let from_tokens = from_account.tokens;
assert_eq!(from_tokens, 50);
assert_eq!(to_account, unchanged_account);
@ -167,7 +169,7 @@ mod tests {
KeyedAccount::new(&owned_key, false, &mut owned_account),
];
let result = create_system_account(&mut keyed_accounts, 50, 2, new_program_owner);
assert!(result.is_err());
assert_eq!(result, Err(SystemError::AccountAlreadyInUse));
let from_tokens = from_account.tokens;
assert_eq!(from_tokens, 50);
assert_eq!(owned_account, unchanged_account);
@ -186,11 +188,27 @@ mod tests {
KeyedAccount::new(&populated_key, false, &mut populated_account),
];
let result = create_system_account(&mut keyed_accounts, 50, 2, new_program_owner);
assert!(result.is_err());
assert_eq!(result, Err(SystemError::AccountAlreadyInUse));
assert_eq!(from_account.tokens, 50);
assert_eq!(populated_account, unchanged_account);
}
#[test]
fn test_create_not_system_account() {
let other_program = Pubkey::new(&[9; 32]);
let from = Keypair::new().pubkey();
let mut from_account = Account::new(100, 0, other_program);
let to = Keypair::new().pubkey();
let mut to_account = Account::new(0, 0, Pubkey::default());
let mut keyed_accounts = [
KeyedAccount::new(&from, true, &mut from_account),
KeyedAccount::new(&to, false, &mut to_account),
];
let result = create_system_account(&mut keyed_accounts, 50, 2, other_program);
assert_eq!(result, Err(SystemError::SourceNotSystemAccount));
}
#[test]
fn test_assign_account_to_program() {
let new_program_owner = Pubkey::new(&[9; 32]);
@ -206,7 +224,7 @@ mod tests {
let another_program_owner = Pubkey::new(&[8; 32]);
keyed_accounts = [KeyedAccount::new(&from, true, &mut from_account)];
let result = assign_account_to_program(&mut keyed_accounts, another_program_owner);
assert!(result.is_err());
assert_eq!(result, Err(ProgramError::AssignOfUnownedAccount));
assert_eq!(from_account.owner, new_program_owner);
}
@ -232,7 +250,7 @@ mod tests {
KeyedAccount::new(&to, false, &mut to_account),
];
let result = move_tokens(&mut keyed_accounts, 100);
assert!(result.is_err());
assert_eq!(result, Err(ProgramError::ResultWithNegativeTokens));
assert_eq!(from_account.tokens, 50);
assert_eq!(to_account.tokens, 51);
}

111
programs/system/tests/system.rs
View File

@ -1,9 +1,10 @@
use solana_runtime::bank::{Bank, Result};
use solana_runtime::bank::{Bank, BankError};
use solana_sdk::genesis_block::GenesisBlock;
use solana_sdk::pubkey::Pubkey;
use solana_sdk::native_program::ProgramError;
use solana_sdk::signature::{Keypair, KeypairUtil};
use solana_sdk::system_instruction::SystemInstruction;
use solana_sdk::system_program;
use solana_sdk::system_transaction::SystemTransaction;
use solana_sdk::transaction_builder::{BuilderInstruction, TransactionBuilder};
struct SystemBank<'a> {
bank: &'a Bank,
@ -14,91 +15,39 @@ impl<'a> SystemBank<'a> {
bank.add_native_program("solana_system_program", &system_program::id());
Self { bank }
}
fn create_account(&self, from_keypair: &Keypair, to: Pubkey, lamports: u64) -> Result<()> {
let blockhash = self.bank.last_blockhash();
let tx = SystemTransaction::new_account(from_keypair, to, lamports, blockhash, 0);
self.bank.process_transaction(&tx)
}
fn move_lamports(&self, from_keypair: &Keypair, to: Pubkey, lamports: u64) -> Result<()> {
let blockhash = self.bank.last_blockhash();
let tx = SystemTransaction::new_move(from_keypair, to, lamports, blockhash, 0);
self.bank.process_transaction(&tx)
}
}
#[test]
fn test_create_cannot_overwrite_used_account() {
let (genesis_block, from_keypair) = GenesisBlock::new(10_000);
fn test_system_unsigned_transaction() {
let (genesis_block, from_keypair) = GenesisBlock::new(100);
let bank = Bank::new(&genesis_block);
let system_bank = SystemBank::new(&bank);
// create_account on uninitialized account should work
let system_account = Keypair::new().pubkey();
system_bank
.create_account(&from_keypair, system_account, 100)
.unwrap();
assert_eq!(system_bank.bank.get_balance(&system_account), 100);
// Create an account assigned to another program
let other_account = Keypair::new().pubkey();
let program_id = Pubkey::new(&[9; 32]);
let tx = SystemTransaction::new_program_account(
&from_keypair,
other_account,
system_bank.bank.last_blockhash(),
1,
0,
program_id,
0,
);
// Fund to account to bypass AccountNotFound error
let to_keypair = Keypair::new();
let blockhash = system_bank.bank.last_blockhash();
let tx = TransactionBuilder::default()
.push(SystemInstruction::new_move(
from_keypair.pubkey(),
to_keypair.pubkey(),
50,
))
.sign(&[&from_keypair], blockhash);
system_bank.bank.process_transaction(&tx).unwrap();
assert_eq!(system_bank.bank.get_balance(&other_account), 1);
assert_eq!(
system_bank.bank.get_account(&other_account).unwrap().owner,
program_id
);
// create_account on an initialized account should fail
assert!(system_bank
.create_account(&from_keypair, other_account, 100)
.is_err());
assert_eq!(system_bank.bank.get_balance(&other_account), 1);
// Erroneously sign transaction with recipient account key
// No signature case is tested by bank `test_zero_signatures()`
let blockhash = system_bank.bank.last_blockhash();
let tx = TransactionBuilder::default()
.push(BuilderInstruction::new(
system_program::id(),
&SystemInstruction::Move { tokens: 10 },
vec![(from_keypair.pubkey(), false), (to_keypair.pubkey(), true)],
))
.sign(&[&to_keypair], blockhash);
assert_eq!(
system_bank.bank.get_account(&other_account).unwrap().owner,
program_id
);
}
#[test]
fn test_move_can_fund_used_account() {
let (genesis_block, from_keypair) = GenesisBlock::new(10_000);
let bank = Bank::new(&genesis_block);
let system_bank = SystemBank::new(&bank);
// Create an account assigned to another program
let other_account = Keypair::new().pubkey();
let program_id = Pubkey::new(&[9; 32]);
let tx = SystemTransaction::new_program_account(
&from_keypair,
other_account,
system_bank.bank.last_blockhash(),
1,
0,
program_id,
0,
);
system_bank.bank.process_transaction(&tx).unwrap();
assert_eq!(system_bank.bank.get_balance(&other_account), 1);
assert_eq!(
system_bank.bank.get_account(&other_account).unwrap().owner,
program_id
);
system_bank
.move_lamports(&from_keypair, other_account, 100)
.unwrap();
assert_eq!(system_bank.bank.get_balance(&other_account), 101);
assert_eq!(
system_bank.bank.get_account(&other_account).unwrap().owner,
program_id
system_bank.bank.process_transaction(&tx),
Err(BankError::ProgramError(0, ProgramError::InvalidArgument))
);
assert_eq!(system_bank.bank.get_balance(&from_keypair.pubkey()), 50);
assert_eq!(system_bank.bank.get_balance(&to_keypair.pubkey()), 50);
}