WIP

IntersectMBO · May 7, 2024 · f932e20 · f932e20
1 parent 4032ea5
commit f932e20
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 6 deletions.
diff --git a/bench/cardano-profile/src/Cardano/Benchmarking/Profile.hs b/bench/cardano-profile/src/Cardano/Benchmarking/Profile.hs
@@ -11,7 +11,7 @@ module Cardano.Benchmarking.Profile (
   , uniCircle, torus, torusDense
   , hosts, pools, hostsChainsync, withExplorerNode
   , withChaindbServer
-  , idle, fixedLoaded, chainsync
+  , idle, tracerOnly, fixedLoaded, chainsync
   , shutdownOnSlot, shutdownOnBlock, shutdownOnOff
   , p2pOn, p2pOff
   , tracerOn, tracerOff
@@ -116,6 +116,9 @@ withChaindbServer = comp (\c -> c {Types.with_chaindb_server = Just True})
 idle :: Types.Profile -> Types.Profile
 idle p = p {Types.scenario = Types.Idle}
 
+tracerOnly :: Types.Profile -> Types.Profile
+tracerOnly p = p {Types.scenario = Types.TracerOnly}
+
 fixedLoaded :: Types.Profile -> Types.Profile
 fixedLoaded p = p {Types.scenario = Types.FixedLoaded}
 

diff --git a/bench/cardano-profile/src/Cardano/Benchmarking/Profile/Map.hs b/bench/cardano-profile/src/Cardano/Benchmarking/Profile/Map.hs
@@ -308,6 +308,33 @@ profilesNoEra = Map.fromList $ map (\p -> (Types.name p, p)) $
   ------------------------------------------------------------------------------
   -- 6 nodes and no "--shutdown-on-slot-synced" and no "--shutdown-on-block-synced"
   ------------------------------------------------------------------------------
+  let idle =   dummy
+             & P.uniCircle . P.hosts 6
+             . P.loopback
+             . P.p2pOff
+             . P.idle
+             . P.shutdownOnOff
+  in [
+    (idle & P.name "devops" . P.tracerOn  . P.newTracing . P.p2pOff)
+  , (idle & P.name "idle"   . P.tracerOn  . P.newTracing . P.p2pOff)
+  ]
+  ++
+  ------------------------------------------------------------------------------
+  -- 6 nodes and no "--shutdown-on-slot-synced" and no "--shutdown-on-block-synced"
+  ------------------------------------------------------------------------------
+  let tracerOnly =   dummy
+                   & P.uniCircle . P.hosts 6
+                   . P.loopback
+                   . P.p2pOff
+                   . P.tracerOnly
+                   . P.shutdownOnOff
+  in [
+    (tracerOnly & P.name "tracer-only" . P.tracerOn  . P.newTracing . P.p2pOff)
+  ]
+  ++
+  ------------------------------------------------------------------------------
+  -- 6 nodes and no "--shutdown-on-slot-synced" and no "--shutdown-on-block-synced"
+  ------------------------------------------------------------------------------
   let noCliStop =   dummy
                   & P.hosts 6
                   . P.fixedLoaded
@@ -318,13 +345,10 @@ profilesNoEra = Map.fromList $ map (\p -> (Types.name p, p)) $
   in [
     (noCliStopLocal     & P.name "default"                    . P.tracerOn  . P.newTracing . P.p2pOff)
   , (noCliStopLocal     & P.name "default-p2p"                . P.tracerOn  . P.newTracing . P.p2pOn )
-  , (noCliStopLocal     & P.name "devops"                     . P.tracerOn  . P.newTracing . P.p2pOff)
-  , (noCliStopLocal     & P.name "idle"                       . P.tracerOn  . P.newTracing . P.p2pOff)
   , (noCliStopLocal     & P.name "oldtracing"                 . P.tracerOn  . P.oldTracing . P.p2pOff)
   , (noCliStopLocal     & P.name "plutus"                     . P.tracerOn  . P.newTracing . P.p2pOff)
   , (noCliStopLocal     & P.name "plutus-secp-ecdsa"          . P.tracerOn  . P.newTracing . P.p2pOff)
   , (noCliStopLocal     & P.name "plutus-secp-schnorr"        . P.tracerOn  . P.newTracing . P.p2pOff)
-  , (noCliStopLocal     & P.name "tracer-only"                . P.tracerOn  . P.newTracing . P.p2pOff)
   , (noCliStopNomadPerf & P.name "default-nomadperf"          . P.tracerOn  . P.newTracing . P.p2pOn )
   , (noCliStopNomadPerf & P.name "default-nomadperf-nop2p"    . P.tracerOn  . P.newTracing . P.p2pOff)
   , (noCliStopNomadPerf & P.name "oldtracing-nomadperf"       . P.tracerOn  . P.oldTracing . P.p2pOn )

diff --git a/bench/cardano-profile/test/Main.hs b/bench/cardano-profile/test/Main.hs
@@ -160,7 +160,6 @@ profilesMap = Tasty.testGroup
             )
 --}
           -- Show the first profile with differences in the Scenario type.
-{--
           mapM_
             (uncurry $ assertEqual
               ("Profile == (decode \"" ++ fp ++ "\") - Scenario")
@@ -175,7 +174,6 @@ profilesMap = Tasty.testGroup
                 (\p -> Types.scenario p) Profiles.profiles
               )
             )
---}
           -- Show the first profile with differences in the Composition type.
           mapM_
             (uncurry $ assertEqual