Add 'Byron' to the list of eras making the testing code more readable

Author: dnadales

ouroboros-consensus-cardano/src/cardano-testlib/Test/Consensus/Cardano/ProtocolInfo.hs

@@ -99,7 +99,8 @@ data HardForkSpec =
     , conwayHardForkSpec  :: (SL.ProtVer, TriggerHardFork)
     }
 
-data Era = Shelley
+data Era = Byron
+         | Shelley
          | Allegra
          | Mary
          | Alonzo
@@ -108,6 +109,7 @@ data Era = Shelley
   deriving (Show, Eq, Ord, Enum)
 
 selectEra :: Era -> HardForkSpec -> (SL.ProtVer, TriggerHardFork)
+selectEra Byron   _                                    = error "Byron is the first era, therefore there is no hard fork spec."
 selectEra Shelley HardForkSpec { shelleyHardForkSpec } = shelleyHardForkSpec
 selectEra Allegra HardForkSpec { allegraHardForkSpec } = allegraHardForkSpec
 selectEra Mary    HardForkSpec { maryHardForkSpec    } = maryHardForkSpec
@@ -136,6 +138,7 @@ versionZero :: SL.Version
 versionZero = SL.natVersion @0
 
 hardForkInto :: Era -> HardForkSpec
+hardForkInto Byron   = stayInByron
 hardForkInto Shelley =
     stayInByron
       { shelleyHardForkSpec = (SL.ProtVer versionZero 0, TriggerHardForkAtEpoch 0) }

ouroboros-consensus-cardano/test/cardano-test/Test/Consensus/Cardano/MiniProtocol/LocalTxSubmission/Server.hs

@@ -39,7 +39,7 @@ import           Test.Consensus.Cardano.MiniProtocol.LocalTxSubmission.ByteStrin
 import           Test.Consensus.Cardano.ProtocolInfo
                      (ByronSlotLengthInSeconds (..), Era (..),
                      ShelleySlotLengthInSeconds (..), hardForkInto,
-                     mkSimpleTestProtocolInfo, stayInByron)
+                     mkSimpleTestProtocolInfo)
 import qualified Test.Consensus.Mempool.Mocked as Mocked
 import           Test.Consensus.Mempool.Mocked (MockedMempool)
 import           Test.Tasty (TestTree, testGroup)
@@ -49,37 +49,27 @@ import qualified Test.ThreadNet.Infra.Shelley as Shelley
 tests :: TestTree
 tests =
     testGroup "LocalTxSubmissionServer"
-      $  [ localServerPassesRegressionTests (stayInByron         , 0) ]
-      <> fmap localServerPassesRegressionTests [(hardForkInto era, fromEnum era + 1) | era <- [Shelley ..]]
-      -- fromEnum Shelley == 0, hence the '+ 1' to account for the Byron era
+      $ fmap localServerPassesRegressionTests [Byron ..]
   where
-    eraName 0 = "Byron"
-    eraName 1 = "Shelley"
-    eraName 2 = "Allegra"
-    eraName 3 = "Mary"
-    eraName 4 = "Alonzo"
-    eraName 5 = "Babbage"
-    eraName 6 = "Conway"
-    eraName i = error $ "Unknown era index: " ++ show i
-
-    localServerPassesRegressionTests (hardForkSpec, i) =
-        testCase ("Passes the regression tests (" ++ eraName i ++ ")") $ do
+    localServerPassesRegressionTests era =
+        testCase ("Passes the regression tests (" ++ show era ++ ")") $ do
           let
             pInfo :: ProtocolInfo (CardanoBlock StandardCrypto)
             pInfo = mkSimpleTestProtocolInfo
                         (Shelley.DecentralizationParam 1)
                         (Consensus.SecurityParam 10)
                         (ByronSlotLengthInSeconds 1)
                         (ShelleySlotLengthInSeconds 1)
-                        hardForkSpec
+                        (hardForkInto era)
+
             eraIndex = index_NS
                      . Telescope.tip
                      . getHardForkState
                      . hardForkLedgerStatePerEra
                      . ledgerState
                      $ pInfoInitLedger pInfo
 
-          eraIndex @=? i
+          eraIndex @=? fromEnum era
 
           mempool <- Mocked.openMockedMempool (Mempool.mkCapacityBytesOverride 100_000) -- We don't want the mempool to fill up during these tests.
                                               nullTracer                                -- Use 'show >$< stdoutTracer' for debugging.