From 3f843f21b91d8cb69cb579ab7e46840b4cdc123c Mon Sep 17 00:00:00 2001 From: Michael Vines Date: Tue, 30 Oct 2018 11:07:11 -0700 Subject: [PATCH] Add solana_ prefix to loaders so their logs appear in the default RUST_LOG config --- programs/native/bpf_loader/Cargo.toml | 2 +- programs/native/lua_loader/Cargo.toml | 2 +- programs/native/lua_loader/src/lib.rs | 4 ++-- src/bpf_loader.rs | 2 +- tests/programs.rs | 8 ++++---- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/programs/native/bpf_loader/Cargo.toml b/programs/native/bpf_loader/Cargo.toml index 62bd49d364..ae42c4e437 100644 --- a/programs/native/bpf_loader/Cargo.toml +++ b/programs/native/bpf_loader/Cargo.toml @@ -19,6 +19,6 @@ serde_derive = "1.0.27" solana-sdk = { path = "../../../sdk", version = "0.10.0" } [lib] -name = "bpf_loader" +name = "solana_bpf_loader" crate-type = ["cdylib"] diff --git a/programs/native/lua_loader/Cargo.toml b/programs/native/lua_loader/Cargo.toml index 68b3db93da..18485b7ead 100644 --- a/programs/native/lua_loader/Cargo.toml +++ b/programs/native/lua_loader/Cargo.toml @@ -19,6 +19,6 @@ solana-sdk = { path = "../../../sdk", version = "0.10.0" } bincode = "1.0.0" [lib] -name = "lua_loader" +name = "solana_lua_loader" crate-type = ["cdylib"] diff --git a/programs/native/lua_loader/src/lib.rs b/programs/native/lua_loader/src/lib.rs index 5a6997d026..863df86e80 100644 --- a/programs/native/lua_loader/src/lib.rs +++ b/programs/native/lua_loader/src/lib.rs @@ -79,8 +79,8 @@ pub extern "C" fn process(keyed_accounts: &mut [KeyedAccount], tx_data: &[u8]) - let len = bytes.len(); trace!("LuaLoader::Write offset {} length {:?}", offset, len); if keyed_accounts[0].account.userdata.len() < offset + len { - println!( - "Overflow {} < {}", + warn!( + "Write overflow {} < {}", keyed_accounts[0].account.userdata.len(), offset + len ); diff --git a/src/bpf_loader.rs b/src/bpf_loader.rs index 23f7d4da1b..c752c22631 100644 --- a/src/bpf_loader.rs +++ b/src/bpf_loader.rs @@ -3,7 +3,7 @@ use native_loader; use solana_sdk::account::Account; 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] = [ 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, diff --git a/tests/programs.rs b/tests/programs.rs index 38dbba0111..0905254576 100644 --- a/tests/programs.rs +++ b/tests/programs.rs @@ -205,7 +205,7 @@ fn test_program_native_noop() { fn test_program_lua_move_funds() { logger::setup(); - let loader = Loader::new_dynamic("lua_loader"); + let loader = Loader::new_dynamic("solana_lua_loader"); let userdata = r#" print("Lua Script!") local tokens, _ = string.unpack("I", data) @@ -304,7 +304,7 @@ fn test_program_builtin_bpf_noop() { fn test_program_bpf_noop_c() { logger::setup(); - let loader = Loader::new_dynamic("bpf_loader"); + let loader = Loader::new_dynamic("solana_bpf_loader"); let program = Program::new( &loader, elf::File::open_path(&create_bpf_path("noop")) @@ -507,7 +507,7 @@ impl Dashboard { fn test_program_bpf_tictactoe_c() { logger::setup(); - let loader = Loader::new_dynamic("bpf_loader"); + let loader = Loader::new_dynamic("solana_bpf_loader"); let program = Program::new( &loader, elf::File::open_path(&create_bpf_path("tictactoe")) @@ -540,7 +540,7 @@ fn test_program_bpf_tictactoe_c() { fn test_program_bpf_tictactoe_dashboard_c() { logger::setup(); - let loader = Loader::new_dynamic("bpf_loader"); + let loader = Loader::new_dynamic("solana_bpf_loader"); let ttt_program = Program::new( &loader, elf::File::open_path(&create_bpf_path("tictactoe"))