From a51ecaeea8e6c9a659f6bb37caf13ade2e126282 Mon Sep 17 00:00:00 2001 From: John Ky Date: Thu, 28 Sep 2023 19:56:59 +1000 Subject: [PATCH 1/8] Rename inEraEonMaybe to forEraInEonMaybe --- cardano-api/internal/Cardano/Api/Eras.hs | 2 +- cardano-api/internal/Cardano/Api/Eras/Core.hs | 6 +++--- cardano-api/src/Cardano/Api.hs | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cardano-api/internal/Cardano/Api/Eras.hs b/cardano-api/internal/Cardano/Api/Eras.hs index a21be76aa0..83382dd330 100644 --- a/cardano-api/internal/Cardano/Api/Eras.hs +++ b/cardano-api/internal/Cardano/Api/Eras.hs @@ -24,7 +24,7 @@ module Cardano.Api.Eras , Eon(..) , AnyEraInEon(..) , forEraInEon - , inEraEonMaybe + , forEraInEonMaybe , maybeEonInEra -- * Data family instances diff --git a/cardano-api/internal/Cardano/Api/Eras/Core.hs b/cardano-api/internal/Cardano/Api/Eras/Core.hs index 89b88ed55e..f7b713ac1b 100644 --- a/cardano-api/internal/Cardano/Api/Eras/Core.hs +++ b/cardano-api/internal/Cardano/Api/Eras/Core.hs @@ -32,7 +32,7 @@ module Cardano.Api.Eras.Core , Eon(..) , AnyEraInEon(..) , forEraInEon - , inEraEonMaybe + , forEraInEonMaybe , maybeEonInEra -- * Data family instances @@ -125,12 +125,12 @@ forEraInEon :: () forEraInEon era no yes = inEonForEra no yes era -inEraEonMaybe :: () +forEraInEonMaybe :: () => Eon eon => CardanoEra era -- ^ Era to check -> (eon era -> a) -- ^ Function to get the value to use if the eon includes the era -> Maybe a -- ^ The value to use -inEraEonMaybe era yes = +forEraInEonMaybe era yes = forEraInEon era Nothing (Just . yes) maybeEonInEra :: () diff --git a/cardano-api/src/Cardano/Api.hs b/cardano-api/src/Cardano/Api.hs index f56a2528e0..57cae79b11 100644 --- a/cardano-api/src/Cardano/Api.hs +++ b/cardano-api/src/Cardano/Api.hs @@ -31,7 +31,7 @@ module Cardano.Api ( Eon(..), AnyEraInEon(..), forEraInEon, - inEraEonMaybe, + forEraInEonMaybe, maybeEonInEra, eonInShelleyBasedEra, From f5ae4b2ca9df0a6031c63375ca40a8e90db98a0a Mon Sep 17 00:00:00 2001 From: John Ky Date: Thu, 28 Sep 2023 19:59:54 +1000 Subject: [PATCH 2/8] Rename maybeEonInEra to forEraMaybeEon --- cardano-api/internal/Cardano/Api/Eras.hs | 2 +- cardano-api/internal/Cardano/Api/Eras/Core.hs | 6 +++--- cardano-api/src/Cardano/Api.hs | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/cardano-api/internal/Cardano/Api/Eras.hs b/cardano-api/internal/Cardano/Api/Eras.hs index 83382dd330..13d9d8c48c 100644 --- a/cardano-api/internal/Cardano/Api/Eras.hs +++ b/cardano-api/internal/Cardano/Api/Eras.hs @@ -25,7 +25,7 @@ module Cardano.Api.Eras , AnyEraInEon(..) , forEraInEon , forEraInEonMaybe - , maybeEonInEra + , forEraMaybeEon -- * Data family instances , AsType(AsByronEra, AsShelleyEra, AsAllegraEra, AsMaryEra, AsAlonzoEra, AsBabbageEra, AsConwayEra) diff --git a/cardano-api/internal/Cardano/Api/Eras/Core.hs b/cardano-api/internal/Cardano/Api/Eras/Core.hs index f7b713ac1b..b5d1cf8980 100644 --- a/cardano-api/internal/Cardano/Api/Eras/Core.hs +++ b/cardano-api/internal/Cardano/Api/Eras/Core.hs @@ -33,7 +33,7 @@ module Cardano.Api.Eras.Core , AnyEraInEon(..) , forEraInEon , forEraInEonMaybe - , maybeEonInEra + , forEraMaybeEon -- * Data family instances , AsType(AsByronEra, AsShelleyEra, AsAllegraEra, AsMaryEra, AsAlonzoEra, AsBabbageEra, AsConwayEra) @@ -133,11 +133,11 @@ forEraInEonMaybe :: () forEraInEonMaybe era yes = forEraInEon era Nothing (Just . yes) -maybeEonInEra :: () +forEraMaybeEon :: () => Eon eon => CardanoEra era -- ^ Era to check -> Maybe (eon era) -- ^ The eon if supported in the era -maybeEonInEra = +forEraMaybeEon = inEonForEra Nothing Just -- ---------------------------------------------------------------------------- diff --git a/cardano-api/src/Cardano/Api.hs b/cardano-api/src/Cardano/Api.hs index 57cae79b11..7555809178 100644 --- a/cardano-api/src/Cardano/Api.hs +++ b/cardano-api/src/Cardano/Api.hs @@ -27,12 +27,12 @@ module Cardano.Api ( InAnyCardanoEra(..), ToCardanoEra(..), - -- * Feature support + -- * Eon support Eon(..), AnyEraInEon(..), forEraInEon, forEraInEonMaybe, - maybeEonInEra, + forEraMaybeEon, eonInShelleyBasedEra, inShelleyBasedEraEon, From 91f22d135c9ca6bb6394b251b710fc0919281a97 Mon Sep 17 00:00:00 2001 From: John Ky Date: Thu, 28 Sep 2023 20:02:41 +1000 Subject: [PATCH 3/8] Rename eonInShelleyBasedEra to inEonForShelleyBasedEra --- cardano-api/internal/Cardano/Api/Eon/ShelleyBasedEra.hs | 8 ++++---- cardano-api/src/Cardano/Api.hs | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cardano-api/internal/Cardano/Api/Eon/ShelleyBasedEra.hs b/cardano-api/internal/Cardano/Api/Eon/ShelleyBasedEra.hs index 1cdedaefc0..ca26027079 100644 --- a/cardano-api/internal/Cardano/Api/Eon/ShelleyBasedEra.hs +++ b/cardano-api/internal/Cardano/Api/Eon/ShelleyBasedEra.hs @@ -15,7 +15,7 @@ module Cardano.Api.Eon.ShelleyBasedEra , AnyShelleyBasedEra(..) , InAnyShelleyBasedEra(..) , shelleyBasedToCardanoEra - , eonInShelleyBasedEra + , inEonForShelleyBasedEra , inShelleyBasedEraEon , inShelleyBasedEraEonMaybe , maybeEonInShelleyBasedEra @@ -45,13 +45,13 @@ import qualified Data.Text as Text import Data.Type.Equality (TestEquality (..), (:~:) (Refl)) -- | Determine the value to use for a feature in a given 'ShelleyBasedEra'. -eonInShelleyBasedEra :: () +inEonForShelleyBasedEra :: () => Eon eon => a -> (eon era -> a) -> ShelleyBasedEra era -> a -eonInShelleyBasedEra no yes = +inEonForShelleyBasedEra no yes = inEonForEra no yes . shelleyBasedToCardanoEra maybeEonInShelleyBasedEra :: () @@ -68,7 +68,7 @@ inShelleyBasedEraEon :: () -> (eon era -> a) -> a inShelleyBasedEraEon era no yes = - eonInShelleyBasedEra no yes era + inEonForShelleyBasedEra no yes era inShelleyBasedEraEonMaybe :: () => Eon eon diff --git a/cardano-api/src/Cardano/Api.hs b/cardano-api/src/Cardano/Api.hs index 7555809178..3d46dfc35a 100644 --- a/cardano-api/src/Cardano/Api.hs +++ b/cardano-api/src/Cardano/Api.hs @@ -34,7 +34,7 @@ module Cardano.Api ( forEraInEonMaybe, forEraMaybeEon, - eonInShelleyBasedEra, + inEonForShelleyBasedEra, inShelleyBasedEraEon, inShelleyBasedEraEonMaybe, maybeEonInShelleyBasedEra, From 263ed04d1c830b4deb3c549f0b1431d5be203766 Mon Sep 17 00:00:00 2001 From: John Ky Date: Thu, 28 Sep 2023 20:06:31 +1000 Subject: [PATCH 4/8] Rename maybeEonInShelleyBasedEra to forShelleyBasedEraMaybeEon --- cardano-api/internal/Cardano/Api/Eon/ShelleyBasedEra.hs | 6 +++--- cardano-api/src/Cardano/Api.hs | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cardano-api/internal/Cardano/Api/Eon/ShelleyBasedEra.hs b/cardano-api/internal/Cardano/Api/Eon/ShelleyBasedEra.hs index ca26027079..1505f13c22 100644 --- a/cardano-api/internal/Cardano/Api/Eon/ShelleyBasedEra.hs +++ b/cardano-api/internal/Cardano/Api/Eon/ShelleyBasedEra.hs @@ -18,7 +18,7 @@ module Cardano.Api.Eon.ShelleyBasedEra , inEonForShelleyBasedEra , inShelleyBasedEraEon , inShelleyBasedEraEonMaybe - , maybeEonInShelleyBasedEra + , forShelleyBasedEraMaybeEon -- * Cardano eras, as Byron vs Shelley-based , CardanoEraStyle(..) @@ -54,11 +54,11 @@ inEonForShelleyBasedEra :: () inEonForShelleyBasedEra no yes = inEonForEra no yes . shelleyBasedToCardanoEra -maybeEonInShelleyBasedEra :: () +forShelleyBasedEraMaybeEon :: () => Eon eon => ShelleyBasedEra era -> Maybe (eon era) -maybeEonInShelleyBasedEra = +forShelleyBasedEraMaybeEon = inEonForEra Nothing Just . shelleyBasedToCardanoEra inShelleyBasedEraEon :: () diff --git a/cardano-api/src/Cardano/Api.hs b/cardano-api/src/Cardano/Api.hs index 3d46dfc35a..33c179247a 100644 --- a/cardano-api/src/Cardano/Api.hs +++ b/cardano-api/src/Cardano/Api.hs @@ -37,7 +37,7 @@ module Cardano.Api ( inEonForShelleyBasedEra, inShelleyBasedEraEon, inShelleyBasedEraEonMaybe, - maybeEonInShelleyBasedEra, + forShelleyBasedEraMaybeEon, Featured(..), asFeaturedInEra, From d9b81c0759b28d68a3268710d4ad914aef0c3246 Mon Sep 17 00:00:00 2001 From: John Ky Date: Thu, 28 Sep 2023 20:09:54 +1000 Subject: [PATCH 5/8] Rename inShelleyBasedEraEon to forShelleyBasedEraInEon --- cardano-api/internal/Cardano/Api/Eon/ShelleyBasedEra.hs | 8 ++++---- cardano-api/internal/Cardano/Api/TxBody.hs | 6 +++--- cardano-api/src/Cardano/Api.hs | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/cardano-api/internal/Cardano/Api/Eon/ShelleyBasedEra.hs b/cardano-api/internal/Cardano/Api/Eon/ShelleyBasedEra.hs index 1505f13c22..599b929010 100644 --- a/cardano-api/internal/Cardano/Api/Eon/ShelleyBasedEra.hs +++ b/cardano-api/internal/Cardano/Api/Eon/ShelleyBasedEra.hs @@ -16,7 +16,7 @@ module Cardano.Api.Eon.ShelleyBasedEra , InAnyShelleyBasedEra(..) , shelleyBasedToCardanoEra , inEonForShelleyBasedEra - , inShelleyBasedEraEon + , forShelleyBasedEraInEon , inShelleyBasedEraEonMaybe , forShelleyBasedEraMaybeEon @@ -61,13 +61,13 @@ forShelleyBasedEraMaybeEon :: () forShelleyBasedEraMaybeEon = inEonForEra Nothing Just . shelleyBasedToCardanoEra -inShelleyBasedEraEon :: () +forShelleyBasedEraInEon :: () => Eon eon => ShelleyBasedEra era -> a -> (eon era -> a) -> a -inShelleyBasedEraEon era no yes = +forShelleyBasedEraInEon era no yes = inEonForShelleyBasedEra no yes era inShelleyBasedEraEonMaybe :: () @@ -76,7 +76,7 @@ inShelleyBasedEraEonMaybe :: () -> (eon era -> a) -> Maybe a inShelleyBasedEraEonMaybe era yes = - inShelleyBasedEraEon era Nothing (Just . yes) + forShelleyBasedEraInEon era Nothing (Just . yes) -- ---------------------------------------------------------------------------- -- Shelley-based eras diff --git a/cardano-api/internal/Cardano/Api/TxBody.hs b/cardano-api/internal/Cardano/Api/TxBody.hs index bff1188481..46435cd01c 100644 --- a/cardano-api/internal/Cardano/Api/TxBody.hs +++ b/cardano-api/internal/Cardano/Api/TxBody.hs @@ -313,7 +313,7 @@ txScriptValidityToScriptValidity (TxScriptValidity _ scriptValidity) = scriptVal scriptValidityToTxScriptValidity :: ShelleyBasedEra era -> ScriptValidity -> TxScriptValidity era scriptValidityToTxScriptValidity sbe scriptValidity = - inShelleyBasedEraEon sbe TxScriptValidityNone $ \w -> TxScriptValidity w scriptValidity + forShelleyBasedEraInEon sbe TxScriptValidityNone $ \w -> TxScriptValidity w scriptValidity txScriptValidityToIsValid :: TxScriptValidity era -> L.IsValid txScriptValidityToIsValid = scriptValidityToIsValid . txScriptValidityToScriptValidity @@ -1779,7 +1779,7 @@ deserialiseShelleyBasedTxBody sbe bs = (flip CBOR.runAnnotator fbs (return TxScriptValidityNone)) 4 -> do sValiditySupported <- - inShelleyBasedEraEon sbe + forShelleyBasedEraInEon sbe ( fail $ mconcat [ "deserialiseShelleyBasedTxBody: Expected an era that supports the " , "script validity flag but got: " @@ -1811,7 +1811,7 @@ deserialiseShelleyBasedTxBody sbe bs = pure sValiditySupported <- - inShelleyBasedEraEon sbe + forShelleyBasedEraInEon sbe ( fail $ mconcat [ "deserialiseShelleyBasedTxBody: Expected an era that supports the " , "script validity flag but got: " diff --git a/cardano-api/src/Cardano/Api.hs b/cardano-api/src/Cardano/Api.hs index 33c179247a..db2ef386d8 100644 --- a/cardano-api/src/Cardano/Api.hs +++ b/cardano-api/src/Cardano/Api.hs @@ -35,7 +35,7 @@ module Cardano.Api ( forEraMaybeEon, inEonForShelleyBasedEra, - inShelleyBasedEraEon, + forShelleyBasedEraInEon, inShelleyBasedEraEonMaybe, forShelleyBasedEraMaybeEon, From a07213ac4072eb12f69e632658ee3cbb61bf3632 Mon Sep 17 00:00:00 2001 From: John Ky Date: Thu, 28 Sep 2023 20:28:08 +1000 Subject: [PATCH 6/8] Rename inShelleyBasedEraEonMaybe to forShelleyBasedEraInEonMaybe --- cardano-api/internal/Cardano/Api/Eon/ShelleyBasedEra.hs | 6 +++--- cardano-api/internal/Cardano/Api/TxBody.hs | 4 ++-- cardano-api/src/Cardano/Api.hs | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/cardano-api/internal/Cardano/Api/Eon/ShelleyBasedEra.hs b/cardano-api/internal/Cardano/Api/Eon/ShelleyBasedEra.hs index 599b929010..fa13de8dff 100644 --- a/cardano-api/internal/Cardano/Api/Eon/ShelleyBasedEra.hs +++ b/cardano-api/internal/Cardano/Api/Eon/ShelleyBasedEra.hs @@ -17,7 +17,7 @@ module Cardano.Api.Eon.ShelleyBasedEra , shelleyBasedToCardanoEra , inEonForShelleyBasedEra , forShelleyBasedEraInEon - , inShelleyBasedEraEonMaybe + , forShelleyBasedEraInEonMaybe , forShelleyBasedEraMaybeEon -- * Cardano eras, as Byron vs Shelley-based @@ -70,12 +70,12 @@ forShelleyBasedEraInEon :: () forShelleyBasedEraInEon era no yes = inEonForShelleyBasedEra no yes era -inShelleyBasedEraEonMaybe :: () +forShelleyBasedEraInEonMaybe :: () => Eon eon => ShelleyBasedEra era -> (eon era -> a) -> Maybe a -inShelleyBasedEraEonMaybe era yes = +forShelleyBasedEraInEonMaybe era yes = forShelleyBasedEraInEon era Nothing (Just . yes) -- ---------------------------------------------------------------------------- diff --git a/cardano-api/internal/Cardano/Api/TxBody.hs b/cardano-api/internal/Cardano/Api/TxBody.hs index 46435cd01c..87629e1338 100644 --- a/cardano-api/internal/Cardano/Api/TxBody.hs +++ b/cardano-api/internal/Cardano/Api/TxBody.hs @@ -2306,7 +2306,7 @@ fromLedgerProposalProcedures -> Ledger.TxBody (ShelleyLedgerEra era) -> Maybe (Featured ConwayEraOnwards era [Proposal era]) fromLedgerProposalProcedures sbe body = - inShelleyBasedEraEonMaybe sbe $ \w -> + forShelleyBasedEraInEonMaybe sbe $ \w -> conwayEraOnwardsConstraints w $ Featured w $ fmap Proposal @@ -2318,7 +2318,7 @@ fromLedgerVotingProcedures :: () -> Ledger.TxBody (ShelleyLedgerEra era) -> Maybe (Featured ConwayEraOnwards era (VotingProcedures era)) fromLedgerVotingProcedures sbe body = - inShelleyBasedEraEonMaybe sbe $ \w -> + forShelleyBasedEraInEonMaybe sbe $ \w -> conwayEraOnwardsConstraints w $ Featured w $ VotingProcedures diff --git a/cardano-api/src/Cardano/Api.hs b/cardano-api/src/Cardano/Api.hs index db2ef386d8..635ca6cc82 100644 --- a/cardano-api/src/Cardano/Api.hs +++ b/cardano-api/src/Cardano/Api.hs @@ -36,7 +36,7 @@ module Cardano.Api ( inEonForShelleyBasedEra, forShelleyBasedEraInEon, - inShelleyBasedEraEonMaybe, + forShelleyBasedEraInEonMaybe, forShelleyBasedEraMaybeEon, Featured(..), From 22e7e75e102c50676992065617ec0de64caa5fd7 Mon Sep 17 00:00:00 2001 From: John Ky Date: Thu, 28 Sep 2023 20:32:25 +1000 Subject: [PATCH 7/8] New inEonForShelleyBasedEraMaybe function --- cardano-api/internal/Cardano/Api/Eon/ShelleyBasedEra.hs | 9 +++++++++ cardano-api/src/Cardano/Api.hs | 1 + 2 files changed, 10 insertions(+) diff --git a/cardano-api/internal/Cardano/Api/Eon/ShelleyBasedEra.hs b/cardano-api/internal/Cardano/Api/Eon/ShelleyBasedEra.hs index fa13de8dff..7cb2ee7a2c 100644 --- a/cardano-api/internal/Cardano/Api/Eon/ShelleyBasedEra.hs +++ b/cardano-api/internal/Cardano/Api/Eon/ShelleyBasedEra.hs @@ -16,6 +16,7 @@ module Cardano.Api.Eon.ShelleyBasedEra , InAnyShelleyBasedEra(..) , shelleyBasedToCardanoEra , inEonForShelleyBasedEra + , inEonForShelleyBasedEraMaybe , forShelleyBasedEraInEon , forShelleyBasedEraInEonMaybe , forShelleyBasedEraMaybeEon @@ -54,6 +55,14 @@ inEonForShelleyBasedEra :: () inEonForShelleyBasedEra no yes = inEonForEra no yes . shelleyBasedToCardanoEra +inEonForShelleyBasedEraMaybe :: () + => Eon eon + => (eon era -> a) + -> ShelleyBasedEra era + -> Maybe a +inEonForShelleyBasedEraMaybe yes = + inEonForShelleyBasedEra Nothing (Just . yes) + forShelleyBasedEraMaybeEon :: () => Eon eon => ShelleyBasedEra era diff --git a/cardano-api/src/Cardano/Api.hs b/cardano-api/src/Cardano/Api.hs index 635ca6cc82..02065cb3e0 100644 --- a/cardano-api/src/Cardano/Api.hs +++ b/cardano-api/src/Cardano/Api.hs @@ -35,6 +35,7 @@ module Cardano.Api ( forEraMaybeEon, inEonForShelleyBasedEra, + inEonForShelleyBasedEraMaybe, forShelleyBasedEraInEon, forShelleyBasedEraInEonMaybe, forShelleyBasedEraMaybeEon, From 4b6ecd8420f7b83b12800eca12995b0361881718 Mon Sep 17 00:00:00 2001 From: John Ky Date: Fri, 29 Sep 2023 09:59:36 +1000 Subject: [PATCH 8/8] New inEonForEraMaybe function --- cardano-api/internal/Cardano/Api/Eras.hs | 2 ++ cardano-api/internal/Cardano/Api/Eras/Core.hs | 9 +++++++++ cardano-api/src/Cardano/Api.hs | 2 ++ 3 files changed, 13 insertions(+) diff --git a/cardano-api/internal/Cardano/Api/Eras.hs b/cardano-api/internal/Cardano/Api/Eras.hs index 13d9d8c48c..5e3dc610b3 100644 --- a/cardano-api/internal/Cardano/Api/Eras.hs +++ b/cardano-api/internal/Cardano/Api/Eras.hs @@ -23,6 +23,8 @@ module Cardano.Api.Eras -- * IsEon , Eon(..) , AnyEraInEon(..) + + , inEonForEraMaybe , forEraInEon , forEraInEonMaybe , forEraMaybeEon diff --git a/cardano-api/internal/Cardano/Api/Eras/Core.hs b/cardano-api/internal/Cardano/Api/Eras/Core.hs index b5d1cf8980..a9ebe88665 100644 --- a/cardano-api/internal/Cardano/Api/Eras/Core.hs +++ b/cardano-api/internal/Cardano/Api/Eras/Core.hs @@ -31,6 +31,7 @@ module Cardano.Api.Eras.Core -- * IsEon , Eon(..) , AnyEraInEon(..) + , inEonForEraMaybe , forEraInEon , forEraInEonMaybe , forEraMaybeEon @@ -116,6 +117,14 @@ class Eon (eon :: Type -> Type) where -> CardanoEra era -- ^ Era to check -> a -- ^ The value to use +inEonForEraMaybe :: () + => Eon eon + => (eon era -> a) -- ^ Function to get the value to use if the eon includes the era + -> CardanoEra era -- ^ Era to check + -> Maybe a -- ^ The value to use +inEonForEraMaybe yes = + inEonForEra Nothing (Just . yes) + forEraInEon :: () => Eon eon => CardanoEra era -- ^ Era to check diff --git a/cardano-api/src/Cardano/Api.hs b/cardano-api/src/Cardano/Api.hs index 02065cb3e0..6d3711566e 100644 --- a/cardano-api/src/Cardano/Api.hs +++ b/cardano-api/src/Cardano/Api.hs @@ -30,6 +30,8 @@ module Cardano.Api ( -- * Eon support Eon(..), AnyEraInEon(..), + + inEonForEraMaybe, forEraInEon, forEraInEonMaybe, forEraMaybeEon,