diff --git a/programs/bpf/rust/128bit/src/lib.rs b/programs/bpf/rust/128bit/src/lib.rs index 001ef79dae..f4792bbdbb 100644 --- a/programs/bpf/rust/128bit/src/lib.rs +++ b/programs/bpf/rust/128bit/src/lib.rs @@ -2,7 +2,6 @@ extern crate solana_sdk; use solana_sdk::entrypoint::SUCCESS; -use solana_sdk::info; #[no_mangle] pub extern "C" fn entrypoint(_input: *mut u8) -> u32 { @@ -48,6 +47,5 @@ pub extern "C" fn entrypoint(_input: *mut u8) -> u32 { ); assert_eq!(x, 0x0001_ffff_ffff_ffff_fffe); - info!("Success"); SUCCESS } diff --git a/programs/bpf/rust/alloc/src/lib.rs b/programs/bpf/rust/alloc/src/lib.rs index bc8de66220..58afa6e6f3 100644 --- a/programs/bpf/rust/alloc/src/lib.rs +++ b/programs/bpf/rust/alloc/src/lib.rs @@ -100,6 +100,5 @@ pub extern "C" fn entrypoint(_input: *mut u8) -> u32 { assert_eq!(v.len(), ITERS); } - info!("Success"); SUCCESS } diff --git a/programs/bpf/rust/dep_crate/src/lib.rs b/programs/bpf/rust/dep_crate/src/lib.rs index f8f3968163..2c903c3bd7 100644 --- a/programs/bpf/rust/dep_crate/src/lib.rs +++ b/programs/bpf/rust/dep_crate/src/lib.rs @@ -3,7 +3,6 @@ extern crate solana_sdk; use byteorder::{ByteOrder, LittleEndian}; use solana_sdk::entrypoint::SUCCESS; -use solana_sdk::info; #[no_mangle] pub extern "C" fn entrypoint(_input: *mut u8) -> u32 { @@ -15,6 +14,5 @@ pub extern "C" fn entrypoint(_input: *mut u8) -> u32 { LittleEndian::write_i16(&mut buf, -5_000); assert_eq!(-5_000, LittleEndian::read_i16(&buf)); - info!("Success"); SUCCESS } diff --git a/programs/bpf/rust/iter/src/lib.rs b/programs/bpf/rust/iter/src/lib.rs index 7361817cff..87cc22aa96 100644 --- a/programs/bpf/rust/iter/src/lib.rs +++ b/programs/bpf/rust/iter/src/lib.rs @@ -16,6 +16,5 @@ pub extern "C" fn entrypoint(_input: *mut u8) -> u32 { info!(0xff, 0, 0, 0, sum); assert_eq!(sum, ITERS as u64); - info!("Success"); SUCCESS } diff --git a/programs/bpf/rust/many_args/src/lib.rs b/programs/bpf/rust/many_args/src/lib.rs index fef3441625..9b5ec2e1f4 100644 --- a/programs/bpf/rust/many_args/src/lib.rs +++ b/programs/bpf/rust/many_args/src/lib.rs @@ -24,6 +24,5 @@ pub extern "C" fn entrypoint(_input: *mut u8) -> u32 { } ); - info!("Success"); SUCCESS } diff --git a/programs/bpf/rust/noop/src/lib.rs b/programs/bpf/rust/noop/src/lib.rs index d89586b615..d1ed6eca61 100644 --- a/programs/bpf/rust/noop/src/lib.rs +++ b/programs/bpf/rust/noop/src/lib.rs @@ -54,7 +54,6 @@ fn process_instruction(program_id: &Pubkey, accounts: &mut [AccountInfo], data: panic!(); } - info!("Success"); SUCCESS } diff --git a/programs/bpf/rust/param_passing/src/lib.rs b/programs/bpf/rust/param_passing/src/lib.rs index 1170fac991..750b32237c 100644 --- a/programs/bpf/rust/param_passing/src/lib.rs +++ b/programs/bpf/rust/param_passing/src/lib.rs @@ -20,5 +20,6 @@ pub extern "C" fn entrypoint(_input: *mut u8) -> u32 { let test_dep = TestDep::new(&data, 1, 2, 3, 4, 5); info!(0, 0, 0, 0, test_dep.thirty); assert!(test_dep.thirty == 30); + SUCCESS } diff --git a/programs/bpf_loader_api/src/helpers.rs b/programs/bpf_loader_api/src/helpers.rs index 21880abb6e..843afe7137 100644 --- a/programs/bpf_loader_api/src/helpers.rs +++ b/programs/bpf_loader_api/src/helpers.rs @@ -109,7 +109,7 @@ pub fn helper_sol_log( if i == len - 1 || c == 0 { let message = from_utf8(from_raw_parts(host_addr as *const u8, len as usize)).unwrap(); - println!("info!: {}", message); + info!("info!: {}", message); return Ok(0); } } diff --git a/programs/bpf_loader_api/src/lib.rs b/programs/bpf_loader_api/src/lib.rs index d119123324..13497e9873 100644 --- a/programs/bpf_loader_api/src/lib.rs +++ b/programs/bpf_loader_api/src/lib.rs @@ -97,7 +97,7 @@ pub fn process_instruction( } let offset = offset as usize; let len = bytes.len(); - debug!("Write: offset={} length={}", offset, len); + trace!("Write: offset={} length={}", offset, len); if keyed_accounts[0].account.data.len() < offset + len { warn!( "Write overflow: {} < {}", @@ -126,7 +126,6 @@ pub fn process_instruction( } let (progs, params) = keyed_accounts.split_at_mut(1); let prog = &progs[0].account.data; - info!("Call BPF program"); let (mut vm, heap_region) = match create_vm(prog) { Ok(info) => info, Err(e) => { @@ -136,6 +135,7 @@ pub fn process_instruction( }; let mut v = serialize_parameters(program_id, params, &data); + info!("Call BPF program"); match vm.execute_program(v.as_mut_slice(), &[], &[heap_region]) { Ok(status) => match u32::try_from(status) { Ok(status) => { @@ -155,10 +155,7 @@ pub fn process_instruction( } } deserialize_parameters(params, &v); - info!( - "BPF program executed {} instructions", - vm.get_last_instruction_count() - ); + info!("BPF program success"); } } } else {