Skip to content

Commit 4344e9f

Browse files
committed
cardano-profile: cleanup; make it pass CI
1 parent e339542 commit 4344e9f

File tree

3 files changed

+16
-25
lines changed

3 files changed

+16
-25
lines changed

bench/cardano-profile/cardano-profile.cabal

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,7 @@ extra-source-files: README.md
1717
data-files: data/all-profiles.json
1818
data/ci-test-bage.json
1919
data/genesis/epoch-timeline.json
20-
data/genesis/overlays/v8-preview.json
21-
data/genesis/overlays/v9-preview.json
22-
data/genesis/overlays/stepshalf.json
23-
data/genesis/overlays/doublebudget.json
20+
data/genesis/overlays/*.json
2421

2522
common project-config
2623
build-depends: base >= 4.14 && < 5

bench/cardano-profile/src/Cardano/Benchmarking/Profile/Builtin/Miniature.hs

Lines changed: 13 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -25,41 +25,31 @@ base =
2525
P.fixedLoaded
2626
. V.datasetMiniature
2727
. V.fundsDefault
28-
. V.timescaleCompressed
2928
. P.initCooldown 5
3029
. P.analysisStandard
31-
. P.desc "Miniature dataset, CI-friendly duration, bench scale"
3230

3331
benchDuration :: Types.Profile -> Types.Profile
3432
benchDuration =
35-
P.shutdownOnBlock 15
36-
-- TODO: dummy "generator.epochs" ignored in favor of "--shutdown-on".
37-
-- Create a "time.epochs" or "time.blocks" or similar, IDK!
38-
-- This applies to all profiles!
33+
V.timescaleCompressed
34+
. P.shutdownOnBlock 15
3935
. P.generatorEpochs 3
4036

4137
duration30 :: Types.Profile -> Types.Profile
4238
duration30 =
43-
P.shutdownOnSlot 1800
44-
-- TODO: dummy "generator.epochs" ignored in favor of "--shutdown-on".
45-
-- Create a "time.epochs" or "time.blocks" or similar, IDK!
46-
-- This applies to all profiles!
39+
V.timescaleCompressed
40+
. P.shutdownOnSlot 1800
4741
. P.generatorEpochs 3
4842

4943
duration60 :: Types.Profile -> Types.Profile
5044
duration60 =
51-
P.shutdownOnSlot 3600
52-
-- TODO: dummy "generator.epochs" ignored in favor of "--shutdown-on".
53-
-- Create a "time.epochs" or "time.blocks" or similar, IDK!
54-
-- This applies to all profiles!
45+
V.timescaleCompressed
46+
. P.shutdownOnSlot 3600
5547
. P.generatorEpochs 6
5648

5749
duration240 :: Types.Profile -> Types.Profile
5850
duration240 =
59-
P.shutdownOnSlot 14400
60-
-- TODO: dummy "generator.epochs" ignored in favor of "--shutdown-on".
61-
-- Create a "time.epochs" or "time.blocks" or similar, IDK!
62-
-- This applies to all profiles!
51+
V.timescaleCompressed
52+
. P.shutdownOnSlot 14400
6353
. P.generatorEpochs 24
6454

6555
--------------------------------------------------------------------------------
@@ -71,6 +61,7 @@ profilesNoEraMiniature =
7161
------------------------------------------------------------------------------
7262
let ciBench =
7363
P.empty & base
64+
. P.desc "Miniature dataset, CI-friendly duration, bench scale"
7465
. P.uniCircle . P.loopback
7566
. benchDuration
7667
. V.clusterDefault -- TODO: "cluster" should be "null" here.
@@ -107,11 +98,12 @@ profilesNoEraMiniature =
10798
, ciBench10Plutus & P.name "10-plutus" . loop . P.dreps 0 . P.traceForwardingOn . P.newTracing . P.p2pOff
10899
]
109100
++
110-
-------------------------------------------------------------------------------------
111-
-- 6 nodes in dense topology, reduced blocksize, miniature dataset and 30mins runtime
112-
-------------------------------------------------------------------------------------
101+
---------------------------------------------------------------------------------------
102+
-- 6 nodes in dense topology, reduced blocksize, miniature dataset and varying runtimes
103+
---------------------------------------------------------------------------------------
113104
let dense =
114105
P.empty & base
106+
. P.desc "Miniature dataset, dense topology on local cluster, 64k blocks"
115107
. P.torusDense . V.hosts 6 . P.loopback
116108
. V.genesisVariantLatest . P.blocksize64k . P.v9Preview . P.v8Preview
117109
. P.dreps 0

bench/cardano-profile/src/Cardano/Benchmarking/Profile/Primitives.hs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
{-# LANGUAGE OverloadedStrings #-}
22

3+
{- HLINT ignore "Use camelCase" -}
4+
35
--------------------------------------------------------------------------------
46
{-
57

0 commit comments

Comments
 (0)