WIP ThreadNet: move validateGenesis helper function

Author: geo2a

ouroboros-consensus-cardano/src/shelley/Ouroboros/Consensus/Shelley/Node.hs

@@ -43,6 +43,7 @@ import Ouroboros.Consensus.Protocol.TPraos
 import Ouroboros.Consensus.Shelley.Ledger
 import Ouroboros.Consensus.Shelley.Ledger.Inspect ()
 import Ouroboros.Consensus.Shelley.Ledger.NetworkProtocolVersion ()
+import Ouroboros.Consensus.Shelley.Node.Common (validateGenesis)
 import Ouroboros.Consensus.Shelley.Node.DiffusionPipelining ()
 import Ouroboros.Consensus.Shelley.Node.Serialisation ()
 import Ouroboros.Consensus.Shelley.Node.TPraos

ouroboros-consensus-cardano/src/shelley/Ouroboros/Consensus/Shelley/Node/Common.hs

@@ -3,6 +3,7 @@
 {-# LANGUAGE FlexibleInstances #-}
 {-# LANGUAGE GADTs #-}
 {-# LANGUAGE MultiParamTypeClasses #-}
+{-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE PolyKinds #-}
 {-# LANGUAGE TypeFamilies #-}
 {-# LANGUAGE TypeOperators #-}
@@ -17,13 +18,16 @@ module Ouroboros.Consensus.Shelley.Node.Common
   , ShelleyEraWithCrypto
   , ShelleyLeaderCredentials (..)
   , shelleyBlockIssuerVKey
+  , validateGenesis
   ) where
 
 import Cardano.Ledger.BaseTypes (unNonZero)
 import qualified Cardano.Ledger.Keys as SL
 import qualified Cardano.Ledger.Shelley.API as SL
 import Cardano.Ledger.Slot
+import Data.Bifunctor (first)
 import Data.Text (Text)
+import qualified Data.Text as Text
 import Ouroboros.Consensus.Block
   ( CannotForge
   , ForgeStateInfo
@@ -134,3 +138,14 @@ data ProtocolParamsShelleyBased c = ProtocolParamsShelleyBased
   -- mutually incompatible.
   , shelleyBasedLeaderCredentials :: [ShelleyLeaderCredentials c]
   }
+
+-- | Check the validity of the genesis config. To be used in conjunction with
+-- 'assertWithMsg'.
+validateGenesis :: SL.ShelleyGenesis -> Either String ()
+validateGenesis = first errsToString . SL.validateGenesis
+ where
+  errsToString :: [SL.ValidationErr] -> String
+  errsToString errs =
+    Text.unpack $
+      Text.unlines
+        ("Invalid genesis config:" : map SL.describeValidationErr errs)

ouroboros-consensus-cardano/src/shelley/Ouroboros/Consensus/Shelley/Node/TPraos.hs

@@ -27,7 +27,6 @@ module Ouroboros.Consensus.Shelley.Node.TPraos
   , protocolInfoTPraosShelleyBased
   , shelleyBlockForging
   , shelleySharedBlockForging
-  , validateGenesis
   ) where
 
 import Cardano.Crypto.Hash (Hash)
@@ -44,9 +43,7 @@ import Cardano.Slotting.EpochInfo
 import Cardano.Slotting.Time (mkSlotLength)
 import Control.Monad.Except (Except)
 import qualified Control.Tracer as Tracer
-import Data.Bifunctor (first)
 import qualified Data.Text as T
-import qualified Data.Text as Text
 import Lens.Micro ((^.))
 import Ouroboros.Consensus.Block
 import Ouroboros.Consensus.Config
@@ -72,6 +69,7 @@ import Ouroboros.Consensus.Shelley.Node.Common
   , ShelleyEraWithCrypto
   , ShelleyLeaderCredentials (..)
   , shelleyBlockIssuerVKey
+  , validateGenesis
   )
 import Ouroboros.Consensus.Shelley.Node.Serialisation ()
 import Ouroboros.Consensus.Shelley.Protocol.TPraos ()
@@ -154,17 +152,6 @@ shelleySharedBlockForging hotKey slotToPeriod credentials =
   ProtocolInfo
 -------------------------------------------------------------------------------}
 
--- | Check the validity of the genesis config. To be used in conjunction with
--- 'assertWithMsg'.
-validateGenesis :: SL.ShelleyGenesis -> Either String ()
-validateGenesis = first errsToString . SL.validateGenesis
- where
-  errsToString :: [SL.ValidationErr] -> String
-  errsToString errs =
-    Text.unpack $
-      Text.unlines
-        ("Invalid genesis config:" : map SL.describeValidationErr errs)
-
 protocolInfoShelley ::
   forall m c.
   ( IOLike m