Replaces MockInvokeContext by ThisInvokeContext in tests

cli/Cargo.toml

@@ -35,6 +35,7 @@ solana-client = { path = "../client", version = "=1.9.0" }
 solana-config-program = { path = "../programs/config", version = "=1.9.0" }
 solana-faucet = { path = "../faucet", version = "=1.9.0" }
 solana-logger = { path = "../logger", version = "=1.9.0" }
+solana-program-runtime = { path = "../program-runtime", version = "=1.9.0" }
 solana_rbpf = "=0.2.14"
 solana-remote-wallet = { path = "../remote-wallet", version = "=1.9.0" }
 solana-sdk = { path = "../sdk", version = "=1.9.0" }

cli/src/program.rs

@@ -24,6 +24,7 @@ use solana_client::{
     rpc_filter::{Memcmp, MemcmpEncodedBytes, RpcFilterType},
     tpu_client::{TpuClient, TpuClientConfig},
 };
+use solana_program_runtime::invoke_context::ThisInvokeContext;
 use solana_rbpf::{
     verifier,
     vm::{Config, Executable},
@@ -40,7 +41,6 @@ use solana_sdk::{
     message::Message,
     native_token::Sol,
     packet::PACKET_DATA_SIZE,
-    process_instruction::MockInvokeContext,
     pubkey::Pubkey,
     signature::{keypair_from_seed, read_keypair_file, Keypair, Signature, Signer},
     system_instruction::{self, SystemError},
@@ -1994,7 +1994,7 @@ fn read_and_verify_elf(program_location: &str) -> Result<Vec<u8>, Box<dyn std::e
     let mut program_data = Vec::new();
     file.read_to_end(&mut program_data)
         .map_err(|err| format!("Unable to read program file: {}", err))?;
-    let mut invoke_context = MockInvokeContext::new(&Pubkey::default(), vec![]);
+    let mut invoke_context = ThisInvokeContext::new_mock(&[], &[]);
 
     // Verify the program
     <dyn Executable<BpfError, ThisInstructionMeter>>::from_elf(

core/src/cost_update_service.rs

@@ -204,7 +204,7 @@ impl CostUpdateService {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use solana_program_runtime::ProgramTiming;
+    use solana_program_runtime::instruction_processor::ProgramTiming;
     use solana_sdk::pubkey::Pubkey;
 
     #[test]

program-runtime/Cargo.toml

@@ -10,6 +10,7 @@ documentation = "https://docs.rs/solana-program-runtime"
 edition = "2018"
 
 [dependencies]
+bincode = "1.3.3"
 libc = "0.2.101"
 libloading = "0.7.0"
 log = "0.4.14"

program-runtime/benches/instruction_processor.rs

@@ -3,7 +3,7 @@
 extern crate test;
 
 use log::*;
-use solana_program_runtime::{ExecuteDetailsTimings, PreAccount};
+use solana_program_runtime::instruction_processor::{ExecuteDetailsTimings, PreAccount};
 use solana_sdk::{account::AccountSharedData, pubkey, rent::Rent};
 use test::Bencher;