Adds keyed_accounts parameter to MockInvokeContext constructor.

solana-labs · Feb 18, 2021 · c9e3da2 · c9e3da2
1 parent ed973e1
commit c9e3da2
Show file tree

Hide file tree

Showing 9 changed files with 578 additions and 529 deletions.
diff --git a/programs/bpf/benches/bpf_loader.rs b/programs/bpf/benches/bpf_loader.rs
@@ -91,7 +91,7 @@ fn bench_program_alu(bencher: &mut Bencher) {
         .unwrap();
     inner_iter.write_u64::<LittleEndian>(0).unwrap();
     let loader_id = bpf_loader::id();
-    let mut invoke_context = MockInvokeContext::default();
+    let mut invoke_context = MockInvokeContext::new(&[]);
 
     let elf = load_elf("bench_alu").unwrap();
     let mut executable =
@@ -194,8 +194,6 @@ fn bench_program_execute_noop(bencher: &mut Bencher) {
 fn bench_instruction_count_tuner(_bencher: &mut Bencher) {
     const BUDGET: u64 = 200_000;
     let loader_id = bpf_loader::id();
-    let mut invoke_context = MockInvokeContext::default();
-    invoke_context.compute_meter.remaining = BUDGET;
 
     let accounts = [RefCell::new(Account::new(
         1,
@@ -210,6 +208,9 @@ fn bench_instruction_count_tuner(_bencher: &mut Bencher) {
         .collect();
     let instruction_data = vec![0u8];
 
+    let mut invoke_context = MockInvokeContext::new(&keyed_accounts);
+    invoke_context.compute_meter.remaining = BUDGET;
+
     // Serialize account data
     let mut serialized = serialize_parameters(
         &bpf_loader::id(),

diff --git a/programs/bpf/tests/programs.rs b/programs/bpf/tests/programs.rs
@@ -188,7 +188,7 @@ fn run_program(
     let mut data = vec![];
     file.read_to_end(&mut data).unwrap();
     let loader_id = bpf_loader::id();
-    let mut invoke_context = MockInvokeContext::default();
+    let mut invoke_context = MockInvokeContext::new(parameter_accounts);
     let parameter_bytes = serialize_parameters(
         &bpf_loader::id(),
         program_id,