Automatically create StacksEpochId::ALL from varients to prevent manual update

Signed-off-by: Jacinta Ferrant <[email protected]>

Author: jacinta-stacks

stacks-common/src/types/mod.rs

@@ -95,9 +95,23 @@ pub const MINING_COMMITMENT_WINDOW: u8 = 6;
 // Only relevant for Nakamoto (epoch 3.x)
 pub const MINING_COMMITMENT_FREQUENCY_NAKAMOTO: u8 = 3;
 
-#[repr(u32)]
-#[derive(Debug, Clone, Eq, PartialEq, PartialOrd, Ord, Hash, Copy, Serialize, Deserialize)]
-pub enum StacksEpochId {
+macro_rules! define_stacks_epochs {
+    ($($variant:ident = $value:expr),* $(,)?) => {
+        #[repr(u32)]
+        #[derive(Debug, Clone, Copy, Eq, PartialEq, PartialOrd, Ord, Hash, Serialize, Deserialize)]
+        pub enum StacksEpochId {
+            $($variant = $value),*
+        }
+
+        impl StacksEpochId {
+            pub const ALL: &'static [StacksEpochId] = &[
+                $(StacksEpochId::$variant),*
+            ];
+        }
+    };
+}
+
+define_stacks_epochs! {
     Epoch10 = 0x01000,
     Epoch20 = 0x02000,
     Epoch2_05 = 0x02005,
@@ -447,20 +461,6 @@ impl StacksEpochId {
         StacksEpochId::Epoch33
     }
 
-    pub const ALL_GTE_20: &'static [StacksEpochId] = &[
-        StacksEpochId::Epoch20,
-        StacksEpochId::Epoch2_05,
-        StacksEpochId::Epoch21,
-        StacksEpochId::Epoch22,
-        StacksEpochId::Epoch23,
-        StacksEpochId::Epoch24,
-        StacksEpochId::Epoch25,
-        StacksEpochId::Epoch30,
-        StacksEpochId::Epoch31,
-        StacksEpochId::Epoch32,
-        StacksEpochId::Epoch33,
-    ];
-
     /// In this epoch, how should the mempool perform garbage collection?
     pub fn mempool_garbage_behavior(&self) -> MempoolCollectionBehavior {
         match self {

stackslib/src/chainstate/tests/consensus.rs

@@ -443,7 +443,7 @@ macro_rules! contract_call_consensus_test {
         #[test]
         fn $name() {
             // Handle deploy_epochs parameter (default to all epochs >= 2.0 if not provided)
-            let deploy_epochs = StacksEpochId::ALL_GTE_20;
+            let deploy_epochs = &StacksEpochId::ALL[1..];
             $(let deploy_epochs = $deploy_epochs;)?
 
             // Handle call_epochs parameter (default to EPOCHS_TO_TEST if not provided)
@@ -912,25 +912,10 @@ impl ConsensusTest<'_> {
         info!("StacksEpoch calculate_epochs first_burn_height = {first_burnchain_height}");
         let reward_cycle_length = pox_constants.reward_cycle_length as u64;
         let prepare_length = pox_constants.prepare_length as u64;
-        // Define all epochs in order
-        let epoch_ids = [
-            StacksEpochId::Epoch10,
-            StacksEpochId::Epoch20,
-            StacksEpochId::Epoch2_05,
-            StacksEpochId::Epoch21,
-            StacksEpochId::Epoch22,
-            StacksEpochId::Epoch23,
-            StacksEpochId::Epoch24,
-            StacksEpochId::Epoch25,
-            StacksEpochId::Epoch30,
-            StacksEpochId::Epoch31,
-            StacksEpochId::Epoch32,
-            StacksEpochId::Epoch33,
-        ];
         // Initialize heights
         let mut epochs = vec![];
         let mut current_height = 0;
-        for epoch_id in epoch_ids.iter() {
+        for epoch_id in StacksEpochId::ALL.iter() {
             let start_height = current_height;
             let end_height = match *epoch_id {
                 StacksEpochId::Epoch10 => first_burnchain_height,