Skip to content

Commit

Permalink
Adapt to IntersectMBO/ouroboros-consensus#1356
Browse files Browse the repository at this point in the history
  • Loading branch information
@jasagredo
jasagredo committed Jan 10, 2025
1 parent 95cc3a8 commit ea5ecaa
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 26 deletions.
2 changes: 0 additions & 2 deletions cardano-node/src/Cardano/Tracing/OrphanInstances/HardFork.hs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -394,8 +394,6 @@ instance ( ToJSON (BlockNodeToClientVersion x)
eraNodeToClientVersions

instance ToJSON HardForkSpecificNodeToClientVersion where
toJSON HardForkSpecificNodeToClientVersion1 = String "HardForkSpecificNodeToClientVersion1"
toJSON HardForkSpecificNodeToClientVersion2 = String "HardForkSpecificNodeToClientVersion2"
toJSON HardForkSpecificNodeToClientVersion3 = String "HardForkSpecificNodeToClientVersion3"

instance (ToJSON (BlockNodeToClientVersion blk)) => ToJSON (EraNodeToClientVersion blk) where
Expand Down
7 changes: 0 additions & 7 deletions cardano-node/src/Cardano/Tracing/OrphanInstances/Shelley.hs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1332,13 +1332,6 @@ instance ToJSON ShelleyNodeToNodeVersion where
toJSON ShelleyNodeToNodeVersion1 = String "ShelleyNodeToNodeVersion1"

instance ToJSON ShelleyNodeToClientVersion where
toJSON ShelleyNodeToClientVersion1 = String "ShelleyNodeToClientVersion1"
toJSON ShelleyNodeToClientVersion2 = String "ShelleyNodeToClientVersion2"
toJSON ShelleyNodeToClientVersion3 = String "ShelleyNodeToClientVersion3"
toJSON ShelleyNodeToClientVersion4 = String "ShelleyNodeToClientVersion4"
toJSON ShelleyNodeToClientVersion5 = String "ShelleyNodeToClientVersion5"
toJSON ShelleyNodeToClientVersion6 = String "ShelleyNodeToClientVersion6"
toJSON ShelleyNodeToClientVersion7 = String "ShelleyNodeToClientVersion7"
toJSON ShelleyNodeToClientVersion8 = String "ShelleyNodeToClientVersion8"
toJSON ShelleyNodeToClientVersion9 = String "ShelleyNodeToClientVersion9"
toJSON ShelleyNodeToClientVersion10 = String "ShelleyNodeToClientVersion10"
Expand Down
30 changes: 15 additions & 15 deletions cardano-node/test/Test/Cardano/Tracing/OrphanInstances/HardFork.hs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,10 @@ tests = H.checkSequential
, "ntc_HFV1_allDisabled.json")
, ( ntc_HFV1_ByronV1
, "ntc_HFV1_ByronV1.json")
, ( ntc_HFV1_ByronV1_ShelleyV1
, "ntc_HFV1_ByronV1_ShelleyV1.json")
, ( ntc_HFV1_ByronV1_ShelleyV6_ConwayV2
, "ntc_HFV1_ByronV1_ShelleyV6_ConwayV2.json")
, ( ntc_HFV1_ByronV1_ShelleyV11
, "ntc_HFV1_ByronV1_ShelleyV11.json")
, ( ntc_HFV1_ByronV1_ShelleyV11_ConwayV11
, "ntc_HFV1_ByronV1_ShelleyV11_ConwayV11.json")
]
where
test (actualValue, goldenBaseName) =
Expand All @@ -65,7 +65,7 @@ ntc_HFV1_allDisabled ::
(Consensus.Cardano.CardanoEras StandardCrypto)
ntc_HFV1_allDisabled =
Consensus.HardForkNodeToClientEnabled
Consensus.HardForkSpecificNodeToClientVersion1
Consensus.HardForkSpecificNodeToClientVersion3
( Consensus.EraNodeToClientDisabled -- Byron
:* Consensus.EraNodeToClientDisabled -- Shelley
:* Consensus.EraNodeToClientDisabled -- Allegra
Expand All @@ -81,7 +81,7 @@ ntc_HFV1_ByronV1 ::
(Consensus.Cardano.CardanoEras StandardCrypto)
ntc_HFV1_ByronV1 =
Consensus.HardForkNodeToClientEnabled
Consensus.HardForkSpecificNodeToClientVersion1
Consensus.HardForkSpecificNodeToClientVersion3
( Consensus.EraNodeToClientEnabled Consensus.Cardano.ByronNodeToClientVersion1 -- Byron
:* Consensus.EraNodeToClientDisabled -- Shelley
:* Consensus.EraNodeToClientDisabled -- Allegra
Expand All @@ -92,14 +92,14 @@ ntc_HFV1_ByronV1 =
:* Nil
)

ntc_HFV1_ByronV1_ShelleyV1 ::
ntc_HFV1_ByronV1_ShelleyV11 ::
Consensus.HardForkNodeToClientVersion
(Consensus.Cardano.CardanoEras StandardCrypto)
ntc_HFV1_ByronV1_ShelleyV1 =
ntc_HFV1_ByronV1_ShelleyV11 =
Consensus.HardForkNodeToClientEnabled
Consensus.HardForkSpecificNodeToClientVersion1
Consensus.HardForkSpecificNodeToClientVersion3
( Consensus.EraNodeToClientEnabled Consensus.Cardano.ByronNodeToClientVersion1 -- Byron
:* Consensus.EraNodeToClientEnabled Consensus.Cardano.ShelleyNodeToClientVersion1 -- Shelley
:* Consensus.EraNodeToClientEnabled Consensus.Cardano.ShelleyNodeToClientVersion11 -- Shelley
:* Consensus.EraNodeToClientDisabled -- Allegra
:* Consensus.EraNodeToClientDisabled -- Mary
:* Consensus.EraNodeToClientDisabled -- Alonzo
Expand All @@ -108,19 +108,19 @@ ntc_HFV1_ByronV1_ShelleyV1 =
:* Nil
)

ntc_HFV1_ByronV1_ShelleyV6_ConwayV2 ::
ntc_HFV1_ByronV1_ShelleyV11_ConwayV11 ::
Consensus.HardForkNodeToClientVersion
(Consensus.Cardano.CardanoEras StandardCrypto)
ntc_HFV1_ByronV1_ShelleyV6_ConwayV2 =
ntc_HFV1_ByronV1_ShelleyV11_ConwayV11 =
Consensus.HardForkNodeToClientEnabled
Consensus.HardForkSpecificNodeToClientVersion1
Consensus.HardForkSpecificNodeToClientVersion3
( Consensus.EraNodeToClientEnabled Consensus.Cardano.ByronNodeToClientVersion1 -- Byron
:* Consensus.EraNodeToClientEnabled Consensus.Cardano.ShelleyNodeToClientVersion6 -- Shelley
:* Consensus.EraNodeToClientEnabled Consensus.Cardano.ShelleyNodeToClientVersion11 -- Shelley
:* Consensus.EraNodeToClientDisabled -- Allegra
:* Consensus.EraNodeToClientDisabled -- Mary
:* Consensus.EraNodeToClientDisabled -- Alonzo
:* Consensus.EraNodeToClientDisabled -- Babbage
:* Consensus.EraNodeToClientEnabled Consensus.Cardano.ShelleyNodeToClientVersion2 -- Conway
:* Consensus.EraNodeToClientEnabled Consensus.Cardano.ShelleyNodeToClientVersion11 -- Conway
:* Nil
)

Expand Down
2 changes: 1 addition & 1 deletion cardano-node/test/Test/Cardano/Tracing/OrphanInstances/data/ntc_HFV1_ByronV1.json
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"eraNodeToClientVersions":["ByronNodeToClientVersion1","EraNodeToClientDisabled","EraNodeToClientDisabled","EraNodeToClientDisabled","EraNodeToClientDisabled","EraNodeToClientDisabled","EraNodeToClientDisabled"],"hardForkSpecificNodeToClientVersion":"HardForkSpecificNodeToClientVersion1","tag":"HardForkNodeToClientEnabled"}
{"eraNodeToClientVersions":["ByronNodeToClientVersion1","EraNodeToClientDisabled","EraNodeToClientDisabled","EraNodeToClientDisabled","EraNodeToClientDisabled","EraNodeToClientDisabled","EraNodeToClientDisabled"],"hardForkSpecificNodeToClientVersion":"HardForkSpecificNodeToClientVersion3","tag":"HardForkNodeToClientEnabled"}
2 changes: 1 addition & 1 deletion cardano-node/test/Test/Cardano/Tracing/OrphanInstances/data/ntc_HFV1_allDisabled.json
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"eraNodeToClientVersions":["EraNodeToClientDisabled","EraNodeToClientDisabled","EraNodeToClientDisabled","EraNodeToClientDisabled","EraNodeToClientDisabled","EraNodeToClientDisabled","EraNodeToClientDisabled"],"hardForkSpecificNodeToClientVersion":"HardForkSpecificNodeToClientVersion1","tag":"HardForkNodeToClientEnabled"}
{"eraNodeToClientVersions":["EraNodeToClientDisabled","EraNodeToClientDisabled","EraNodeToClientDisabled","EraNodeToClientDisabled","EraNodeToClientDisabled","EraNodeToClientDisabled","EraNodeToClientDisabled"],"hardForkSpecificNodeToClientVersion":"HardForkSpecificNodeToClientVersion3","tag":"HardForkNodeToClientEnabled"}

0 comments on commit ea5ecaa

Please sign in to comment.