Skip to content

Commit 03582a7

Browse files
committed
Basic nix changes to be able to execute ERA=dira make ci-bench
1 parent ff1f623 commit 03582a7

File tree

3 files changed

+19
-15
lines changed

3 files changed

+19
-15
lines changed

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

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ overlay profile =
202202
-- "derive" needs above "shelley", "alonzo" and "conway" properties.
203203
derive :: Types.Profile -> Types.Profile
204204
derive p@(Types.Profile _ _ _ comp _era gsis _ n gtor _ _ _ ana _ _ _ _) =
205-
let
205+
let
206206
-- Absolute/epoch durations:
207207
----------------------------
208208
slot_duration = Types.slot_duration gsis -- NominalDiffTime
@@ -403,7 +403,7 @@ cliArgs p@(Types.Profile _ _ _ comp __ gsis _ _ _ _ _ _ _ dved _ _ _) =
403403
++
404404
if Types.dense_pool_density comp /= 1
405405
then
406-
[
406+
[
407407
Aeson.String "--bulk-pool-cred-files", Aeson.Number $ fromInteger $ Types.n_dense_hosts comp
408408
, Aeson.String "--bulk-pools-per-file", Aeson.Number $ fromInteger $ Types.dense_pool_density comp
409409
]
@@ -480,12 +480,13 @@ addEras :: Map.Map String Types.Profile -> Map.Map String Types.Profile
480480
addEras = foldMap
481481
(\profile -> Map.fromList $
482482
catMaybes
483-
[ addEra profile Types.Shelley "shey"
484-
, addEra profile Types.Allegra "alra"
485-
, addEra profile Types.Mary "mary"
486-
, addEra profile Types.Alonzo "alzo"
487-
, addEra profile Types.Babbage "bage"
488-
, addEra profile Types.Conway "coay"
483+
[ addEra profile Types.Shelley "shey"
484+
, addEra profile Types.Allegra "alra"
485+
, addEra profile Types.Mary "mary"
486+
, addEra profile Types.Alonzo "alzo"
487+
, addEra profile Types.Babbage "bage"
488+
, addEra profile Types.Conway "coay"
489+
, addEra profile Types.Dijkstra "dira"
489490
]
490491
)
491492

nix/nixos/tx-generator-service.nix

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,7 @@ in pkgs.commonLib.defServiceModule
123123
"alonzo"
124124
"babbage"
125125
"conway"
126+
"dijkstra"
126127
])
127128
"mary"
128129
"Cardano era to generate transactions for.";

nix/workbench/service/nodes.nix

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ let
3232
"alonzo"
3333
"babbage"
3434
"conway"
35+
"dijkstra"
3536
];
3637

3738
configHardforksIntoEra = era:
@@ -41,13 +42,14 @@ let
4142
then ret
4243
else go ret (__head rest) (__tail rest);
4344
eraSetupHardforks = {
44-
byron = {};
45-
shelley = { TestShelleyHardForkAtEpoch = 0; };
46-
allegra = { TestAllegraHardForkAtEpoch = 0; };
47-
mary = { TestMaryHardForkAtEpoch = 0; };
48-
alonzo = { TestAlonzoHardForkAtEpoch = 0; };
49-
babbage = { TestBabbageHardForkAtEpoch = 0; };
50-
conway = { TestConwayHardForkAtEpoch = 0; };
45+
byron = {};
46+
shelley = { TestShelleyHardForkAtEpoch = 0; };
47+
allegra = { TestAllegraHardForkAtEpoch = 0; };
48+
mary = { TestMaryHardForkAtEpoch = 0; };
49+
alonzo = { TestAlonzoHardForkAtEpoch = 0; };
50+
babbage = { TestBabbageHardForkAtEpoch = 0; };
51+
conway = { TestConwayHardForkAtEpoch = 0; };
52+
dijkstra = { TestDijktraHardForkAtEpoch = 0; };
5153
};
5254
in if __hasAttr era eraSetupHardforks
5355
then go {} (__head eras) (__tail eras)

0 commit comments

Comments
 (0)