Updated ouroboros-consensus-mock-test

IntersectMBO · Nov 21, 2022 · 5efb284 · 5efb284
1 parent e27ef02
commit 5efb284
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 15 deletions.
diff --git a/ouroboros-consensus-mock-test/test/Test/ThreadNet/BFT.hs b/ouroboros-consensus-mock-test/test/Test/ThreadNet/BFT.hs
@@ -103,11 +103,12 @@ prop_simple_bft_convergence TestSetup
     testOutput =
         runTestNetwork testConfig testConfigB TestConfigMB
             { nodeInfo = \nid ->
-                plainTestNodeInitialization $
-                  protocolInfoBft
+                plainTestNodeInitialization
+                  (protocolInfoBft
                     numCoreNodes
                     nid
                     k
-                    (HardFork.defaultEraParams k slotLength)
+                    (HardFork.defaultEraParams k slotLength))
+                  (pure $ blockForgingBft nid)
             , mkRekeyM = Nothing
             }
diff --git a/ouroboros-consensus-mock-test/test/Test/ThreadNet/LeaderSchedule.hs b/ouroboros-consensus-mock-test/test/Test/ThreadNet/LeaderSchedule.hs
@@ -119,8 +119,8 @@ prop_simple_leader_schedule_convergence TestSetup
     testOutput@TestOutput{testOutputNodes} =
         runTestNetwork testConfig testConfigB TestConfigMB
             { nodeInfo = \nid ->
-                plainTestNodeInitialization $
-                protocolInfoPraosRule
+                plainTestNodeInitialization
+                (protocolInfoPraosRule
                   numCoreNodes
                   nid
                   PraosParams
@@ -130,7 +130,8 @@ prop_simple_leader_schedule_convergence TestSetup
                   }
                   (HardFork.defaultEraParams k slotLength)
                   schedule
-                  emptyPraosEvolvingStake
+                  emptyPraosEvolvingStake)
+                (pure blockForgingPraosRule)
             , mkRekeyM = Nothing
             }
 

diff --git a/ouroboros-consensus-mock-test/test/Test/ThreadNet/PBFT.hs b/ouroboros-consensus-mock-test/test/Test/ThreadNet/PBFT.hs
@@ -21,7 +21,7 @@ import           Ouroboros.Consensus.Mock.Ledger.Block
 import           Ouroboros.Consensus.Mock.Ledger.Block.PBFT
 import           Ouroboros.Consensus.Mock.Node ()
 import           Ouroboros.Consensus.Mock.Node.PBFT (MockPBftBlock,
-                     protocolInfoMockPBFT)
+                     blockForgingMockPBFT, protocolInfoMockPBFT)
 import           Ouroboros.Consensus.Node.ProtocolInfo (NumCoreNodes (..))
 import           Ouroboros.Consensus.NodeId
 import           Ouroboros.Consensus.Protocol.PBFT
@@ -115,10 +115,12 @@ prop_simple_pbft_convergence TestSetup
 
     testOutput =
         runTestNetwork testConfig testConfigB TestConfigMB
-            { nodeInfo = plainTestNodeInitialization .
-                            protocolInfoMockPBFT
-                              params
-                              (HardFork.defaultEraParams k slotLength)
+            { nodeInfo = \nid ->
+                            plainTestNodeInitialization
+                              (protocolInfoMockPBFT
+                                params
+                                (HardFork.defaultEraParams k slotLength))
+                              (pure $ blockForgingMockPBFT nid)
             , mkRekeyM = Nothing
             }
 

diff --git a/ouroboros-consensus-mock-test/test/Test/ThreadNet/Praos.hs b/ouroboros-consensus-mock-test/test/Test/ThreadNet/Praos.hs
@@ -20,7 +20,7 @@ import qualified Ouroboros.Consensus.HardFork.History as HardFork
 import           Ouroboros.Consensus.Mock.Ledger
 import           Ouroboros.Consensus.Mock.Node ()
 import           Ouroboros.Consensus.Mock.Node.Praos (MockPraosBlock,
-                     protocolInfoPraos)
+                     blockForgingPraos, protocolInfoPraos)
 import           Ouroboros.Consensus.Mock.Protocol.Praos
 
 import           Test.ThreadNet.General
@@ -146,15 +146,16 @@ prop_simple_praos_convergence TestSetup
 
     testOutput@TestOutput{testOutputNodes} =
         runTestNetwork testConfig testConfigB TestConfigMB
-            { nodeInfo = \nid -> plainTestNodeInitialization $
-                                    protocolInfoPraos
+            { nodeInfo = \nid -> plainTestNodeInitialization
+                                    (protocolInfoPraos
                                       numCoreNodes
                                       nid
                                       params
                                       (HardFork.defaultEraParams
                                         k
                                         slotLength)
                                       setupInitialNonce
-                                      evolvingStake
+                                      evolvingStake)
+                                    (blockForgingPraos numCoreNodes nid)
             , mkRekeyM = Nothing
             }