@@ -132,36 +132,6 @@ define_stacks_epochs! {
132132 Epoch33 = 0x03003 ,
133133}
134134
135- impl StacksEpochId {
136- /// Return the network epoch associated with the StacksEpochId
137- pub fn network_epoch ( epoch : StacksEpochId ) -> u8 {
138- match epoch {
139- StacksEpochId :: Epoch10 => PEER_VERSION_EPOCH_1_0 ,
140- StacksEpochId :: Epoch20 => PEER_VERSION_EPOCH_2_0 ,
141- StacksEpochId :: Epoch2_05 => PEER_VERSION_EPOCH_2_05 ,
142- StacksEpochId :: Epoch21 => PEER_VERSION_EPOCH_2_1 ,
143- StacksEpochId :: Epoch22 => PEER_VERSION_EPOCH_2_2 ,
144- StacksEpochId :: Epoch23 => PEER_VERSION_EPOCH_2_3 ,
145- StacksEpochId :: Epoch24 => PEER_VERSION_EPOCH_2_4 ,
146- StacksEpochId :: Epoch25 => PEER_VERSION_EPOCH_2_5 ,
147- StacksEpochId :: Epoch30 => PEER_VERSION_EPOCH_3_0 ,
148- StacksEpochId :: Epoch31 => PEER_VERSION_EPOCH_3_1 ,
149- StacksEpochId :: Epoch32 => PEER_VERSION_EPOCH_3_2 ,
150- StacksEpochId :: Epoch33 => PEER_VERSION_EPOCH_3_3 ,
151- }
152- }
153-
154- #[ cfg( any( test, feature = "testing" ) ) ]
155- pub fn since ( epoch : StacksEpochId ) -> & ' static [ StacksEpochId ] {
156- let idx = Self :: ALL
157- . iter ( )
158- . position ( |& e| e == epoch)
159- . expect ( "epoch not found in ALL" ) ;
160-
161- & Self :: ALL [ idx..]
162- }
163- }
164-
165135#[ derive( Debug ) ]
166136pub enum MempoolCollectionBehavior {
167137 ByStacksHeight ,
@@ -889,6 +859,34 @@ impl StacksEpochId {
889859 StacksEpochId :: Epoch33 => true ,
890860 }
891861 }
862+
863+ /// Return the network epoch associated with the StacksEpochId
864+ pub fn network_epoch ( epoch : StacksEpochId ) -> u8 {
865+ match epoch {
866+ StacksEpochId :: Epoch10 => PEER_VERSION_EPOCH_1_0 ,
867+ StacksEpochId :: Epoch20 => PEER_VERSION_EPOCH_2_0 ,
868+ StacksEpochId :: Epoch2_05 => PEER_VERSION_EPOCH_2_05 ,
869+ StacksEpochId :: Epoch21 => PEER_VERSION_EPOCH_2_1 ,
870+ StacksEpochId :: Epoch22 => PEER_VERSION_EPOCH_2_2 ,
871+ StacksEpochId :: Epoch23 => PEER_VERSION_EPOCH_2_3 ,
872+ StacksEpochId :: Epoch24 => PEER_VERSION_EPOCH_2_4 ,
873+ StacksEpochId :: Epoch25 => PEER_VERSION_EPOCH_2_5 ,
874+ StacksEpochId :: Epoch30 => PEER_VERSION_EPOCH_3_0 ,
875+ StacksEpochId :: Epoch31 => PEER_VERSION_EPOCH_3_1 ,
876+ StacksEpochId :: Epoch32 => PEER_VERSION_EPOCH_3_2 ,
877+ StacksEpochId :: Epoch33 => PEER_VERSION_EPOCH_3_3 ,
878+ }
879+ }
880+
881+ #[ cfg( any( test, feature = "testing" ) ) ]
882+ pub fn since ( epoch : StacksEpochId ) -> & ' static [ StacksEpochId ] {
883+ let idx = Self :: ALL
884+ . iter ( )
885+ . position ( |& e| e == epoch)
886+ . expect ( "epoch not found in ALL" ) ;
887+
888+ & Self :: ALL [ idx..]
889+ }
892890}
893891
894892impl std:: fmt:: Display for StacksEpochId {
0 commit comments