Skip to content

Commit 4c64d1c

Browse files
Merge #4249
4249: Added FromJSON instance for 'EraInMode BabbageEra CardanoMode' r=Jimbo4350 a=koslambrou Co-authored-by: Konstantinos Lambrou-Latreille <[email protected]>
2 parents aed8e71 + d23ad5a commit 4c64d1c

File tree

2 files changed

+9
-2
lines changed

2 files changed

+9
-2
lines changed

cardano-api/src/Cardano/Api/Modes.hs

+7
Original file line numberDiff line numberDiff line change
@@ -211,6 +211,13 @@ instance FromJSON (EraInMode AlonzoEra CardanoMode) where
211211
"parsing 'EraInMode AlonzoEra CardanoMode' failed, "
212212
invalid
213213

214+
instance FromJSON (EraInMode BabbageEra CardanoMode) where
215+
parseJSON "BabbageEraInCardanoMode" = pure BabbageEraInCardanoMode
216+
parseJSON invalid =
217+
invalidJSONFailure "BabbageEraInCardanoMode"
218+
"parsing 'EraInMode Babbage CardanoMode' failed, "
219+
invalid
220+
214221
invalidJSONFailure :: String -> String -> Value -> Parser a
215222
invalidJSONFailure expectedType errorMsg invalidValue =
216223
prependFailure errorMsg

cardano-api/test/Test/Cardano/Api/Json.hs

+2-2
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ prop_json_roundtrip_eraInMode = H.property $ do
6060
H.assert $ parseEither rountripEraInModeParser AllegraEraInCardanoMode == Right AllegraEraInCardanoMode
6161
H.assert $ parseEither rountripEraInModeParser MaryEraInCardanoMode == Right MaryEraInCardanoMode
6262
H.assert $ parseEither rountripEraInModeParser AlonzoEraInCardanoMode == Right AlonzoEraInCardanoMode
63+
H.assert $ parseEither rountripEraInModeParser BabbageEraInCardanoMode == Right BabbageEraInCardanoMode
6364

6465
where
6566
-- Defined this way instead of using 'tripping' in order to warn the
@@ -74,8 +75,7 @@ prop_json_roundtrip_eraInMode = H.property $ do
7475
AllegraEraInCardanoMode -> parseJSON $ toJSON AllegraEraInCardanoMode
7576
MaryEraInCardanoMode -> parseJSON $ toJSON MaryEraInCardanoMode
7677
AlonzoEraInCardanoMode -> parseJSON $ toJSON AlonzoEraInCardanoMode
77-
BabbageEraInCardanoMode ->
78-
panic "TODO: Babbage era - depends on consensus exposing a babbage era"
78+
BabbageEraInCardanoMode -> parseJSON $ toJSON BabbageEraInCardanoMode
7979

8080
prop_json_roundtrip_scriptdata_detailed_json :: Property
8181
prop_json_roundtrip_scriptdata_detailed_json = H.property $ do

0 commit comments

Comments
 (0)