From 718939b6a0c55fdae177eb9ae36c9fafa06430d0 Mon Sep 17 00:00:00 2001
From: Jack May <jack@solana.com>
Date: Wed, 28 Jul 2021 14:47:21 -0700
Subject: [PATCH] Reduce bpf_loader test dependencies (#18949)

---
 programs/bpf_loader/src/lib.rs | 23 +++--------------------
 1 file changed, 3 insertions(+), 20 deletions(-)

diff --git a/programs/bpf_loader/src/lib.rs b/programs/bpf_loader/src/lib.rs
index b2b9a4d364..b3b4a7b973 100644
--- a/programs/bpf_loader/src/lib.rs
+++ b/programs/bpf_loader/src/lib.rs
@@ -864,16 +864,13 @@ mod tests {
         account_utils::StateMut,
         client::SyncClient,
         clock::Clock,
-        compute_budget::ComputeBudget,
         feature_set::FeatureSet,
         genesis_config::create_genesis_config,
         instruction::Instruction,
         instruction::{AccountMeta, InstructionError},
         keyed_account::KeyedAccount,
         message::Message,
-        process_instruction::{
-            InvokeContextStackFrame, MockComputeMeter, MockInvokeContext, MockLogger,
-        },
+        process_instruction::{MockComputeMeter, MockInvokeContext},
         pubkey::Pubkey,
         rent::Rent,
         signature::{Keypair, Signer},
@@ -1123,22 +1120,8 @@ mod tests {
         );
 
         // Case: limited budget
-        let keyed_accounts_range = 0..keyed_accounts.len();
-        let mut invoke_context = MockInvokeContext {
-            invoke_stack: vec![InvokeContextStackFrame {
-                key: Pubkey::default(),
-                keyed_accounts,
-                keyed_accounts_range,
-            }],
-            logger: MockLogger::default(),
-            compute_budget: ComputeBudget::default(),
-            bpf_compute_budget: ComputeBudget::default().into(),
-            compute_meter: MockComputeMeter::default(),
-            programs: vec![],
-            accounts: vec![],
-            sysvars: vec![],
-            disabled_features: vec![].into_iter().collect(),
-        };
+        let mut invoke_context = MockInvokeContext::new(keyed_accounts);
+        invoke_context.compute_meter = MockComputeMeter::default();
         assert_eq!(
             Err(InstructionError::ProgramFailedToComplete),
             process_instruction(&program_key, &[], &mut invoke_context)