blockworks-foundation
/
solana-with-rpc-optimizations
mirror of https://github.com/blockworks-foundation/solana-with-rpc-optimizations.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Selectable jit in program-test (#16685)

This commit is contained in:
Jack May 2021-04-20 15:02:54 -07:00 committed by GitHub
parent 34addee882
commit 05fa7250b0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
program-test/src/lib.rs
View File

@ -466,6 +466,7 @@ pub struct ProgramTest {
builtins: Vec<Builtin>, builtins: Vec<Builtin>,
bpf_compute_max_units: Option<u64>, bpf_compute_max_units: Option<u64>,
prefer_bpf: bool, prefer_bpf: bool,
use_bpf_jit: bool,
} }
impl Default for ProgramTest { impl Default for ProgramTest {
@ -495,6 +496,7 @@ impl Default for ProgramTest {
builtins: vec![], builtins: vec![],
bpf_compute_max_units: None, bpf_compute_max_units: None,
prefer_bpf, prefer_bpf,
use_bpf_jit: false,
} }
} }
} }
@ -520,6 +522,11 @@ impl ProgramTest {
self.bpf_compute_max_units = Some(bpf_compute_max_units); self.bpf_compute_max_units = Some(bpf_compute_max_units);
} }
/// Execute the BPF program with JIT if true, interpreted if false
pub fn use_bpf_jit(&mut self, use_bpf_jit: bool) {
self.use_bpf_jit = use_bpf_jit;
}
/// Add an account to the test environment /// Add an account to the test environment
pub fn add_account(&mut self, address: Pubkey, account: Account) { pub fn add_account(&mut self, address: Pubkey, account: Account) {
self.accounts self.accounts
@ -688,11 +695,17 @@ impl ProgramTest {
let mut bank = Bank::new(&genesis_config); let mut bank = Bank::new(&genesis_config);
for loader in &[ // Add loaders
solana_bpf_loader_deprecated_program!(), macro_rules! add_builtin {
solana_bpf_loader_program!(), ($b:expr) => {
] { bank.add_builtin(&$b.0, $b.1, $b.2)
bank.add_builtin(&loader.0, loader.1, loader.2); };
}
add_builtin!(solana_bpf_loader_deprecated_program!());
if self.use_bpf_jit {
add_builtin!(solana_bpf_loader_program_with_jit!());
} else {
add_builtin!(solana_bpf_loader_program!());
} }
// Add commonly-used SPL programs as a convenience to the user // Add commonly-used SPL programs as a convenience to the user