From 2a779eb3c077b7668aa95897557df0ea62c9dd3a Mon Sep 17 00:00:00 2001
From: K-anon <IntokuSatori@users.noreply.github.com>
Date: Tue, 21 Feb 2023 14:58:40 -0700
Subject: [PATCH] Revert "Add test for executor cache runtime feature upgrades.
 (#30382)"

This reverts commit c5a24e11ba065346c1c11273649ba7350d23a4e8.
---
 .../test_elfs/out/callx-r10-sbfv1.so          | Bin 1456 -> 0 bytes
 .../test_elfs/out/callx-r10-sbfv2.so          | Bin 1456 -> 0 bytes
 runtime/src/bank/tests.rs                     |  92 +-----------------
 3 files changed, 1 insertion(+), 91 deletions(-)
 delete mode 100644 programs/bpf_loader/test_elfs/out/callx-r10-sbfv1.so
 delete mode 100644 programs/bpf_loader/test_elfs/out/callx-r10-sbfv2.so

diff --git a/programs/bpf_loader/test_elfs/out/callx-r10-sbfv1.so b/programs/bpf_loader/test_elfs/out/callx-r10-sbfv1.so
deleted file mode 100644
index d54f9325de3c1cc184ac0bb20d9ac7420c36f5c2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1456
zcmbVLyGjF55FOW7d=#P}Y9XmDmIw-Jm0%RaXrYyr#u!YHY$RF1RO$x^Hhzn(y^Y{c
zSjIw2<D9*7mSq)$T$nv`&z<MJvo~9%ZEs*exCUi3+Pxc*H|%<}5XsA$c>0}?F@fi>
z3hmQ4XKqB9as<MSKxOI_W^5m$bL;ziub$&7Pby0)k1AM;4rItMs!8<+%RgZ}>qoCx
z&vuTOSd$K9){yY|-D^UBHGAgi+Mag*A<U=svUtC&N2)>C>RdMKK^TRA9c4jv&n_I?
z-OKj@?j3@Ca+T`AMYXk&EtQJd<yAlDuOv@@>+m0vk6!vDdR|X6q!QrX{;b~*tJk6U
zXPuzjs8=GT-Dx-sTjHMwSAMPBu8Dms%|=6e7GJHx@~L929k!h2P|AKKc`e7qqy56(
z&StvQzV>Jf!a3o45aV~T=$TZOQS%)n&wDa_FrITlfBS8s*ThWX4Y4?<#GIp}c}7V3
zvo0WV)BoA>5;?~fCjE?()q}5IuStK-H4*1n?2q{!>;65=0{y#|pU67t&wC)EKe(_@
z#?4s384`vTKJH^(dFD=<W{o^C68|-7VEwGCV7!^daBKdDG2;~GC%vl*dm{&YGynM{
Ise0P~2gWN^r2qf`

diff --git a/programs/bpf_loader/test_elfs/out/callx-r10-sbfv2.so b/programs/bpf_loader/test_elfs/out/callx-r10-sbfv2.so
deleted file mode 100644
index 9c08ee4d80f21f7e8d9bd5d8f48e08055a2bbc59..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1456
zcmbVLO)mps5FV>2br2H4LH6vhAtAx3;v*5|z{!cKMjPo?+Lh=DKS1K*x462yNc;)M
zI&f6;>^sk9vm_Fe%s%tZJKyi@^=4_y>+2IzzYN8vH&YZ1yPgw#g`zBrr{97M3p@vu
zX`jU@y#o<t%$*T#5F%4&FmLAso!h^^cj`H!{HQ#q{Gbe)bs#yzxF(hFEq}rEtRKCC
zp6nhmL8A_2(va}+)oVh2F?;6e+L?BLA<V~hSe!5Gk!l#VIv34)7{wuAN1jpHvw=f*
z`~0<!xr1>|Q>h-FS6i!oskGrQECutyV*2){4F8<G_p&$f^Lm;glK^x3wf-QgUPTg|
zcEWO_UWtWvr{OSaNpKck2DNg#Cibl~8x8GQ0=0_DCyKRp)N+zTDF>DGSdKOh_tti|
z*R!Sm>x{O*+!MYBF?kn@p3h_%GT(mcIVZz=({oSgZ@*3an%GIaA&7fQoOkMYpAnM&
ztP6<T^nbFvMDDSL$v&g_dhyxoHR;d2CgL8%{+Qos-M@!jpnuo$6ImzyIR_&8gA4m)
z+`I*xpu*6?Cw;7_p1ISezA2AQiT@fkuzuFHW_mMA;Kuw95{(m>pXwbI*c)}gSM#4v
JD^<?=e*<<pRmA`R

diff --git a/runtime/src/bank/tests.rs b/runtime/src/bank/tests.rs
index 97b6f0ee696c1b..01beb58aa02934 100644
--- a/runtime/src/bank/tests.rs
+++ b/runtime/src/bank/tests.rs
@@ -30,7 +30,6 @@ use {
     rand::Rng,
     rayon::ThreadPoolBuilder,
     serde::{Deserialize, Serialize},
-    solana_bpf_loader_program::solana_bpf_loader_program,
     solana_logger,
     solana_program_runtime::{
         compute_budget::{self, ComputeBudget, MAX_COMPUTE_UNIT_LIMIT},
@@ -57,7 +56,7 @@ use {
         entrypoint::MAX_PERMITTED_DATA_INCREASE,
         epoch_schedule::{EpochSchedule, MINIMUM_SLOTS_PER_EPOCH},
         feature::{self, Feature},
-        feature_set::{self, reject_callx_r10, FeatureSet},
+        feature_set::{self, FeatureSet},
         fee::FeeStructure,
         fee_calculator::FeeRateGovernor,
         genesis_config::{create_genesis_config, ClusterType, GenesisConfig},
@@ -12691,92 +12690,3 @@ fn test_calculate_fee_with_request_heap_frame_flag() {
         signature_fee
     );
 }
-
-#[test]
-fn test_runtime_feature_enable_with_executor_cache() {
-    solana_logger::setup();
-
-    // Bank Setup
-    let (mut genesis_config, mint_keypair) = create_genesis_config(1_000_000 * LAMPORTS_PER_SOL);
-    genesis_config
-        .accounts
-        .remove(&feature_set::reject_callx_r10::id());
-    let mut root_bank = Bank::new_for_tests(&genesis_config);
-    let (name, id, entrypoint) = solana_bpf_loader_program!();
-    root_bank.add_builtin(&name, &id, entrypoint);
-
-    // Test a basic transfer
-    let amount = genesis_config.rent.minimum_balance(0);
-    let pubkey = solana_sdk::pubkey::new_rand();
-    root_bank.transfer(amount, &mint_keypair, &pubkey).unwrap();
-    assert_eq!(root_bank.get_balance(&pubkey), amount);
-
-    // Program Setup
-    let program_keypair = Keypair::new();
-    let program_data =
-        include_bytes!("../../../programs/bpf_loader/test_elfs/out/callx-r10-sbfv1.so");
-    let program_account = AccountSharedData::from(Account {
-        lamports: Rent::default().minimum_balance(program_data.len()).min(1),
-        data: program_data.to_vec(),
-        owner: bpf_loader::id(),
-        executable: true,
-        rent_epoch: 0,
-    });
-    root_bank.store_account(&program_keypair.pubkey(), &program_account);
-
-    // Compose instruction using the desired program
-    let instruction1 = Instruction::new_with_bytes(program_keypair.pubkey(), &[], Vec::new());
-    let message1 = Message::new(&[instruction1], Some(&mint_keypair.pubkey()));
-    let binding1 = mint_keypair.insecure_clone();
-    let signers1 = vec![&binding1];
-    let transaction1 = Transaction::new(&signers1, message1, root_bank.last_blockhash());
-
-    // Advance the bank so the next transaction can be submitted.
-    goto_end_of_slot(&mut root_bank);
-    let mut bank = new_from_parent(&Arc::new(root_bank));
-
-    // Compose second instruction using the same program with a different block hash
-    let instruction2 = Instruction::new_with_bytes(program_keypair.pubkey(), &[], Vec::new());
-    let message2 = Message::new(&[instruction2], Some(&mint_keypair.pubkey()));
-    let binding2 = mint_keypair.insecure_clone();
-    let signers2 = vec![&binding2];
-    let transaction2 = Transaction::new(&signers2, message2, bank.last_blockhash());
-
-    // Execute before feature is enabled to get program into the cache.
-    let result_without_feature_enabled = bank.process_transaction(&transaction1);
-    // Should fail when executing here
-    assert_eq!(
-        result_without_feature_enabled,
-        Err(TransactionError::InstructionError(
-            0,
-            InstructionError::ProgramFailedToComplete
-        ))
-    );
-
-    // Activate feature
-    bank.activate_feature(&reject_callx_r10::id());
-
-    // Execute after feature is enabled
-    let result_with_feature_enabled = bank.process_transaction(&transaction2);
-    // Feature should have been activated thus causing the TX to fail at
-    // verification. It should fail here with new Executor Cache because feature
-    // activations should force the program to recompile with the new feature,
-    // and in this case the feature should cause the TX to fail at verification.
-    // Note: `ProgramFailedToComplete` error appearing again means the account
-    // was not recompiled by the cache upon feature activation and thus fails in
-    // the same way.
-    match &result_with_feature_enabled {
-        Err(x) => {
-            if *x
-                == TransactionError::InstructionError(0, InstructionError::ProgramFailedToComplete)
-            {
-                println!("ERROR: Program was not recompiled after runtime feature was enabled.");
-            }
-        }
-        Ok(_) => println!("ERROR: Program should fail during execution."),
-    }
-    // assert_eq!(
-    //     result_with_feature_enabled,
-    //     Err(TransactionError::InstructionError(0, InstructionError::InvalidAccountData))
-    // );
-}