Skip to content

Commit 77d6f58

Browse files
authored
Merge pull request #1234 from IntersectMBO/jordan/remove-deprecated-convert-fns
Remove deprecated era conversion functions superseded by convert
2 parents ab2de02 + 476a962 commit 77d6f58

14 files changed

Lines changed: 7 additions & 112 deletions
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
project: cardano-api
2+
pr: 1234
3+
kind:
4+
- breaking
5+
description: |
6+
Remove deprecated era conversion functions that were superseded by 'convert': shelleyToAlonzoEraToShelleyToBabbageEra, alonzoEraOnwardsToMaryEraOnwards, babbageEraOnwardsToMaryEraOnwards, babbageEraOnwardsToAlonzoEraOnwards, eraToSbe, eraToBabbageEraOnwards, shelleyToMaryEraToShelleyBasedEra, conwayEraOnwardsToShelleyBasedEra, conwayEraOnwardsToBabbageEraOnwards, maryEraOnwardsToShelleyBasedEra, babbageEraOnwardsToShelleyBasedEra, shelleyEraOnlyToShelleyBasedEra, alonzoEraOnwardsToShelleyBasedEra, shelleyToBabbageEraToShelleyBasedEra, allegraEraOnwardsToShelleyBasedEra, shelleyToAllegraEraToShelleyBasedEra. Use 'convert' instead.

cardano-api/gen/Test/Gen/Cardano/Api/Typed.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -981,7 +981,7 @@ genTxMintValue =
981981
policies <- Gen.list (Range.constant 1 3) genPolicyId
982982
assets <- forM policies $ \policy -> do
983983
mintValue <- genPolicyAssets
984-
witness <- genScriptWitnessForMint (maryEraOnwardsToShelleyBasedEra w)
984+
witness <- genScriptWitnessForMint (convert w)
985985
pure (policy, (mintValue, pure witness))
986986

987987
Gen.choice

cardano-api/src/Cardano/Api/Era/Internal/Case.hs

Lines changed: 0 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,6 @@ module Cardano.Api.Era.Internal.Case
1313
, caseShelleyToMaryOrAlonzoEraOnwards
1414
, caseShelleyToAlonzoOrBabbageEraOnwards
1515
, caseShelleyToBabbageOrConwayEraOnwards
16-
-- Conversions
17-
, shelleyToAlonzoEraToShelleyToBabbageEra
18-
, alonzoEraOnwardsToMaryEraOnwards
19-
, babbageEraOnwardsToMaryEraOnwards
20-
, babbageEraOnwardsToAlonzoEraOnwards
2116
)
2217
where
2318

@@ -156,45 +151,3 @@ caseShelleyToBabbageOrConwayEraOnwards l r = \case
156151
ShelleyBasedEraBabbage -> l ShelleyToBabbageEraBabbage
157152
ShelleyBasedEraConway -> r ConwayEraOnwardsConway
158153
ShelleyBasedEraDijkstra -> error "TODO Dijkstra: caseShelleyToBabbageOrConwayEraOnwards: era not supported"
159-
160-
{-# DEPRECATED shelleyToAlonzoEraToShelleyToBabbageEra "Use convert instead" #-}
161-
shelleyToAlonzoEraToShelleyToBabbageEra
162-
:: ()
163-
=> ShelleyToAlonzoEra era
164-
-> ShelleyToBabbageEra era
165-
shelleyToAlonzoEraToShelleyToBabbageEra = \case
166-
ShelleyToAlonzoEraShelley -> ShelleyToBabbageEraShelley
167-
ShelleyToAlonzoEraAllegra -> ShelleyToBabbageEraAllegra
168-
ShelleyToAlonzoEraMary -> ShelleyToBabbageEraMary
169-
ShelleyToAlonzoEraAlonzo -> ShelleyToBabbageEraAlonzo
170-
171-
{-# DEPRECATED alonzoEraOnwardsToMaryEraOnwards "Use convert instead" #-}
172-
alonzoEraOnwardsToMaryEraOnwards
173-
:: ()
174-
=> AlonzoEraOnwards era
175-
-> MaryEraOnwards era
176-
alonzoEraOnwardsToMaryEraOnwards = \case
177-
AlonzoEraOnwardsAlonzo -> MaryEraOnwardsAlonzo
178-
AlonzoEraOnwardsBabbage -> MaryEraOnwardsBabbage
179-
AlonzoEraOnwardsConway -> MaryEraOnwardsConway
180-
AlonzoEraOnwardsDijkstra -> MaryEraOnwardsDijkstra
181-
182-
{-# DEPRECATED babbageEraOnwardsToMaryEraOnwards "Use convert instead" #-}
183-
babbageEraOnwardsToMaryEraOnwards
184-
:: ()
185-
=> BabbageEraOnwards era
186-
-> MaryEraOnwards era
187-
babbageEraOnwardsToMaryEraOnwards = \case
188-
BabbageEraOnwardsBabbage -> MaryEraOnwardsBabbage
189-
BabbageEraOnwardsConway -> MaryEraOnwardsConway
190-
BabbageEraOnwardsDijkstra -> MaryEraOnwardsDijkstra
191-
192-
{-# DEPRECATED babbageEraOnwardsToAlonzoEraOnwards "Use convert instead" #-}
193-
babbageEraOnwardsToAlonzoEraOnwards
194-
:: ()
195-
=> BabbageEraOnwards era
196-
-> AlonzoEraOnwards era
197-
babbageEraOnwardsToAlonzoEraOnwards = \case
198-
BabbageEraOnwardsBabbage -> AlonzoEraOnwardsBabbage
199-
BabbageEraOnwardsConway -> AlonzoEraOnwardsConway
200-
BabbageEraOnwardsDijkstra -> AlonzoEraOnwardsDijkstra

cardano-api/src/Cardano/Api/Era/Internal/Eon/AllegraEraOnwards.hs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
module Cardano.Api.Era.Internal.Eon.AllegraEraOnwards
1313
( AllegraEraOnwards (..)
1414
, allegraEraOnwardsConstraints
15-
, allegraEraOnwardsToShelleyBasedEra
1615
, AllegraEraOnwardsConstraints
1716
, IsAllegraBasedEra (..)
1817
)
@@ -122,10 +121,6 @@ allegraEraOnwardsConstraints = \case
122121
AllegraEraOnwardsConway -> id
123122
_ -> const $ error "TODO Dijkstra: allegraEraOnwardsConstraints: era not supported"
124123

125-
{-# DEPRECATED allegraEraOnwardsToShelleyBasedEra "Use 'convert' instead." #-}
126-
allegraEraOnwardsToShelleyBasedEra :: AllegraEraOnwards era -> ShelleyBasedEra era
127-
allegraEraOnwardsToShelleyBasedEra = convert
128-
129124
class IsShelleyBasedEra era => IsAllegraBasedEra era where
130125
allegraBasedEra :: AllegraEraOnwards era
131126

cardano-api/src/Cardano/Api/Era/Internal/Eon/AlonzoEraOnwards.hs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
module Cardano.Api.Era.Internal.Eon.AlonzoEraOnwards
1313
( AlonzoEraOnwards (..)
1414
, alonzoEraOnwardsConstraints
15-
, alonzoEraOnwardsToShelleyBasedEra
1615
, AlonzoEraOnwardsConstraints
1716
, IsAlonzoBasedEra (..)
1817
)
@@ -130,10 +129,6 @@ alonzoEraOnwardsConstraints = \case
130129
AlonzoEraOnwardsConway -> id
131130
AlonzoEraOnwardsDijkstra -> id
132131

133-
{-# DEPRECATED alonzoEraOnwardsToShelleyBasedEra "Use 'convert' instead." #-}
134-
alonzoEraOnwardsToShelleyBasedEra :: AlonzoEraOnwards era -> ShelleyBasedEra era
135-
alonzoEraOnwardsToShelleyBasedEra = convert
136-
137132
class IsMaryBasedEra era => IsAlonzoBasedEra era where
138133
alonzoBasedEra :: AlonzoEraOnwards era
139134

cardano-api/src/Cardano/Api/Era/Internal/Eon/BabbageEraOnwards.hs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
module Cardano.Api.Era.Internal.Eon.BabbageEraOnwards
1414
( BabbageEraOnwards (..)
1515
, babbageEraOnwardsConstraints
16-
, babbageEraOnwardsToShelleyBasedEra
1716
, BabbageEraOnwardsConstraints
1817
, IsBabbageBasedEra (..)
1918
)
@@ -139,10 +138,6 @@ babbageEraOnwardsConstraints = \case
139138
BabbageEraOnwardsConway -> id
140139
BabbageEraOnwardsDijkstra -> const $ error "TODO Dijkstra: babbageEraOnwardsConstraints: era not supported"
141140

142-
{-# DEPRECATED babbageEraOnwardsToShelleyBasedEra "Use 'convert' instead." #-}
143-
babbageEraOnwardsToShelleyBasedEra :: BabbageEraOnwards era -> ShelleyBasedEra era
144-
babbageEraOnwardsToShelleyBasedEra = convert
145-
146141
class IsAlonzoBasedEra era => IsBabbageBasedEra era where
147142
babbageBasedEra :: BabbageEraOnwards era
148143

cardano-api/src/Cardano/Api/Era/Internal/Eon/ConwayEraOnwards.hs

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@
1212
module Cardano.Api.Era.Internal.Eon.ConwayEraOnwards
1313
( ConwayEraOnwards (..)
1414
, conwayEraOnwardsConstraints
15-
, conwayEraOnwardsToShelleyBasedEra
16-
, conwayEraOnwardsToBabbageEraOnwards
1715
, ConwayEraOnwardsConstraints
1816
, IsConwayBasedEra (..)
1917
)
@@ -147,14 +145,6 @@ conwayEraOnwardsConstraints = \case
147145
ConwayEraOnwardsConway -> id
148146
_ -> const $ error "TODO Dijkstra: conwayEraOnwardsConstraints: era not supported"
149147

150-
{-# DEPRECATED conwayEraOnwardsToShelleyBasedEra "Use 'convert' instead." #-}
151-
conwayEraOnwardsToShelleyBasedEra :: ConwayEraOnwards era -> ShelleyBasedEra era
152-
conwayEraOnwardsToShelleyBasedEra = convert
153-
154-
{-# DEPRECATED conwayEraOnwardsToBabbageEraOnwards "Use 'convert' instead." #-}
155-
conwayEraOnwardsToBabbageEraOnwards :: ConwayEraOnwards era -> BabbageEraOnwards era
156-
conwayEraOnwardsToBabbageEraOnwards = convert
157-
158148
class IsBabbageBasedEra era => IsConwayBasedEra era where
159149
conwayBasedEra :: ConwayEraOnwards era
160150

cardano-api/src/Cardano/Api/Era/Internal/Eon/MaryEraOnwards.hs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
module Cardano.Api.Era.Internal.Eon.MaryEraOnwards
1313
( MaryEraOnwards (..)
1414
, maryEraOnwardsConstraints
15-
, maryEraOnwardsToShelleyBasedEra
1615
, MaryEraOnwardsConstraints
1716
, IsMaryBasedEra (..)
1817
)
@@ -123,10 +122,6 @@ maryEraOnwardsConstraints = \case
123122
MaryEraOnwardsConway -> id
124123
MaryEraOnwardsDijkstra -> const $ error "TODO Dijkstra: maryEraOnwardsConstraints: era not supported"
125124

126-
{-# DEPRECATED maryEraOnwardsToShelleyBasedEra "Use 'convert' instead." #-}
127-
maryEraOnwardsToShelleyBasedEra :: MaryEraOnwards era -> ShelleyBasedEra era
128-
maryEraOnwardsToShelleyBasedEra = convert
129-
130125
class IsAllegraBasedEra era => IsMaryBasedEra era where
131126
maryBasedEra :: MaryEraOnwards era
132127

cardano-api/src/Cardano/Api/Era/Internal/Eon/ShelleyEraOnly.hs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
module Cardano.Api.Era.Internal.Eon.ShelleyEraOnly
1313
( ShelleyEraOnly (..)
1414
, shelleyEraOnlyConstraints
15-
, shelleyEraOnlyToShelleyBasedEra
1615
, ShelleyEraOnlyConstraints
1716
)
1817
where
@@ -109,7 +108,3 @@ shelleyEraOnlyConstraints
109108
-> a
110109
shelleyEraOnlyConstraints = \case
111110
ShelleyEraOnlyShelley -> id
112-
113-
{-# DEPRECATED shelleyEraOnlyToShelleyBasedEra "Use 'convert' instead." #-}
114-
shelleyEraOnlyToShelleyBasedEra :: ShelleyEraOnly era -> ShelleyBasedEra era
115-
shelleyEraOnlyToShelleyBasedEra = convert

cardano-api/src/Cardano/Api/Era/Internal/Eon/ShelleyToAllegraEra.hs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
module Cardano.Api.Era.Internal.Eon.ShelleyToAllegraEra
1313
( ShelleyToAllegraEra (..)
1414
, shelleyToAllegraEraConstraints
15-
, shelleyToAllegraEraToShelleyBasedEra
1615
, ShelleyToAllegraEraConstraints
1716
)
1817
where
@@ -113,7 +112,3 @@ shelleyToAllegraEraConstraints
113112
shelleyToAllegraEraConstraints = \case
114113
ShelleyToAllegraEraShelley -> id
115114
ShelleyToAllegraEraAllegra -> id
116-
117-
{-# DEPRECATED shelleyToAllegraEraToShelleyBasedEra "Use 'convert' instead." #-}
118-
shelleyToAllegraEraToShelleyBasedEra :: ShelleyToAllegraEra era -> ShelleyBasedEra era
119-
shelleyToAllegraEraToShelleyBasedEra = convert

0 commit comments

Comments
 (0)