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

Add solana_ prefix to loaders so their logs appear in the default RUST_LOG config

This commit is contained in:
Michael Vines 2018-10-30 11:07:11 -07:00 committed by Grimes
parent ae7222f0df
commit 073d39df44
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
programs/native/bpf_loader/Cargo.toml
View File

@ -19,6 +19,6 @@ serde_derive = "1.0.27"
solana-sdk = { path = "../../../sdk", version = "0.11.0" } solana-sdk = { path = "../../../sdk", version = "0.11.0" }
[lib] [lib]
name = "bpf_loader" name = "solana_bpf_loader"
crate-type = ["cdylib"] crate-type = ["cdylib"]

2
programs/native/lua_loader/Cargo.toml
View File

@ -19,6 +19,6 @@ solana-sdk = { path = "../../../sdk", version = "0.11.0" }
bincode = "1.0.0" bincode = "1.0.0"
[lib] [lib]
name = "lua_loader" name = "solana_lua_loader"
crate-type = ["cdylib"] crate-type = ["cdylib"]

4
programs/native/lua_loader/src/lib.rs
View File

@ -79,8 +79,8 @@ pub extern "C" fn process(keyed_accounts: &mut [KeyedAccount], tx_data: &[u8]) -
let len = bytes.len(); let len = bytes.len();
trace!("LuaLoader::Write offset {} length {:?}", offset, len); trace!("LuaLoader::Write offset {} length {:?}", offset, len);
if keyed_accounts[0].account.userdata.len() < offset + len { if keyed_accounts[0].account.userdata.len() < offset + len {
println!( warn!(
"Overflow {} < {}", "Write overflow {} < {}",
keyed_accounts[0].account.userdata.len(), keyed_accounts[0].account.userdata.len(),
offset + len offset + len
); );

2
src/bpf_loader.rs
View File

@ -3,7 +3,7 @@ use native_loader;
use solana_sdk::account::Account; use solana_sdk::account::Account;
use solana_sdk::pubkey::Pubkey; use solana_sdk::pubkey::Pubkey;
const BPF_LOADER_NAME: &str = "bpf_loader"; const BPF_LOADER_NAME: &str = "solana_bpf_loader";
const BPF_LOADER_PROGRAM_ID: [u8; 32] = [ const BPF_LOADER_PROGRAM_ID: [u8; 32] = [
128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0,

4
tests/programs.rs
View File

@ -204,7 +204,7 @@ fn test_program_native_noop() {
fn test_program_lua_move_funds() { fn test_program_lua_move_funds() {
logger::setup(); logger::setup();
let loader = Loader::new_dynamic("lua_loader"); let loader = Loader::new_dynamic("solana_lua_loader");
let userdata = r#" let userdata = r#"
print("Lua Script!") print("Lua Script!")
local tokens, _ = string.unpack("I", data) local tokens, _ = string.unpack("I", data)
@ -303,7 +303,7 @@ fn test_program_builtin_bpf_noop() {
fn test_program_bpf_noop_c() { fn test_program_bpf_noop_c() {
logger::setup(); logger::setup();
let loader = Loader::new_dynamic("bpf_loader"); let loader = Loader::new_dynamic("solana_bpf_loader");
let program = Program::new( let program = Program::new(
&loader, &loader,
elf::File::open_path(&create_bpf_path("noop")) elf::File::open_path(&create_bpf_path("noop"))