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

Simplifies return_data accessors in InvokeContext. (#20290)

Browse Source
This commit is contained in:
Alexander Meißner
2021-09-29 19:11:06 +02:00
committed by GitHub
parent 57c8abf499
commit 4de5fff3ca
6 changed files with 58 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
programs/bpf_loader/src/lib.rs
View File

@@ -945,9 +945,9 @@ impl Executor for BpfExecutor {
trace!("BPF Program Instruction Trace:\n{}", trace_string);
}
drop(vm);
let return_data = invoke_context.get_return_data();
if let Some((program_id, return_data)) = return_data {
stable_log::program_return(&logger, program_id, return_data);
let (program_id, return_data) = invoke_context.get_return_data();
if !return_data.is_empty() {
stable_log::program_return(&logger, &program_id, return_data);
}
match result {
Ok(status) => {
@@ -960,7 +960,7 @@ impl Executor for BpfExecutor {
} else {
status.into()
};
stable_log::program_failure(&logger, program_id, &error);
stable_log::program_failure(&logger, &program_id, &error);
return Err(error);
}
}
@@ -974,7 +974,7 @@ impl Executor for BpfExecutor {
InstructionError::ProgramFailedToComplete
}
};
stable_log::program_failure(&logger, program_id, &error);
stable_log::program_failure(&logger, &program_id, &error);
return Err(error);
}
}