TOSQUASH fix multiplicities in mempool tests and clean build again

Author: nfrisby

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

@@ -451,7 +451,6 @@ test-suite cardano-test
     containers,
     contra-tracer,
     filepath,
-    measures,
     microlens,
     ouroboros-consensus:{ouroboros-consensus, unstable-consensus-testlib, unstable-mempool-test-utils},
     ouroboros-consensus-cardano:{ouroboros-consensus-cardano, unstable-cardano-testlib},
@@ -548,7 +547,6 @@ library unstable-cardano-tools
     filepath,
     fs-api ^>=0.2.0.1,
     githash,
-    measures,
     microlens,
     mtl,
     network,

ouroboros-consensus-cardano/src/unstable-cardano-tools/Cardano/Tools/DBAnalyser/Block/Byron.hs

@@ -26,7 +26,6 @@ import           Ouroboros.Consensus.Byron.Ledger (ByronBlock)
 import qualified Ouroboros.Consensus.Byron.Ledger as Byron
 import           Ouroboros.Consensus.Byron.Node (PBftSignatureThreshold (..),
                      ProtocolParams (..), protocolInfoByron)
-import qualified Ouroboros.Consensus.Mempool as Mempool
 import           Ouroboros.Consensus.Node.ProtocolInfo
 import           Text.Builder (decimal)
 

ouroboros-consensus-cardano/src/unstable-cardano-tools/Cardano/Tools/DBAnalyser/Block/Shelley.hs

@@ -37,7 +37,6 @@ import           Data.Sequence.Strict (StrictSeq)
 import           Data.Word (Word64)
 import           Lens.Micro ((^.))
 import           Lens.Micro.Extras (view)
-import qualified Ouroboros.Consensus.Mempool as Mempool
 import           Ouroboros.Consensus.Node.ProtocolInfo
 import           Ouroboros.Consensus.Protocol.TPraos (TPraos)
 import           Ouroboros.Consensus.Shelley.Eras (StandardCrypto,

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

@@ -75,7 +75,6 @@ import           Lens.Micro
 import           Ouroboros.Consensus.Block
 import           Ouroboros.Consensus.BlockchainTime
 import           Ouroboros.Consensus.Config.SecurityParam
-import qualified Ouroboros.Consensus.Mempool as Mempool
 import           Ouroboros.Consensus.Node.ProtocolInfo
 import           Ouroboros.Consensus.Protocol.Praos.Common
                      (PraosCanBeLeader (PraosCanBeLeader),

ouroboros-consensus-cardano/test/cardano-test/Test/Consensus/Cardano/MiniProtocol/LocalTxSubmission/Server.hs

@@ -10,7 +10,6 @@ module Test.Consensus.Cardano.MiniProtocol.LocalTxSubmission.Server (tests) wher
 import           Control.Monad (void)
 import           Control.Tracer (Tracer, nullTracer, stdoutTracer)
 import           Data.Functor.Contravariant ((>$<))
-import qualified Data.Measure as Measure
 import           Data.SOP.Strict (index_NS)
 import qualified Data.SOP.Telescope as Telescope
 import           Network.TypedProtocol.Proofs (connect)
@@ -27,8 +26,6 @@ import           Ouroboros.Consensus.MiniProtocol.LocalTxSubmission.Server
                      (TraceLocalTxSubmissionServerEvent,
                      localTxSubmissionServer)
 import           Ouroboros.Consensus.Node.ProtocolInfo
-import           Ouroboros.Consensus.Shelley.Ledger.Mempool (AlonzoMeasure (..),
-                     ConwayMeasure (..))
 import           Ouroboros.Network.Protocol.LocalTxSubmission.Client
                      (SubmitResult, localTxSubmissionClientPeer)
 import           Ouroboros.Network.Protocol.LocalTxSubmission.Examples
@@ -74,11 +71,8 @@ tests =
 
           let
             -- We don't want the mempool to fill up during these tests.
-            capcityBytesOverride =
-                Mempool.mkOverrides
-              $ ConwayMeasure
-                  (AlonzoMeasure 100_000 Measure.maxBound)   -- TODO
-                  Measure.maxBound
+            multiplicityOverride =
+              Mempool.MempoolMultiplicityOverride 100
             -- Use 'show >$< stdoutTracer' for debugging.
             tracer               = nullTracer
             mempoolParams        = Mocked.MempoolAndModelParams {
@@ -89,7 +83,7 @@ tests =
               }
 
           mempool <- Mocked.openMockedMempool
-                      capcityBytesOverride
+                      (Just multiplicityOverride)
                       tracer
                       mempoolParams
 

ouroboros-consensus-cardano/test/shelley-test/Test/Consensus/Shelley/Coherence.hs

@@ -3,7 +3,6 @@ module Test.Consensus.Shelley.Coherence (tests) where
 import           Cardano.Ledger.Alonzo.Scripts (ExUnits, pointWiseExUnits)
 import qualified Data.Measure as Measure
 import           Data.Word (Word32)
-import qualified Ouroboros.Consensus.Mempool.Capacity as MempoolCapacity
 import           Ouroboros.Consensus.Shelley.Ledger.Mempool (AlonzoMeasure (..),
                      fromExUnits)
 import           Ouroboros.Network.SizeInBytes (SizeInBytes (..))

ouroboros-consensus-diffusion/ouroboros-consensus-diffusion.cabal

@@ -87,7 +87,6 @@ library
     fs-api ^>=0.2.0.1,
     hashable,
     io-classes ^>=1.5,
-    measures,
     mtl,
     ouroboros-consensus ^>=0.19,
     ouroboros-network ^>=0.16,
@@ -138,7 +137,6 @@ library unstable-diffusion-testlib
     graphviz >=2999.20.1.0,
     io-classes,
     io-sim,
-    measures,
     mtl,
     ouroboros-consensus:{ouroboros-consensus, unstable-consensus-testlib},
     ouroboros-consensus-diffusion,
@@ -285,6 +283,7 @@ test-suite consensus-test
     hashable,
     io-classes,
     io-sim,
+    measures,
     mtl,
     nothunks,
     ouroboros-consensus:{ouroboros-consensus, unstable-consensus-testlib},

ouroboros-consensus-diffusion/src/ouroboros-consensus-diffusion/Ouroboros/Consensus/Node.hs

@@ -69,7 +69,6 @@ import           Data.Hashable (Hashable)
 import           Data.Map.Strict (Map)
 import qualified Data.Map.Strict as Map
 import           Data.Maybe (fromMaybe, isNothing)
-import qualified Data.Measure as Measure
 import           Data.Time (NominalDiffTime)
 import           Data.Typeable (Typeable)
 import           Ouroboros.Consensus.Block

ouroboros-consensus/bench/mempool-bench/Main.hs

@@ -25,6 +25,7 @@ import qualified Ouroboros.Consensus.Mempool.Capacity as Mempool
 import           System.Exit (die, exitFailure)
 import qualified Test.Consensus.Mempool.Mocked as Mocked
 import           Test.Consensus.Mempool.Mocked (MockedMempool)
+import           Test.Consensus.Mempool.Multiplicity (leastMultiplicity)
 import           Test.Tasty (withResource)
 import           Test.Tasty.Bench (CsvPath (CsvPath), bench, benchIngredients,
                      bgroup, whnfIO)
@@ -131,16 +132,17 @@ main = withStdTerminalHandles $ do
 
 openMempoolWithCapacityFor :: [MempoolCmd TestBlock] ->  IO (MockedMempool IO TestBlock)
 openMempoolWithCapacityFor cmds =
-    Mocked.openMockedMempool capacityRequiredByCmds
-                             Tracer.nullTracer
-                             Mocked.MempoolAndModelParams {
-                                 Mocked.immpInitialState = TestBlock.initialLedgerState
-                               , Mocked.immpLedgerConfig = TestBlock.sampleLedgerConfig
-                             }
+    Mocked.openMockedMempool
+        (Just $ Mempool.MempoolMultiplicityOverride multRequiredByCmds)
+        Tracer.nullTracer
+        Mocked.MempoolAndModelParams {
+            Mocked.immpInitialState = TestBlock.initialLedgerState
+          , Mocked.immpLedgerConfig = TestBlock.sampleLedgerConfig
+          }
   where
-    capacityRequiredByCmds :: Mempool.TxOverrides TestBlock
-    capacityRequiredByCmds =
-      Mempool.mkOverrides $ sum $ fmap TestBlock.txSize $ getCmdsTxs cmds
+    multRequiredByCmds :: Int
+    multRequiredByCmds =
+      leastMultiplicity $ fmap TestBlock.txSize $ getCmdsTxs cmds
 
 mkNTryAddTxs :: Int -> [MempoolCmd TestBlock.TestBlock]
 mkNTryAddTxs 0 = []

ouroboros-consensus/ouroboros-consensus.cabal

@@ -480,13 +480,17 @@ library unstable-mempool-test-utils
   import: common-lib
   visibility: public
   hs-source-dirs: src/unstable-mempool-test-utils
-  exposed-modules: Test.Consensus.Mempool.Mocked
+  exposed-modules:
+    Test.Consensus.Mempool.Mocked
+    Test.Consensus.Mempool.Multiplicity
   build-depends:
     base,
     contra-tracer,
     deepseq,
     ouroboros-consensus,
+    ouroboros-network-api,
     strict-stm,
+    unstable-mock-block
 
 library unstable-tutorials
   import: common-lib
@@ -569,6 +573,7 @@ test-suite consensus-test
     typed-protocols ^>=0.1.1,
     typed-protocols-examples,
     unstable-consensus-testlib,
+    unstable-mempool-test-utils,
     unstable-mock-block,
 
 test-suite infra-test