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

Bumps solana_rbpf to v0.2.16 (#21492)

Browse Source
This commit is contained in:
Alexander Meißner
2021-11-30 16:26:36 +01:00
committed by GitHub
parent e960634909
commit c9aa7ed5ca
11 changed files with 41 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
programs/bpf/tests/programs.rs
View File

@ -20,8 +20,9 @@ use solana_bpf_rust_realloc_invoke::instructions::*;
use solana_cli_output::display::println_transaction;
use solana_program_runtime::invoke_context::{with_mock_invoke_context, InvokeContext};
use solana_rbpf::{
elf::Executable,
static_analysis::Analysis,
vm::{Config, Executable, Tracer},
vm::{Config, Tracer},
};
use solana_runtime::{
bank::{Bank, ExecuteTimings, NonceInfo, TransactionBalancesSet, TransactionResults},
@ -210,7 +211,7 @@ fn run_program(name: &str) -> u64 {
enable_instruction_tracing: true,
..Config::default()
};
let mut executable = <dyn Executable<BpfError, ThisInstructionMeter>>::from_elf(
let mut executable = Executable::<BpfError, ThisInstructionMeter>::from_elf(
&data,
None,
config,
@ -227,7 +228,7 @@ fn run_program(name: &str) -> u64 {
{
let mut vm = create_vm(
&loader_id,
executable.as_ref(),
&executable,
parameter_bytes.as_slice_mut(),
invoke_context,
&account_lengths,
@ -246,7 +247,7 @@ fn run_program(name: &str) -> u64 {
if config.enable_instruction_tracing {
if i == 1 {
if !Tracer::compare(tracer.as_ref().unwrap(), vm.get_tracer()) {
let analysis = Analysis::from_executable(executable.as_ref());
let analysis = Analysis::from_executable(&executable);
let stdout = std::io::stdout();
println!("TRACE (interpreted):");
tracer
@ -260,7 +261,7 @@ fn run_program(name: &str) -> u64 {
.unwrap();
assert!(false);
} else if log_enabled!(Trace) {
let analysis = Analysis::from_executable(executable.as_ref());
let analysis = Analysis::from_executable(&executable);
let mut trace_buffer = Vec::<u8>::new();
tracer
.as_ref()