Skip to content

Commit e25724a

Browse files
committed
Fix tests
1 parent aa82aa9 commit e25724a

File tree

19 files changed

+250
-225
lines changed

19 files changed

+250
-225
lines changed

cardano-chain-gen/test/Main.hs

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@ tests iom = do
2929
pure $
3030
testGroup
3131
"cardano-chain-gen"
32-
[ testProperty "QSM" $ Property.prop_empty_blocks iom knownMigrationsPlain
32+
[ Conway.unitTests iom knownMigrationsPlain
3333
, Babbage.unitTests iom knownMigrationsPlain
34-
, Conway.unitTests iom knownMigrationsPlain
3534
, Alonzo.unitTests iom knownMigrationsPlain
35+
, testProperty "QSM" $ Property.prop_empty_blocks iom knownMigrationsPlain
3636
]
3737
where
3838
knownMigrationsPlain :: [(Text, Text)]
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,38 @@
11
{
22
"poolVotingThresholds": {
3-
"pvtCommitteeNormal": 0,
4-
"pvtCommitteeNoConfidence": 0,
5-
"pvtHardForkInitiation": 0,
6-
"pvtMotionNoConfidence": 0
3+
"committeeNormal": 0.51,
4+
"committeeNoConfidence": 0.51,
5+
"hardForkInitiation": 0.51,
6+
"motionNoConfidence": 0.51,
7+
"ppSecurityGroup": 0.51
78
},
89
"dRepVotingThresholds": {
9-
"dvtCommitteeNormal": 0,
10-
"dvtCommitteeNoConfidence": 0,
11-
"dvtHardForkInitiation": 0,
12-
"dvtMotionNoConfidence": 0,
13-
"dvtPPEconomicGroup": 0,
14-
"dvtPPGovGroup": 0,
15-
"dvtPPNetworkGroup": 0,
16-
"dvtPPTechnicalGroup": 0,
17-
"dvtTreasuryWithdrawal": 0,
18-
"dvtUpdateToConstitution": 0
10+
"motionNoConfidence": 0.51,
11+
"committeeNormal": 0.51,
12+
"committeeNoConfidence": 0.51,
13+
"updateToConstitution": 0.51,
14+
"hardForkInitiation": 0.51,
15+
"ppNetworkGroup": 0.51,
16+
"ppEconomicGroup": 0.51,
17+
"ppTechnicalGroup": 0.51,
18+
"ppGovGroup": 0.51,
19+
"treasuryWithdrawal": 0.51
1920
},
20-
"minCommitteeSize": 0,
21-
"committeeTermLimit": 0,
22-
"govActionExpiration": 0,
23-
"govActionDeposit": 0,
24-
"dRepDeposit": 0,
25-
"dRepActivity": 0
26-
}
21+
"committeeMinSize": 0,
22+
"committeeMaxTermLength": 200,
23+
"govActionLifetime": 10,
24+
"govActionDeposit": 1000000000,
25+
"dRepDeposit": 2000000,
26+
"dRepActivity": 20,
27+
"constitution": {
28+
"anchor": {
29+
"url": "",
30+
"dataHash": "0000000000000000000000000000000000000000000000000000000000000000"
31+
}
32+
},
33+
"committee": {
34+
"members": {
35+
},
36+
"quorum": 0
37+
}
38+
}
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,38 @@
11
{
2-
"poolVotingThresholds": {
3-
"pvtCommitteeNormal": 0.51,
4-
"pvtCommitteeNoConfidence": 0.51,
5-
"pvtHardForkInitiation": 0.51,
6-
"pvtMotionNoConfidence": 0.51
7-
},
8-
"dRepVotingThresholds": {
9-
"dvtMotionNoConfidence": 0.51,
10-
"dvtCommitteeNormal": 0.51,
11-
"dvtCommitteeNoConfidence": 0.51,
12-
"dvtUpdateToConstitution": 0.51,
13-
"dvtHardForkInitiation": 0.51,
14-
"dvtPPNetworkGroup": 0.51,
15-
"dvtPPEconomicGroup": 0.51,
16-
"dvtPPTechnicalGroup": 0.51,
17-
"dvtPPGovGroup": 0.51,
18-
"dvtTreasuryWithdrawal": 0.51
19-
},
20-
"committeeMinSize": 0,
21-
"committeeMaxTermLength": 60,
22-
"govActionLifetime": 14,
23-
"govActionDeposit": 0,
24-
"dRepDeposit": 0,
25-
"dRepActivity": 0,
26-
"constitution": {
27-
"anchor": {
28-
"url": "",
29-
"dataHash": "0000000000000000000000000000000000000000000000000000000000000000"
30-
}
31-
},
32-
"committee": {
33-
"members": {
34-
},
35-
"quorum": 0
2+
"poolVotingThresholds": {
3+
"committeeNormal": 0.51,
4+
"committeeNoConfidence": 0.51,
5+
"hardForkInitiation": 0.51,
6+
"motionNoConfidence": 0.51,
7+
"ppSecurityGroup": 0.51
8+
},
9+
"dRepVotingThresholds": {
10+
"motionNoConfidence": 0.51,
11+
"committeeNormal": 0.51,
12+
"committeeNoConfidence": 0.51,
13+
"updateToConstitution": 0.51,
14+
"hardForkInitiation": 0.51,
15+
"ppNetworkGroup": 0.51,
16+
"ppEconomicGroup": 0.51,
17+
"ppTechnicalGroup": 0.51,
18+
"ppGovGroup": 0.51,
19+
"treasuryWithdrawal": 0.51
20+
},
21+
"committeeMinSize": 0,
22+
"committeeMaxTermLength": 200,
23+
"govActionLifetime": 10,
24+
"govActionDeposit": 1000000000,
25+
"dRepDeposit": 2000000,
26+
"dRepActivity": 20,
27+
"constitution": {
28+
"anchor": {
29+
"url": "",
30+
"dataHash": "0000000000000000000000000000000000000000000000000000000000000000"
3631
}
32+
},
33+
"committee": {
34+
"members": {
35+
},
36+
"quorum": 0
3737
}
38+
}

cardano-chain-gen/test/testfiles/config-conway-hf-epoch1/test-config.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"ByronGenesisFile": "genesis.byron.json",
55
"ByronGenesisHash": "865a9da19944fc00cefe5a0cdcb6dc9d3964a74681d9488ab79967f13a6400b3",
66
"ConwayGenesisFile": "genesis.conway.json",
7-
"ConwayGenesisHash": "0c46e9a39325f313c6e0e75d4a6ba7e5b082a9fd5e44c4e2c6f1b3172f44b3fd",
7+
"ConwayGenesisHash": "b84bce2d465bcdb38ebd873f126a866d7ebceb154357496396fb602104329299",
88
"LastKnownBlockVersion-Alt": 0,
99
"LastKnownBlockVersion-Major": 9,
1010
"LastKnownBlockVersion-Minor": 1,
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,38 @@
11
{
2-
"poolVotingThresholds": {
3-
"pvtCommitteeNormal": 0.51,
4-
"pvtCommitteeNoConfidence": 0.51,
5-
"pvtHardForkInitiation": 0.51,
6-
"pvtMotionNoConfidence": 0.51
7-
},
8-
"dRepVotingThresholds": {
9-
"dvtMotionNoConfidence": 0.51,
10-
"dvtCommitteeNormal": 0.51,
11-
"dvtCommitteeNoConfidence": 0.51,
12-
"dvtUpdateToConstitution": 0.51,
13-
"dvtHardForkInitiation": 0.51,
14-
"dvtPPNetworkGroup": 0.51,
15-
"dvtPPEconomicGroup": 0.51,
16-
"dvtPPTechnicalGroup": 0.51,
17-
"dvtPPGovGroup": 0.51,
18-
"dvtTreasuryWithdrawal": 0.51
19-
},
20-
"committeeMinSize": 0,
21-
"committeeMaxTermLength": 60,
22-
"govActionLifetime": 14,
23-
"govActionDeposit": 0,
24-
"dRepDeposit": 0,
25-
"dRepActivity": 0,
26-
"constitution": {
27-
"anchor": {
28-
"url": "",
29-
"dataHash": "0000000000000000000000000000000000000000000000000000000000000000"
30-
}
31-
},
32-
"committee": {
33-
"members": {
34-
},
35-
"quorum": 0
2+
"poolVotingThresholds": {
3+
"committeeNormal": 0.51,
4+
"committeeNoConfidence": 0.51,
5+
"hardForkInitiation": 0.51,
6+
"motionNoConfidence": 0.51,
7+
"ppSecurityGroup": 0.51
8+
},
9+
"dRepVotingThresholds": {
10+
"motionNoConfidence": 0.51,
11+
"committeeNormal": 0.51,
12+
"committeeNoConfidence": 0.51,
13+
"updateToConstitution": 0.51,
14+
"hardForkInitiation": 0.51,
15+
"ppNetworkGroup": 0.51,
16+
"ppEconomicGroup": 0.51,
17+
"ppTechnicalGroup": 0.51,
18+
"ppGovGroup": 0.51,
19+
"treasuryWithdrawal": 0.51
20+
},
21+
"committeeMinSize": 0,
22+
"committeeMaxTermLength": 200,
23+
"govActionLifetime": 10,
24+
"govActionDeposit": 1000000000,
25+
"dRepDeposit": 2000000,
26+
"dRepActivity": 20,
27+
"constitution": {
28+
"anchor": {
29+
"url": "",
30+
"dataHash": "0000000000000000000000000000000000000000000000000000000000000000"
3631
}
32+
},
33+
"committee": {
34+
"members": {
35+
},
36+
"quorum": 0
3737
}
38+
}

cardano-chain-gen/test/testfiles/config-conway-insert-options/test-config.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"ByronGenesisFile": "genesis.byron.json",
55
"ByronGenesisHash": "865a9da19944fc00cefe5a0cdcb6dc9d3964a74681d9488ab79967f13a6400b3",
66
"ConwayGenesisFile": "genesis.conway.json",
7-
"ConwayGenesisHash": "0c46e9a39325f313c6e0e75d4a6ba7e5b082a9fd5e44c4e2c6f1b3172f44b3fd",
7+
"ConwayGenesisHash": "182ee96ccdb49162bb960b4e881ac9d952d2af967d4073932cef704517c550a5",
88
"LastKnownBlockVersion-Alt": 0,
99
"LastKnownBlockVersion-Major": 9,
1010
"LastKnownBlockVersion-Minor": 1,
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,38 @@
11
{
2-
"poolVotingThresholds": {
3-
"pvtCommitteeNormal": 0.51,
4-
"pvtCommitteeNoConfidence": 0.51,
5-
"pvtHardForkInitiation": 0.51,
6-
"pvtMotionNoConfidence": 0.51
7-
},
8-
"dRepVotingThresholds": {
9-
"dvtMotionNoConfidence": 0.51,
10-
"dvtCommitteeNormal": 0.51,
11-
"dvtCommitteeNoConfidence": 0.51,
12-
"dvtUpdateToConstitution": 0.51,
13-
"dvtHardForkInitiation": 0.51,
14-
"dvtPPNetworkGroup": 0.51,
15-
"dvtPPEconomicGroup": 0.51,
16-
"dvtPPTechnicalGroup": 0.51,
17-
"dvtPPGovGroup": 0.51,
18-
"dvtTreasuryWithdrawal": 0.51
19-
},
20-
"committeeMinSize": 0,
21-
"committeeMaxTermLength": 60,
22-
"govActionLifetime": 14,
23-
"govActionDeposit": 0,
24-
"dRepDeposit": 0,
25-
"dRepActivity": 0,
26-
"constitution": {
27-
"anchor": {
28-
"url": "",
29-
"dataHash": "0000000000000000000000000000000000000000000000000000000000000000"
30-
}
31-
},
32-
"committee": {
33-
"members": {
34-
},
35-
"quorum": 0
2+
"poolVotingThresholds": {
3+
"committeeNormal": 0.51,
4+
"committeeNoConfidence": 0.51,
5+
"hardForkInitiation": 0.51,
6+
"motionNoConfidence": 0.51,
7+
"ppSecurityGroup": 0.51
8+
},
9+
"dRepVotingThresholds": {
10+
"motionNoConfidence": 0.51,
11+
"committeeNormal": 0.51,
12+
"committeeNoConfidence": 0.51,
13+
"updateToConstitution": 0.51,
14+
"hardForkInitiation": 0.51,
15+
"ppNetworkGroup": 0.51,
16+
"ppEconomicGroup": 0.51,
17+
"ppTechnicalGroup": 0.51,
18+
"ppGovGroup": 0.51,
19+
"treasuryWithdrawal": 0.51
20+
},
21+
"committeeMinSize": 0,
22+
"committeeMaxTermLength": 200,
23+
"govActionLifetime": 10,
24+
"govActionDeposit": 1000000000,
25+
"dRepDeposit": 2000000,
26+
"dRepActivity": 20,
27+
"constitution": {
28+
"anchor": {
29+
"url": "",
30+
"dataHash": "0000000000000000000000000000000000000000000000000000000000000000"
3631
}
32+
},
33+
"committee": {
34+
"members": {
35+
},
36+
"quorum": 0
3737
}
38+
}

cardano-chain-gen/test/testfiles/config-conway-no-pools/test-config.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"ByronGenesisFile": "genesis.byron.json",
55
"ByronGenesisHash": "865a9da19944fc00cefe5a0cdcb6dc9d3964a74681d9488ab79967f13a6400b3",
66
"ConwayGenesisFile": "genesis.conway.json",
7-
"ConwayGenesisHash": "0c46e9a39325f313c6e0e75d4a6ba7e5b082a9fd5e44c4e2c6f1b3172f44b3fd",
7+
"ConwayGenesisHash": "b84bce2d465bcdb38ebd873f126a866d7ebceb154357496396fb602104329299",
88
"LastKnownBlockVersion-Alt": 0,
99
"LastKnownBlockVersion-Major": 9,
1010
"LastKnownBlockVersion-Minor": 1,
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,38 @@
11
{
2-
"poolVotingThresholds": {
3-
"pvtCommitteeNormal": 0.51,
4-
"pvtCommitteeNoConfidence": 0.51,
5-
"pvtHardForkInitiation": 0.51,
6-
"pvtMotionNoConfidence": 0.51
7-
},
8-
"dRepVotingThresholds": {
9-
"dvtMotionNoConfidence": 0.51,
10-
"dvtCommitteeNormal": 0.51,
11-
"dvtCommitteeNoConfidence": 0.51,
12-
"dvtUpdateToConstitution": 0.51,
13-
"dvtHardForkInitiation": 0.51,
14-
"dvtPPNetworkGroup": 0.51,
15-
"dvtPPEconomicGroup": 0.51,
16-
"dvtPPTechnicalGroup": 0.51,
17-
"dvtPPGovGroup": 0.51,
18-
"dvtTreasuryWithdrawal": 0.51
19-
},
20-
"committeeMinSize": 0,
21-
"committeeMaxTermLength": 60,
22-
"govActionLifetime": 14,
23-
"govActionDeposit": 0,
24-
"dRepDeposit": 0,
25-
"dRepActivity": 0,
26-
"constitution": {
27-
"anchor": {
28-
"url": "",
29-
"dataHash": "0000000000000000000000000000000000000000000000000000000000000000"
30-
}
31-
},
32-
"committee": {
33-
"members": {
34-
},
35-
"quorum": 0
2+
"poolVotingThresholds": {
3+
"committeeNormal": 0.51,
4+
"committeeNoConfidence": 0.51,
5+
"hardForkInitiation": 0.51,
6+
"motionNoConfidence": 0.51,
7+
"ppSecurityGroup": 0.51
8+
},
9+
"dRepVotingThresholds": {
10+
"motionNoConfidence": 0.51,
11+
"committeeNormal": 0.51,
12+
"committeeNoConfidence": 0.51,
13+
"updateToConstitution": 0.51,
14+
"hardForkInitiation": 0.51,
15+
"ppNetworkGroup": 0.51,
16+
"ppEconomicGroup": 0.51,
17+
"ppTechnicalGroup": 0.51,
18+
"ppGovGroup": 0.51,
19+
"treasuryWithdrawal": 0.51
20+
},
21+
"committeeMinSize": 0,
22+
"committeeMaxTermLength": 200,
23+
"govActionLifetime": 10,
24+
"govActionDeposit": 1000000000,
25+
"dRepDeposit": 2000000,
26+
"dRepActivity": 20,
27+
"constitution": {
28+
"anchor": {
29+
"url": "",
30+
"dataHash": "0000000000000000000000000000000000000000000000000000000000000000"
3631
}
32+
},
33+
"committee": {
34+
"members": {
35+
},
36+
"quorum": 0
3737
}
38+
}

0 commit comments

Comments
 (0)