WIP ThreadNet: abstract protocolInfoShelleyBasedHardFork

Author: geo2a

ouroboros-consensus-cardano/src/unstable-cardano-testlib/Test/ThreadNet/Infra/ShelleyBasedHardFork.hs

@@ -194,7 +194,6 @@ type ShelleyBasedHardForkConstraints proto1 era1 proto2 era2 =
   , -- At the moment, fix the protocols together
     ProtoCrypto proto1 ~ ProtoCrypto proto2
   , PraosCrypto (ProtoCrypto proto1)
-  , proto1 ~ TPraos (ProtoCrypto proto1)
   , proto1 ~ proto2
   , MemPack (TxOut (LedgerState (ShelleyBlock proto1 era1)))
   , MemPack (TxOut (LedgerState (ShelleyBlock proto2 era2)))
@@ -391,7 +390,23 @@ protocolInfoShelleyBasedHardFork ::
   ( KESAgentContext (ProtoCrypto proto2) m
   , ShelleyBasedHardForkConstraints proto1 era1 proto2 era2
   ) =>
+  ( ProtocolParamsShelleyBased (ProtoCrypto proto1) ->
+    L.TransitionConfig era1 ->
+    SL.ProtVer ->
+    ( ProtocolInfo (ShelleyBlock proto1 era1)
+    , Tracer.Tracer m KESAgentClientTrace -> m [MkBlockForging m (ShelleyBlock proto1 era1)]
+    )
+  ) ->
+  ( ProtocolParamsShelleyBased (ProtoCrypto proto2) ->
+    L.TransitionConfig era2 ->
+    SL.ProtVer ->
+    ( ProtocolInfo (ShelleyBlock proto2 era2)
+    , Tracer.Tracer m KESAgentClientTrace -> m [MkBlockForging m (ShelleyBlock proto2 era2)]
+    )
+  ) ->
   ProtocolParamsShelleyBased (ProtoCrypto proto1) ->
+  (ConsensusConfig proto1 -> PartialConsensusConfig proto1) ->
+  (ConsensusConfig proto2 -> PartialConsensusConfig proto2) ->
   SL.ProtVer ->
   SL.ProtVer ->
   L.TransitionConfig era2 ->
@@ -401,7 +416,11 @@ protocolInfoShelleyBasedHardFork ::
     m [MkBlockForging m (ShelleyBasedHardForkBlock proto1 era1 proto2 era2)]
   )
 protocolInfoShelleyBasedHardFork
+  protocolInfoProtoShelleyBased1 -- TODO(geo2a): come up with a better name for this argument
+  protocolInfoProtoShelleyBased2
   protocolParamsShelleyBased
+  toPartialConsensusConfig1
+  toPartialConsensusConfig2
   protVer1
   protVer2
   transCfg2
@@ -411,20 +430,15 @@ protocolInfoShelleyBasedHardFork
       protocolInfo1
       blockForging1
       eraParams1
-      tpraosParams
+      toPartialConsensusConfig1
       toPartialLedgerConfig1
       -- Era 2
       protocolInfo2
       blockForging2
       eraParams2
-      tpraosParams
+      toPartialConsensusConfig2
       toPartialLedgerConfig2
    where
-    ProtocolParamsShelleyBased
-      { shelleyBasedInitialNonce
-      , shelleyBasedLeaderCredentials
-      } = protocolParamsShelleyBased
-
     -- Era 1
 
     genesis :: SL.ShelleyGenesis
@@ -434,7 +448,7 @@ protocolInfoShelleyBasedHardFork
     blockForging1 ::
       Tracer.Tracer m KESAgentClientTrace -> m [MkBlockForging m (ShelleyBlock proto1 era1)]
     (protocolInfo1, blockForging1) =
-      protocolInfoTPraosShelleyBased
+      protocolInfoProtoShelleyBased1
         protocolParamsShelleyBased
         (transCfg2 ^. L.tcPreviousEraConfigL)
         protVer1
@@ -457,11 +471,8 @@ protocolInfoShelleyBasedHardFork
     blockForging2 ::
       Tracer.Tracer m KESAgentClientTrace -> m [MkBlockForging m (ShelleyBlock proto2 era2)]
     (protocolInfo2, blockForging2) =
-      protocolInfoTPraosShelleyBased
-        ProtocolParamsShelleyBased
-          { shelleyBasedInitialNonce
-          , shelleyBasedLeaderCredentials
-          }
+      protocolInfoProtoShelleyBased2
+        protocolParamsShelleyBased
         transCfg2
         protVer2
 

ouroboros-consensus-cardano/test/cardano-test/Test/ThreadNet/AllegraMary.hs

@@ -36,11 +36,13 @@ import Ouroboros.Consensus.Ledger.SupportsMempool (extractTxs)
 import Ouroboros.Consensus.Node.ProtocolInfo
 import Ouroboros.Consensus.NodeId
 import Ouroboros.Consensus.Protocol.TPraos (TPraos)
+import qualified Ouroboros.Consensus.Protocol.TPraos as TPraos
 import Ouroboros.Consensus.Shelley.Eras
 import Ouroboros.Consensus.Shelley.Ledger.SupportsProtocol ()
 import Ouroboros.Consensus.Shelley.Node
   ( ProtocolParamsShelleyBased (..)
   , ShelleyGenesis (..)
+  , protocolInfoTPraosShelleyBased
   )
 import Test.Consensus.Shelley.MockCrypto (MockCrypto)
 import Test.QuickCheck
@@ -178,7 +180,11 @@ prop_simple_allegraMary_convergence
                     TriggerHardForkAtVersion $ SL.getVersion majorVersion2
                   (protocolInfo, blockForging) =
                     protocolInfoShelleyBasedHardFork
+                      protocolInfoTPraosShelleyBased
+                      protocolInfoTPraosShelleyBased
                       protocolParamsShelleyBased
+                      TPraos.tpraosParams
+                      TPraos.tpraosParams
                       (SL.ProtVer majorVersion1 0)
                       (SL.ProtVer majorVersion2 0)
                       ( L.mkTransitionConfig L.NoGenesis $

ouroboros-consensus-cardano/test/cardano-test/Test/ThreadNet/MaryAlonzo.hs

@@ -41,11 +41,13 @@ import Ouroboros.Consensus.Ledger.SupportsMempool (extractTxs)
 import Ouroboros.Consensus.Node.ProtocolInfo
 import Ouroboros.Consensus.NodeId
 import Ouroboros.Consensus.Protocol.TPraos (TPraos)
+import qualified Ouroboros.Consensus.Protocol.TPraos as TPraos
 import Ouroboros.Consensus.Shelley.Eras
 import Ouroboros.Consensus.Shelley.Ledger.SupportsProtocol ()
 import Ouroboros.Consensus.Shelley.Node
   ( ProtocolParamsShelleyBased (..)
   , ShelleyGenesis (..)
+  , protocolInfoTPraosShelleyBased
   )
 import qualified Test.Cardano.Ledger.Alonzo.Examples as SL
 import Test.Consensus.Shelley.MockCrypto (MockCrypto)
@@ -184,7 +186,11 @@ prop_simple_allegraAlonzo_convergence
                     TriggerHardForkAtVersion $ SL.getVersion majorVersion2
                   (protocolInfo, blockForging) =
                     protocolInfoShelleyBasedHardFork
+                      protocolInfoTPraosShelleyBased
+                      protocolInfoTPraosShelleyBased
                       protocolParamsShelleyBased
+                      TPraos.tpraosParams
+                      TPraos.tpraosParams
                       (SL.ProtVer majorVersion1 0)
                       (SL.ProtVer majorVersion2 0)
                       ( L.mkTransitionConfig alonzoGenesis $

ouroboros-consensus-cardano/test/cardano-test/Test/ThreadNet/ShelleyAllegra.hs

@@ -36,11 +36,13 @@ import Ouroboros.Consensus.Ledger.SupportsMempool (extractTxs)
 import Ouroboros.Consensus.Node.ProtocolInfo
 import Ouroboros.Consensus.NodeId
 import Ouroboros.Consensus.Protocol.TPraos (TPraos)
+import qualified Ouroboros.Consensus.Protocol.TPraos as TPraos
 import Ouroboros.Consensus.Shelley.Eras
 import Ouroboros.Consensus.Shelley.Ledger.SupportsProtocol ()
 import Ouroboros.Consensus.Shelley.Node
   ( ProtocolParamsShelleyBased (..)
   , ShelleyGenesis (..)
+  , protocolInfoTPraosShelleyBased
   )
 import Test.Consensus.Shelley.MockCrypto (MockCrypto)
 import Test.QuickCheck
@@ -187,7 +189,11 @@ prop_simple_shelleyAllegra_convergence
                     TriggerHardForkAtVersion $ SL.getVersion majorVersion2
                   (protocolInfo, blockForging) =
                     protocolInfoShelleyBasedHardFork
+                      protocolInfoTPraosShelleyBased
+                      protocolInfoTPraosShelleyBased
                       protocolParamsShelleyBased
+                      TPraos.tpraosParams
+                      TPraos.tpraosParams
                       (SL.ProtVer majorVersion1 0)
                       (SL.ProtVer majorVersion2 0)
                       ( L.mkTransitionConfig L.NoGenesis $