updated ProgramTest with desctivated native_programs_consume_cu featu…

…re to continue support existing mock/test programs that do not consume units

program-test/src/lib.rs

@@ -463,13 +463,18 @@ impl Default for ProgramTest {
         let prefer_bpf =
             std::env::var("BPF_OUT_DIR").is_ok() || std::env::var("SBF_OUT_DIR").is_ok();
 
+        // deactivate feature `native_program_consume_cu` to continue support existing mock/test
+        // programs that do not consume units.
+        let mut deactivate_feature_set = HashSet::default();
+        deactivate_feature_set.insert(solana_sdk::feature_set::native_programs_consume_cu::id());
+
         Self {
             accounts: vec![],
             builtins: vec![],
             compute_max_units: None,
             prefer_bpf,
             use_bpf_jit: false,
-            deactivate_feature_set: HashSet::default(),
+            deactivate_feature_set,
             transaction_account_lock_limit: None,
         }
     }

program-test/tests/cpi.rs

@@ -123,7 +123,6 @@ async fn cpi() {
         invoker_program_id,
         processor!(invoker_process_instruction),
     );
-    program_test.deactivate_feature(solana_sdk::feature_set::native_programs_consume_cu::id());
     let invoked_program_id = Pubkey::new_unique();
     program_test.add_program(
         "invoked",
@@ -160,7 +159,6 @@ async fn cpi_dupes() {
         invoker_program_id,
         processor!(invoker_dupes_process_instruction),
     );
-    program_test.deactivate_feature(solana_sdk::feature_set::native_programs_consume_cu::id());
     let invoked_program_id = Pubkey::new_unique();
     program_test.add_program(
         "invoked",
@@ -270,7 +268,6 @@ async fn stack_height() {
         invoker_stack_height_program_id,
         processor!(invoker_stack_height),
     );
-    program_test.deactivate_feature(solana_sdk::feature_set::native_programs_consume_cu::id());
     program_test.add_program(
         "invoked_stack_height",
         invoked_stack_height_program_id,

program-test/tests/fuzz.rs

@@ -30,12 +30,11 @@ fn simulate_fuzz() {
     let rt = tokio::runtime::Runtime::new().unwrap();
     let program_id = Pubkey::new_unique();
     // Initialize and start the test network
-    let mut program_test = ProgramTest::new(
+    let program_test = ProgramTest::new(
         "program-test-fuzz",
         program_id,
         processor!(process_instruction),
     );
-    program_test.deactivate_feature(solana_sdk::feature_set::native_programs_consume_cu::id());
 
     let (mut banks_client, payer, last_blockhash) =
         rt.block_on(async { program_test.start().await });
@@ -59,12 +58,11 @@ fn simulate_fuzz_with_context() {
     let rt = tokio::runtime::Runtime::new().unwrap();
     let program_id = Pubkey::new_unique();
     // Initialize and start the test network
-    let mut program_test = ProgramTest::new(
+    let program_test = ProgramTest::new(
         "program-test-fuzz",
         program_id,
         processor!(process_instruction),
     );
-    program_test.deactivate_feature(solana_sdk::feature_set::native_programs_consume_cu::id());
 
     let mut context = rt.block_on(async { program_test.start_with_context().await });
 

program-test/tests/lamports.rs

@@ -34,12 +34,11 @@ fn move_lamports_process_instruction(
 #[tokio::test]
 async fn move_lamports() {
     let move_lamports_program_id = Pubkey::new_unique();
-    let mut program_test = ProgramTest::new(
+    let program_test = ProgramTest::new(
         "move_lamports",
         move_lamports_program_id,
         processor!(move_lamports_process_instruction),
     );
-    program_test.deactivate_feature(solana_sdk::feature_set::native_programs_consume_cu::id());
 
     let lamports = 1_000_000_000;
     let source = Keypair::new();

program-test/tests/return_data.rs

@@ -63,7 +63,6 @@ async fn return_data() {
         get_return_data_program_id,
         processor!(get_return_data_process_instruction),
     );
-    program_test.deactivate_feature(solana_sdk::feature_set::native_programs_consume_cu::id());
     let set_return_data_program_id = Pubkey::new_unique();
     program_test.add_program(
         "set_return_data",

program-test/tests/warp.rs

@@ -128,12 +128,11 @@ fn process_instruction(
 async fn clock_sysvar_updated_from_warp() {
     let program_id = Pubkey::new_unique();
     // Initialize and start the test network
-    let mut program_test = ProgramTest::new(
+    let program_test = ProgramTest::new(
         "program-test-warp",
         program_id,
         processor!(process_instruction),
     );
-    program_test.deactivate_feature(solana_sdk::feature_set::native_programs_consume_cu::id());
 
     let mut context = program_test.start_with_context().await;
     let mut expected_slot = 100_000;

programs/zk-token-proof-tests/tests/process_transaction.rs

@@ -326,9 +326,7 @@ async fn test_verify_proof_without_context<T, U>(
     T: Pod + ZkProofData<U>,
     U: Pod,
 {
-    let mut program_test = ProgramTest::default();
-    program_test.deactivate_feature(solana_sdk::feature_set::native_programs_consume_cu::id());
-    let mut context = program_test.start_with_context().await;
+    let mut context = ProgramTest::default().start_with_context().await;
 
     let client = &mut context.banks_client;
     let payer = &context.payer;
@@ -397,9 +395,7 @@ async fn test_verify_proof_with_context<T, U>(
     T: Pod + ZkProofData<U>,
     U: Pod,
 {
-    let mut program_test = ProgramTest::default();
-    program_test.deactivate_feature(solana_sdk::feature_set::native_programs_consume_cu::id());
-    let mut context = program_test.start_with_context().await;
+    let mut context = ProgramTest::default().start_with_context().await;
     let rent = context.banks_client.get_rent().await.unwrap();
 
     let client = &mut context.banks_client;
@@ -601,9 +597,7 @@ async fn test_close_context_state<T, U>(
     T: Pod + ZkProofData<U>,
     U: Pod,
 {
-    let mut program_test = ProgramTest::default();
-    program_test.deactivate_feature(solana_sdk::feature_set::native_programs_consume_cu::id());
-    let mut context = program_test.start_with_context().await;
+    let mut context = ProgramTest::default().start_with_context().await;
     let rent = context.banks_client.get_rent().await.unwrap();
 
     let client = &mut context.banks_client;