Code review suggestions

Co-authored-by: Alexander Esgen <[email protected]>

Author: jasagredo

ouroboros-consensus-cardano/ouroboros-consensus-cardano.cabal

@@ -413,6 +413,7 @@ library unstable-cardano-testlib
     sop-core,
     sop-extras,
     strict-sop-core,
+    text,
     unstable-byron-testlib,
     unstable-shelley-testlib,
 

ouroboros-consensus-cardano/src/ouroboros-consensus-cardano/Ouroboros/Consensus/Cardano/Block.hs

@@ -128,13 +128,13 @@ type ShelleyBasedLedgerEras c =
 -- Here we use layout and adjacency to make it obvious that we haven't
 -- miscounted.
 
-pattern TagByron   :: f ByronBlock                               -> NS f (CardanoEras c)
+pattern TagByron   :: f ByronBlock                           -> NS f (CardanoEras c)
 pattern TagShelley :: f (ShelleyBlock (TPraos c) ShelleyEra) -> NS f (CardanoEras c)
 pattern TagAllegra :: f (ShelleyBlock (TPraos c) AllegraEra) -> NS f (CardanoEras c)
-pattern TagMary    :: f (ShelleyBlock (TPraos c) MaryEra) -> NS f (CardanoEras c)
-pattern TagAlonzo  :: f (ShelleyBlock (TPraos c) AlonzoEra) -> NS f (CardanoEras c)
+pattern TagMary    :: f (ShelleyBlock (TPraos c) MaryEra   ) -> NS f (CardanoEras c)
+pattern TagAlonzo  :: f (ShelleyBlock (TPraos c) AlonzoEra ) -> NS f (CardanoEras c)
 pattern TagBabbage :: f (ShelleyBlock (Praos c)  BabbageEra) -> NS f (CardanoEras c)
-pattern TagConway  :: f (ShelleyBlock (Praos c)  ConwayEra) -> NS f (CardanoEras c)
+pattern TagConway  :: f (ShelleyBlock (Praos c)  ConwayEra ) -> NS f (CardanoEras c)
 
 pattern TagByron   x =                   Z x
 pattern TagShelley x =                S (Z x)

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

@@ -33,6 +33,7 @@ import           Data.SOP.BasicFunctors
 import           Data.SOP.Counting (Exactly (..))
 import           Data.SOP.Index (Index (..), himap)
 import           Data.SOP.Strict
+import qualified Data.Text as T
 import           Ouroboros.Consensus.Block
 import           Ouroboros.Consensus.Byron.ByronHFC
 import           Ouroboros.Consensus.Byron.Ledger (ByronBlock)
@@ -109,16 +110,11 @@ combineEras perEraExamples = Examples {
         inj idx = fmap (fmap (inject $ oracularInjectionIndex exampleStartBounds idx))
 
     perEraExamplesPrefixed :: NP Examples (CardanoEras Crypto)
-    perEraExamplesPrefixed = hzipWith (\(K eraName) es -> prefixExamples eraName es) perEraNames perEraExamples
+    perEraExamplesPrefixed = hcmap proxySingle prefixWithEraName perEraExamples
       where
-        perEraNames = K "Byron"
-                   :* K "Shelley"
-                   :* K "Allegra"
-                   :* K "Mary"
-                   :* K "Alonzo"
-                   :* K "Babbage"
-                   :* K "Conway"
-                   :* Nil
+        prefixWithEraName es = prefixExamples (T.unpack eraName) es
+          where
+            eraName = singleEraName $ singleEraInfo es
 
     exampleLedgerConfigCardano ::
          Labelled (HardForkLedgerConfig (CardanoEras Crypto))
@@ -200,8 +196,6 @@ instance Inject Examples where
         => Proxy f -> Labelled a -> Labelled b
       inj p = map (fmap (inject' p iidx))
 
-
-
 {-------------------------------------------------------------------------------
   Setup
 -------------------------------------------------------------------------------}

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

@@ -27,6 +27,7 @@ import qualified Data.Map.Strict as Map
 import           Data.Maybe (catMaybes, fromMaybe)
 import           Data.Proxy
 import           Data.SOP.BasicFunctors
+import           Data.SOP.Constraint
 import           Data.SOP.Counting (Exactly (..))
 import           Data.SOP.Index
 import           Data.SOP.NonEmpty
@@ -726,23 +727,12 @@ instance SListI xs => Arbitrary (History.Shape xs) where
 
 instance (CardanoHardForkConstraints c)
       => Arbitrary (PerEraLedgerConfig (CardanoEras c)) where
-  arbitrary = do
-    byronPLC   <- WrapPartialLedgerConfig <$> arbitrary
-    shelleyPLC <- WrapPartialLedgerConfig <$> arbitrary
-    allegraPLC <- WrapPartialLedgerConfig <$> arbitrary
-    maryPLC    <- WrapPartialLedgerConfig <$> arbitrary
-    alonzoPLC  <- WrapPartialLedgerConfig <$> arbitrary
-    babbagePLC <- WrapPartialLedgerConfig <$> arbitrary
-    conwayPLC  <- WrapPartialLedgerConfig <$> arbitrary
-    return $ PerEraLedgerConfig $
-      byronPLC
-      :* shelleyPLC
-      :* allegraPLC
-      :* maryPLC
-      :* alonzoPLC
-      :* babbagePLC
-      :* conwayPLC
-      :* Nil
+  arbitrary =
+      fmap PerEraLedgerConfig . hsequence'
+    $ hcpure (Proxy @(Compose Arbitrary WrapPartialLedgerConfig)) (Comp arbitrary)
+
+instance Arbitrary (PartialLedgerConfig blk) => Arbitrary (WrapPartialLedgerConfig blk) where
+  arbitrary = WrapPartialLedgerConfig <$> arbitrary
 
 instance Arbitrary ByronPartialLedgerConfig where
   arbitrary = ByronPartialLedgerConfig <$> arbitrary <*> arbitrary

ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/Config/SecurityParam.hs

@@ -17,8 +17,8 @@ import           Quiet
 --
 -- We interpret this as the number of rollbacks we support.
 --
--- i.e., k == 0: we can't roll back at all
---       k == 1: we can roll back at most one block, etc
+-- i.e., k == 1: we can roll back at most one block
+--       k == 2: we can roll back at most two blocks, etc
 --
 -- NOTE: This talks about the number of /blocks/ we can roll back, not
 -- the number of /slots/.

ouroboros-consensus/src/unstable-consensus-testlib/Test/Ouroboros/Consensus/ChainGenerator/Adversarial.hs

@@ -171,7 +171,6 @@ checkAdversarialChain recipe adv = do
         let pc = BV.countActivesInV S.notInverted vA
         when (C.toVar pc <= 0) $ Exn.throwError BadCount
 
-
     -- the youngest slot in which the adversarial schedule cannot have accelerated
     --
     -- (IE @s@ past the first active adversarial slot, or @d@ past the @k+1@st

ouroboros-consensus/src/unstable-consensus-testlib/Test/Ouroboros/Consensus/ChainGenerator/Params.hs

@@ -1,6 +1,5 @@
 {-# LANGUAGE FlexibleInstances #-}
 {-# LANGUAGE PatternSynonyms #-}
-{-# OPTIONS_GHC -Wno-orphans #-}
 
 module Test.Ouroboros.Consensus.ChainGenerator.Params (
     Asc (Asc, UnsafeAsc)