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

Revert "Make instruction data opaque to runtime (#6470)" (#6564)

Browse Source 
This reverts commit 6eeca9c6f1.
This commit is contained in:
Jack May
2019-10-25 16:22:41 -07:00
committed by GitHub
parent 0cfa3d3de7
commit d68e2c4d06
10 changed files with 114 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
programs/bpf/Cargo.lock generated
View File

@ -1777,7 +1777,6 @@ dependencies = [
name = "solana-runtime"
version = "0.20.0"
dependencies = [
"backtrace 0.3.37 (registry+https://github.com/rust-lang/crates.io-index)",
"bincode 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
"bv 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
"byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",

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

@ -3,12 +3,9 @@ mod bpf {
use solana_runtime::bank::Bank;
use solana_runtime::bank_client::BankClient;
use solana_runtime::genesis_utils::{create_genesis_block, GenesisBlockInfo};
use solana_runtime::loader_utils::{load_program, run_program};
use solana_sdk::bpf_loader;
use solana_sdk::instruction::AccountMeta;
use solana_runtime::loader_utils::load_program;
use std::env;
use std::fs::File;
use std::io::Read;
use std::path::PathBuf;
/// BPF program file extension
@ -29,7 +26,11 @@ mod bpf {
#[cfg(feature = "bpf_c")]
mod bpf_c {
use super::*;
use solana_runtime::loader_utils::create_invoke_instruction;
use solana_sdk::bpf_loader;
use solana_sdk::client::SyncClient;
use solana_sdk::signature::KeypairUtil;
use std::io::Read;
#[test]
fn test_program_bpf_c() {
@ -61,14 +62,9 @@ mod bpf {
// Call user program
let program_id = load_program(&bank_client, &mint_keypair, &bpf_loader::id(), elf);
let account_metas = vec![AccountMeta::new(mint_keypair.pubkey(), true)];
let result = run_program(
&bank_client,
&mint_keypair,
&program_id,
account_metas,
&1u8,
);
let instruction =
create_invoke_instruction(mint_keypair.pubkey(), program_id, &1u8);
let result = bank_client.send_instruction(&mint_keypair, instruction);
if program.1 {
assert!(result.is_ok());
} else {
@ -81,10 +77,14 @@ mod bpf {
#[cfg(feature = "bpf_rust")]
mod bpf_rust {
use super::*;
use solana_sdk::bpf_loader;
use solana_sdk::client::SyncClient;
use solana_sdk::clock::DEFAULT_SLOTS_PER_EPOCH;
use solana_sdk::instruction::{AccountMeta, Instruction};
use solana_sdk::pubkey::Pubkey;
use solana_sdk::signature::{Keypair, KeypairUtil};
use solana_sdk::sysvar::{clock, fees, rent, rewards, slot_hashes, stake_history};
use std::io::Read;
use std::sync::Arc;
#[test]
@ -133,13 +133,8 @@ mod bpf {
AccountMeta::new(stake_history::id(), false),
AccountMeta::new(rent::id(), false),
];
let result = run_program(
&bank_client,
&mint_keypair,
&program_id,
account_metas,
&1u8,
);
let instruction = Instruction::new(program_id, &1u8, account_metas);
let result = bank_client.send_instruction(&mint_keypair, instruction);
if program.1 {
assert!(result.is_ok());
} else {

8
programs/bpf_loader_api/src/lib.rs
View File

@ -167,12 +167,8 @@ pub fn process_instruction(
}
}
} else {
warn!(
"Invalid instruction data ({:?}): {:?}",
ix_data.len(),
ix_data
);
return Err(InstructionError::InvalidInstructionData);
warn!("Invalid instruction data: {:?}", ix_data);
return Err(InstructionError::GenericError);
}
Ok(())
}

21
programs/failure_program/tests/failure.rs
View File

@ -1,8 +1,8 @@
use solana_runtime::bank::Bank;
use solana_runtime::bank_client::BankClient;
use solana_runtime::loader_utils::run_program;
use solana_runtime::loader_utils::create_invoke_instruction;
use solana_sdk::client::SyncClient;
use solana_sdk::genesis_block::create_genesis_block;
use solana_sdk::instruction::AccountMeta;
use solana_sdk::instruction::InstructionError;
use solana_sdk::pubkey::Pubkey;
use solana_sdk::signature::KeypairUtil;
@ -14,20 +14,15 @@ fn test_program_native_failure() {
let program_id = Pubkey::new_rand();
let bank = Bank::new(&genesis_block);
bank.register_native_instruction_processor("solana_failure_program", &program_id);
let bank_client = BankClient::new(bank);
// Call user program
let account_metas = vec![AccountMeta::new(alice_keypair.pubkey(), true)];
let instruction = create_invoke_instruction(alice_keypair.pubkey(), program_id, &1u8);
let bank_client = BankClient::new(bank);
assert_eq!(
run_program(
&bank_client,
&alice_keypair,
&program_id,
account_metas,
&1u8,
)
.unwrap_err()
.unwrap(),
bank_client
.send_instruction(&alice_keypair, instruction)
.unwrap_err()
.unwrap(),
TransactionError::InstructionError(0, InstructionError::GenericError)
);
}