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

Don't depend on solana_native_loader for IDs in the SDK

Browse Source
This commit is contained in:
Greg Fitzgerald
2019-02-07 09:03:40 -07:00
committed by Grimes
parent 83b40e4f30
commit d1945c29d7
5 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
programs/native/native_loader/src/lib.rs
View File

@ -7,9 +7,7 @@ use libloading::os::windows::*;
use log::*;
use solana_sdk::account::KeyedAccount;
use solana_sdk::loader_instruction::LoaderInstruction;
pub use solana_sdk::native_loader::*;
use solana_sdk::native_program;
use solana_sdk::native_program::ProgramError;
use solana_sdk::native_program::{self, ProgramError};
use solana_sdk::pubkey::Pubkey;
use std::env;
use std::path::PathBuf;
@ -48,10 +46,6 @@ fn create_path(name: &str) -> PathBuf {
}
}
pub fn check_id(program_id: &Pubkey) -> bool {
program_id.as_ref() == NATIVE_LOADER_PROGRAM_ID
}
pub fn entrypoint(
program_id: &Pubkey,
keyed_accounts: &mut [KeyedAccount],

9
programs/tests/programs.rs
View File

@ -1,6 +1,7 @@
use solana::bank::Bank;
use solana::genesis_block::GenesisBlock;
use solana_sdk::loader_transaction::LoaderTransaction;
use solana_sdk::native_loader;
use solana_sdk::pubkey::Pubkey;
use solana_sdk::signature::{Keypair, KeypairUtil};
use solana_sdk::system_transaction::SystemTransaction;
@ -52,7 +53,7 @@ fn test_program_native_noop() {
let bank = Bank::new(&genesis_block);
let program = "noop".as_bytes().to_vec();
let program_id = load_program(&bank, &mint_keypair, solana_native_loader::id(), program);
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_id(), 0);
@ -68,7 +69,7 @@ fn test_program_lua_move_funds() {
let loader_id = load_program(
&bank,
&mint_keypair,
solana_native_loader::id(),
native_loader::id(),
"solana_lua_loader".as_bytes().to_vec(),
);
@ -191,7 +192,7 @@ fn test_program_bpf_c() {
let loader_id = load_program(
&bank,
&mint_keypair,
solana_native_loader::id(),
native_loader::id(),
"solana_bpf_loader".as_bytes().to_vec(),
);
@ -230,7 +231,7 @@ fn test_program_bpf_rust() {
let loader_id = load_program(
&bank,
&mint_keypair,
solana_native_loader::id(),
native_loader::id(),
"solana_bpf_loader".as_bytes().to_vec(),
);