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

Refactor: move compute budget runtime logic into solana-program-runtime (backport #22543) (#22545)

Browse Source 
* Refactor: move compute budget runtime logic into solana-program-runtime (#22543)

(cherry picked from commit cc76a73c49)

# Conflicts:
#	programs/bpf/tests/programs.rs
#	sdk/src/compute_budget.rs

* resolve conflicts

Co-authored-by: Justin Starry <justin@solana.com>
This commit is contained in:
mergify[bot]
2022-01-21 13:45:01 +08:00
committed by GitHub
parent a0a881594a
commit 7f10fd6a21
8 changed files with 300 additions and 279 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -17,7 +17,10 @@ use solana_bpf_loader_program::{
use solana_bpf_rust_invoke::instructions::*;
use solana_bpf_rust_realloc::instructions::*;
use solana_bpf_rust_realloc_invoke::instructions::*;
use solana_program_runtime::{invoke_context::with_mock_invoke_context, timings::ExecuteTimings};
use solana_program_runtime::{
compute_budget::ComputeBudget, invoke_context::with_mock_invoke_context,
timings::ExecuteTimings,
};
use solana_rbpf::{
elf::Executable,
static_analysis::Analysis,
@ -41,7 +44,7 @@ use solana_sdk::{
bpf_loader, bpf_loader_deprecated, bpf_loader_upgradeable,
client::SyncClient,
clock::MAX_PROCESSING_AGE,
compute_budget::{ComputeBudget, ComputeBudgetInstruction},
compute_budget::ComputeBudgetInstruction,
entrypoint::{MAX_PERMITTED_DATA_INCREASE, SUCCESS},
instruction::{AccountMeta, CompiledInstruction, Instruction, InstructionError},
loader_instruction,