Merge pull request #330 from input-output-hk/newhoggy/delete-AlonzoEr…

…aOnly Delete `AlonzoEraOnly`
IntersectMBO · Oct 19, 2023 · 4ab5f61 · 4ab5f61
2 parents 0e670df + 9281f5e
commit 4ab5f61
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 146 deletions.
diff --git a/cardano-api/cardano-api.cabal b/cardano-api/cardano-api.cabal
@@ -56,7 +56,6 @@ library internal
                         Cardano.Api.DeserialiseAnyOf
                         Cardano.Api.DRepMetadata
                         Cardano.Api.Eon.AllegraEraOnwards
-                        Cardano.Api.Eon.AlonzoEraOnly
                         Cardano.Api.Eon.AlonzoEraOnwards
                         Cardano.Api.Eon.BabbageEraOnly
                         Cardano.Api.Eon.BabbageEraOnwards

diff --git a/cardano-api/internal/Cardano/Api/Eon/AlonzoEraOnly.hs b/cardano-api/internal/Cardano/Api/Eon/AlonzoEraOnly.hs
diff --git a/cardano-api/internal/Cardano/Api/Eras/Case.hs b/cardano-api/internal/Cardano/Api/Eras/Case.hs
@@ -22,25 +22,19 @@ module Cardano.Api.Eras.Case
     -- Case on MaryEraOnwards
   , caseMaryEraOnlyOrAlonzoEraOnwards
 
-    -- Case on AlonzoEraOnwards
-  , caseAlonzoOnlyOrBabbageEraOnwards
-
     -- Proofs
   , noByronEraInShelleyBasedEra
-  , disjointAlonzoEraOnlyAndBabbageEraOnwards
   , disjointByronEraOnlyAndShelleyBasedEra
 
     -- Conversions
   , shelleyToAllegraEraToByronToAllegraEra
   , shelleyToAlonzoEraToShelleyToBabbageEra
-  , alonzoEraOnlyToAlonzoEraOnwards
   , alonzoEraOnwardsToMaryEraOnwards
   , babbageEraOnwardsToMaryEraOnwards
   , babbageEraOnwardsToAlonzoEraOnwards
   ) where
 
 import           Cardano.Api.Eon.AllegraEraOnwards
-import           Cardano.Api.Eon.AlonzoEraOnly
 import           Cardano.Api.Eon.AlonzoEraOnwards
 import           Cardano.Api.Eon.BabbageEraOnwards
 import           Cardano.Api.Eon.ByronAndAllegraEraOnwards
@@ -226,30 +220,13 @@ caseMaryEraOnlyOrAlonzoEraOnwards l r = \case
   MaryEraOnwardsBabbage -> r AlonzoEraOnwardsBabbage
   MaryEraOnwardsConway  -> r AlonzoEraOnwardsConway
 
--- | @caseAlonzoOnlyOrBabbageEraOnwards f g era@ applies @f@ to alonzo;
--- and applies @g@ to babbage and later eras.
-caseAlonzoOnlyOrBabbageEraOnwards :: ()
-  => (AlonzoEraOnly era -> a)
-  -> (BabbageEraOnwards era -> a)
-  -> AlonzoEraOnwards era
-  -> a
-caseAlonzoOnlyOrBabbageEraOnwards l r = \case
-  AlonzoEraOnwardsAlonzo -> l AlonzoEraOnlyAlonzo
-  AlonzoEraOnwardsBabbage -> r BabbageEraOnwardsBabbage
-  AlonzoEraOnwardsConway  -> r BabbageEraOnwardsConway
-
 {-# DEPRECATED noByronEraInShelleyBasedEra "Use disjointByronEraOnlyAndShelleyBasedEra instead" #-}
 noByronEraInShelleyBasedEra :: ShelleyBasedEra era -> ByronEraOnly era -> a
 noByronEraInShelleyBasedEra = flip disjointByronEraOnlyAndShelleyBasedEra
 
 disjointByronEraOnlyAndShelleyBasedEra :: ByronEraOnly era -> ShelleyBasedEra era -> a
 disjointByronEraOnlyAndShelleyBasedEra ByronEraOnlyByron sbe = case sbe of {}
 
-disjointAlonzoEraOnlyAndBabbageEraOnwards :: AlonzoEraOnly era -> BabbageEraOnwards era -> a
-disjointAlonzoEraOnlyAndBabbageEraOnwards eonL eonR =
-  case eonL of
-    AlonzoEraOnlyAlonzo -> case eonR of {}
-
 shelleyToAllegraEraToByronToAllegraEra :: ShelleyToAllegraEra era -> ByronToAllegraEra era
 shelleyToAllegraEraToByronToAllegraEra = \case
   ShelleyToAllegraEraShelley -> ByronToAllegraEraShelley
@@ -272,12 +249,6 @@ alonzoEraOnwardsToMaryEraOnwards = \case
   AlonzoEraOnwardsBabbage -> MaryEraOnwardsBabbage
   AlonzoEraOnwardsConway  -> MaryEraOnwardsConway
 
-alonzoEraOnlyToAlonzoEraOnwards :: ()
-  => AlonzoEraOnly era
-  -> AlonzoEraOnwards era
-alonzoEraOnlyToAlonzoEraOnwards = \case
-  AlonzoEraOnlyAlonzo -> AlonzoEraOnwardsAlonzo
-
 babbageEraOnwardsToMaryEraOnwards :: ()
   => BabbageEraOnwards era
   -> MaryEraOnwards era

diff --git a/cardano-api/src/Cardano/Api.hs b/cardano-api/src/Cardano/Api.hs
@@ -125,11 +125,6 @@ module Cardano.Api (
 
     -- ** From Alonzo
 
-    AlonzoEraOnly(..),
-    alonzoEraOnlyConstraints,
-    alonzoEraOnlyToCardanoEra,
-    alonzoEraOnlyToShelleyBasedEra,
-
     AlonzoEraOnwards(..),
     alonzoEraOnwardsConstraints,
     alonzoEraOnwardsToCardanoEra,
@@ -163,17 +158,16 @@ module Cardano.Api (
     caseShelleyToMaryOrAlonzoEraOnwards,
     caseShelleyToAlonzoOrBabbageEraOnwards,
     caseShelleyToBabbageOrConwayEraOnwards,
-    caseAlonzoOnlyOrBabbageEraOnwards,
+
+    -- Case on MaryEraOnwards
+    caseMaryEraOnlyOrAlonzoEraOnwards,
 
     -- ** Eon relaxation
 
     -- *** for AlonzoEraOnly
     shelleyToAllegraEraToByronToAllegraEra,
     shelleyToAlonzoEraToShelleyToBabbageEra,
 
-    -- *** for AlonzoEraOnly
-    alonzoEraOnlyToAlonzoEraOnwards,
-
     -- *** for AlonzoEraOnwards
     alonzoEraOnwardsToMaryEraOnwards,
 
@@ -1028,7 +1022,6 @@ import           Cardano.Api.Convenience.Construction
 import           Cardano.Api.Convenience.Query
 import           Cardano.Api.DeserialiseAnyOf
 import           Cardano.Api.DRepMetadata
-import           Cardano.Api.Eon.AlonzoEraOnly
 import           Cardano.Api.Eon.AlonzoEraOnwards
 import           Cardano.Api.Eon.BabbageEraOnwards
 import           Cardano.Api.Eon.ByronAndAllegraEraOnwards