From 1957e960acf37fb78848835e2ea5d0fae200092b Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Tue, 15 Sep 2020 23:16:01 +0000
Subject: [PATCH] Add BPF test program instruction monitoring (bp #11984)
 (#12248)

* Add BPF test program instruction monitoring (#11984)


(cherry picked from commit fab2d44abdd8d86417220c421d11a607d89bc62c)

* fix conflicts

Co-authored-by: Jack May <jack@solana.com>
---
 programs/bpf/build.rs          | 6 +++---
 programs/bpf/tests/programs.rs | 7 +++----
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/programs/bpf/build.rs b/programs/bpf/build.rs
index 24b0c0cfcc..eaaedc7574 100644
--- a/programs/bpf/build.rs
+++ b/programs/bpf/build.rs
@@ -35,7 +35,7 @@ fn rerun_if_changed(files: &[&str], directories: &[&str], excludes: &[&str]) {
 }
 
 fn main() {
-    let bpf_c = !env::var("CARGO_FEATURE_BPF_C").is_err();
+    let bpf_c = env::var("CARGO_FEATURE_BPF_C").is_ok();
     if bpf_c {
         let install_dir =
             "OUT_DIR=../target/".to_string() + &env::var("PROFILE").unwrap() + &"/bpf".to_string();
@@ -52,7 +52,7 @@ fn main() {
         rerun_if_changed(&["c/makefile"], &["c/src", "../../sdk"], &["/target/"]);
     }
 
-    let bpf_rust = !env::var("CARGO_FEATURE_BPF_RUST").is_err();
+    let bpf_rust = env::var("CARGO_FEATURE_BPF_RUST").is_ok();
     if bpf_rust {
         let install_dir =
             "target/".to_string() + &env::var("PROFILE").unwrap() + &"/bpf".to_string();
@@ -100,7 +100,7 @@ fn main() {
                 .arg(&src)
                 .arg(&install_dir)
                 .status()
-                .expect(&format!("Failed to cp {} to {}", src, install_dir))
+                .unwrap_or_else(|_| panic!("Failed to cp {} to {}", src, install_dir))
                 .success());
         }
 
diff --git a/programs/bpf/tests/programs.rs b/programs/bpf/tests/programs.rs
index a469202c1c..85c2f65774 100644
--- a/programs/bpf/tests/programs.rs
+++ b/programs/bpf/tests/programs.rs
@@ -26,8 +26,7 @@ use solana_sdk::{
     instruction::{AccountMeta, CompiledInstruction, Instruction, InstructionError},
     message::Message,
     pubkey::Pubkey,
-    signature::Keypair,
-    signature::Signer,
+    signature::{Keypair, Signer},
     sysvar::{clock, fees, rent, rewards, slot_hashes, stake_history},
     transaction::TransactionError,
 };
@@ -84,7 +83,7 @@ fn run_program(
     )
     .unwrap();
     let mut parameter_bytes = serialize_parameters(
-        &bpf_loader::id(),
+        &loader_id,
         program_id,
         parameter_accounts,
         &instruction_data,
@@ -95,7 +94,7 @@ fn run_program(
         vm.execute_program(parameter_bytes.as_mut_slice(), &[], &[heap_region.clone()])
             .unwrap()
     );
-    deserialize_parameters(&bpf_loader::id(), parameter_accounts, &parameter_bytes).unwrap();
+    deserialize_parameters(&loader_id, parameter_accounts, &parameter_bytes).unwrap();
     Ok(vm.get_total_instruction_count())
 }