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

Cleanup #22182 (#22205)

Browse Source 
* Turns compute_units_consumed of ProcessInstructionResult into a &mut parameter.

* Removes second nesting level from test_process_instruction_compute_budget().

* Makes test_process_cross_program and test_native_invoke symmetric.

* Unifies test_process_cross_program(), test_native_invoke() and test_process_instruction_compute_budget() into test_process_instruction().
This commit is contained in:
Alexander Meißner
2021-12-31 17:55:27 +01:00
committed by GitHub
parent 557d35ec79
commit e529d03c11
4 changed files with 109 additions and 310 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
runtime/src/message_processor.rs
View File

@ -3,7 +3,7 @@ use {
solana_measure::measure::Measure,
solana_program_runtime::{
instruction_recorder::InstructionRecorder,
invoke_context::{BuiltinProgram, Executors, InvokeContext, ProcessInstructionResult},
invoke_context::{BuiltinProgram, Executors, InvokeContext},
log_collector::LogCollector,
timings::ExecuteDetailsTimings,
},
@ -128,14 +128,13 @@ impl MessageProcessor {
})
.collect::<Vec<_>>();
let mut time = Measure::start("execute_instruction");
let ProcessInstructionResult {
compute_units_consumed,
result,
} = invoke_context.process_instruction(
let mut compute_units_consumed = 0;
let result = invoke_context.process_instruction(
&instruction.data,
&instruction_accounts,
None,
program_indices,
&mut compute_units_consumed,
);
time.stop();
timings.accumulate_program(