cardano: introduce active Shelley stake pools in the ThreadNet tests

IntersectMBO · Aug 10, 2020 · 0d9410d · 0d9410d
1 parent 8dcc6d4
commit 0d9410d
Show file tree

Hide file tree

Showing 13 changed files with 531 additions and 109 deletions.
diff --git a/.buildkite/slow-ThreadNet-tests.sh b/.buildkite/slow-ThreadNet-tests.sh
@@ -24,10 +24,10 @@ set -euo pipefail
 # overhead and also more reliable percentages in their QuickCheck statistics.
 rows=(
     # From the slowest individual invocation ...
-    '1 Cardano    5000'  # ~45 minutes per invocation
+    '1 Cardano    2000'  # ~35 minutes per invocation
     '2 RealTPraos 200'   # ~30 minutes per invocation (but high variance)
     '4 RealTPraos 100'   # ~15 minutes per invocation (but high variance)
-    '5 Cardano    500'   # ~5 minutes per invocation
+    '5 Cardano    300'   # ~5  minutes per invocation
     # ... to fastest individual invocation
     #
     # And the number of invocations is non-decreasing.

diff --git a/ouroboros-consensus-byron-test/src/Test/ThreadNet/TxGen/Byron.hs b/ouroboros-consensus-byron-test/src/Test/ThreadNet/TxGen/Byron.hs
@@ -8,4 +8,4 @@ import           Test.ThreadNet.TxGen
 instance TxGen ByronBlock where
   -- We don't generate transactions for 'ByronBlock', but we do for
   -- 'DualByronBlock'.
-  testGenTxs _ _ _ _ _ = return []
+  testGenTxs _ _ _ _ _ _ = return []
diff --git a/ouroboros-consensus-byron-test/test/Test/ThreadNet/DualPBFT.hs b/ouroboros-consensus-byron-test/test/Test/ThreadNet/DualPBFT.hs
@@ -259,7 +259,7 @@ realPBftParams ByronSpecGenesis{..} =
 -------------------------------------------------------------------------------}
 
 instance TxGen DualByronBlock where
-  testGenTxs _numCoreNodes curSlotNo cfg () = \st -> do
+  testGenTxs _coreNodeId _numCoreNodes curSlotNo cfg () = \st -> do
       n <- choose (0, 20)
       go [] n $ applyChainTick (configLedger cfg) curSlotNo st
     where

diff --git a/ouroboros-consensus-cardano/ouroboros-consensus-cardano.cabal b/ouroboros-consensus-cardano/ouroboros-consensus-cardano.cabal
@@ -87,6 +87,7 @@ test-suite test
                      , bytestring        >=0.10  && <0.11
                      , cardano-binary
                      , cardano-crypto-class
+                     , cardano-crypto-wrapper
                      , cardano-ledger
                      , cardano-ledger-test
                      , cardano-slotting