rebase then cleanup references to activated feature

program-runtime/src/compute_budget_processor.rs

@@ -69,9 +69,8 @@ impl From<ComputeBudgetLimits> for FeeBudgetLimits {
 /// are retrieved and returned,
 pub fn process_compute_budget_instructions<'a>(
     instructions: impl Iterator<Item = (&'a Pubkey, &'a CompiledInstruction)>,
-    feature_set: &FeatureSet,
+    _feature_set: &FeatureSet,
 ) -> Result<ComputeBudgetLimits, TransactionError> {
-
     let mut num_non_compute_budget_instructions: u32 = 0;
     let mut updated_compute_unit_limit = None;
     let mut updated_compute_unit_price = None;
@@ -160,7 +159,6 @@ mod tests {
     use {
         super::*,
         solana_sdk::{
-            feature_set::add_set_tx_loaded_accounts_data_size_instruction,
             hash::Hash,
             instruction::Instruction,
             message::Message,
@@ -180,9 +178,7 @@ mod tests {
                 Message::new($instructions, Some(&payer_keypair.pubkey())),
                 Hash::default(),
             ));
-            let mut feature_set = FeatureSet::default();
-            feature_set.activate(&remove_deprecated_request_unit_ix::id(), 0);
-            feature_set.activate(&add_set_tx_loaded_accounts_data_size_instruction::id(), 0);
+            let feature_set = FeatureSet::default();
             let result = process_compute_budget_instructions(
                 tx.message().program_instructions_iter(),
                 &feature_set,
@@ -493,8 +489,7 @@ mod tests {
                 Hash::default(),
             ));
 
-        let mut feature_set = FeatureSet::default();
-        feature_set.activate(&add_set_tx_loaded_accounts_data_size_instruction::id(), 0);
+        let feature_set = FeatureSet::default();
 
         let result = process_compute_budget_instructions(
             transaction.message().program_instructions_iter(),

runtime/src/accounts/mod.rs

@@ -1541,19 +1541,12 @@ mod tests {
             Ok(Some(NonZeroUsize::new(99).unwrap()));
         let result_invalid_limit = Err(TransactionError::InvalidLoadedAccountsDataSizeLimit);
 
-        let mut feature_set = FeatureSet::default();
+        let feature_set = FeatureSet::default();
 
-        // both `cap_transaction_accounts_data_size` and
-        //    `add_set_tx_loaded_accounts_data_size_instruction` are activated in mainnet-beta
         // the results should be:
         //    if tx doesn't set limit, then default limit (64MiB)
         //    if tx sets limit, then requested limit
         //    if tx sets limit to zero, then TransactionError::InvalidLoadedAccountsDataSizeLimit
-        feature_set.activate(&feature_set::cap_transaction_accounts_data_size::id(), 0);
-        feature_set.activate(
-            &solana_sdk::feature_set::add_set_tx_loaded_accounts_data_size_instruction::id(),
-            0,
-        );
         test(tx_not_set_limit, &feature_set, &result_default_limit);
         test(tx_set_limit_99, &feature_set, &result_requested_limit);
         test(tx_set_limit_0, &feature_set, &result_invalid_limit);

runtime/src/transaction_priority_details.rs

@@ -24,13 +24,7 @@ pub trait GetTransactionPriorityDetails {
         instructions: impl Iterator<Item = (&'a Pubkey, &'a CompiledInstruction)>,
         _round_compute_unit_price_enabled: bool,
     ) -> Option<TransactionPriorityDetails> {
-        let mut feature_set = FeatureSet::default();
-        // this feature was enabled on mainnet-beta since epooch 537
-        // https://github.com/solana-labs/solana/issues/30366
-        feature_set.activate(
-            &solana_sdk::feature_set::add_set_tx_loaded_accounts_data_size_instruction::id(),
-            0,
-        );
+        let feature_set = FeatureSet::default();
 
         let compute_budget_limits =
             process_compute_budget_instructions(instructions, &feature_set).ok()?;