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

Move top-level native program tests to their respective crates

This commit is contained in:
Greg Fitzgerald 2019-03-02 20:56:49 -07:00 committed by Grimes
parent 037fcf6b3d
commit b830449f23
8 changed files with 67 additions and 104 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Cargo.lock generated
View File

@ -2091,6 +2091,7 @@ name = "solana-failure"
version = "0.12.0"
dependencies = [
"log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
"solana-runtime 0.12.0",
"solana-sdk 0.12.0",
]
@ -2211,6 +2212,7 @@ version = "0.12.0"
dependencies = [
"log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
"solana-logger 0.12.0",
"solana-runtime 0.12.0",
"solana-sdk 0.12.0",
]
@ -2220,11 +2222,8 @@ version = "0.12.0"
dependencies = [
"solana 0.12.0",
"solana-bpfloader 0.12.0",
"solana-failure 0.12.0",
"solana-logger 0.12.0",
"solana-native-loader 0.12.0",
"solana-noop 0.12.0",
"solana-runtime 0.12.0",
"solana-sdk 0.12.0",
]

5
programs/Cargo.toml
View File

@ -22,9 +22,4 @@ solana = { path = "../core", version = "0.12.0" }
solana-bpfloader = { path = "bpf_loader", version = "0.12.0" }
solana-logger = { path = "../logger", version = "0.12.0" }
solana-native-loader = { path = "native_loader", version = "0.12.0" }
solana-runtime = { path = "../runtime", version = "0.12.0" }
solana-sdk = { path = "../sdk", version = "0.12.0" }
[dev-dependencies]
solana-noop = { path = "noop", version = "0.12.0" }
solana-failure = { path = "failure", version = "0.12.0" }

3
programs/failure/Cargo.toml
View File

@ -12,6 +12,9 @@ edition = "2018"
solana-sdk = { path = "../../sdk", version = "0.12.0" }
log = "0.4.2"
[dev-dependencies]
solana-runtime = { path = "../../runtime", version = "0.12.0" }
[lib]
name = "failure"
crate-type = ["cdylib"]

30
programs/failure/tests/failure.rs Normal file
View File

@ -0,0 +1,30 @@
use solana_runtime::bank::Bank;
use solana_runtime::bank::BankError;
use solana_runtime::loader_utils::load_program;
use solana_sdk::genesis_block::GenesisBlock;
use solana_sdk::native_loader;
use solana_sdk::native_program::ProgramError;
use solana_sdk::transaction::Transaction;
#[test]
fn test_program_native_failure() {
let (genesis_block, mint_keypair) = GenesisBlock::new(50);
let bank = Bank::new(&genesis_block);
let program = "failure".as_bytes().to_vec();
let program_id = load_program(&bank, &mint_keypair, native_loader::id(), program);
// Call user program
let tx = Transaction::new(
&mint_keypair,
&[],
program_id,
&1u8,
bank.last_blockhash(),
0,
);
assert_eq!(
bank.process_transaction(&tx),
Err(BankError::ProgramError(0, ProgramError::GenericError))
);
}

3
programs/noop/Cargo.toml
View File

@ -13,6 +13,9 @@ solana-sdk = { path = "../../sdk", version = "0.12.0" }
solana-logger = { path = "../../logger", version = "0.12.0" }
log = "0.4.2"
[dev-dependencies]
solana-runtime = { path = "../../runtime", version = "0.12.0" }
[lib]
name = "noop"
crate-type = ["cdylib"]

28
programs/noop/tests/noop.rs Normal file
View File

@ -0,0 +1,28 @@
use solana_runtime::bank::Bank;
use solana_runtime::loader_utils::load_program;
use solana_sdk::genesis_block::GenesisBlock;
use solana_sdk::native_loader;
use solana_sdk::transaction::Transaction;
#[test]
fn test_program_native_noop() {
solana_logger::setup();
let (genesis_block, mint_keypair) = GenesisBlock::new(50);
let bank = Bank::new(&genesis_block);
let program = "noop".as_bytes().to_vec();
let program_id = load_program(&bank, &mint_keypair, native_loader::id(), program);
// Call user program
let tx = Transaction::new(
&mint_keypair,
&[],
program_id,
&1u8,
bank.last_blockhash(),
0,
);
bank.process_transaction(&tx).unwrap();
assert_eq!(bank.get_signature_status(&tx.signatures[0]), Some(Ok(())));
}

96
programs/tests/programs.rs
View File

@ -1,99 +1,3 @@
use solana_runtime::bank::Bank;
use solana_runtime::bank::BankError;
use solana_sdk::genesis_block::GenesisBlock;
use solana_sdk::loader_transaction::LoaderTransaction;
use solana_sdk::native_loader;
use solana_sdk::native_program::ProgramError;
use solana_sdk::pubkey::Pubkey;
use solana_sdk::signature::{Keypair, KeypairUtil};
use solana_sdk::system_transaction::SystemTransaction;
use solana_sdk::transaction::Transaction;
fn load_program(bank: &Bank, from: &Keypair, loader_id: Pubkey, program: Vec<u8>) -> Pubkey {
let program_account = Keypair::new();
let tx = SystemTransaction::new_program_account(
from,
program_account.pubkey(),
bank.last_blockhash(),
1,
program.len() as u64,
loader_id,
0,
);
bank.process_transaction(&tx).unwrap();
assert_eq!(bank.get_signature_status(&tx.signatures[0]), Some(Ok(())));
let chunk_size = 256; // Size of chunk just needs to fit into tx
let mut offset = 0;
for chunk in program.chunks(chunk_size) {
let tx = LoaderTransaction::new_write(
&program_account,
loader_id,
offset,
chunk.to_vec(),
bank.last_blockhash(),
0,
);
bank.process_transaction(&tx).unwrap();
offset += chunk_size as u32;
}
let tx = LoaderTransaction::new_finalize(&program_account, loader_id, bank.last_blockhash(), 0);
bank.process_transaction(&tx).unwrap();
assert_eq!(bank.get_signature_status(&tx.signatures[0]), Some(Ok(())));
program_account.pubkey()
}
#[test]
fn test_program_native_noop() {
solana_logger::setup();
let (genesis_block, mint_keypair) = GenesisBlock::new(50);
let bank = Bank::new(&genesis_block);
let program = "noop".as_bytes().to_vec();
let program_id = load_program(&bank, &mint_keypair, native_loader::id(), program);
// Call user program
let tx = Transaction::new(
&mint_keypair,
&[],
program_id,
&1u8,
bank.last_blockhash(),
0,
);
bank.process_transaction(&tx).unwrap();
assert_eq!(bank.get_signature_status(&tx.signatures[0]), Some(Ok(())));
}
#[test]
fn test_program_native_failure() {
solana_logger::setup();
let (genesis_block, mint_keypair) = GenesisBlock::new(50);
let bank = Bank::new(&genesis_block);
let program = "failure".as_bytes().to_vec();
let program_id = load_program(&bank, &mint_keypair, native_loader::id(), program);
// Call user program
let tx = Transaction::new(
&mint_keypair,
&[],
program_id,
&1u8,
bank.last_blockhash(),
0,
);
assert_eq!(
bank.process_transaction(&tx),
Err(BankError::ProgramError(0, ProgramError::GenericError))
);
}
#[cfg(feature = "bpf_c")]
use solana_sdk::bpf_loader;
#[cfg(any(feature = "bpf_c", feature = "bpf_rust"))]

1
runtime/src/lib.rs
View File

@ -3,6 +3,7 @@ pub mod appendvec;
pub mod bank;
pub mod bloom;
mod hash_queue;
pub mod loader_utils;
mod runtime;
mod status_cache;