Use exclude_clarity_versions

Signed-off-by: Jacinta Ferrant <jacinta@stackslabs.com>

Author: jacinta-stacks

stacks-common/src/types/mod.rs

@@ -150,6 +150,16 @@ impl StacksEpochId {
             StacksEpochId::Epoch33 => PEER_VERSION_EPOCH_3_3,
         }
     }
+
+    #[cfg(any(test, feature = "testing"))]
+    pub fn since(epoch: StacksEpochId) -> &'static [StacksEpochId] {
+        let idx = Self::ALL
+            .iter()
+            .position(|&e| e == epoch)
+            .expect("epoch not found in ALL");
+
+        &Self::ALL[idx..]
+    }
 }
 
 #[derive(Debug)]

stackslib/src/chainstate/tests/consensus.rs

@@ -1620,7 +1620,7 @@ macro_rules! contract_call_consensus_test {
     ) => {
         {
              // Handle deploy_epochs parameter (default to all epochs >= 2.0 if not provided)
-            let deploy_epochs = &clarity::types::StacksEpochId::ALL[1..];
+            let deploy_epochs = &clarity::types::StacksEpochId::since(clarity::types::StacksEpochId::Epoch20);
             $(let deploy_epochs = $deploy_epochs;)?
 
             // Handle call_epochs parameter (default to EPOCHS_TO_TEST if not provided)
@@ -1892,6 +1892,6 @@ fn problematic_supertype_list() {
     (err  1)))
     (print (var-get my-list))
     ",
-    deploy_epochs: &StacksEpochId::ALL[1..],
+    deploy_epochs: &StacksEpochId::since(StacksEpochId::Epoch20),
     );
 }

stackslib/src/chainstate/tests/runtime_tests.rs

@@ -31,8 +31,7 @@ use crate::chainstate::stacks::boot::test::{
     make_signer_key_signature,
 };
 use crate::chainstate::tests::consensus::{
-    clarity_versions_for_epoch, contract_call_consensus_test, contract_deploy_consensus_test,
-    ConsensusTest, ConsensusUtils, TestBlock, EPOCHS_TO_TEST, SK_1,
+    contract_call_consensus_test, contract_deploy_consensus_test, ConsensusTest, TestBlock, SK_1,
 };
 use crate::chainstate::tests::parse_tests;
 use crate::core::test_util::to_addr;
@@ -414,6 +413,8 @@ fn arithmetic_zero_n_log_n() {
 )",
         function_name: "trigger",
         function_args: &[],
+        deploy_epochs: &StacksEpochId::since(StacksEpochId::Epoch21),
+        exclude_clarity_versions: &[ClarityVersion::Clarity1],
     );
 }
 
@@ -752,64 +753,17 @@ fn pox_already_locked() {
 /// Outcome: block accepted
 #[test]
 fn block_time_not_available() {
-    let contract_code = "
-(define-read-only (trigger (height uint))
-  (ok (at-block (unwrap! (get-stacks-block-info? id-header-hash height) (err u100))
-    stacks-block-time
-  ))
-)";
-
-    let mut nonce = 0;
-    let mut contract_names = vec![];
-    let mut epoch_blocks = HashMap::new();
-    for &epoch in &StacksEpochId::ALL[11..] {
-        let mut blocks = vec![];
-        // Get all Clarity versions supported in this epoch
-        let clarity_versions = clarity_versions_for_epoch(epoch);
-        // For each clarity version, deploy a contract
-        for &each_clarity_ver in clarity_versions {
-            // Skip Clarity 1/2/3 — they can't compile this code (stacks-block-time doesn't exist)
-            if matches!(
-                each_clarity_ver,
-                ClarityVersion::Clarity1 | ClarityVersion::Clarity2 | ClarityVersion::Clarity3
-            ) {
-                continue;
-            };
-            let epoch_name = format!("Epoch{}", epoch.to_string().replace('.', "_"));
-
-            let version_tag = each_clarity_ver.to_string().replace(' ', "");
-            let contract_name = format!("no-block-time-{epoch_name}-{version_tag}");
-            // Create the deploy block
-            blocks.push(TestBlock {
-                transactions: vec![ConsensusUtils::new_deploy_tx(
-                    nonce,
-                    &contract_name,
-                    contract_code,
-                    Some(each_clarity_ver),
-                )],
-            });
-            nonce += 1;
-            contract_names.push(contract_name);
-
-            if EPOCHS_TO_TEST.contains(&epoch) {
-                for contract_name in &contract_names {
-                    blocks.push(TestBlock {
-                        transactions: vec![ConsensusUtils::new_call_tx(
-                            nonce,
-                            contract_name,
-                            "trigger",
-                            &[ClarityValue::UInt(1)],
-                        )],
-                    });
-                    nonce += 1;
-                }
-            }
-        }
-        if !blocks.is_empty() {
-            epoch_blocks.insert(epoch, blocks);
-        }
-    }
-
-    let results = ConsensusTest::new(function_name!(), vec![], epoch_blocks).run();
-    insta::assert_ron_snapshot!(results);
+    contract_call_consensus_test!(
+        contract_name: "no-block-time",
+        contract_code: "
+        (define-read-only (trigger (height uint))
+          (ok (at-block (unwrap! (get-stacks-block-info? id-header-hash height) (err u100))
+            stacks-block-time
+           ))
+        )",
+        function_name: "trigger",
+        function_args: &[ClarityValue::UInt(1)],
+        deploy_epochs: &StacksEpochId::since(StacksEpochId::Epoch33),
+        exclude_clarity_versions: &[ClarityVersion::Clarity1, ClarityVersion::Clarity2, ClarityVersion::Clarity3],
+    )
 }