Introduce new AnyShelleyBasedEra type and simplify CDDL tests. #5072
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
newhoggy
requested review from
dcoutts,
Jimbo4350,
erikd,
JaredCorduan and
CarlosLopezDeLara
as code owners
carbolymer
reviewed
Apr 7, 2023
carbolymer
reviewed
Apr 7, 2023
carbolymer
reviewed
Apr 7, 2023
carbolymer
approved these changes
Apr 11, 2023
Jimbo4350
reviewed
Apr 11, 2023
| ] | ||
| prop_roundtrip_TxWitness_Cddl :: Property | ||
| prop_roundtrip_TxWitness_Cddl = H.property $ do | ||
| AnyShelleyBasedEra era <- H.forAll $ Gen.element [AnyShelleyBasedEra ShelleyBasedEraShelley .. AnyShelleyBasedEra ShelleyBasedEraAlonzo] |
There was a problem hiding this comment.
Now using both minBound and maxBound.
cardano-api/src/Cardano/Api/Eras.hs
Outdated
| "Alonzo" -> pure $ AnyShelleyBasedEra ShelleyBasedEraAlonzo | ||
| "Babbage" -> pure $ AnyShelleyBasedEra ShelleyBasedEraBabbage | ||
| "Conway" -> pure $ AnyShelleyBasedEra ShelleyBasedEraConway | ||
| wrong -> fail $ "Failed to parse unknown era: " <> Text.unpack wrong |
There was a problem hiding this comment.
This overlaps with:
instance FromJSON AnyCardanoEra where
parseJSON = withText "AnyCardanoEra"
$ \case
"Byron" -> pure $ AnyCardanoEra ByronEra
"Shelley" -> pure $ AnyCardanoEra ShelleyEra
"Allegra" -> pure $ AnyCardanoEra AllegraEra
"Mary" -> pure $ AnyCardanoEra MaryEra
"Alonzo" -> pure $ AnyCardanoEra AlonzoEra
"Babbage" -> pure $ AnyCardanoEra BabbageEra
"Conway" -> pure $ AnyCardanoEra ConwayEra
wrong -> fail $ "Failed to parse unknown era: " <> Text.unpack wrong
There was a problem hiding this comment.
There's overlap, but this instance can't accept Byron.
There was a problem hiding this comment.
I've added property tests to ensure the cardano and shelley based eras always match except for Byron.
| @@ -365,6 +383,62 @@ instance IsShelleyBasedEra BabbageEra where | |||
| instance IsShelleyBasedEra ConwayEra where | |||
| shelleyBasedEra = ShelleyBasedEraConway | |||
|
|
|||
| data AnyShelleyBasedEra where | |||
| AnyShelleyBasedEra | |||
There was a problem hiding this comment.
What problem is the introduction of this GADT solving?
There was a problem hiding this comment.
newhoggy
commented
Apr 11, 2023
newhoggy
force-pushed
the
newhoggy/simplify-cddl-tests
branch
4 times, most recently
from
e70d2f2 to
e374b40
Compare
newhoggy
commented
Apr 11, 2023
newhoggy
force-pushed
the
newhoggy/simplify-cddl-tests
branch
from
e374b40 to
8e5c3bf
Compare
newhoggy
force-pushed
the
newhoggy/simplify-cddl-tests
branch
2 times, most recently
from
f7252d4 to
5b2c997
Compare
Jimbo4350
reviewed
Apr 12, 2023
newhoggy
force-pushed
the
newhoggy/simplify-cddl-tests
branch
2 times, most recently
from
af398c6 to
0b151b3
Compare
Jimbo4350
approved these changes
Apr 12, 2023
| @@ -0,0 +1,52 @@ | |||
| {-# LANGUAGE TypeApplications #-} | |||
There was a problem hiding this comment.
Space between pragma and module
newhoggy
force-pushed
the
newhoggy/simplify-cddl-tests
branch
from
0b151b3 to
1150fb9
Compare
…onvert tests into property tests
newhoggy
force-pushed
the
newhoggy/simplify-cddl-tests
branch
from
1150fb9 to
09a6d21
Compare
newhoggy
changed the title
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Introduce new
AnyShelleyBasedEratype and simplify CDDL tests.We inline roundtrip functions that are rarely used and convert test groups to property tests for consistency.