Skip to content

Commit 5d20c68

Browse files
committed
Remove all deprecated functionality introduced before the latest release
1 parent 6c24032 commit 5d20c68

File tree

100 files changed

+136
-930
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

100 files changed

+136
-930
lines changed

eras/allegra/impl/CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
## 1.9.0.0
44

5+
* Remove deprecated type `Allegra`
6+
* Remove deprecated type `TimelockConstr`
57
* Add `invalidBeforeL`, `invalidHereAfterL`
68
* Add `basicAllegraTxBody`
79
* Add `TxLevel` argument to `Tx` and `TxBody`

eras/allegra/impl/src/Cardano/Ledger/Allegra.hs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
{-# OPTIONS_GHC -Wno-orphans #-}
77

88
module Cardano.Ledger.Allegra (
9-
Allegra,
109
AllegraEra,
1110
Tx (..),
1211
) where
@@ -23,10 +22,6 @@ import Cardano.Ledger.Allegra.Tx (Tx (..))
2322
import Cardano.Ledger.Allegra.UTxO ()
2423
import Cardano.Ledger.Shelley.API
2524

26-
type Allegra = AllegraEra
27-
28-
{-# DEPRECATED Allegra "In favor of `AllegraEra`" #-}
29-
3025
--------------------------------------------------------------------------------
3126
-- Mempool instances
3227
--------------------------------------------------------------------------------

eras/allegra/impl/src/Cardano/Ledger/Allegra/Scripts.hs

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ module Cardano.Ledger.Allegra.Scripts (
4040
getTimeStartTimelock,
4141
mkTimeExpireTimelock,
4242
getTimeExpireTimelock,
43-
Timelock (MkTimelock, TimelockConstr),
43+
Timelock (MkTimelock),
4444
pattern RequireTimeExpire,
4545
pattern RequireTimeStart,
4646
TimelockRaw (..),
@@ -232,13 +232,6 @@ newtype Timelock era = MkTimelock (MemoBytes (TimelockRaw era))
232232
deriving (Eq, Generic)
233233
deriving newtype (ToCBOR, NFData, SafeToHash)
234234

235-
pattern TimelockConstr :: MemoBytes (TimelockRaw era) -> Timelock era
236-
pattern TimelockConstr timelockRaw = MkTimelock timelockRaw
237-
238-
{-# COMPLETE TimelockConstr #-}
239-
240-
{-# DEPRECATED TimelockConstr "In favor of more consistently name `MkTimelock`" #-}
241-
242235
instance Era era => MemPack (Timelock era) where
243236
packedByteCount (MkTimelock mb) = byteCountMemoBytes mb
244237
packM (MkTimelock mb) = packMemoBytesM mb

eras/alonzo/impl/CHANGELOG.md

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,19 @@
22

33
## 1.15.0.0
44

5+
* Remove deprecated functions `nullRedeemers`, `lookupRedeemers`, `nullDats`
6+
* Remove deprecated type `AlonzoTxWits'` and its accessor functions:
7+
- `txwitsVKey'`
8+
- `txwitsBoot'`
9+
- `txscripts'`
10+
- `txdats'`
11+
- `txrdmrs'`
12+
* Remove deprecated type `TxDats'`
13+
* Remove deprecated function `toAlonzoGenesisPairs`
14+
* Remove deprecated function `toAlonzoTransitionConfigPairs`
15+
* Remove deprecated function `hashAlonzoTxAuxData`
16+
* Remove deprecated type `Alonzo`
17+
* Remove deprecated module `Cardano.Ledger.TxSeq`
518
* Remove deprecated accessor functions:
619
- `inputs'`
720
- `collateral'`
@@ -25,6 +38,7 @@
2538

2639
### `testlib`
2740

41+
* Remove deprecated function `mkPlutusScript'`
2842
* Add `NativeScript` parameter to `exampleTx`
2943

3044
## 1.14.0.0

eras/alonzo/impl/cardano-ledger-alonzo.cabal

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ library
4444
Cardano.Ledger.Alonzo.TxAuxData
4545
Cardano.Ledger.Alonzo.TxBody
4646
Cardano.Ledger.Alonzo.TxOut
47-
Cardano.Ledger.Alonzo.TxSeq
4847
Cardano.Ledger.Alonzo.TxWits
4948
Cardano.Ledger.Alonzo.UTxO
5049

@@ -143,7 +142,6 @@ library testlib
143142
-Wunused-packages
144143

145144
build-depends:
146-
FailT,
147145
HUnit,
148146
base,
149147
bytestring,

eras/alonzo/impl/src/Cardano/Ledger/Alonzo.hs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
{-# OPTIONS_GHC -Wno-orphans #-}
99

1010
module Cardano.Ledger.Alonzo (
11-
Alonzo,
1211
AlonzoEra,
1312
AlonzoTxOut,
1413
MaryValue,
@@ -35,10 +34,6 @@ import Cardano.Ledger.Mary.Value (MaryValue)
3534
import Cardano.Ledger.Plutus.Data ()
3635
import Cardano.Ledger.Shelley.API
3736

38-
type Alonzo = AlonzoEra
39-
40-
{-# DEPRECATED Alonzo "In favor of `AlonzoEra`" #-}
41-
4237
-- =====================================================
4338

4439
instance ApplyTx AlonzoEra where

eras/alonzo/impl/src/Cardano/Ledger/Alonzo/Genesis.hs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ module Cardano.Ledger.Alonzo.Genesis (
2727
agCollateralPercentage,
2828
agMaxCollateralInputs
2929
),
30-
toAlonzoGenesisPairs,
3130
) where
3231

3332
import Cardano.Ledger.Alonzo.Era (AlonzoEra)
@@ -192,7 +191,3 @@ instance ToKeyValuePairs AlonzoGenesis where
192191
, "collateralPercentage" .= agCollateralPercentage ag
193192
, "maxCollateralInputs" .= agMaxCollateralInputs ag
194193
]
195-
196-
toAlonzoGenesisPairs :: Aeson.KeyValue e a => AlonzoGenesis -> [a]
197-
toAlonzoGenesisPairs = toKeyValuePairs
198-
{-# DEPRECATED toAlonzoGenesisPairs "In favor of `toKeyValuePairs`" #-}

eras/alonzo/impl/src/Cardano/Ledger/Alonzo/Transition.hs

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,14 @@
66

77
module Cardano.Ledger.Alonzo.Transition (
88
TransitionConfig (..),
9-
toAlonzoTransitionConfigPairs,
109
) where
1110

1211
import Cardano.Ledger.Alonzo.Era
1312
import Cardano.Ledger.Alonzo.Genesis (AlonzoGenesis)
1413
import Cardano.Ledger.Alonzo.Translation ()
15-
import Cardano.Ledger.BaseTypes (toKeyValuePairs)
1614
import Cardano.Ledger.Mary
1715
import Cardano.Ledger.Mary.Transition (TransitionConfig (MaryTransitionConfig))
1816
import Cardano.Ledger.Shelley.Transition
19-
import Data.Aeson (KeyValue (..))
2017
import GHC.Generics
2118
import Lens.Micro
2219
import NoThunks.Class (NoThunks (..))
@@ -39,7 +36,3 @@ instance EraTransition AlonzoEra where
3936
lens atcAlonzoGenesis (\atc ag -> atc {atcAlonzoGenesis = ag})
4037

4138
instance NoThunks (TransitionConfig AlonzoEra)
42-
43-
toAlonzoTransitionConfigPairs :: KeyValue e a => TransitionConfig AlonzoEra -> [a]
44-
toAlonzoTransitionConfigPairs = toKeyValuePairs
45-
{-# DEPRECATED toAlonzoTransitionConfigPairs "In favor of `toKeyValuePairs`" #-}

eras/alonzo/impl/src/Cardano/Ledger/Alonzo/Tx.hs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,6 @@ module Cardano.Ledger.Alonzo.Tx (
5050
auxDataAlonzoTxL,
5151
sizeAlonzoTxF,
5252
isValidAlonzoTxL,
53-
txdats',
54-
txscripts',
5553
txrdmrs,
5654
TxBody (AlonzoTxBody),
5755
-- Figure 4

eras/alonzo/impl/src/Cardano/Ledger/Alonzo/TxAuxData.hs

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ module Cardano.Ledger.Alonzo.TxAuxData (
3535
AlonzoEraTxAuxData (..),
3636
AlonzoTxAuxDataRaw (..),
3737
mkAlonzoTxAuxData,
38-
hashAlonzoTxAuxData,
3938
validateAlonzoTxAuxData,
4039
getAlonzoTxAuxDataScripts,
4140
metadataAlonzoTxAuxDataL,
@@ -289,13 +288,6 @@ metadataAlonzoTxAuxDataL =
289288
lensMemoRawType @era atadrMetadata $
290289
\txAuxDataRaw md -> txAuxDataRaw {atadrMetadata = md}
291290

292-
hashAlonzoTxAuxData ::
293-
HashAnnotated x EraIndependentTxAuxData =>
294-
x ->
295-
TxAuxDataHash
296-
hashAlonzoTxAuxData x = TxAuxDataHash (hashAnnotated x)
297-
{-# DEPRECATED hashAlonzoTxAuxData "In favor of `hashTxAuxData`" #-}
298-
299291
validateAlonzoTxAuxData ::
300292
(AlonzoEraScript era, Script era ~ AlonzoScript era) =>
301293
ProtVer ->

0 commit comments

Comments
 (0)