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

Remove copypasta (#8700)

Browse Source 
automerge
This commit is contained in:
Jack May
2020-03-06 18:18:01 -08:00
committed by GitHub
parent cea8067219
commit a5f2444ad2
3 changed files with 42 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
programs/bpf/tests/programs.rs
View File

@@ -6,7 +6,8 @@ mod bpf {
genesis_utils::{create_genesis_config, GenesisConfigInfo},
loader_utils::load_program,
};
use std::{env, fs::File, path::PathBuf};
use solana_sdk::{bpf_loader, pubkey::Pubkey, signature::Keypair};
use std::{env, fs::File, io::Read, path::PathBuf};
/// BPF program file extension
const PLATFORM_FILE_EXTENSION_BPF: &str = "so";
@@ -23,20 +24,28 @@ mod bpf {
pathbuf
}
fn load_bpf_program(bank_client: &BankClient, payer_keypair: &Keypair, name: &str) -> Pubkey {
let path = create_bpf_path(name);
println!("path {:?}", path);
let mut file = File::open(path).unwrap();
let mut elf = Vec::new();
file.read_to_end(&mut elf).unwrap();
load_program(bank_client, payer_keypair, &bpf_loader::id(), elf)
}
#[cfg(feature = "bpf_c")]
mod bpf_c {
use super::*;
use solana_runtime::loader_utils::create_invoke_instruction;
use solana_sdk::{
account::Account,
bpf_loader,
client::SyncClient,
instruction::{AccountMeta, Instruction, InstructionError},
pubkey::Pubkey,
signature::Signer,
transaction::TransactionError,
};
use std::{io::Read, sync::Arc};
use std::sync::Arc;
#[test]
fn test_program_bpf_c() {
@@ -54,9 +63,6 @@ mod bpf {
];
for program in programs.iter() {
println!("Test program: {:?}", program.0);
let mut file = File::open(create_bpf_path(program.0)).expect("file open failed");
let mut elf = Vec::new();
file.read_to_end(&mut elf).unwrap();
let GenesisConfigInfo {
genesis_config,
@@ -67,7 +73,7 @@ mod bpf {
let bank_client = BankClient::new(bank);
// Call user program
let program_id = load_program(&bank_client, &mint_keypair, &bpf_loader::id(), elf);
let program_id = load_bpf_program(&bank_client, &mint_keypair, program.0);
let instruction =
create_invoke_instruction(mint_keypair.pubkey(), program_id, &1u8);
let result = bank_client.send_instruction(&mint_keypair, instruction);
@@ -83,11 +89,6 @@ mod bpf {
fn test_program_bpf_c_duplicate_accounts() {
solana_logger::setup();
let filename = create_bpf_path("dup_accounts");
let mut file = File::open(filename).unwrap();
let mut elf = Vec::new();
file.read_to_end(&mut elf).unwrap();
let GenesisConfigInfo {
genesis_config,
mint_keypair,
@@ -96,8 +97,7 @@ mod bpf {
let bank = Arc::new(Bank::new(&genesis_config));
let bank_client = BankClient::new_shared(&bank);
let program_id = load_program(&bank_client, &mint_keypair, &bpf_loader::id(), elf);
let program_id = load_bpf_program(&bank_client, &mint_keypair, "dup_accounts");
let payee_account = Account::new(10, 1, &program_id);
let payee_pubkey = Pubkey::new_rand();
bank.store_account(&payee_pubkey, &payee_account);
@@ -158,11 +158,6 @@ mod bpf {
fn test_program_bpf_c_error_handling() {
solana_logger::setup();
let filename = create_bpf_path("error_handling");
let mut file = File::open(filename).unwrap();
let mut elf = Vec::new();
file.read_to_end(&mut elf).unwrap();
let GenesisConfigInfo {
genesis_config,
mint_keypair,
@@ -171,7 +166,7 @@ mod bpf {
let bank = Bank::new(&genesis_config);
let bank_client = BankClient::new(bank);
let program_id = load_program(&bank_client, &mint_keypair, &bpf_loader::id(), elf);
let program_id = load_bpf_program(&bank_client, &mint_keypair, "error_handling");
let account_metas = vec![AccountMeta::new(mint_keypair.pubkey(), true)];
let instruction = Instruction::new(program_id, &1u8, account_metas.clone());
@@ -220,7 +215,6 @@ mod bpf {
use super::*;
use solana_sdk::{
account::Account,
bpf_loader,
client::SyncClient,
clock::DEFAULT_SLOTS_PER_EPOCH,
instruction::{AccountMeta, Instruction, InstructionError},
@@ -229,7 +223,6 @@ mod bpf {
sysvar::{clock, fees, rent, rewards, slot_hashes, stake_history},
transaction::TransactionError,
};
use std::io::Read;
use std::sync::Arc;
#[test]
@@ -249,11 +242,7 @@ mod bpf {
("solana_bpf_rust_sysval", true),
];
for program in programs.iter() {
let filename = create_bpf_path(program.0);
println!("Test program: {:?} from {:?}", program.0, filename);
let mut file = File::open(filename).unwrap();
let mut elf = Vec::new();
file.read_to_end(&mut elf).unwrap();
println!("Test program: {:?}", program.0);
let GenesisConfigInfo {
genesis_config,
@@ -267,7 +256,7 @@ mod bpf {
let bank_client = BankClient::new(bank);
// Call user program
let program_id = load_program(&bank_client, &mint_keypair, &bpf_loader::id(), elf);
let program_id = load_bpf_program(&bank_client, &mint_keypair, program.0);
let account_metas = vec![
AccountMeta::new(mint_keypair.pubkey(), true),
AccountMeta::new(Keypair::new().pubkey(), false),
@@ -292,21 +281,15 @@ mod bpf {
fn test_program_bpf_rust_duplicate_accounts() {
solana_logger::setup();
let filename = create_bpf_path("solana_bpf_rust_dup_accounts");
let mut file = File::open(filename).unwrap();
let mut elf = Vec::new();
file.read_to_end(&mut elf).unwrap();
let GenesisConfigInfo {
genesis_config,
mint_keypair,
..
} = create_genesis_config(50);
let bank = Arc::new(Bank::new(&genesis_config));
let bank_client = BankClient::new_shared(&bank);
let program_id = load_program(&bank_client, &mint_keypair, &bpf_loader::id(), elf);
let program_id =
load_bpf_program(&bank_client, &mint_keypair, "solana_bpf_rust_dup_accounts");
let payee_account = Account::new(10, 1, &program_id);
let payee_pubkey = Pubkey::new_rand();
bank.store_account(&payee_pubkey, &payee_account);
@@ -367,20 +350,18 @@ mod bpf {
fn test_program_bpf_rust_error_handling() {
solana_logger::setup();
let filename = create_bpf_path("solana_bpf_rust_error_handling");
let mut file = File::open(filename).unwrap();
let mut elf = Vec::new();
file.read_to_end(&mut elf).unwrap();
let GenesisConfigInfo {
genesis_config,
mint_keypair,
..
} = create_genesis_config(50);
let bank = Bank::new(&genesis_config);
let bank_client = BankClient::new(bank);
let program_id = load_program(&bank_client, &mint_keypair, &bpf_loader::id(), elf);
let program_id = load_bpf_program(
&bank_client,
&mint_keypair,
"solana_bpf_rust_error_handling",
);
let account_metas = vec![AccountMeta::new(mint_keypair.pubkey(), true)];
let instruction = Instruction::new(program_id, &1u8, account_metas.clone());