diff --git a/alonzo b/alonzo deleted file mode 120000 index 8e0f3c5331b..00000000000 --- a/alonzo +++ /dev/null @@ -1 +0,0 @@ -eras/alonzo \ No newline at end of file diff --git a/byron b/byron deleted file mode 120000 index a84b2583a9a..00000000000 --- a/byron +++ /dev/null @@ -1 +0,0 @@ -eras/byron \ No newline at end of file diff --git a/cabal.project b/cabal.project index b48b6fb04e8..a8854e6ba71 100644 --- a/cabal.project +++ b/cabal.project @@ -25,11 +25,6 @@ packages: libs/small-steps-test libs/compact-map - -- Deprecations - eras/shelley/chain-and-ledger/executable-spec - eras/shelley/chain-and-ledger/shelley-spec-ledger-test - eras/shelley/chain-and-ledger/dependencies/non-integer - -- Always write GHC env files, because they are needed by the doctests. write-ghc-environment-files: always diff --git a/cardano-ledger-core b/cardano-ledger-core deleted file mode 120000 index 909726f709c..00000000000 --- a/cardano-ledger-core +++ /dev/null @@ -1 +0,0 @@ -libs/cardano-ledger-core \ No newline at end of file diff --git a/cardano-ledger-test b/cardano-ledger-test deleted file mode 120000 index f53b786f210..00000000000 --- a/cardano-ledger-test +++ /dev/null @@ -1 +0,0 @@ -libs/cardano-ledger-test \ No newline at end of file diff --git a/eras/alonzo/impl/src/Cardano/Ledger/Alonzo/Genesis.hs b/eras/alonzo/impl/src/Cardano/Ledger/Alonzo/Genesis.hs index 29fd37b7aea..416c53d2785 100644 --- a/eras/alonzo/impl/src/Cardano/Ledger/Alonzo/Genesis.hs +++ b/eras/alonzo/impl/src/Cardano/Ledger/Alonzo/Genesis.hs @@ -5,9 +5,6 @@ module Cardano.Ledger.Alonzo.Genesis ( AlonzoGenesis (..), extendPPWithGenesis, - - -- * Deprecated - adaPerUTxOWord, ) where @@ -36,10 +33,6 @@ data AlonzoGenesis = AlonzoGenesis } deriving (Eq, Generic, NoThunks) -{-# DEPRECATED adaPerUTxOWord "Use coinsPerUTxOWord instead" #-} -adaPerUTxOWord :: AlonzoGenesis -> Coin -adaPerUTxOWord = coinsPerUTxOWord - -- | Given the missing pieces turn a Shelley.PParams' into an Params' extendPPWithGenesis :: Shelley.PParams' Identity era1 -> diff --git a/eras/alonzo/impl/src/Cardano/Ledger/Alonzo/PParams.hs b/eras/alonzo/impl/src/Cardano/Ledger/Alonzo/PParams.hs index 434707ee453..3b1168440c8 100644 --- a/eras/alonzo/impl/src/Cardano/Ledger/Alonzo/PParams.hs +++ b/eras/alonzo/impl/src/Cardano/Ledger/Alonzo/PParams.hs @@ -27,10 +27,6 @@ module Cardano.Ledger.Alonzo.PParams encodeLangViews, retractPP, extendPP, - -- Deprecated - ProtVer, - pvMajor, - pvMinor, ) where @@ -542,15 +538,3 @@ extendPP col mxCol = PParams ma mb mxBB mxT mxBH kd pd emx a n rho tau d eE pv mnP ada cost price mxTx mxBl mxV col mxCol - -{-# DEPRECATED ProtVer "Import from Cardano.Ledger.BaseTypes instead" #-} - -type ProtVer = BT.ProtVer - -{-# DEPRECATED pvMajor "Import from Cardano.Ledger.BaseTypes instead" #-} -pvMajor :: ProtVer -> Natural -pvMajor = BT.pvMajor - -{-# DEPRECATED pvMinor "Import from Cardano.Ledger.BaseTypes instead" #-} -pvMinor :: ProtVer -> Natural -pvMinor = BT.pvMinor diff --git a/eras/alonzo/impl/src/Cardano/Ledger/Alonzo/Scripts.hs b/eras/alonzo/impl/src/Cardano/Ledger/Alonzo/Scripts.hs index d645f10105d..8ce20fc29fb 100644 --- a/eras/alonzo/impl/src/Cardano/Ledger/Alonzo/Scripts.hs +++ b/eras/alonzo/impl/src/Cardano/Ledger/Alonzo/Scripts.hs @@ -34,11 +34,6 @@ module Cardano.Ledger.Alonzo.Scripts validateCostModelParams, decodeCostModelMap, decodeCostModel, - - -- * Deprecated - defaultCostModel, - alwaysSucceeds, - alwaysFails, ) where @@ -73,10 +68,6 @@ import GHC.Generics (Generic) import NoThunks.Class (InspectHeapNamed (..), NoThunks) import Numeric.Natural (Natural) import Plutus.V1.Ledger.Api as PV1 hiding (Map, Script) -import qualified Plutus.V1.Ledger.Examples as Plutus - ( alwaysFailingNAryFunction, - alwaysSucceedingNAryFunction, - ) import Plutus.V2.Ledger.Api as PV2 hiding (Map, Script) -- | Marker indicating the part of a transaction for which this script is acting @@ -118,14 +109,6 @@ instance SafeToHash (Script era) where originalBytes (TimelockScript t) = originalBytes t originalBytes (PlutusScript _ bs) = fromShort bs -{-# DEPRECATED alwaysSucceeds "import from Test.Cardano.Ledger.Alonzo.Scripts instead" #-} -alwaysSucceeds :: Language -> Natural -> Script era -alwaysSucceeds lang n = PlutusScript lang (Plutus.alwaysSucceedingNAryFunction n) - -{-# DEPRECATED alwaysFails "import from Test.Cardano.Ledger.Alonzo.Scripts instead" #-} -alwaysFails :: Language -> Natural -> Script era -alwaysFails lang n = PlutusScript lang (Plutus.alwaysFailingNAryFunction n) - isPlutusScript :: Script era -> Bool isPlutusScript (PlutusScript _ _) = True isPlutusScript (TimelockScript _) = False @@ -220,10 +203,6 @@ checkCostModel PlutusV2 cm = then Right (CostModel cm) else Left ("Invalid PlutusV2 cost model: " ++ show cm) -defaultCostModel :: Language -> Maybe CostModel -defaultCostModel PlutusV1 = CostModel <$> PV1.defaultCostModelParams -defaultCostModel PlutusV2 = CostModel <$> PV2.defaultCostModelParams - decodeCostModelMap :: Decoder s (Map Language CostModel) decodeCostModelMap = decodeMapByKey fromCBOR decodeCostModel diff --git a/eras/alonzo/impl/src/Cardano/Ledger/Alonzo/Tx.hs b/eras/alonzo/impl/src/Cardano/Ledger/Alonzo/Tx.hs index 3f2fb872199..65b9cbeaefb 100644 --- a/eras/alonzo/impl/src/Cardano/Ledger/Alonzo/Tx.hs +++ b/eras/alonzo/impl/src/Cardano/Ledger/Alonzo/Tx.hs @@ -60,11 +60,6 @@ module Cardano.Ledger.Alonzo.Tx -- Other toCBORForSizeComputation, toCBORForMempoolSubmission, - -- Deprecated - IsValidating, - isValidating, - WitnessPPData, - hashWitnessPPData, ) where @@ -150,18 +145,6 @@ import Numeric.Natural (Natural) -- =================================================== -{-# DEPRECATED IsValidating "Use IsValid instead" #-} - -type IsValidating = IsValid - -{-# DEPRECATED isValidating "Use isValid instead" #-} -isValidating :: ValidatedTx era -> IsValid -isValidating = isValid - --- | DEPRECATED - remove this HasField instance once we have removed IsValidating -instance HasField "isValidating" (ValidatedTx era) IsValid where - getField = isValid - -- | Tag indicating whether non-native scripts in this transaction are expected -- to validate. This is added by the block creator when constructing the block. newtype IsValid = IsValid Bool @@ -250,10 +233,6 @@ data ScriptIntegrity era !(Set LangDepView) -- From the Porotocl parameters deriving (Show, Eq, Generic, Typeable) -{-# DEPRECATED WitnessPPData "Use ScriptIntegrity instead" #-} - -type WitnessPPData = ScriptIntegrity - deriving instance Typeable era => NoThunks (ScriptIntegrity era) -- ScriptIntegrity is not transmitted over the network. The bytes are independently @@ -283,17 +262,6 @@ hashScriptIntegrity pp langs rdmrs dats = let newset = Set.map (getLanguageView pp) langs in SJust (hashAnnotated (ScriptIntegrity rdmrs dats newset)) -{-# DEPRECATED hashWitnessPPData "Use hashScriptIntegrity instead" #-} -hashWitnessPPData :: - forall era. - Era era => - PParams era -> - Set Language -> - Redeemers era -> - TxDats era -> - StrictMaybe (ScriptIntegrityHash (Crypto era)) -hashWitnessPPData = hashScriptIntegrity - -- =============================================================== -- From the specification, Figure 5 "Functions related to fees" -- =============================================================== diff --git a/eras/alonzo/impl/src/Cardano/Ledger/Alonzo/TxBody.hs b/eras/alonzo/impl/src/Cardano/Ledger/Alonzo/TxBody.hs index 12616ffd46b..a0fe49b659d 100644 --- a/eras/alonzo/impl/src/Cardano/Ledger/Alonzo/TxBody.hs +++ b/eras/alonzo/impl/src/Cardano/Ledger/Alonzo/TxBody.hs @@ -54,9 +54,6 @@ module Cardano.Ledger.Alonzo.TxBody AlonzoBody, EraIndependentScriptIntegrity, ScriptIntegrityHash, - - -- * deprecated - WitnessPPDataHash, ) where @@ -382,10 +379,6 @@ pattern TxOutCompactDH addr vl dh <- type ScriptIntegrityHash crypto = SafeHash crypto EraIndependentScriptIntegrity -{-# DEPRECATED WitnessPPDataHash "Use ScriptIntegrityHash instead" #-} - -type WitnessPPDataHash crypto = SafeHash crypto EraIndependentScriptIntegrity - data TxBodyRaw era = TxBodyRaw { _inputs :: !(Set (TxIn (Crypto era))), _collateral :: !(Set (TxIn (Crypto era))), @@ -846,13 +839,6 @@ instance where getField (TxBodyConstr (Memo m _)) = _adHash m --- | TODO deprecated -instance - c ~ Crypto era => - HasField "wppHash" (TxBody era) (StrictMaybe (ScriptIntegrityHash c)) - where - getField (TxBodyConstr (Memo m _)) = _scriptIntegrityHash m - instance c ~ Crypto era => HasField "scriptIntegrityHash" (TxBody era) (StrictMaybe (ScriptIntegrityHash c)) diff --git a/eras/alonzo/impl/src/Cardano/Ledger/Alonzo/TxInfo.hs b/eras/alonzo/impl/src/Cardano/Ledger/Alonzo/TxInfo.hs index 252be647d37..639cf7fbd1b 100644 --- a/eras/alonzo/impl/src/Cardano/Ledger/Alonzo/TxInfo.hs +++ b/eras/alonzo/impl/src/Cardano/Ledger/Alonzo/TxInfo.hs @@ -540,18 +540,17 @@ runPLCScript proxy lang (CostModel cost) scriptbytestring units ds = -- It pays to decode the context data into a real context because that provides -- way more information. But there is no guarantee the context data really can -- be decoded. -explainPlutusFailure, - explain_plutus_failure :: - forall era. - Show (Script era) => - Proxy era -> - Language -> - SBS.ShortByteString -> - PV1.EvaluationError -> - [PV1.Data] -> - CostModel -> - ExUnits -> - ScriptResult +explainPlutusFailure :: + forall era. + Show (Script era) => + Proxy era -> + Language -> + SBS.ShortByteString -> + PV1.EvaluationError -> + [PV1.Data] -> + CostModel -> + ExUnits -> + ScriptResult explainPlutusFailure _proxy lang scriptbytestring e ds@[dat, redeemer, info] cm eu = -- A three data argument script. let ss :: Script era @@ -632,8 +631,6 @@ explainPlutusFailure _proxy lang scriptbytestring e ds cm eu = ++ map show ds ) db = B64.encode . serialize' $ PlutusDebug cm eu scriptbytestring ds PlutusV1 -explain_plutus_failure = explainPlutusFailure -{-# DEPRECATED explain_plutus_failure "In favor of properly named `explainPlutusFailure`" #-} validPlutusdata :: PV1.Data -> Bool validPlutusdata (PV1.Constr _n ds) = all validPlutusdata ds diff --git a/eras/shelley-ma/test-suite/src/Test/Cardano/Ledger/ShelleyMA/Serialisation/Roundtrip.hs b/eras/shelley-ma/test-suite/src/Test/Cardano/Ledger/ShelleyMA/Serialisation/Roundtrip.hs index 0b89762015b..52c6e6b6948 100644 --- a/eras/shelley-ma/test-suite/src/Test/Cardano/Ledger/ShelleyMA/Serialisation/Roundtrip.hs +++ b/eras/shelley-ma/test-suite/src/Test/Cardano/Ledger/ShelleyMA/Serialisation/Roundtrip.hs @@ -9,7 +9,7 @@ module Test.Cardano.Ledger.ShelleyMA.Serialisation.Roundtrip where import Cardano.Binary (Annotator (..), FromCBOR, ToCBOR) import qualified Cardano.Ledger.Core as Core import Cardano.Ledger.Shelley.API (ApplyTx, ApplyTxError) -import Cardano.Ledger.Shelley.Constraints (ShelleyBased) +import Cardano.Ledger.Shelley.Constraints import qualified Data.ByteString.Lazy.Char8 as BSL import Data.Proxy (Proxy (Proxy)) import Data.Typeable (typeRep) @@ -68,7 +68,10 @@ property x = allprops :: forall e. - ( ShelleyBased e, + ( UsesValue e, + UsesScript e, + UsesTxBody e, + UsesAuxiliary e, ApplyTx e, Arbitrary (Core.TxBody e), Arbitrary (Core.AuxiliaryData e), diff --git a/eras/shelley/chain-and-ledger/dependencies/non-integer/ChangeLog.md b/eras/shelley/chain-and-ledger/dependencies/non-integer/ChangeLog.md deleted file mode 100644 index 6c3d568c1db..00000000000 --- a/eras/shelley/chain-and-ledger/dependencies/non-integer/ChangeLog.md +++ /dev/null @@ -1,3 +0,0 @@ -# Changelog for non-integer - -## Unreleased changes diff --git a/eras/shelley/chain-and-ledger/dependencies/non-integer/README.md b/eras/shelley/chain-and-ledger/dependencies/non-integer/README.md deleted file mode 100644 index 5fb74184eb2..00000000000 --- a/eras/shelley/chain-and-ledger/dependencies/non-integer/README.md +++ /dev/null @@ -1 +0,0 @@ -# non-integer diff --git a/eras/shelley/chain-and-ledger/dependencies/non-integer/Setup.hs b/eras/shelley/chain-and-ledger/dependencies/non-integer/Setup.hs deleted file mode 100644 index e8ef27dbba9..00000000000 --- a/eras/shelley/chain-and-ledger/dependencies/non-integer/Setup.hs +++ /dev/null @@ -1,3 +0,0 @@ -import Distribution.Simple - -main = defaultMain diff --git a/eras/shelley/chain-and-ledger/dependencies/non-integer/doc b/eras/shelley/chain-and-ledger/dependencies/non-integer/doc deleted file mode 120000 index 0b553a9f1f0..00000000000 --- a/eras/shelley/chain-and-ledger/dependencies/non-integer/doc +++ /dev/null @@ -1 +0,0 @@ -../../../../../docs/non-integer-calculations \ No newline at end of file diff --git a/eras/shelley/chain-and-ledger/dependencies/non-integer/shelley-spec-non-integral.cabal b/eras/shelley/chain-and-ledger/dependencies/non-integer/shelley-spec-non-integral.cabal deleted file mode 100644 index f294db24e4b..00000000000 --- a/eras/shelley/chain-and-ledger/dependencies/non-integer/shelley-spec-non-integral.cabal +++ /dev/null @@ -1,25 +0,0 @@ -cabal-version: 2.2 - -name: shelley-spec-non-integral -version: 0.1.0.0 -license: Apache-2.0 -author: IOHK Formal Methods Team -maintainer: formal.methods@iohk.io -description: Implementation decision for non-integer calculations -build-type: Simple - -extra-source-files: - README.md - ChangeLog.md - -source-repository head - type: git - location: https://github.com/input-output-hk/cardano-ledger-specs.git - subdir: libs/non-integral - -library - default-language: Haskell2010 - hs-source-dirs: src - build-depends: base, non-integral - exposed-modules: - Shelley.Spec.NonIntegral diff --git a/eras/shelley/chain-and-ledger/dependencies/non-integer/src/Shelley/Spec/NonIntegral.hs b/eras/shelley/chain-and-ledger/dependencies/non-integer/src/Shelley/Spec/NonIntegral.hs deleted file mode 100644 index 06250ae8264..00000000000 --- a/eras/shelley/chain-and-ledger/dependencies/non-integer/src/Shelley/Spec/NonIntegral.hs +++ /dev/null @@ -1,6 +0,0 @@ -module Shelley.Spec.NonIntegral - {-# DEPRECATED "Use 'import Cardano.Ledger.NonIntegral' instead." #-} - (module X) -where - -import Cardano.Ledger.NonIntegral as X diff --git a/eras/shelley/chain-and-ledger/executable-spec/Setup.hs b/eras/shelley/chain-and-ledger/executable-spec/Setup.hs deleted file mode 100644 index e8ef27dbba9..00000000000 --- a/eras/shelley/chain-and-ledger/executable-spec/Setup.hs +++ /dev/null @@ -1,3 +0,0 @@ -import Distribution.Simple - -main = defaultMain diff --git a/eras/shelley/chain-and-ledger/executable-spec/shelley-spec-ledger.cabal b/eras/shelley/chain-and-ledger/executable-spec/shelley-spec-ledger.cabal deleted file mode 100644 index 45e929c983e..00000000000 --- a/eras/shelley/chain-and-ledger/executable-spec/shelley-spec-ledger.cabal +++ /dev/null @@ -1,101 +0,0 @@ -cabal-version: 2.2 - -name: shelley-spec-ledger -version: 0.1.0.0 -description: Shelley Ledger Executable Model -license: Apache-2.0 -author: IOHK Formal Methods Team -maintainer: formal.methods@iohk.io -build-type: Simple - -source-repository head - type: git - location: https://github.com/input-output-hk/cardano-ledger-specs.git - subdir: hs - -common base - build-depends: base >= 4.12 && < 4.15 - -common project-config - default-language: Haskell2010 - - ghc-options: -Wall - -Wcompat - -Wincomplete-record-updates - -Wincomplete-uni-patterns - -Wredundant-constraints - -Wpartial-fields - -Wunused-packages - -library - import: base, project-config - reexported-modules: - Cardano.Ledger.Shelley, - Cardano.Ledger.Shelley.Constraints - exposed-modules: - Shelley.Spec.Ledger.Address - Shelley.Spec.Ledger.Address.Bootstrap - Shelley.Spec.Ledger.API - Shelley.Spec.Ledger.API.ByronTranslation - Shelley.Spec.Ledger.API.Genesis - Shelley.Spec.Ledger.API.Protocol - Shelley.Spec.Ledger.API.Validation - Shelley.Spec.Ledger.API.Wallet - Shelley.Spec.Ledger.API.Mempool - Shelley.Spec.Ledger.BaseTypes - Shelley.Spec.Ledger.BlockChain - Shelley.Spec.Ledger.CompactAddr - Shelley.Spec.Ledger.Credential - Shelley.Spec.Ledger.Delegation.Certificates - Shelley.Spec.Ledger.Delegation.PoolParams - Shelley.Spec.Ledger.EpochBoundary - Shelley.Spec.Ledger.Genesis - Shelley.Spec.Ledger.HardForks - Shelley.Spec.Ledger.Keys - Shelley.Spec.Ledger.LedgerState - Shelley.Spec.Ledger.Metadata - Shelley.Spec.Ledger.OCert - Shelley.Spec.Ledger.Orphans - Shelley.Spec.Ledger.OverlaySchedule - Shelley.Spec.Ledger.PParams - Shelley.Spec.Ledger.Rewards - Shelley.Spec.Ledger.RewardProvenance - Shelley.Spec.Ledger.RewardUpdate - Shelley.Spec.Ledger.Scripts - Shelley.Spec.Ledger.Slot - Shelley.Spec.Ledger.SoftForks - Shelley.Spec.Ledger.StabilityWindow - Shelley.Spec.Ledger.STS.Bbody - Shelley.Spec.Ledger.STS.Chain - Shelley.Spec.Ledger.STS.Deleg - Shelley.Spec.Ledger.STS.Delegs - Shelley.Spec.Ledger.STS.Delpl - Shelley.Spec.Ledger.STS.Epoch - Shelley.Spec.Ledger.STS.EraMapping - Shelley.Spec.Ledger.STS.Ledger - Shelley.Spec.Ledger.STS.Ledgers - Shelley.Spec.Ledger.STS.Mir - Shelley.Spec.Ledger.STS.NewEpoch - Shelley.Spec.Ledger.STS.Newpp - Shelley.Spec.Ledger.STS.Ocert - Shelley.Spec.Ledger.STS.Overlay - Shelley.Spec.Ledger.STS.Pool - Shelley.Spec.Ledger.STS.PoolReap - Shelley.Spec.Ledger.STS.Ppup - Shelley.Spec.Ledger.STS.Prtcl - Shelley.Spec.Ledger.STS.Rupd - Shelley.Spec.Ledger.STS.Snap - Shelley.Spec.Ledger.STS.Tick - Shelley.Spec.Ledger.STS.Tickn - Shelley.Spec.Ledger.STS.Updn - Shelley.Spec.Ledger.STS.Upec - Shelley.Spec.Ledger.STS.Utxo - Shelley.Spec.Ledger.STS.Utxow - Shelley.Spec.Ledger.Tx - Shelley.Spec.Ledger.TxBody - Shelley.Spec.Ledger.UTxO - hs-source-dirs: src - build-depends: - cardano-ledger-core, - cardano-ledger-shelley, - cardano-protocol-tpraos diff --git a/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/API.hs b/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/API.hs deleted file mode 100644 index 6dc443072f8..00000000000 --- a/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/API.hs +++ /dev/null @@ -1,6 +0,0 @@ -module Shelley.Spec.Ledger.API - {-# DEPRECATED "Use 'import Cardano.Ledger.Shelley.API' instead." #-} - (module X) -where - -import Cardano.Ledger.Shelley.API as X diff --git a/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/API/ByronTranslation.hs b/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/API/ByronTranslation.hs deleted file mode 100644 index 1c5580ae7bc..00000000000 --- a/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/API/ByronTranslation.hs +++ /dev/null @@ -1,6 +0,0 @@ -module Shelley.Spec.Ledger.API.ByronTranslation - {-# DEPRECATED "Use 'import Cardano.Ledger.Shelley.API.ByronTranslation' instead." #-} - (module X) -where - -import Cardano.Ledger.Shelley.API.ByronTranslation as X diff --git a/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/API/Genesis.hs b/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/API/Genesis.hs deleted file mode 100644 index b0bb8b11ad0..00000000000 --- a/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/API/Genesis.hs +++ /dev/null @@ -1,6 +0,0 @@ -module Shelley.Spec.Ledger.API.Genesis - {-# DEPRECATED "Use 'import Cardano.Ledger.Shelley.API.Genesis' instead." #-} - (module X) -where - -import Cardano.Ledger.Shelley.API.Genesis as X diff --git a/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/API/Mempool.hs b/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/API/Mempool.hs deleted file mode 100644 index 26b43a5ebce..00000000000 --- a/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/API/Mempool.hs +++ /dev/null @@ -1,6 +0,0 @@ -module Shelley.Spec.Ledger.API.Mempool - {-# DEPRECATED "Use 'import Cardano.Ledger.Shelley.API.Mempool' instead." #-} - (module X) -where - -import Cardano.Ledger.Shelley.API.Mempool as X diff --git a/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/API/Protocol.hs b/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/API/Protocol.hs deleted file mode 100644 index de31f1f9885..00000000000 --- a/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/API/Protocol.hs +++ /dev/null @@ -1,6 +0,0 @@ -module Shelley.Spec.Ledger.API.Protocol - {-# DEPRECATED "Use 'import Cardano.Ledger.Shelley.API.Protocol' instead." #-} - (module X) -where - -import Cardano.Ledger.Shelley.API.Protocol as X diff --git a/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/API/Types.hs b/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/API/Types.hs deleted file mode 100644 index f9f11682431..00000000000 --- a/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/API/Types.hs +++ /dev/null @@ -1,6 +0,0 @@ -module Shelley.Spec.Ledger.API.Types - {-# DEPRECATED "Use 'import Cardano.Ledger.Shelley.API.Types' instead." #-} - (module X) -where - -import Cardano.Ledger.Shelley.API.Types as X diff --git a/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/API/Validation.hs b/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/API/Validation.hs deleted file mode 100644 index 6413775045d..00000000000 --- a/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/API/Validation.hs +++ /dev/null @@ -1,6 +0,0 @@ -module Shelley.Spec.Ledger.API.Validation - {-# DEPRECATED "Use 'import Cardano.Ledger.Shelley.API.Validation' instead." #-} - (module X) -where - -import Cardano.Ledger.Shelley.API.Validation as X diff --git a/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/API/Wallet.hs b/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/API/Wallet.hs deleted file mode 100644 index ab5782c0e6a..00000000000 --- a/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/API/Wallet.hs +++ /dev/null @@ -1,6 +0,0 @@ -module Shelley.Spec.Ledger.API.Wallet - {-# DEPRECATED "Use 'import Cardano.Ledger.Shelley.API.Wallet' instead." #-} - (module X) -where - -import Cardano.Ledger.Shelley.API.Wallet as X diff --git a/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/Address.hs b/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/Address.hs deleted file mode 100644 index eeb0634ec8c..00000000000 --- a/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/Address.hs +++ /dev/null @@ -1,6 +0,0 @@ -module Shelley.Spec.Ledger.Address - {-# DEPRECATED "Use 'import Cardano.Ledger.Address' instead." #-} - (module X) -where - -import Cardano.Ledger.Address as X diff --git a/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/Address/Bootstrap.hs b/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/Address/Bootstrap.hs deleted file mode 100644 index 7060e134be3..00000000000 --- a/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/Address/Bootstrap.hs +++ /dev/null @@ -1,6 +0,0 @@ -module Shelley.Spec.Ledger.Address.Bootstrap - {-# DEPRECATED "Use 'import Cardano.Ledger.Shelley.Address.Bootstrap' instead." #-} - (module X) -where - -import Cardano.Ledger.Shelley.Address.Bootstrap as X diff --git a/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/BaseTypes.hs b/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/BaseTypes.hs deleted file mode 100644 index 7f078baf310..00000000000 --- a/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/BaseTypes.hs +++ /dev/null @@ -1,6 +0,0 @@ -module Shelley.Spec.Ledger.BaseTypes - {-# DEPRECATED "Use 'import Cardano.Ledger.BaseTypes' instead." #-} - (module X) -where - -import Cardano.Ledger.BaseTypes as X diff --git a/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/BlockChain.hs b/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/BlockChain.hs deleted file mode 100644 index 5eb345c9e03..00000000000 --- a/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/BlockChain.hs +++ /dev/null @@ -1,6 +0,0 @@ -module Shelley.Spec.Ledger.BlockChain - {-# DEPRECATED "Use 'import Cardano.Ledger.Shelley.BlockChain' instead." #-} - (module X) -where - -import Cardano.Ledger.Shelley.BlockChain as X diff --git a/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/CompactAddr.hs b/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/CompactAddr.hs deleted file mode 100644 index f7e4663df39..00000000000 --- a/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/CompactAddr.hs +++ /dev/null @@ -1,6 +0,0 @@ -module Shelley.Spec.Ledger.CompactAddr - {-# DEPRECATED "Use 'import Cardano.Ledger.Shelley.CompactAddr' instead." #-} - (module X) -where - -import Cardano.Ledger.Shelley.CompactAddr as X diff --git a/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/Credential.hs b/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/Credential.hs deleted file mode 100644 index 5452c623602..00000000000 --- a/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/Credential.hs +++ /dev/null @@ -1,6 +0,0 @@ -module Shelley.Spec.Ledger.Credential - {-# DEPRECATED "Use 'import Cardano.Ledger.Credential' instead." #-} - (module X) -where - -import Cardano.Ledger.Credential as X diff --git a/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/Delegation/Certificates.hs b/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/Delegation/Certificates.hs deleted file mode 100644 index 4d77992f0f9..00000000000 --- a/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/Delegation/Certificates.hs +++ /dev/null @@ -1,6 +0,0 @@ -module Shelley.Spec.Ledger.Delegation.Certificates - {-# DEPRECATED "Use 'import Cardano.Ledger.Shelley.Delegation.Certificates' instead." #-} - (module X) -where - -import Cardano.Ledger.Shelley.Delegation.Certificates as X diff --git a/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/Delegation/PoolParams.hs b/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/Delegation/PoolParams.hs deleted file mode 100644 index ad0dc953ce3..00000000000 --- a/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/Delegation/PoolParams.hs +++ /dev/null @@ -1,6 +0,0 @@ -module Shelley.Spec.Ledger.Delegation.PoolParams - {-# DEPRECATED "Use 'import Cardano.Ledger.Shelley.Delegation.PoolParams' instead." #-} - (module X) -where - -import Cardano.Ledger.Shelley.Delegation.PoolParams as X diff --git a/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/EpochBoundary.hs b/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/EpochBoundary.hs deleted file mode 100644 index 70977ef0bc2..00000000000 --- a/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/EpochBoundary.hs +++ /dev/null @@ -1,6 +0,0 @@ -module Shelley.Spec.Ledger.EpochBoundary - {-# DEPRECATED "Use 'import Cardano.Ledger.Shelley.EpochBoundary' instead." #-} - (module X) -where - -import Cardano.Ledger.Shelley.EpochBoundary as X diff --git a/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/Genesis.hs b/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/Genesis.hs deleted file mode 100644 index 960433024eb..00000000000 --- a/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/Genesis.hs +++ /dev/null @@ -1,6 +0,0 @@ -module Shelley.Spec.Ledger.Genesis - {-# DEPRECATED "Use 'import Cardano.Ledger.Shelley.Genesis' instead." #-} - (module X) -where - -import Cardano.Ledger.Shelley.Genesis as X diff --git a/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/HardForks.hs b/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/HardForks.hs deleted file mode 100644 index 877f23975f5..00000000000 --- a/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/HardForks.hs +++ /dev/null @@ -1,6 +0,0 @@ -module Shelley.Spec.Ledger.HardForks - {-# DEPRECATED "Use 'import Cardano.Ledger.Shelley.HardForks' instead." #-} - (module X) -where - -import Cardano.Ledger.Shelley.HardForks as X diff --git a/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/Keys.hs b/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/Keys.hs deleted file mode 100644 index a5d9f54fb96..00000000000 --- a/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/Keys.hs +++ /dev/null @@ -1,6 +0,0 @@ -module Shelley.Spec.Ledger.Keys - {-# DEPRECATED "Use 'import Cardano.Ledger.Keys' instead." #-} - (module X) -where - -import Cardano.Ledger.Keys as X diff --git a/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/LedgerState.hs b/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/LedgerState.hs deleted file mode 100644 index 3c9c69aa42f..00000000000 --- a/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/LedgerState.hs +++ /dev/null @@ -1,6 +0,0 @@ -module Shelley.Spec.Ledger.LedgerState - {-# DEPRECATED "Use 'import Cardano.Ledger.Shelley.LedgerState' instead." #-} - (module X) -where - -import Cardano.Ledger.Shelley.LedgerState as X diff --git a/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/Metadata.hs b/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/Metadata.hs deleted file mode 100644 index bcfaa76d85b..00000000000 --- a/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/Metadata.hs +++ /dev/null @@ -1,6 +0,0 @@ -module Shelley.Spec.Ledger.Metadata - {-# DEPRECATED "Use 'import Cardano.Ledger.Shelley.Metadata' instead." #-} - (module X) -where - -import Cardano.Ledger.Shelley.Metadata as X diff --git a/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/OCert.hs b/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/OCert.hs deleted file mode 100644 index 5f52bab5365..00000000000 --- a/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/OCert.hs +++ /dev/null @@ -1,6 +0,0 @@ -module Shelley.Spec.Ledger.OCert - {-# DEPRECATED "Use 'import Cardano.Protocol.TPraos.OCert' instead." #-} - (module X) -where - -import Cardano.Protocol.TPraos.OCert as X diff --git a/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/Orphans.hs b/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/Orphans.hs deleted file mode 100644 index a6e03d3cb08..00000000000 --- a/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/Orphans.hs +++ /dev/null @@ -1,6 +0,0 @@ -module Shelley.Spec.Ledger.Orphans - {-# DEPRECATED "Use 'import Cardano.Ledger.Shelley.Orphans' instead." #-} - () -where - -import Cardano.Ledger.Shelley.Orphans () diff --git a/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/OverlaySchedule.hs b/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/OverlaySchedule.hs deleted file mode 100644 index c22a1a09280..00000000000 --- a/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/OverlaySchedule.hs +++ /dev/null @@ -1,6 +0,0 @@ -module Shelley.Spec.Ledger.OverlaySchedule - {-# DEPRECATED "Use 'import Cardano.Protocol.TPraos.Rules.Overlay' instead." #-} - (module X) -where - -import Cardano.Protocol.TPraos.Rules.Overlay as X diff --git a/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/PParams.hs b/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/PParams.hs deleted file mode 100644 index ab35b29b87f..00000000000 --- a/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/PParams.hs +++ /dev/null @@ -1,6 +0,0 @@ -module Shelley.Spec.Ledger.PParams - {-# DEPRECATED "Use 'import Cardano.Ledger.Shelley.PParams' instead." #-} - (module X) -where - -import Cardano.Ledger.Shelley.PParams as X diff --git a/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/RewardProvenance.hs b/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/RewardProvenance.hs deleted file mode 100644 index db8dbe7b1a2..00000000000 --- a/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/RewardProvenance.hs +++ /dev/null @@ -1,6 +0,0 @@ -module Shelley.Spec.Ledger.RewardProvenance - {-# DEPRECATED "Use 'import Cardano.Ledger.Shelley.RewardProvenance' instead." #-} - (module X) -where - -import Cardano.Ledger.Shelley.RewardProvenance as X diff --git a/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/RewardUpdate.hs b/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/RewardUpdate.hs deleted file mode 100644 index 4ac097dc41b..00000000000 --- a/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/RewardUpdate.hs +++ /dev/null @@ -1,6 +0,0 @@ -module Shelley.Spec.Ledger.RewardUpdate - {-# DEPRECATED "Use 'import Cardano.Ledger.Shelley.RewardUpdate' instead." #-} - (module X) -where - -import Cardano.Ledger.Shelley.RewardUpdate as X diff --git a/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/Rewards.hs b/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/Rewards.hs deleted file mode 100644 index 4640f14d5de..00000000000 --- a/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/Rewards.hs +++ /dev/null @@ -1,6 +0,0 @@ -module Shelley.Spec.Ledger.Rewards - {-# DEPRECATED "Use 'import Cardano.Ledger.Shelley.Rewards' instead." #-} - (module X) -where - -import Cardano.Ledger.Shelley.Rewards as X diff --git a/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/STS/Bbody.hs b/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/STS/Bbody.hs deleted file mode 100644 index 30f9f21794d..00000000000 --- a/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/STS/Bbody.hs +++ /dev/null @@ -1,6 +0,0 @@ -module Shelley.Spec.Ledger.STS.Bbody - {-# DEPRECATED "Use 'import Cardano.Ledger.Shelley.Rules.Bbody' instead." #-} - (module X) -where - -import Cardano.Ledger.Shelley.Rules.Bbody as X diff --git a/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/STS/Chain.hs b/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/STS/Chain.hs deleted file mode 100644 index 85688a29351..00000000000 --- a/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/STS/Chain.hs +++ /dev/null @@ -1,7 +0,0 @@ -module Shelley.Spec.Ledger.STS.Chain - {-# DEPRECATED "Use 'import Test.Cardano.Ledger.Shelley.Rules.Chain' for the CHAIN rule, use 'import Cardano.Ledger.Chain' for chainChecks, and use 'import Cardano.Ledger.Shelley.API.Wallet' for AdaPots." #-} - (module X) -where - -import Cardano.Ledger.Chain as X -import Cardano.Ledger.Shelley.API.Wallet as X (AdaPots (..), totalAdaES, totalAdaPotsES) diff --git a/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/STS/Deleg.hs b/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/STS/Deleg.hs deleted file mode 100644 index 60f5b59d1da..00000000000 --- a/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/STS/Deleg.hs +++ /dev/null @@ -1,6 +0,0 @@ -module Shelley.Spec.Ledger.STS.Deleg - {-# DEPRECATED "Use 'import Cardano.Ledger.Shelley.Rules.Deleg' instead." #-} - (module X) -where - -import Cardano.Ledger.Shelley.Rules.Deleg as X diff --git a/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/STS/Delegs.hs b/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/STS/Delegs.hs deleted file mode 100644 index ef6623cef31..00000000000 --- a/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/STS/Delegs.hs +++ /dev/null @@ -1,6 +0,0 @@ -module Shelley.Spec.Ledger.STS.Delegs - {-# DEPRECATED "Use 'import Cardano.Ledger.Shelley.Rules.Delegs' instead." #-} - (module X) -where - -import Cardano.Ledger.Shelley.Rules.Delegs as X diff --git a/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/STS/Delpl.hs b/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/STS/Delpl.hs deleted file mode 100644 index 4a9fd71d7ca..00000000000 --- a/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/STS/Delpl.hs +++ /dev/null @@ -1,6 +0,0 @@ -module Shelley.Spec.Ledger.STS.Delpl - {-# DEPRECATED "Use 'import Cardano.Ledger.Shelley.Rules.Delpl' instead." #-} - (module X) -where - -import Cardano.Ledger.Shelley.Rules.Delpl as X diff --git a/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/STS/Epoch.hs b/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/STS/Epoch.hs deleted file mode 100644 index c186916bb4e..00000000000 --- a/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/STS/Epoch.hs +++ /dev/null @@ -1,6 +0,0 @@ -module Shelley.Spec.Ledger.STS.Epoch - {-# DEPRECATED "Use 'import Cardano.Ledger.Shelley.Rules.Epoch' instead." #-} - (module X) -where - -import Cardano.Ledger.Shelley.Rules.Epoch as X diff --git a/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/STS/EraMapping.hs b/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/STS/EraMapping.hs deleted file mode 100644 index 7dd65e9eac4..00000000000 --- a/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/STS/EraMapping.hs +++ /dev/null @@ -1,6 +0,0 @@ -module Shelley.Spec.Ledger.STS.EraMapping - {-# DEPRECATED "Use 'import Cardano.Ledger.Shelley.Rules.EraMapping' instead." #-} - () -where - -import Cardano.Ledger.Shelley.Rules.EraMapping () diff --git a/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/STS/Ledger.hs b/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/STS/Ledger.hs deleted file mode 100644 index aececd336fc..00000000000 --- a/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/STS/Ledger.hs +++ /dev/null @@ -1,6 +0,0 @@ -module Shelley.Spec.Ledger.STS.Ledger - {-# DEPRECATED "Use 'import Cardano.Ledger.Shelley.Rules.Ledger' instead." #-} - (module X) -where - -import Cardano.Ledger.Shelley.Rules.Ledger as X diff --git a/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/STS/Ledgers.hs b/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/STS/Ledgers.hs deleted file mode 100644 index 5c1619480d6..00000000000 --- a/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/STS/Ledgers.hs +++ /dev/null @@ -1,6 +0,0 @@ -module Shelley.Spec.Ledger.STS.Ledgers - {-# DEPRECATED "Use 'import Cardano.Ledger.Shelley.Rules.Ledgers' instead." #-} - (module X) -where - -import Cardano.Ledger.Shelley.Rules.Ledgers as X diff --git a/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/STS/Mir.hs b/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/STS/Mir.hs deleted file mode 100644 index caa881e6307..00000000000 --- a/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/STS/Mir.hs +++ /dev/null @@ -1,6 +0,0 @@ -module Shelley.Spec.Ledger.STS.Mir - {-# DEPRECATED "Use 'import Cardano.Ledger.Shelley.Rules.Mir' instead." #-} - (module X) -where - -import Cardano.Ledger.Shelley.Rules.Mir as X diff --git a/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/STS/NewEpoch.hs b/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/STS/NewEpoch.hs deleted file mode 100644 index 0cc210548c2..00000000000 --- a/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/STS/NewEpoch.hs +++ /dev/null @@ -1,6 +0,0 @@ -module Shelley.Spec.Ledger.STS.NewEpoch - {-# DEPRECATED "Use 'import Cardano.Ledger.Shelley.Rules.NewEpoch' instead." #-} - (module X) -where - -import Cardano.Ledger.Shelley.Rules.NewEpoch as X diff --git a/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/STS/Newpp.hs b/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/STS/Newpp.hs deleted file mode 100644 index e10b7a0e5fa..00000000000 --- a/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/STS/Newpp.hs +++ /dev/null @@ -1,6 +0,0 @@ -module Shelley.Spec.Ledger.STS.Newpp - {-# DEPRECATED "Use 'import Cardano.Ledger.Shelley.Rules.Newpp' instead." #-} - (module X) -where - -import Cardano.Ledger.Shelley.Rules.Newpp as X diff --git a/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/STS/Ocert.hs b/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/STS/Ocert.hs deleted file mode 100644 index 150655dd649..00000000000 --- a/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/STS/Ocert.hs +++ /dev/null @@ -1,6 +0,0 @@ -module Shelley.Spec.Ledger.STS.Ocert - {-# DEPRECATED "Use 'import Cardano.Protocol.TPraos.Rules.OCert' instead." #-} - (module X) -where - -import Cardano.Protocol.TPraos.Rules.OCert as X diff --git a/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/STS/Overlay.hs b/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/STS/Overlay.hs deleted file mode 100644 index 3258caa061e..00000000000 --- a/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/STS/Overlay.hs +++ /dev/null @@ -1,6 +0,0 @@ -module Shelley.Spec.Ledger.STS.Overlay - {-# DEPRECATED "Use 'import Cardano.Protocol.TPraos.Rules.Overlay' instead." #-} - (module X) -where - -import Cardano.Protocol.TPraos.Rules.Overlay as X diff --git a/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/STS/Pool.hs b/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/STS/Pool.hs deleted file mode 100644 index 96d128f046c..00000000000 --- a/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/STS/Pool.hs +++ /dev/null @@ -1,6 +0,0 @@ -module Shelley.Spec.Ledger.STS.Pool - {-# DEPRECATED "Use 'import Cardano.Ledger.Shelley.Rules.Pool' instead." #-} - (module X) -where - -import Cardano.Ledger.Shelley.Rules.Pool as X diff --git a/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/STS/PoolReap.hs b/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/STS/PoolReap.hs deleted file mode 100644 index 379723a4da3..00000000000 --- a/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/STS/PoolReap.hs +++ /dev/null @@ -1,6 +0,0 @@ -module Shelley.Spec.Ledger.STS.PoolReap - {-# DEPRECATED "Use 'import Cardano.Ledger.Shelley.Rules.PoolReap' instead." #-} - (module X) -where - -import Cardano.Ledger.Shelley.Rules.PoolReap as X diff --git a/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/STS/Ppup.hs b/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/STS/Ppup.hs deleted file mode 100644 index 6739e406644..00000000000 --- a/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/STS/Ppup.hs +++ /dev/null @@ -1,6 +0,0 @@ -module Shelley.Spec.Ledger.STS.Ppup - {-# DEPRECATED "Use 'import Cardano.Ledger.Shelley.Rules.Ppup' instead." #-} - (module X) -where - -import Cardano.Ledger.Shelley.Rules.Ppup as X diff --git a/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/STS/Prtcl.hs b/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/STS/Prtcl.hs deleted file mode 100644 index c0493b087f6..00000000000 --- a/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/STS/Prtcl.hs +++ /dev/null @@ -1,6 +0,0 @@ -module Shelley.Spec.Ledger.STS.Prtcl - {-# DEPRECATED "Use 'import Cardano.Protocol.TPraos.Rules.Prtcl' instead." #-} - (module X) -where - -import Cardano.Protocol.TPraos.Rules.Prtcl as X diff --git a/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/STS/Rupd.hs b/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/STS/Rupd.hs deleted file mode 100644 index bb021034344..00000000000 --- a/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/STS/Rupd.hs +++ /dev/null @@ -1,6 +0,0 @@ -module Shelley.Spec.Ledger.STS.Rupd - {-# DEPRECATED "Use 'import Cardano.Ledger.Shelley.Rules.Rupd' instead." #-} - (module X) -where - -import Cardano.Ledger.Shelley.Rules.Rupd as X diff --git a/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/STS/Snap.hs b/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/STS/Snap.hs deleted file mode 100644 index a3caa4a7d20..00000000000 --- a/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/STS/Snap.hs +++ /dev/null @@ -1,6 +0,0 @@ -module Shelley.Spec.Ledger.STS.Snap - {-# DEPRECATED "Use 'import Cardano.Ledger.Shelley.Rules.Snap' instead." #-} - (module X) -where - -import Cardano.Ledger.Shelley.Rules.Snap as X diff --git a/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/STS/Tick.hs b/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/STS/Tick.hs deleted file mode 100644 index efd9f698db4..00000000000 --- a/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/STS/Tick.hs +++ /dev/null @@ -1,6 +0,0 @@ -module Shelley.Spec.Ledger.STS.Tick - {-# DEPRECATED "Use 'import Cardano.Ledger.Shelley.Rules.Tick' instead." #-} - (module X) -where - -import Cardano.Ledger.Shelley.Rules.Tick as X diff --git a/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/STS/Tickn.hs b/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/STS/Tickn.hs deleted file mode 100644 index 96a69aa2602..00000000000 --- a/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/STS/Tickn.hs +++ /dev/null @@ -1,6 +0,0 @@ -module Shelley.Spec.Ledger.STS.Tickn - {-# DEPRECATED "Use 'import Cardano.Protocol.TPraos.Rules.Tickn' instead." #-} - (module X) -where - -import Cardano.Protocol.TPraos.Rules.Tickn as X diff --git a/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/STS/Updn.hs b/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/STS/Updn.hs deleted file mode 100644 index 5543d95604a..00000000000 --- a/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/STS/Updn.hs +++ /dev/null @@ -1,6 +0,0 @@ -module Shelley.Spec.Ledger.STS.Updn - {-# DEPRECATED "Use 'import Cardano.Ledger.Shelley.Rules.Updn' instead." #-} - (module X) -where - -import Cardano.Ledger.Shelley.Rules.Updn as X diff --git a/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/STS/Upec.hs b/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/STS/Upec.hs deleted file mode 100644 index aa1351477f3..00000000000 --- a/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/STS/Upec.hs +++ /dev/null @@ -1,6 +0,0 @@ -module Shelley.Spec.Ledger.STS.Upec - {-# DEPRECATED "Use 'import Cardano.Ledger.Shelley.Rules.Upec' instead." #-} - (module X) -where - -import Cardano.Ledger.Shelley.Rules.Upec as X diff --git a/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/STS/Utxo.hs b/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/STS/Utxo.hs deleted file mode 100644 index 465aec08d32..00000000000 --- a/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/STS/Utxo.hs +++ /dev/null @@ -1,6 +0,0 @@ -module Shelley.Spec.Ledger.STS.Utxo - {-# DEPRECATED "Use 'import Cardano.Ledger.Shelley.Rules.Utxo' instead." #-} - (module X) -where - -import Cardano.Ledger.Shelley.Rules.Utxo as X diff --git a/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/STS/Utxow.hs b/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/STS/Utxow.hs deleted file mode 100644 index 8d8c701a51d..00000000000 --- a/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/STS/Utxow.hs +++ /dev/null @@ -1,6 +0,0 @@ -module Shelley.Spec.Ledger.STS.Utxow - {-# DEPRECATED "Use 'import Cardano.Ledger.Shelley.Rules.Utxow' instead." #-} - (module X) -where - -import Cardano.Ledger.Shelley.Rules.Utxow as X diff --git a/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/Scripts.hs b/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/Scripts.hs deleted file mode 100644 index 4c07ca80084..00000000000 --- a/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/Scripts.hs +++ /dev/null @@ -1,6 +0,0 @@ -module Shelley.Spec.Ledger.Scripts - {-# DEPRECATED "Use 'import Cardano.Ledger.Shelley.Scripts' instead." #-} - (module X) -where - -import Cardano.Ledger.Shelley.Scripts as X diff --git a/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/Serialization.hs b/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/Serialization.hs deleted file mode 100644 index 1356223a5ca..00000000000 --- a/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/Serialization.hs +++ /dev/null @@ -1,6 +0,0 @@ -module Shelley.Spec.Ledger.Serialization - {-# DEPRECATED "Use 'import Cardano.Ledger.Serialization' instead." #-} - (module X) -where - -import Cardano.Ledger.Serialization as X diff --git a/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/Slot.hs b/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/Slot.hs deleted file mode 100644 index 3c391c6206d..00000000000 --- a/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/Slot.hs +++ /dev/null @@ -1,6 +0,0 @@ -module Shelley.Spec.Ledger.Slot - {-# DEPRECATED "Use 'import Cardano.Ledger.Slot' instead." #-} - (module X) -where - -import Cardano.Ledger.Slot as X diff --git a/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/SoftForks.hs b/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/SoftForks.hs deleted file mode 100644 index c24825aa581..00000000000 --- a/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/SoftForks.hs +++ /dev/null @@ -1,6 +0,0 @@ -module Shelley.Spec.Ledger.SoftForks - {-# DEPRECATED "Use 'import Cardano.Ledger.Shelley.SoftForks' instead." #-} - (module X) -where - -import Cardano.Ledger.Shelley.SoftForks as X diff --git a/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/StabilityWindow.hs b/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/StabilityWindow.hs deleted file mode 100644 index e2242a60999..00000000000 --- a/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/StabilityWindow.hs +++ /dev/null @@ -1,6 +0,0 @@ -module Shelley.Spec.Ledger.StabilityWindow - {-# DEPRECATED "Use 'import Cardano.Ledger.Shelley.StabilityWindow' instead." #-} - (module X) -where - -import Cardano.Ledger.Shelley.StabilityWindow as X diff --git a/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/Tx.hs b/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/Tx.hs deleted file mode 100644 index de0fbe4ec77..00000000000 --- a/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/Tx.hs +++ /dev/null @@ -1,6 +0,0 @@ -module Shelley.Spec.Ledger.Tx - {-# DEPRECATED "Use 'import Cardano.Ledger.Shelley.Tx' instead." #-} - (module X) -where - -import Cardano.Ledger.Shelley.Tx as X diff --git a/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/TxBody.hs b/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/TxBody.hs deleted file mode 100644 index d5649a32097..00000000000 --- a/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/TxBody.hs +++ /dev/null @@ -1,6 +0,0 @@ -module Shelley.Spec.Ledger.TxBody - {-# DEPRECATED "Use 'import Cardano.Ledger.Shelley.TxBody' instead." #-} - (module X) -where - -import Cardano.Ledger.Shelley.TxBody as X diff --git a/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/UTxO.hs b/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/UTxO.hs deleted file mode 100644 index f3297f730aa..00000000000 --- a/eras/shelley/chain-and-ledger/executable-spec/src/Shelley/Spec/Ledger/UTxO.hs +++ /dev/null @@ -1,6 +0,0 @@ -module Shelley.Spec.Ledger.UTxO - {-# DEPRECATED "Use 'import Cardano.Ledger.Shelley.UTxO' instead." #-} - (module X) -where - -import Cardano.Ledger.Shelley.UTxO as X diff --git a/eras/shelley/chain-and-ledger/shelley-spec-ledger-test/Setup.hs b/eras/shelley/chain-and-ledger/shelley-spec-ledger-test/Setup.hs deleted file mode 100644 index e8ef27dbba9..00000000000 --- a/eras/shelley/chain-and-ledger/shelley-spec-ledger-test/Setup.hs +++ /dev/null @@ -1,3 +0,0 @@ -import Distribution.Simple - -main = defaultMain diff --git a/eras/shelley/chain-and-ledger/shelley-spec-ledger-test/shelley-spec-ledger-test.cabal b/eras/shelley/chain-and-ledger/shelley-spec-ledger-test/shelley-spec-ledger-test.cabal deleted file mode 100644 index 9d18a089e94..00000000000 --- a/eras/shelley/chain-and-ledger/shelley-spec-ledger-test/shelley-spec-ledger-test.cabal +++ /dev/null @@ -1,65 +0,0 @@ -cabal-version: 2.2 - -name: shelley-spec-ledger-test -version: 0.1.0.0 -description: Test helpers from shelley-spec-ledger exposed to other packages -license: Apache-2.0 -author: IOHK Formal Methods Team -maintainer: formal.methods@iohk.io -build-type: Simple - -source-repository head - type: git - location: https://github.com/input-output-hk/cardano-ledger-specs.git - -common base - build-depends: base >= 4.12 && < 4.15 - -common project-config - default-language: Haskell2010 - - ghc-options: -Wall - -Wcompat - -Wincomplete-record-updates - -Wincomplete-uni-patterns - -Wredundant-constraints - -Wunused-packages - -library - import: base, project-config - hs-source-dirs: src - reexported-modules: - Test.Cardano.Crypto.VRF.Fake - exposed-modules: - Test.Shelley.Spec.Ledger.BenchmarkFunctions - Test.Shelley.Spec.Ledger.ConcreteCryptoTypes - Test.Shelley.Spec.Ledger.Examples.Cast - Test.Shelley.Spec.Ledger.Examples.Consensus - Test.Shelley.Spec.Ledger.Generator.Block - Test.Shelley.Spec.Ledger.Generator.Constants - Test.Shelley.Spec.Ledger.Generator.Core - Test.Shelley.Spec.Ledger.Generator.Delegation - Test.Shelley.Spec.Ledger.Generator.Metadata - Test.Shelley.Spec.Ledger.Generator.Presets - Test.Shelley.Spec.Ledger.Generator.Trace.Chain - Test.Shelley.Spec.Ledger.Generator.Trace.DCert - Test.Shelley.Spec.Ledger.Generator.Trace.Ledger - Test.Shelley.Spec.Ledger.Generator.Update - Test.Shelley.Spec.Ledger.Generator.Utxo - Test.Shelley.Spec.Ledger.Generator.EraGen - Test.Shelley.Spec.Ledger.Generator.ScriptClass - Test.Shelley.Spec.Ledger.Generator.ShelleyEraGen - Test.Shelley.Spec.Ledger.Orphans - Test.Shelley.Spec.Ledger.Rules.ClassifyTraces - Test.Shelley.Spec.Ledger.Rules.TestChain - Test.Shelley.Spec.Ledger.Serialisation.CDDLUtils - Test.Shelley.Spec.Ledger.Serialisation.Generators - Test.Shelley.Spec.Ledger.Serialisation.EraIndepGenerators - Test.Shelley.Spec.Ledger.Serialisation.Generators.Bootstrap - Test.Shelley.Spec.Ledger.Serialisation.Generators.Genesis - Test.Shelley.Spec.Ledger.Serialisation.GoldenUtils - Test.Shelley.Spec.Ledger.Shrinkers - Test.Shelley.Spec.Ledger.Utils - Test.Shelley.Spec.Ledger.PropertyTests - build-depends: - cardano-ledger-shelley-test \ No newline at end of file diff --git a/eras/shelley/chain-and-ledger/shelley-spec-ledger-test/src/Test/Shelley/Spec/Ledger/BenchmarkFunctions.hs b/eras/shelley/chain-and-ledger/shelley-spec-ledger-test/src/Test/Shelley/Spec/Ledger/BenchmarkFunctions.hs deleted file mode 100644 index 9fe3b99218f..00000000000 --- a/eras/shelley/chain-and-ledger/shelley-spec-ledger-test/src/Test/Shelley/Spec/Ledger/BenchmarkFunctions.hs +++ /dev/null @@ -1,6 +0,0 @@ -module Test.Shelley.Spec.Ledger.BenchmarkFunctions - {-# DEPRECATED "Use 'import Test.Cardano.Ledger.Shelley.BenchmarkFunctions' instead." #-} - (module X) -where - -import Test.Cardano.Ledger.Shelley.BenchmarkFunctions as X diff --git a/eras/shelley/chain-and-ledger/shelley-spec-ledger-test/src/Test/Shelley/Spec/Ledger/ConcreteCryptoTypes.hs b/eras/shelley/chain-and-ledger/shelley-spec-ledger-test/src/Test/Shelley/Spec/Ledger/ConcreteCryptoTypes.hs deleted file mode 100644 index f930a552fde..00000000000 --- a/eras/shelley/chain-and-ledger/shelley-spec-ledger-test/src/Test/Shelley/Spec/Ledger/ConcreteCryptoTypes.hs +++ /dev/null @@ -1,6 +0,0 @@ -module Test.Shelley.Spec.Ledger.ConcreteCryptoTypes - {-# DEPRECATED "Use 'import Test.Cardano.Ledger.Shelley.ConcreteCryptoTypes' instead." #-} - (module X) -where - -import Test.Cardano.Ledger.Shelley.ConcreteCryptoTypes as X diff --git a/eras/shelley/chain-and-ledger/shelley-spec-ledger-test/src/Test/Shelley/Spec/Ledger/Examples/Cast.hs b/eras/shelley/chain-and-ledger/shelley-spec-ledger-test/src/Test/Shelley/Spec/Ledger/Examples/Cast.hs deleted file mode 100644 index 877be663c23..00000000000 --- a/eras/shelley/chain-and-ledger/shelley-spec-ledger-test/src/Test/Shelley/Spec/Ledger/Examples/Cast.hs +++ /dev/null @@ -1,6 +0,0 @@ -module Test.Shelley.Spec.Ledger.Examples.Cast - {-# DEPRECATED "Use 'import Test.Cardano.Ledger.Shelley.Examples.Cast' instead." #-} - (module X) -where - -import Test.Cardano.Ledger.Shelley.Examples.Cast as X diff --git a/eras/shelley/chain-and-ledger/shelley-spec-ledger-test/src/Test/Shelley/Spec/Ledger/Examples/Consensus.hs b/eras/shelley/chain-and-ledger/shelley-spec-ledger-test/src/Test/Shelley/Spec/Ledger/Examples/Consensus.hs deleted file mode 100644 index d0358cde110..00000000000 --- a/eras/shelley/chain-and-ledger/shelley-spec-ledger-test/src/Test/Shelley/Spec/Ledger/Examples/Consensus.hs +++ /dev/null @@ -1,6 +0,0 @@ -module Test.Shelley.Spec.Ledger.Examples.Consensus - {-# DEPRECATED "Use 'import Test.Cardano.Ledger.Shelley.Examples.Consensus' instead." #-} - (module X) -where - -import Test.Cardano.Ledger.Shelley.Examples.Consensus as X diff --git a/eras/shelley/chain-and-ledger/shelley-spec-ledger-test/src/Test/Shelley/Spec/Ledger/Generator/Block.hs b/eras/shelley/chain-and-ledger/shelley-spec-ledger-test/src/Test/Shelley/Spec/Ledger/Generator/Block.hs deleted file mode 100644 index a4a76fe7b1f..00000000000 --- a/eras/shelley/chain-and-ledger/shelley-spec-ledger-test/src/Test/Shelley/Spec/Ledger/Generator/Block.hs +++ /dev/null @@ -1,6 +0,0 @@ -module Test.Shelley.Spec.Ledger.Generator.Block - {-# DEPRECATED "Use 'import Test.Cardano.Ledger.Shelley.Generator.Block' instead." #-} - (module X) -where - -import Test.Cardano.Ledger.Shelley.Generator.Block as X diff --git a/eras/shelley/chain-and-ledger/shelley-spec-ledger-test/src/Test/Shelley/Spec/Ledger/Generator/Constants.hs b/eras/shelley/chain-and-ledger/shelley-spec-ledger-test/src/Test/Shelley/Spec/Ledger/Generator/Constants.hs deleted file mode 100644 index a27930d25e5..00000000000 --- a/eras/shelley/chain-and-ledger/shelley-spec-ledger-test/src/Test/Shelley/Spec/Ledger/Generator/Constants.hs +++ /dev/null @@ -1,6 +0,0 @@ -module Test.Shelley.Spec.Ledger.Generator.Constants - {-# DEPRECATED "Use 'import Test.Cardano.Ledger.Shelley.Generator.Constants' instead." #-} - (module X) -where - -import Test.Cardano.Ledger.Shelley.Generator.Constants as X diff --git a/eras/shelley/chain-and-ledger/shelley-spec-ledger-test/src/Test/Shelley/Spec/Ledger/Generator/Core.hs b/eras/shelley/chain-and-ledger/shelley-spec-ledger-test/src/Test/Shelley/Spec/Ledger/Generator/Core.hs deleted file mode 100644 index 944196db9f5..00000000000 --- a/eras/shelley/chain-and-ledger/shelley-spec-ledger-test/src/Test/Shelley/Spec/Ledger/Generator/Core.hs +++ /dev/null @@ -1,6 +0,0 @@ -module Test.Shelley.Spec.Ledger.Generator.Core - {-# DEPRECATED "Use 'import Test.Cardano.Ledger.Shelley.Generator.Core' instead." #-} - (module X) -where - -import Test.Cardano.Ledger.Shelley.Generator.Core as X diff --git a/eras/shelley/chain-and-ledger/shelley-spec-ledger-test/src/Test/Shelley/Spec/Ledger/Generator/Delegation.hs b/eras/shelley/chain-and-ledger/shelley-spec-ledger-test/src/Test/Shelley/Spec/Ledger/Generator/Delegation.hs deleted file mode 100644 index 063aa40296c..00000000000 --- a/eras/shelley/chain-and-ledger/shelley-spec-ledger-test/src/Test/Shelley/Spec/Ledger/Generator/Delegation.hs +++ /dev/null @@ -1,6 +0,0 @@ -module Test.Shelley.Spec.Ledger.Generator.Delegation - {-# DEPRECATED "Use 'import Test.Cardano.Ledger.Shelley.Generator.Delegation' instead." #-} - (module X) -where - -import Test.Cardano.Ledger.Shelley.Generator.Delegation as X diff --git a/eras/shelley/chain-and-ledger/shelley-spec-ledger-test/src/Test/Shelley/Spec/Ledger/Generator/EraGen.hs b/eras/shelley/chain-and-ledger/shelley-spec-ledger-test/src/Test/Shelley/Spec/Ledger/Generator/EraGen.hs deleted file mode 100644 index c4512f7bce3..00000000000 --- a/eras/shelley/chain-and-ledger/shelley-spec-ledger-test/src/Test/Shelley/Spec/Ledger/Generator/EraGen.hs +++ /dev/null @@ -1,6 +0,0 @@ -module Test.Shelley.Spec.Ledger.Generator.EraGen - {-# DEPRECATED "Use 'import Test.Cardano.Ledger.Shelley.Generator.EraGen' instead." #-} - (module X) -where - -import Test.Cardano.Ledger.Shelley.Generator.EraGen as X diff --git a/eras/shelley/chain-and-ledger/shelley-spec-ledger-test/src/Test/Shelley/Spec/Ledger/Generator/Metadata.hs b/eras/shelley/chain-and-ledger/shelley-spec-ledger-test/src/Test/Shelley/Spec/Ledger/Generator/Metadata.hs deleted file mode 100644 index 8deff41e92e..00000000000 --- a/eras/shelley/chain-and-ledger/shelley-spec-ledger-test/src/Test/Shelley/Spec/Ledger/Generator/Metadata.hs +++ /dev/null @@ -1,6 +0,0 @@ -module Test.Shelley.Spec.Ledger.Generator.Metadata - {-# DEPRECATED "Use 'import Test.Cardano.Ledger.Shelley.Generator.Metadata' instead." #-} - (module X) -where - -import Test.Cardano.Ledger.Shelley.Generator.Metadata as X diff --git a/eras/shelley/chain-and-ledger/shelley-spec-ledger-test/src/Test/Shelley/Spec/Ledger/Generator/Presets.hs b/eras/shelley/chain-and-ledger/shelley-spec-ledger-test/src/Test/Shelley/Spec/Ledger/Generator/Presets.hs deleted file mode 100644 index 2a5db42a8f9..00000000000 --- a/eras/shelley/chain-and-ledger/shelley-spec-ledger-test/src/Test/Shelley/Spec/Ledger/Generator/Presets.hs +++ /dev/null @@ -1,6 +0,0 @@ -module Test.Shelley.Spec.Ledger.Generator.Presets - {-# DEPRECATED "Use 'import Test.Cardano.Ledger.Shelley.Generator.Presets' instead." #-} - (module X) -where - -import Test.Cardano.Ledger.Shelley.Generator.Presets as X diff --git a/eras/shelley/chain-and-ledger/shelley-spec-ledger-test/src/Test/Shelley/Spec/Ledger/Generator/ScriptClass.hs b/eras/shelley/chain-and-ledger/shelley-spec-ledger-test/src/Test/Shelley/Spec/Ledger/Generator/ScriptClass.hs deleted file mode 100644 index 8315c34e01d..00000000000 --- a/eras/shelley/chain-and-ledger/shelley-spec-ledger-test/src/Test/Shelley/Spec/Ledger/Generator/ScriptClass.hs +++ /dev/null @@ -1,6 +0,0 @@ -module Test.Shelley.Spec.Ledger.Generator.ScriptClass - {-# DEPRECATED "Use 'import Test.Cardano.Ledger.Shelley.Generator.ScriptClass' instead." #-} - (module X) -where - -import Test.Cardano.Ledger.Shelley.Generator.ScriptClass as X diff --git a/eras/shelley/chain-and-ledger/shelley-spec-ledger-test/src/Test/Shelley/Spec/Ledger/Generator/ShelleyEraGen.hs b/eras/shelley/chain-and-ledger/shelley-spec-ledger-test/src/Test/Shelley/Spec/Ledger/Generator/ShelleyEraGen.hs deleted file mode 100644 index 140928ccbbd..00000000000 --- a/eras/shelley/chain-and-ledger/shelley-spec-ledger-test/src/Test/Shelley/Spec/Ledger/Generator/ShelleyEraGen.hs +++ /dev/null @@ -1,6 +0,0 @@ -module Test.Shelley.Spec.Ledger.Generator.ShelleyEraGen - {-# DEPRECATED "Use 'import Test.Cardano.Ledger.Shelley.Generator.ShelleyEraGen' instead." #-} - (module X) -where - -import Test.Cardano.Ledger.Shelley.Generator.ShelleyEraGen as X diff --git a/eras/shelley/chain-and-ledger/shelley-spec-ledger-test/src/Test/Shelley/Spec/Ledger/Generator/Trace/Chain.hs b/eras/shelley/chain-and-ledger/shelley-spec-ledger-test/src/Test/Shelley/Spec/Ledger/Generator/Trace/Chain.hs deleted file mode 100644 index 7b967088a30..00000000000 --- a/eras/shelley/chain-and-ledger/shelley-spec-ledger-test/src/Test/Shelley/Spec/Ledger/Generator/Trace/Chain.hs +++ /dev/null @@ -1,6 +0,0 @@ -module Test.Shelley.Spec.Ledger.Generator.Trace.Chain - {-# DEPRECATED "Use 'import Test.Cardano.Ledger.Shelley.Generator.Trace.Chain' instead." #-} - (module X) -where - -import Test.Cardano.Ledger.Shelley.Generator.Trace.Chain as X diff --git a/eras/shelley/chain-and-ledger/shelley-spec-ledger-test/src/Test/Shelley/Spec/Ledger/Generator/Trace/DCert.hs b/eras/shelley/chain-and-ledger/shelley-spec-ledger-test/src/Test/Shelley/Spec/Ledger/Generator/Trace/DCert.hs deleted file mode 100644 index 82bda0fffbe..00000000000 --- a/eras/shelley/chain-and-ledger/shelley-spec-ledger-test/src/Test/Shelley/Spec/Ledger/Generator/Trace/DCert.hs +++ /dev/null @@ -1,6 +0,0 @@ -module Test.Shelley.Spec.Ledger.Generator.Trace.DCert - {-# DEPRECATED "Use 'import Test.Cardano.Ledger.Shelley.Generator.Trace.DCert' instead." #-} - (module X) -where - -import Test.Cardano.Ledger.Shelley.Generator.Trace.DCert as X diff --git a/eras/shelley/chain-and-ledger/shelley-spec-ledger-test/src/Test/Shelley/Spec/Ledger/Generator/Trace/Ledger.hs b/eras/shelley/chain-and-ledger/shelley-spec-ledger-test/src/Test/Shelley/Spec/Ledger/Generator/Trace/Ledger.hs deleted file mode 100644 index d37fbed34ac..00000000000 --- a/eras/shelley/chain-and-ledger/shelley-spec-ledger-test/src/Test/Shelley/Spec/Ledger/Generator/Trace/Ledger.hs +++ /dev/null @@ -1,6 +0,0 @@ -module Test.Shelley.Spec.Ledger.Generator.Trace.Ledger - {-# DEPRECATED "Use 'import Test.Cardano.Ledger.Shelley.Generator.Trace.Ledger' instead." #-} - (module X) -where - -import Test.Cardano.Ledger.Shelley.Generator.Trace.Ledger as X diff --git a/eras/shelley/chain-and-ledger/shelley-spec-ledger-test/src/Test/Shelley/Spec/Ledger/Generator/Update.hs b/eras/shelley/chain-and-ledger/shelley-spec-ledger-test/src/Test/Shelley/Spec/Ledger/Generator/Update.hs deleted file mode 100644 index c5800713958..00000000000 --- a/eras/shelley/chain-and-ledger/shelley-spec-ledger-test/src/Test/Shelley/Spec/Ledger/Generator/Update.hs +++ /dev/null @@ -1,6 +0,0 @@ -module Test.Shelley.Spec.Ledger.Generator.Update - {-# DEPRECATED "Use 'import Test.Cardano.Ledger.Shelley.Generator.Update' instead." #-} - (module X) -where - -import Test.Cardano.Ledger.Shelley.Generator.Update as X diff --git a/eras/shelley/chain-and-ledger/shelley-spec-ledger-test/src/Test/Shelley/Spec/Ledger/Generator/Utxo.hs b/eras/shelley/chain-and-ledger/shelley-spec-ledger-test/src/Test/Shelley/Spec/Ledger/Generator/Utxo.hs deleted file mode 100644 index 9e92d37ff7b..00000000000 --- a/eras/shelley/chain-and-ledger/shelley-spec-ledger-test/src/Test/Shelley/Spec/Ledger/Generator/Utxo.hs +++ /dev/null @@ -1,6 +0,0 @@ -module Test.Shelley.Spec.Ledger.Generator.Utxo - {-# DEPRECATED "Use 'import Test.Cardano.Ledger.Shelley.Generator.Utxo' instead." #-} - (module X) -where - -import Test.Cardano.Ledger.Shelley.Generator.Utxo as X diff --git a/eras/shelley/chain-and-ledger/shelley-spec-ledger-test/src/Test/Shelley/Spec/Ledger/Orphans.hs b/eras/shelley/chain-and-ledger/shelley-spec-ledger-test/src/Test/Shelley/Spec/Ledger/Orphans.hs deleted file mode 100644 index 325cc532c13..00000000000 --- a/eras/shelley/chain-and-ledger/shelley-spec-ledger-test/src/Test/Shelley/Spec/Ledger/Orphans.hs +++ /dev/null @@ -1,6 +0,0 @@ -module Test.Shelley.Spec.Ledger.Orphans - {-# DEPRECATED "Use 'import Test.Cardano.Ledger.Shelley.Orphans' instead." #-} - () -where - -import Test.Cardano.Ledger.Shelley.Orphans () diff --git a/eras/shelley/chain-and-ledger/shelley-spec-ledger-test/src/Test/Shelley/Spec/Ledger/PropertyTests.hs b/eras/shelley/chain-and-ledger/shelley-spec-ledger-test/src/Test/Shelley/Spec/Ledger/PropertyTests.hs deleted file mode 100644 index 2f6eadacde0..00000000000 --- a/eras/shelley/chain-and-ledger/shelley-spec-ledger-test/src/Test/Shelley/Spec/Ledger/PropertyTests.hs +++ /dev/null @@ -1,6 +0,0 @@ -module Test.Shelley.Spec.Ledger.PropertyTests - {-# DEPRECATED "Use 'import Test.Cardano.Ledger.Shelley.PropertyTests' instead." #-} - (module X) -where - -import Test.Cardano.Ledger.Shelley.PropertyTests as X diff --git a/eras/shelley/chain-and-ledger/shelley-spec-ledger-test/src/Test/Shelley/Spec/Ledger/Rules/ClassifyTraces.hs b/eras/shelley/chain-and-ledger/shelley-spec-ledger-test/src/Test/Shelley/Spec/Ledger/Rules/ClassifyTraces.hs deleted file mode 100644 index fdd5762baeb..00000000000 --- a/eras/shelley/chain-and-ledger/shelley-spec-ledger-test/src/Test/Shelley/Spec/Ledger/Rules/ClassifyTraces.hs +++ /dev/null @@ -1,6 +0,0 @@ -module Test.Shelley.Spec.Ledger.Rules.ClassifyTraces - {-# DEPRECATED "Use 'import Test.Cardano.Ledger.Shelley.Rules.ClassifyTraces' instead." #-} - (module X) -where - -import Test.Cardano.Ledger.Shelley.Rules.ClassifyTraces as X diff --git a/eras/shelley/chain-and-ledger/shelley-spec-ledger-test/src/Test/Shelley/Spec/Ledger/Rules/TestChain.hs b/eras/shelley/chain-and-ledger/shelley-spec-ledger-test/src/Test/Shelley/Spec/Ledger/Rules/TestChain.hs deleted file mode 100644 index f178386d038..00000000000 --- a/eras/shelley/chain-and-ledger/shelley-spec-ledger-test/src/Test/Shelley/Spec/Ledger/Rules/TestChain.hs +++ /dev/null @@ -1,6 +0,0 @@ -module Test.Shelley.Spec.Ledger.Rules.TestChain - {-# DEPRECATED "Use 'import Test.Cardano.Ledger.Shelley.Rules.TestChain' instead." #-} - (module X) -where - -import Test.Cardano.Ledger.Shelley.Rules.TestChain as X diff --git a/eras/shelley/chain-and-ledger/shelley-spec-ledger-test/src/Test/Shelley/Spec/Ledger/Serialisation/CDDLUtils.hs b/eras/shelley/chain-and-ledger/shelley-spec-ledger-test/src/Test/Shelley/Spec/Ledger/Serialisation/CDDLUtils.hs deleted file mode 100644 index 472b7b367ed..00000000000 --- a/eras/shelley/chain-and-ledger/shelley-spec-ledger-test/src/Test/Shelley/Spec/Ledger/Serialisation/CDDLUtils.hs +++ /dev/null @@ -1,6 +0,0 @@ -module Test.Shelley.Spec.Ledger.Serialisation.CDDLUtils - {-# DEPRECATED "Use 'import Test.Cardano.Ledger.Shelley.Serialisation.CDDLUtils' instead." #-} - (module X) -where - -import Test.Cardano.Ledger.Shelley.Serialisation.CDDLUtils as X diff --git a/eras/shelley/chain-and-ledger/shelley-spec-ledger-test/src/Test/Shelley/Spec/Ledger/Serialisation/EraIndepGenerators.hs b/eras/shelley/chain-and-ledger/shelley-spec-ledger-test/src/Test/Shelley/Spec/Ledger/Serialisation/EraIndepGenerators.hs deleted file mode 100644 index 03d77a927d6..00000000000 --- a/eras/shelley/chain-and-ledger/shelley-spec-ledger-test/src/Test/Shelley/Spec/Ledger/Serialisation/EraIndepGenerators.hs +++ /dev/null @@ -1,6 +0,0 @@ -module Test.Shelley.Spec.Ledger.Serialisation.EraIndepGenerators - {-# DEPRECATED "Use 'import Test.Cardano.Ledger.Shelley.Serialisation.EraIndepGenerators' instead." #-} - (module X) -where - -import Test.Cardano.Ledger.Shelley.Serialisation.EraIndepGenerators as X diff --git a/eras/shelley/chain-and-ledger/shelley-spec-ledger-test/src/Test/Shelley/Spec/Ledger/Serialisation/Generators.hs b/eras/shelley/chain-and-ledger/shelley-spec-ledger-test/src/Test/Shelley/Spec/Ledger/Serialisation/Generators.hs deleted file mode 100644 index 70ab327af28..00000000000 --- a/eras/shelley/chain-and-ledger/shelley-spec-ledger-test/src/Test/Shelley/Spec/Ledger/Serialisation/Generators.hs +++ /dev/null @@ -1,6 +0,0 @@ -module Test.Shelley.Spec.Ledger.Serialisation.Generators - {-# DEPRECATED "Use 'import Test.Cardano.Ledger.Shelley.Serialisation.Generators' instead." #-} - () -where - -import Test.Cardano.Ledger.Shelley.Serialisation.Generators () diff --git a/eras/shelley/chain-and-ledger/shelley-spec-ledger-test/src/Test/Shelley/Spec/Ledger/Serialisation/Generators/Bootstrap.hs b/eras/shelley/chain-and-ledger/shelley-spec-ledger-test/src/Test/Shelley/Spec/Ledger/Serialisation/Generators/Bootstrap.hs deleted file mode 100644 index fef4147f544..00000000000 --- a/eras/shelley/chain-and-ledger/shelley-spec-ledger-test/src/Test/Shelley/Spec/Ledger/Serialisation/Generators/Bootstrap.hs +++ /dev/null @@ -1,6 +0,0 @@ -module Test.Shelley.Spec.Ledger.Serialisation.Generators.Bootstrap - {-# DEPRECATED "Use 'import Test.Cardano.Ledger.Shelley.Serialisation.Generators.Bootstrap' instead." #-} - (module X) -where - -import Test.Cardano.Ledger.Shelley.Serialisation.Generators.Bootstrap as X diff --git a/eras/shelley/chain-and-ledger/shelley-spec-ledger-test/src/Test/Shelley/Spec/Ledger/Serialisation/Generators/Genesis.hs b/eras/shelley/chain-and-ledger/shelley-spec-ledger-test/src/Test/Shelley/Spec/Ledger/Serialisation/Generators/Genesis.hs deleted file mode 100644 index a874af11e42..00000000000 --- a/eras/shelley/chain-and-ledger/shelley-spec-ledger-test/src/Test/Shelley/Spec/Ledger/Serialisation/Generators/Genesis.hs +++ /dev/null @@ -1,6 +0,0 @@ -module Test.Shelley.Spec.Ledger.Serialisation.Generators.Genesis - {-# DEPRECATED "Use 'import Test.Cardano.Ledger.Shelley.Serialisation.Generators.Genesis' instead." #-} - (module X) -where - -import Test.Cardano.Ledger.Shelley.Serialisation.Generators.Genesis as X diff --git a/eras/shelley/chain-and-ledger/shelley-spec-ledger-test/src/Test/Shelley/Spec/Ledger/Serialisation/GoldenUtils.hs b/eras/shelley/chain-and-ledger/shelley-spec-ledger-test/src/Test/Shelley/Spec/Ledger/Serialisation/GoldenUtils.hs deleted file mode 100644 index 355be4456f7..00000000000 --- a/eras/shelley/chain-and-ledger/shelley-spec-ledger-test/src/Test/Shelley/Spec/Ledger/Serialisation/GoldenUtils.hs +++ /dev/null @@ -1,6 +0,0 @@ -module Test.Shelley.Spec.Ledger.Serialisation.GoldenUtils - {-# DEPRECATED "Use 'import Test.Cardano.Ledger.Shelley.Serialisation.GoldenUtils' instead." #-} - (module X) -where - -import Test.Cardano.Ledger.Shelley.Serialisation.GoldenUtils as X diff --git a/eras/shelley/chain-and-ledger/shelley-spec-ledger-test/src/Test/Shelley/Spec/Ledger/Shrinkers.hs b/eras/shelley/chain-and-ledger/shelley-spec-ledger-test/src/Test/Shelley/Spec/Ledger/Shrinkers.hs deleted file mode 100644 index e0238494bd2..00000000000 --- a/eras/shelley/chain-and-ledger/shelley-spec-ledger-test/src/Test/Shelley/Spec/Ledger/Shrinkers.hs +++ /dev/null @@ -1,6 +0,0 @@ -module Test.Shelley.Spec.Ledger.Shrinkers - {-# DEPRECATED "Use 'import Test.Cardano.Ledger.Shelley.Shrinkers' instead." #-} - (module X) -where - -import Test.Cardano.Ledger.Shelley.Shrinkers as X diff --git a/eras/shelley/chain-and-ledger/shelley-spec-ledger-test/src/Test/Shelley/Spec/Ledger/Utils.hs b/eras/shelley/chain-and-ledger/shelley-spec-ledger-test/src/Test/Shelley/Spec/Ledger/Utils.hs deleted file mode 100644 index 9209b1a2745..00000000000 --- a/eras/shelley/chain-and-ledger/shelley-spec-ledger-test/src/Test/Shelley/Spec/Ledger/Utils.hs +++ /dev/null @@ -1,6 +0,0 @@ -module Test.Shelley.Spec.Ledger.Utils - {-# DEPRECATED "Use 'import Test.Cardano.Ledger.Shelley.Utils' instead." #-} - (module X) -where - -import Test.Cardano.Ledger.Shelley.Utils as X diff --git a/eras/shelley/impl/cardano-ledger-shelley.cabal b/eras/shelley/impl/cardano-ledger-shelley.cabal index 613e416cbd8..bc8ce0a9422 100644 --- a/eras/shelley/impl/cardano-ledger-shelley.cabal +++ b/eras/shelley/impl/cardano-ledger-shelley.cabal @@ -33,7 +33,6 @@ library Cardano.Ledger.Chain Cardano.Ledger.Shelley Cardano.Ledger.Shelley.Constraints - Cardano.Ledger.Shelley.Address Cardano.Ledger.Shelley.Address.Bootstrap Cardano.Ledger.Shelley.API Cardano.Ledger.Shelley.API.ByronTranslation @@ -42,31 +41,24 @@ library Cardano.Ledger.Shelley.API.Validation Cardano.Ledger.Shelley.API.Wallet Cardano.Ledger.Shelley.API.Mempool - Cardano.Ledger.Shelley.BaseTypes Cardano.Ledger.Shelley.BlockChain Cardano.Ledger.Shelley.CompactAddr - Cardano.Ledger.Shelley.Credential Cardano.Ledger.Shelley.Delegation.Certificates Cardano.Ledger.Shelley.Delegation.PoolParams Cardano.Ledger.Shelley.EpochBoundary Cardano.Ledger.Shelley.Genesis Cardano.Ledger.Shelley.HardForks - Cardano.Ledger.Shelley.Keys Cardano.Ledger.Shelley.LedgerState Cardano.Ledger.Shelley.Metadata - Cardano.Ledger.Shelley.OCert Cardano.Ledger.Shelley.Orphans - Cardano.Ledger.Shelley.OverlaySchedule Cardano.Ledger.Shelley.PParams Cardano.Ledger.Shelley.Rewards Cardano.Ledger.Shelley.RewardProvenance Cardano.Ledger.Shelley.RewardUpdate Cardano.Ledger.Shelley.Scripts - Cardano.Ledger.Shelley.Slot Cardano.Ledger.Shelley.SoftForks Cardano.Ledger.Shelley.StabilityWindow Cardano.Ledger.Shelley.Rules.Bbody - Cardano.Ledger.Shelley.Rules.Chain Cardano.Ledger.Shelley.Rules.Deleg Cardano.Ledger.Shelley.Rules.Delegs Cardano.Ledger.Shelley.Rules.Delpl @@ -77,16 +69,12 @@ library Cardano.Ledger.Shelley.Rules.Mir Cardano.Ledger.Shelley.Rules.NewEpoch Cardano.Ledger.Shelley.Rules.Newpp - Cardano.Ledger.Shelley.Rules.Ocert - Cardano.Ledger.Shelley.Rules.Overlay Cardano.Ledger.Shelley.Rules.Pool Cardano.Ledger.Shelley.Rules.PoolReap Cardano.Ledger.Shelley.Rules.Ppup - Cardano.Ledger.Shelley.Rules.Prtcl Cardano.Ledger.Shelley.Rules.Rupd Cardano.Ledger.Shelley.Rules.Snap Cardano.Ledger.Shelley.Rules.Tick - Cardano.Ledger.Shelley.Rules.Tickn Cardano.Ledger.Shelley.Rules.Updn Cardano.Ledger.Shelley.Rules.Upec Cardano.Ledger.Shelley.Rules.Utxo diff --git a/eras/shelley/impl/src/Cardano/Ledger/Chain.hs b/eras/shelley/impl/src/Cardano/Ledger/Chain.hs index 32cbf6102fa..ed1835e004d 100644 --- a/eras/shelley/impl/src/Cardano/Ledger/Chain.hs +++ b/eras/shelley/impl/src/Cardano/Ledger/Chain.hs @@ -18,9 +18,6 @@ module Cardano.Ledger.Chain ChainPredicateFailure (..), pparamsToChainChecksPParams, chainChecks, - -- deprecated - ChainChecksData, - pparamsToChainChecksData, ) where @@ -41,10 +38,6 @@ data ChainChecksPParams = ChainChecksPParams } deriving (Show, Eq, Generic, NoThunks) -{-# DEPRECATED ChainChecksData "Use ChainChecksPParams instead" #-} - -type ChainChecksData = ChainChecksPParams - pparamsToChainChecksPParams :: ( HasField "_maxBHSize" pp Natural, HasField "_maxBBSize" pp Natural, @@ -59,16 +52,6 @@ pparamsToChainChecksPParams pp = ccProtocolVersion = getField @"_protocolVersion" pp } -{-# DEPRECATED pparamsToChainChecksData "Use pparamsToChainChecksPParams instead" #-} -pparamsToChainChecksData :: - ( HasField "_maxBHSize" pp Natural, - HasField "_maxBBSize" pp Natural, - HasField "_protocolVersion" pp ProtVer - ) => - pp -> - ChainChecksPParams -pparamsToChainChecksData = pparamsToChainChecksPParams - data ChainPredicateFailure era = HeaderSizeTooLargeCHAIN !Natural -- Header Size diff --git a/eras/shelley/impl/src/Cardano/Ledger/Shelley/API.hs b/eras/shelley/impl/src/Cardano/Ledger/Shelley/API.hs index 2c612e855b9..fef2ebc3374 100644 --- a/eras/shelley/impl/src/Cardano/Ledger/Shelley/API.hs +++ b/eras/shelley/impl/src/Cardano/Ledger/Shelley/API.hs @@ -20,7 +20,7 @@ import Cardano.Ledger.Shelley.API.Mempool as X import Cardano.Ledger.Shelley.API.Protocol as X import Cardano.Ledger.Shelley.API.Types as X import Cardano.Ledger.Shelley.API.Validation as X -import Cardano.Ledger.Shelley.API.Wallet as X hiding (getLeaderSchedule) +import Cardano.Ledger.Shelley.API.Wallet as X import Cardano.Ledger.Shelley.Constraints ( UsesAuxiliary, UsesPParams, diff --git a/eras/shelley/impl/src/Cardano/Ledger/Shelley/API/Mempool.hs b/eras/shelley/impl/src/Cardano/Ledger/Shelley/API/Mempool.hs index 37fcaa9ed5f..1df6d24a51a 100644 --- a/eras/shelley/impl/src/Cardano/Ledger/Shelley/API/Mempool.hs +++ b/eras/shelley/impl/src/Cardano/Ledger/Shelley/API/Mempool.hs @@ -41,6 +41,7 @@ import Cardano.Ledger.Core (AnnotatedData, ChainData, SerialisableData) import qualified Cardano.Ledger.Core as Core import Cardano.Ledger.Era ( Crypto, + Era, PreviousEra, TranslateEra (translateEra), TranslationContext, @@ -48,7 +49,6 @@ import Cardano.Ledger.Era ) import Cardano.Ledger.Shelley (ShelleyEra) import Cardano.Ledger.Shelley.API.Protocol (PraosCrypto) -import Cardano.Ledger.Shelley.Constraints (ShelleyBased) import Cardano.Ledger.Shelley.LedgerState (NewEpochState) import qualified Cardano.Ledger.Shelley.LedgerState as LedgerState import Cardano.Ledger.Shelley.PParams (PParams' (..)) @@ -241,7 +241,7 @@ deriving stock instance Show (ApplyTxError era) instance - ( ShelleyBased era, + ( Era era, ToCBOR (PredicateFailure (Core.EraRule "LEDGER" era)) ) => ToCBOR (ApplyTxError era) @@ -249,7 +249,7 @@ instance toCBOR (ApplyTxError es) = toCBOR es instance - ( ShelleyBased era, + ( Era era, FromCBOR (PredicateFailure (Core.EraRule "LEDGER" era)) ) => FromCBOR (ApplyTxError era) diff --git a/eras/shelley/impl/src/Cardano/Ledger/Shelley/API/Wallet.hs b/eras/shelley/impl/src/Cardano/Ledger/Shelley/API/Wallet.hs index 7c8bb9f263f..db101688d1e 100644 --- a/eras/shelley/impl/src/Cardano/Ledger/Shelley/API/Wallet.hs +++ b/eras/shelley/impl/src/Cardano/Ledger/Shelley/API/Wallet.hs @@ -37,10 +37,6 @@ module Cardano.Ledger.Shelley.API.Wallet AdaPots (..), totalAdaES, totalAdaPotsES, - - -- * Deprecated - getRewardInfo, - getLeaderSchedule, ) where @@ -54,14 +50,12 @@ import Cardano.Binary serialize, ) import Cardano.Crypto.DSIGN.Class (decodeSignedDSIGN, sizeSigDSIGN, sizeVerKeyDSIGN) -import qualified Cardano.Crypto.VRF as VRF import Cardano.Ledger.Address (Addr (..)) import Cardano.Ledger.BaseTypes ( BlocksMade, Globals (..), NonNegativeInterval, ProtVer, - Seed, UnitInterval, epochInfo, ) @@ -69,16 +63,15 @@ import Cardano.Ledger.Coin (Coin (..)) import Cardano.Ledger.Compactible (fromCompact) import qualified Cardano.Ledger.Core as Core import Cardano.Ledger.Credential (Credential (..)) -import Cardano.Ledger.Crypto (DSIGN, VRF) +import Cardano.Ledger.Crypto (DSIGN) import qualified Cardano.Ledger.Crypto as CC (Crypto) import Cardano.Ledger.Era (Crypto, Era) -import Cardano.Ledger.Keys (KeyHash, KeyRole (..), SignKeyVRF) +import Cardano.Ledger.Keys (KeyHash, KeyRole (..)) import Cardano.Ledger.PoolDistr ( IndividualPoolStake (..), PoolDistr (..), ) import Cardano.Ledger.Shelley (ShelleyEra) -import qualified Cardano.Ledger.Shelley.API.Protocol as TP (ChainDepState, getLeaderSchedule) import Cardano.Ledger.Shelley.CompactAddr (CompactAddr, compactAddr) import Cardano.Ledger.Shelley.Constraints (UsesValue) import qualified Cardano.Ledger.Shelley.EpochBoundary as EB @@ -117,7 +110,7 @@ import Cardano.Ledger.Slot (epochInfoSize) import Cardano.Ledger.TxIn (TxIn (..)) import Cardano.Ledger.Val ((<->)) import qualified Cardano.Ledger.Val as Val -import Cardano.Slotting.Slot (EpochSize, SlotNo) +import Cardano.Slotting.Slot (EpochSize) import Control.DeepSeq (NFData) import Control.Monad.Trans.Reader (runReader) import Control.Provenance (runWithProvM) @@ -427,21 +420,6 @@ getRewardInfoPools globals ss = pstake = EB.sumAllStake $ EB.poolStake key delegs stakes ostake = sumPoolOwnersStake poolp stakes -{-# DEPRECATED getRewardInfo "Use 'getRewardProvenance' instead." #-} -getRewardInfo :: - forall era. - ( HasField "_a0" (Core.PParams era) NonNegativeInterval, - HasField "_d" (Core.PParams era) UnitInterval, - HasField "_nOpt" (Core.PParams era) Natural, - HasField "_protocolVersion" (Core.PParams era) ProtVer, - HasField "_rho" (Core.PParams era) UnitInterval, - HasField "_tau" (Core.PParams era) UnitInterval - ) => - Globals -> - NewEpochState era -> - (RewardUpdate (Crypto era), RewardProvenance (Crypto era)) -getRewardInfo = getRewardProvenance - -- | Calculate stake pool rewards from the snapshot labeled `go`. -- Also includes information on how the rewards were calculated -- ('RewardProvenance'). @@ -482,23 +460,6 @@ getRewardProvenance globals newepochstate = asc = activeSlotCoeff globals secparam = securityParameter globals -{-# DEPRECATED getLeaderSchedule "import from Cardano.Ledger.Shelley.API.Protocol instead." #-} -getLeaderSchedule :: - ( Era era, - VRF.Signable - (VRF (Crypto era)) - Seed, - HasField "_d" (Core.PParams era) UnitInterval - ) => - Globals -> - NewEpochState era -> - TP.ChainDepState (Crypto era) -> - KeyHash 'StakePool (Crypto era) -> - SignKeyVRF (Crypto era) -> - Core.PParams era -> - Set SlotNo -getLeaderSchedule = TP.getLeaderSchedule - -------------------------------------------------------------------------------- -- Transaction helpers -------------------------------------------------------------------------------- diff --git a/eras/shelley/impl/src/Cardano/Ledger/Shelley/Address.hs b/eras/shelley/impl/src/Cardano/Ledger/Shelley/Address.hs deleted file mode 100644 index 62936e43593..00000000000 --- a/eras/shelley/impl/src/Cardano/Ledger/Shelley/Address.hs +++ /dev/null @@ -1,6 +0,0 @@ -module Cardano.Ledger.Shelley.Address - {-# DEPRECATED "Use 'import Cardano.Ledger.Address' instead." #-} - (module X) -where - -import Cardano.Ledger.Address as X diff --git a/eras/shelley/impl/src/Cardano/Ledger/Shelley/BaseTypes.hs b/eras/shelley/impl/src/Cardano/Ledger/Shelley/BaseTypes.hs deleted file mode 100644 index c2b4660d4f7..00000000000 --- a/eras/shelley/impl/src/Cardano/Ledger/Shelley/BaseTypes.hs +++ /dev/null @@ -1,6 +0,0 @@ -module Cardano.Ledger.Shelley.BaseTypes - {-# DEPRECATED "Use 'import Cardano.Ledger.BaseTypes' instead." #-} - (module X) -where - -import Cardano.Ledger.BaseTypes as X diff --git a/eras/shelley/impl/src/Cardano/Ledger/Shelley/BlockChain.hs b/eras/shelley/impl/src/Cardano/Ledger/Shelley/BlockChain.hs index 43911079600..af6551b463a 100644 --- a/eras/shelley/impl/src/Cardano/Ledger/Shelley/BlockChain.hs +++ b/eras/shelley/impl/src/Cardano/Ledger/Shelley/BlockChain.hs @@ -28,30 +28,6 @@ module Cardano.Ledger.Shelley.BlockChain -- incrBlocks, coreAuxDataBytes, - -- deprecated - HashHeader, - PrevHash, - BHBody, - BHeader, - LastAppliedBlock, - checkLeaderValue, - bhHash, - bnonce, - hashHeaderToNonce, - prevHashToNonce, - bHeaderSize, - bhbody, - hBbsize, - issuerIDfromBHBody, - seedEta, - seedL, - mkSeed, - lastAppliedHash, - -- - Block, - bheader, - bbody, - neededTxInsForBlock, txSeqDecoder, ) where @@ -67,22 +43,16 @@ import Cardano.Binary withSlice, ) import qualified Cardano.Crypto.Hash.Class as Hash -import qualified Cardano.Crypto.VRF as VRF import Cardano.Ledger.BaseTypes - ( ActiveSlotCoeff, - BlocksMade (..), + ( BlocksMade (..), Nonce (..), - Seed (..), StrictMaybe (..), mkNonceFromNumber, strictMaybeToMaybe, ) import Cardano.Ledger.Block (BlockAnn) -import qualified Cardano.Ledger.Block as Core import qualified Cardano.Ledger.Core as Core -import qualified Cardano.Ledger.Crypto as CC import Cardano.Ledger.Era (Crypto, Era) -import qualified Cardano.Ledger.Era as Era import Cardano.Ledger.Hashes (EraIndependentBlockBody) import Cardano.Ledger.Keys (Hash, KeyHash, KeyRole (..)) import Cardano.Ledger.SafeHash (SafeToHash (..)) @@ -95,9 +65,6 @@ import Cardano.Ledger.Serialization ) import Cardano.Ledger.Shelley.Tx (Tx, segwitTx) import Cardano.Ledger.Slot (SlotNo (..)) -import Cardano.Ledger.TxIn (TxIn (..)) -import qualified Cardano.Protocol.TPraos.BHeader as TP -import Cardano.Slotting.Slot (WithOrigin (..)) import Control.Monad (unless) import Data.ByteString (ByteString) import qualified Data.ByteString.Char8 as BS @@ -109,12 +76,10 @@ import Data.Sequence (Seq) import qualified Data.Sequence as Seq import Data.Sequence.Strict (StrictSeq) import qualified Data.Sequence.Strict as StrictSeq -import Data.Set (Set) import Data.Typeable import GHC.Generics (Generic) import GHC.Records (HasField (..)) import NoThunks.Class (AllowThunksIn (..), NoThunks (..)) -import Numeric.Natural (Natural) data TxSeq era = TxSeq' { txSeqTxns' :: !(StrictSeq (Tx era)), @@ -320,104 +285,3 @@ incrBlocks isOverlay hk b'@(BlocksMade b) Just n -> Map.insert hk (n + 1) b where hkVal = Map.lookup hk b - --- DEPRECATED - -{-# DEPRECATED HashHeader "Import from Cardano.Protocol.TPraos.BHeader instead" #-} - -type HashHeader = TP.HashHeader - -{-# DEPRECATED PrevHash "Import from Cardano.Protocol.TPraos.BHeader instead" #-} - -type PrevHash = TP.PrevHash - -{-# DEPRECATED BHBody "Import from Cardano.Protocol.TPraos.BHeader instead" #-} - -type BHBody = TP.BHBody - -{-# DEPRECATED BHeader "Import from Cardano.Protocol.TPraos.BHeader instead" #-} - -type BHeader = TP.BHeader - -{-# DEPRECATED LastAppliedBlock "Import from Cardano.Protocol.TPraos.BHeader instead" #-} - -type LastAppliedBlock = TP.LastAppliedBlock - -{-# DEPRECATED checkLeaderValue "Import from Cardano.Protocol.TPraos.BHeader instead" #-} -checkLeaderValue :: - forall v. - (VRF.VRFAlgorithm v) => - VRF.OutputVRF v -> - Rational -> - ActiveSlotCoeff -> - Bool -checkLeaderValue = TP.checkLeaderValue - -{-# DEPRECATED bhHash "Import from Cardano.Protocol.TPraos.BHeader instead" #-} -bhHash :: CC.Crypto crypto => TP.BHeader crypto -> TP.HashHeader crypto -bhHash = TP.bhHash - -{-# DEPRECATED hashHeaderToNonce "Import from Cardano.Protocol.TPraos.BHeader instead" #-} -hashHeaderToNonce :: TP.HashHeader crypto -> Nonce -hashHeaderToNonce = TP.hashHeaderToNonce - -{-# DEPRECATED prevHashToNonce "Import from Cardano.Protocol.TPraos.BHeader instead" #-} -prevHashToNonce :: TP.PrevHash crypto -> Nonce -prevHashToNonce = TP.prevHashToNonce - -{-# DEPRECATED issuerIDfromBHBody "Import from Cardano.Protocol.TPraos.BHeader instead" #-} -issuerIDfromBHBody :: CC.Crypto crypto => TP.BHBody crypto -> KeyHash 'BlockIssuer crypto -issuerIDfromBHBody = TP.issuerIDfromBHBody - -{-# DEPRECATED bHeaderSize "Import from Cardano.Protocol.TPraos.BHeader instead" #-} -bHeaderSize :: forall crypto. (CC.Crypto crypto) => TP.BHeader crypto -> Int -bHeaderSize = TP.bHeaderSize - -{-# DEPRECATED bhbody "Import from Cardano.Protocol.TPraos.BHeader instead" #-} -bhbody :: CC.Crypto crypto => TP.BHeader crypto -> TP.BHBody crypto -bhbody = TP.bhbody - -{-# DEPRECATED hBbsize "Import from Cardano.Protocol.TPraos.BHeader instead" #-} -hBbsize :: TP.BHBody crypto -> Natural -hBbsize = TP.hBbsize - -{-# DEPRECATED seedEta "Import from Cardano.Protocol.TPraos.BHeader instead" #-} -seedEta :: Nonce -seedEta = TP.seedEta - -{-# DEPRECATED seedL "Import from Cardano.Protocol.TPraos.BHeader instead" #-} -seedL :: Nonce -seedL = TP.seedL - -{-# DEPRECATED mkSeed "Import from Cardano.Protocol.TPraos.BHeader instead" #-} -mkSeed :: Nonce -> SlotNo -> Nonce -> Seed -mkSeed = TP.mkSeed - -{-# DEPRECATED lastAppliedHash "Import from Cardano.Protocol.TPraos.BHeader instead" #-} -lastAppliedHash :: WithOrigin (TP.LastAppliedBlock crypto) -> TP.PrevHash crypto -lastAppliedHash = TP.lastAppliedHash - -{-# DEPRECATED bnonce "Import from Cardano.Protocol.TPraos.BHeader instead" #-} -bnonce :: TP.BHBody crypto -> Nonce -bnonce = TP.bnonce - -{-# DEPRECATED Block "Import from Cardano.Ledger.Block instead" #-} - -type Block = Core.Block - -{-# DEPRECATED bheader "Import from Cardano.Ledger.Block instead" #-} -bheader :: Block h era -> h (Crypto era) -bheader = Core.bheader - -{-# DEPRECATED bbody "Import from Cardano.Ledger.Block instead" #-} -bbody :: Block h era -> Era.TxSeq era -bbody = Core.bbody - -{-# DEPRECATED neededTxInsForBlock "Import from Cardano.Ledger.Block instead" #-} -neededTxInsForBlock :: - ( Era era, - HasField "inputs" (Core.TxBody era) (Set (TxIn (Crypto era))) - ) => - Block h era -> - Set (TxIn (Crypto era)) -neededTxInsForBlock = Core.neededTxInsForBlock diff --git a/eras/shelley/impl/src/Cardano/Ledger/Shelley/Constraints.hs b/eras/shelley/impl/src/Cardano/Ledger/Shelley/Constraints.hs index d5ed539db1d..0b45827b1b9 100644 --- a/eras/shelley/impl/src/Cardano/Ledger/Shelley/Constraints.hs +++ b/eras/shelley/impl/src/Cardano/Ledger/Shelley/Constraints.hs @@ -106,18 +106,3 @@ type TransValue (c :: Type -> Constraint) era = Compactible (Value era), c (Value era) ) - --- | General constraints that will hold true for ledgers which are based on --- Shelley, and share similar serialisation formats" -type ShelleyBased era = - ( -- Value constraints - UsesValue era, - -- TxBody constraints - UsesTxBody era, - -- Script constraints - UsesScript era, - -- AuxiliaryData constraints - UsesAuxiliary era - ) - -{-# LANGUAGE Deprecated ShelleyBased "Use appropriate 'Uses' constraits (e.g. `UsesValue`) instead." #-} diff --git a/eras/shelley/impl/src/Cardano/Ledger/Shelley/Credential.hs b/eras/shelley/impl/src/Cardano/Ledger/Shelley/Credential.hs deleted file mode 100644 index f34316466a6..00000000000 --- a/eras/shelley/impl/src/Cardano/Ledger/Shelley/Credential.hs +++ /dev/null @@ -1,6 +0,0 @@ -module Cardano.Ledger.Shelley.Credential - {-# DEPRECATED "Use 'import Cardano.Ledger.Credential' instead." #-} - (module X) -where - -import Cardano.Ledger.Credential as X diff --git a/eras/shelley/impl/src/Cardano/Ledger/Shelley/Delegation/Certificates.hs b/eras/shelley/impl/src/Cardano/Ledger/Shelley/Delegation/Certificates.hs index e932d585083..15c3e6da8ef 100644 --- a/eras/shelley/impl/src/Cardano/Ledger/Shelley/Delegation/Certificates.hs +++ b/eras/shelley/impl/src/Cardano/Ledger/Shelley/Delegation/Certificates.hs @@ -31,15 +31,11 @@ module Cardano.Ledger.Shelley.Delegation.Certificates isReservesMIRCert, isTreasuryMIRCert, requiresVKeyWitness, - -- Deprecated - PoolDistr, - IndividualPoolStake, ) where import Cardano.Ledger.Credential (Credential (..)) import Cardano.Ledger.Keys (KeyHash, KeyRole (..)) -import qualified Cardano.Ledger.PoolDistr as PD import Cardano.Ledger.Shelley.TxBody ( DCert (..), DelegCert (..), @@ -114,13 +110,3 @@ requiresVKeyWitness :: DCert crypto -> Bool requiresVKeyWitness (DCertMir (MIRCert _ _)) = False requiresVKeyWitness (DCertDeleg (RegKey _)) = False requiresVKeyWitness _ = True - --- Deprecated - -{-# DEPRECATED PoolDistr "Import from Cardano.Ledger.PoolDistr instead" #-} - -type PoolDistr = PD.PoolDistr - -{-# DEPRECATED IndividualPoolStake "Import from Cardano.Ledger.PoolDistr instead" #-} - -type IndividualPoolStake = PD.IndividualPoolStake diff --git a/eras/shelley/impl/src/Cardano/Ledger/Shelley/EpochBoundary.hs b/eras/shelley/impl/src/Cardano/Ledger/Shelley/EpochBoundary.hs index 17bc2f77776..ddc87da5204 100644 --- a/eras/shelley/impl/src/Cardano/Ledger/Shelley/EpochBoundary.hs +++ b/eras/shelley/impl/src/Cardano/Ledger/Shelley/EpochBoundary.hs @@ -29,16 +29,12 @@ module Cardano.Ledger.Shelley.EpochBoundary obligation, maxPool, maxPool', - - -- * Deprecated - BlocksMade, ) where import Cardano.Binary (FromCBOR (..), ToCBOR (..), encodeListLen) import Cardano.Ledger.Address (Addr (..)) import Cardano.Ledger.BaseTypes (BoundedRational (..), NonNegativeInterval) -import qualified Cardano.Ledger.BaseTypes as Core (BlocksMade) import Cardano.Ledger.Coin ( Coin (..), coinToRational, @@ -247,7 +243,3 @@ emptySnapShot = SnapShot (Stake VMap.empty) VMap.empty VMap.empty emptySnapShots :: SnapShots crypto emptySnapShots = SnapShots emptySnapShot emptySnapShot emptySnapShot (Coin 0) - -{-# DEPRECATED BlocksMade "Import from Cardano.Ledger.BaseTypes instead" #-} - -type BlocksMade = Core.BlocksMade diff --git a/eras/shelley/impl/src/Cardano/Ledger/Shelley/Keys.hs b/eras/shelley/impl/src/Cardano/Ledger/Shelley/Keys.hs deleted file mode 100644 index cbd1ca1cf64..00000000000 --- a/eras/shelley/impl/src/Cardano/Ledger/Shelley/Keys.hs +++ /dev/null @@ -1,6 +0,0 @@ -module Cardano.Ledger.Shelley.Keys - {-# DEPRECATED "Use 'import Cardano.Ledger.Keys' instead." #-} - (module X) -where - -import Cardano.Ledger.Keys as X diff --git a/eras/shelley/impl/src/Cardano/Ledger/Shelley/OCert.hs b/eras/shelley/impl/src/Cardano/Ledger/Shelley/OCert.hs deleted file mode 100644 index 4246397fe1e..00000000000 --- a/eras/shelley/impl/src/Cardano/Ledger/Shelley/OCert.hs +++ /dev/null @@ -1,6 +0,0 @@ -module Cardano.Ledger.Shelley.OCert - {-# DEPRECATED "Use 'import Cardano.Protocol.TPraos.OCert' instead." #-} - (module X) -where - -import Cardano.Protocol.TPraos.OCert as X diff --git a/eras/shelley/impl/src/Cardano/Ledger/Shelley/OverlaySchedule.hs b/eras/shelley/impl/src/Cardano/Ledger/Shelley/OverlaySchedule.hs deleted file mode 100644 index c9738233543..00000000000 --- a/eras/shelley/impl/src/Cardano/Ledger/Shelley/OverlaySchedule.hs +++ /dev/null @@ -1,11 +0,0 @@ -{-# LANGUAGE DataKinds #-} -{-# LANGUAGE DeriveGeneric #-} -{-# LANGUAGE DerivingStrategies #-} -{-# LANGUAGE LambdaCase #-} - -module Cardano.Ledger.Shelley.OverlaySchedule - {-# DEPRECATED "Use 'import Cardano.Protocol.TPraos.Rules.Overlay' instead." #-} - (module X) -where - -import Cardano.Protocol.TPraos.Rules.Overlay as X diff --git a/eras/shelley/impl/src/Cardano/Ledger/Shelley/PParams.hs b/eras/shelley/impl/src/Cardano/Ledger/Shelley/PParams.hs index da461b0a0da..7fc8d3a5080 100644 --- a/eras/shelley/impl/src/Cardano/Ledger/Shelley/PParams.hs +++ b/eras/shelley/impl/src/Cardano/Ledger/Shelley/PParams.hs @@ -23,10 +23,6 @@ module Cardano.Ledger.Shelley.PParams emptyPParamsUpdate, Update (..), updatePParams, - -- DEPRECATED - ProtVer, - pvMajor, - pvMinor, ) where @@ -461,15 +457,3 @@ updatePParams pp ppup = _minUTxOValue = fromSMaybe (_minUTxOValue pp) (_minUTxOValue ppup), _minPoolCost = fromSMaybe (_minPoolCost pp) (_minPoolCost ppup) } - -{-# DEPRECATED ProtVer "Import from Cardano.Ledger.BaseTypes instead" #-} - -type ProtVer = BT.ProtVer - -{-# DEPRECATED pvMajor "Import from Cardano.Ledger.BaseTypes instead" #-} -pvMajor :: ProtVer -> Natural -pvMajor = BT.pvMajor - -{-# DEPRECATED pvMinor "Import from Cardano.Ledger.BaseTypes instead" #-} -pvMinor :: ProtVer -> Natural -pvMinor = BT.pvMinor diff --git a/eras/shelley/impl/src/Cardano/Ledger/Shelley/Rules/Chain.hs b/eras/shelley/impl/src/Cardano/Ledger/Shelley/Rules/Chain.hs deleted file mode 100644 index c547bff6f46..00000000000 --- a/eras/shelley/impl/src/Cardano/Ledger/Shelley/Rules/Chain.hs +++ /dev/null @@ -1,7 +0,0 @@ -module Cardano.Ledger.Shelley.Rules.Chain - {-# DEPRECATED "Use 'import Test.Cardano.Ledger.Shelley.Rules.Chain' for the CHAIN rule, use 'import Cardano.Ledger.Chain' for chainChecks, and use 'import Cardano.Ledger.Shelley.API.Wallet' for AdaPots." #-} - (module X) -where - -import Cardano.Ledger.Chain as X -import Cardano.Ledger.Shelley.API.Wallet as X (AdaPots (..), totalAdaES, totalAdaPotsES) diff --git a/eras/shelley/impl/src/Cardano/Ledger/Shelley/Rules/Delegs.hs b/eras/shelley/impl/src/Cardano/Ledger/Shelley/Rules/Delegs.hs index 47d620a3e14..0f6eabab16d 100644 --- a/eras/shelley/impl/src/Cardano/Ledger/Shelley/Rules/Delegs.hs +++ b/eras/shelley/impl/src/Cardano/Ledger/Shelley/Rules/Delegs.hs @@ -41,7 +41,6 @@ import Cardano.Ledger.Serialization mapFromCBOR, mapToCBOR, ) -import Cardano.Ledger.Shelley.Constraints (ShelleyBased) import Cardano.Ledger.Shelley.LedgerState ( AccountState, DPState (..), @@ -120,7 +119,7 @@ deriving stock instance Eq (DelegsPredicateFailure era) instance - ( ShelleyBased era, + ( Era era, HasField "wdrls" (Core.TxBody era) (Wdrl (Crypto era)), Embed (Core.EraRule "DELPL" era) (DELEGS era), Environment (Core.EraRule "DELPL" era) ~ DelplEnv era, @@ -188,7 +187,7 @@ instance delegsTransition :: forall era. - ( ShelleyBased era, + ( Era era, HasField "wdrls" (Core.TxBody era) (Wdrl (Crypto era)), Embed (Core.EraRule "DELPL" era) (DELEGS era), Environment (Core.EraRule "DELPL" era) ~ DelplEnv era, diff --git a/eras/shelley/impl/src/Cardano/Ledger/Shelley/Rules/Ledgers.hs b/eras/shelley/impl/src/Cardano/Ledger/Shelley/Rules/Ledgers.hs index 0627e90f264..ab3cb502217 100644 --- a/eras/shelley/impl/src/Cardano/Ledger/Shelley/Rules/Ledgers.hs +++ b/eras/shelley/impl/src/Cardano/Ledger/Shelley/Rules/Ledgers.hs @@ -24,7 +24,6 @@ import Cardano.Ledger.BaseTypes (ShelleyBase) import qualified Cardano.Ledger.Core as Core import Cardano.Ledger.Era import Cardano.Ledger.Keys (DSignable, Hash) -import Cardano.Ledger.Shelley.Constraints (ShelleyBased) import Cardano.Ledger.Shelley.LedgerState ( AccountState, DPState, @@ -72,25 +71,25 @@ newtype LedgersEvent era = LedgerEvent (Event (Core.EraRule "LEDGER" era)) deriving stock instance - ( ShelleyBased era, + ( Era era, Show (PredicateFailure (Core.EraRule "LEDGER" era)) ) => Show (LedgersPredicateFailure era) deriving stock instance - ( ShelleyBased era, + ( Era era, Eq (PredicateFailure (Core.EraRule "LEDGER" era)) ) => Eq (LedgersPredicateFailure era) instance - ( ShelleyBased era, + ( Era era, NoThunks (PredicateFailure (Core.EraRule "LEDGER" era)) ) => NoThunks (LedgersPredicateFailure era) instance - ( ShelleyBased era, + ( Era era, ToCBOR (PredicateFailure (Core.EraRule "LEDGER" era)) ) => ToCBOR (LedgersPredicateFailure era) @@ -98,7 +97,7 @@ instance toCBOR (LedgerFailure e) = toCBOR e instance - ( ShelleyBased era, + ( Era era, FromCBOR (PredicateFailure (Core.EraRule "LEDGER" era)) ) => FromCBOR (LedgersPredicateFailure era) @@ -107,7 +106,6 @@ instance instance ( Era era, - ShelleyBased era, Embed (Core.EraRule "LEDGER" era) (LEDGERS era), Environment (Core.EraRule "LEDGER" era) ~ LedgerEnv era, State (Core.EraRule "LEDGER" era) ~ (UTxOState era, DPState (Crypto era)), diff --git a/eras/shelley/impl/src/Cardano/Ledger/Shelley/Rules/Ocert.hs b/eras/shelley/impl/src/Cardano/Ledger/Shelley/Rules/Ocert.hs deleted file mode 100644 index 5f1d53e6993..00000000000 --- a/eras/shelley/impl/src/Cardano/Ledger/Shelley/Rules/Ocert.hs +++ /dev/null @@ -1,6 +0,0 @@ -module Cardano.Ledger.Shelley.Rules.Ocert - {-# DEPRECATED "Use 'import Cardano.Protocol.TPraos.Rules.OCert' instead." #-} - (module X) -where - -import Cardano.Protocol.TPraos.Rules.OCert as X diff --git a/eras/shelley/impl/src/Cardano/Ledger/Shelley/Rules/Overlay.hs b/eras/shelley/impl/src/Cardano/Ledger/Shelley/Rules/Overlay.hs deleted file mode 100644 index ec9d1b2d6de..00000000000 --- a/eras/shelley/impl/src/Cardano/Ledger/Shelley/Rules/Overlay.hs +++ /dev/null @@ -1,6 +0,0 @@ -module Cardano.Ledger.Shelley.Rules.Overlay - {-# DEPRECATED "Use 'import Cardano.Protocol.TPraos.Rules.Overlay' instead." #-} - (module X) -where - -import Cardano.Protocol.TPraos.Rules.Overlay as X diff --git a/eras/shelley/impl/src/Cardano/Ledger/Shelley/Rules/Ppup.hs b/eras/shelley/impl/src/Cardano/Ledger/Shelley/Rules/Ppup.hs index 507965dda3d..4dd20f6bd06 100644 --- a/eras/shelley/impl/src/Cardano/Ledger/Shelley/Rules/Ppup.hs +++ b/eras/shelley/impl/src/Cardano/Ledger/Shelley/Rules/Ppup.hs @@ -32,7 +32,7 @@ import Cardano.Ledger.Era (Crypto, Era) import Cardano.Ledger.Keys import Cardano.Ledger.Serialization (decodeRecordSum) import Cardano.Ledger.Shelley.LedgerState (PPUPState (..), pvCanFollow) -import Cardano.Ledger.Shelley.PParams hiding (ProtVer) +import Cardano.Ledger.Shelley.PParams import Cardano.Ledger.Slot import Control.Monad.Trans.Reader (asks) import Control.SetAlgebra (dom, eval, (⊆), (⨃)) diff --git a/eras/shelley/impl/src/Cardano/Ledger/Shelley/Rules/Prtcl.hs b/eras/shelley/impl/src/Cardano/Ledger/Shelley/Rules/Prtcl.hs deleted file mode 100644 index f695e3a4055..00000000000 --- a/eras/shelley/impl/src/Cardano/Ledger/Shelley/Rules/Prtcl.hs +++ /dev/null @@ -1,6 +0,0 @@ -module Cardano.Ledger.Shelley.Rules.Prtcl - {-# DEPRECATED "Use 'import Cardano.Protocol.TPraos.Rules.Prtcl' instead." #-} - (module X) -where - -import Cardano.Protocol.TPraos.Rules.Prtcl as X diff --git a/eras/shelley/impl/src/Cardano/Ledger/Shelley/Rules/Tickn.hs b/eras/shelley/impl/src/Cardano/Ledger/Shelley/Rules/Tickn.hs deleted file mode 100644 index a42193097a2..00000000000 --- a/eras/shelley/impl/src/Cardano/Ledger/Shelley/Rules/Tickn.hs +++ /dev/null @@ -1,6 +0,0 @@ -module Cardano.Ledger.Shelley.Rules.Tickn - {-# DEPRECATED "Use 'import Cardano.Protocol.TPraos.Rules.Tickn' instead." #-} - (module X) -where - -import Cardano.Protocol.TPraos.Rules.Tickn as X diff --git a/eras/shelley/impl/src/Cardano/Ledger/Shelley/Rules/Upec.hs b/eras/shelley/impl/src/Cardano/Ledger/Shelley/Rules/Upec.hs index 3bc006a3310..65258c8d810 100644 --- a/eras/shelley/impl/src/Cardano/Ledger/Shelley/Rules/Upec.hs +++ b/eras/shelley/impl/src/Cardano/Ledger/Shelley/Rules/Upec.hs @@ -17,9 +17,9 @@ module Cardano.Ledger.Shelley.Rules.Upec where import Cardano.Ledger.BaseTypes (Globals (..), ProtVer, ShelleyBase, StrictMaybe) import Cardano.Ledger.Coin (Coin) import qualified Cardano.Ledger.Core as Core +import Cardano.Ledger.Era (Era) import Cardano.Ledger.Shelley.Constraints - ( ShelleyBased, - UsesAuxiliary, + ( UsesAuxiliary, UsesPParams (mergePPUpdates), UsesScript, UsesTxBody, @@ -150,7 +150,7 @@ votedValue (ProposedPPUpdates pup) pps quorumN = _ -> Nothing instance - (ShelleyBased era, STS (NEWPP era)) => + (Era era, STS (NEWPP era)) => Embed (NEWPP era) (UPEC era) where wrapFailed = NewPpFailure diff --git a/eras/shelley/impl/src/Cardano/Ledger/Shelley/Serialization.hs b/eras/shelley/impl/src/Cardano/Ledger/Shelley/Serialization.hs deleted file mode 100644 index da61f464ade..00000000000 --- a/eras/shelley/impl/src/Cardano/Ledger/Shelley/Serialization.hs +++ /dev/null @@ -1,6 +0,0 @@ -module Cardano.Ledger.Shelley.Serialization - {-# DEPRECATED "Use 'import Cardano.Ledger.Serialization' instead." #-} - (module X) -where - -import Cardano.Ledger.Serialization as X diff --git a/eras/shelley/impl/src/Cardano/Ledger/Shelley/Slot.hs b/eras/shelley/impl/src/Cardano/Ledger/Shelley/Slot.hs deleted file mode 100644 index 8c6347f3d08..00000000000 --- a/eras/shelley/impl/src/Cardano/Ledger/Shelley/Slot.hs +++ /dev/null @@ -1,6 +0,0 @@ -module Cardano.Ledger.Shelley.Slot - {-# DEPRECATED "Use 'import Cardano.Ledger.Slot' instead." #-} - (module X) -where - -import Cardano.Ledger.Slot as X diff --git a/eras/shelley/impl/src/Cardano/Ledger/Shelley/TxBody.hs b/eras/shelley/impl/src/Cardano/Ledger/Shelley/TxBody.hs index 3509942ec31..33cccafb29f 100644 --- a/eras/shelley/impl/src/Cardano/Ledger/Shelley/TxBody.hs +++ b/eras/shelley/impl/src/Cardano/Ledger/Shelley/TxBody.hs @@ -64,10 +64,6 @@ module Cardano.Ledger.Shelley.TxBody TransTxId, TransTxOut, TransTxBody, - - -- * Deprecated - TxId, - TxIn, ) where @@ -1132,13 +1128,3 @@ instance _poolRelays = relays, _poolMD = maybeToStrictMaybe md } - --- DEPRECATED - -{-# DEPRECATED TxId "Import from Cardano.Ledger.TxIn instead" #-} - -type TxId = Core.TxId - -{-# DEPRECATED TxIn "Import from Cardano.Ledger.TxIn instead" #-} - -type TxIn = Core.TxIn diff --git a/eras/shelley/impl/src/Cardano/Ledger/Shelley/UTxO.hs b/eras/shelley/impl/src/Cardano/Ledger/Shelley/UTxO.hs index 57180b9b8f5..a56a7f7539e 100644 --- a/eras/shelley/impl/src/Cardano/Ledger/Shelley/UTxO.hs +++ b/eras/shelley/impl/src/Cardano/Ledger/Shelley/UTxO.hs @@ -37,9 +37,6 @@ module Cardano.Ledger.Shelley.UTxO -- * Utilities TransUTxO, - - -- * Deprecated - txid, ) where @@ -82,7 +79,7 @@ import Cardano.Ledger.Shelley.TxBody pattern Delegate, pattern Delegation, ) -import Cardano.Ledger.TxIn (TxId (..), TxIn (..)) +import Cardano.Ledger.TxIn (TxIn (..)) import qualified Cardano.Ledger.TxIn as Core (txid) import Cardano.Ledger.Val (zero, (<+>), (<×>)) import Control.DeepSeq (NFData) @@ -153,14 +150,6 @@ deriving via Show (Core.TxOut era) => Show (UTxO era) -{-# DEPRECATED txid "Import from Cardano.Ledger.TxIn instead" #-} -txid :: - forall era. - Era era => - Core.TxBody era -> - TxId (Crypto era) -txid = Core.txid - -- | Compute the UTxO inputs of a transaction. -- txins has the same problems as txouts, see notes below. txins :: diff --git a/eras/shelley/test-suite/src/Test/Cardano/Ledger/Shelley/Examples/Consensus.hs b/eras/shelley/test-suite/src/Test/Cardano/Ledger/Shelley/Examples/Consensus.hs index 89c07d121b1..e69dbb495e9 100644 --- a/eras/shelley/test-suite/src/Test/Cardano/Ledger/Shelley/Examples/Consensus.hs +++ b/eras/shelley/test-suite/src/Test/Cardano/Ledger/Shelley/Examples/Consensus.hs @@ -29,7 +29,7 @@ import Cardano.Ledger.Shelley.API import Cardano.Ledger.Shelley.Constraints import Cardano.Ledger.Shelley.EpochBoundary import Cardano.Ledger.Shelley.LedgerState -import Cardano.Ledger.Shelley.PParams hiding (ProtVer) +import Cardano.Ledger.Shelley.PParams import Cardano.Ledger.Shelley.Rules.Delegs import Cardano.Ledger.Shelley.Rules.Ledger import Cardano.Ledger.Shelley.Tx diff --git a/eras/shelley/test-suite/src/Test/Cardano/Ledger/Shelley/Rules/TestChain.hs b/eras/shelley/test-suite/src/Test/Cardano/Ledger/Shelley/Rules/TestChain.hs index 13c2bfe82b1..ee3eee446a3 100644 --- a/eras/shelley/test-suite/src/Test/Cardano/Ledger/Shelley/Rules/TestChain.hs +++ b/eras/shelley/test-suite/src/Test/Cardano/Ledger/Shelley/Rules/TestChain.hs @@ -53,7 +53,7 @@ import Cardano.Ledger.Shelley.Rules.Pool (POOL, PoolEnv (..)) import Cardano.Ledger.Shelley.Rules.Upec (votedValue) import Cardano.Ledger.Shelley.Scripts (ScriptHash) import Cardano.Ledger.Shelley.Tx hiding (TxIn) -import Cardano.Ledger.Shelley.TxBody hiding (TxIn) +import Cardano.Ledger.Shelley.TxBody import Cardano.Ledger.Shelley.UTxO (UTxO (..), balance, totalDeposits, txins, txouts, pattern UTxO) import Cardano.Ledger.TxIn (TxIn (..)) import Cardano.Ledger.Val ((<+>), (<->)) diff --git a/eras/shelley/test-suite/src/Test/Cardano/Ledger/Shelley/Serialisation/Generators/Genesis.hs b/eras/shelley/test-suite/src/Test/Cardano/Ledger/Shelley/Serialisation/Generators/Genesis.hs index 349b0195bae..e773c6a2fbb 100644 --- a/eras/shelley/test-suite/src/Test/Cardano/Ledger/Shelley/Serialisation/Generators/Genesis.hs +++ b/eras/shelley/test-suite/src/Test/Cardano/Ledger/Shelley/Serialisation/Generators/Genesis.hs @@ -27,7 +27,7 @@ import Cardano.Ledger.Keys hashKey, ) import Cardano.Ledger.Shelley.Genesis -import Cardano.Ledger.Shelley.PParams hiding (ProtVer) +import Cardano.Ledger.Shelley.PParams import Cardano.Ledger.Shelley.Scripts import Cardano.Ledger.Shelley.TxBody import Cardano.Prelude (Natural, Word32, Word64, Word8) diff --git a/eras/shelley/test-suite/src/Test/Cardano/Ledger/Shelley/Shrinkers.hs b/eras/shelley/test-suite/src/Test/Cardano/Ledger/Shelley/Shrinkers.hs index 3bc59750806..775516ffcc6 100644 --- a/eras/shelley/test-suite/src/Test/Cardano/Ledger/Shelley/Shrinkers.hs +++ b/eras/shelley/test-suite/src/Test/Cardano/Ledger/Shelley/Shrinkers.hs @@ -11,7 +11,7 @@ import qualified Cardano.Ledger.Core as Core import Cardano.Ledger.Shelley.PParams import Cardano.Ledger.Shelley.Scripts import Cardano.Ledger.Shelley.Tx hiding (TxIn) -import Cardano.Ledger.Shelley.TxBody hiding (TxIn) +import Cardano.Ledger.Shelley.TxBody import Cardano.Ledger.Slot import Cardano.Ledger.TxIn (TxIn) import Cardano.Ledger.Val ((<+>), (<->)) diff --git a/example-shelley b/example-shelley deleted file mode 120000 index ea40e8d1aaf..00000000000 --- a/example-shelley +++ /dev/null @@ -1 +0,0 @@ -libs/cardano-ledger-example-shelley \ No newline at end of file diff --git a/libs/cardano-ledger-core/src/Cardano/Ledger/Era.hs b/libs/cardano-ledger-core/src/Cardano/Ledger/Era.hs index afb31abfdd9..f163631d57b 100644 --- a/libs/cardano-ledger-core/src/Cardano/Ledger/Era.hs +++ b/libs/cardano-ledger-core/src/Cardano/Ledger/Era.hs @@ -22,7 +22,6 @@ module Cardano.Ledger.Era ValidateScript (..), -- $segWit SupportsSegWit (..), - TxInBlock, ) where @@ -139,13 +138,6 @@ class SupportsSegWit era where -- | The number of segregated components numSegComponents :: Word64 -{-# DEPRECATED TxInBlock "Please use Cardano.Ledger.Core.Tx instead." #-} - --- | Deprecated alias for Tx. --- --- TODO Remove this once downstream projects have been updated. -type TxInBlock era = Core.Tx era - -------------------------------------------------------------------------------- -- Era translation -------------------------------------------------------------------------------- diff --git a/libs/cardano-ledger-core/src/Cardano/Ledger/Hashes.hs b/libs/cardano-ledger-core/src/Cardano/Ledger/Hashes.hs index 566f4f290d0..0fc49227662 100644 --- a/libs/cardano-ledger-core/src/Cardano/Ledger/Hashes.hs +++ b/libs/cardano-ledger-core/src/Cardano/Ledger/Hashes.hs @@ -23,9 +23,6 @@ module Cardano.Ledger.Hashes -- * Script hashes ScriptHash (..), - - -- * deprecated - EraIndependentWitnessPPData, ) where @@ -66,10 +63,6 @@ data EraIndependentPParamView data EraIndependentScriptIntegrity -{-# DEPRECATED EraIndependentWitnessPPData "Use EraIndependentScriptIntegrity instead" #-} - -type EraIndependentWitnessPPData = EraIndependentScriptIntegrity - newtype ScriptHash crypto = ScriptHash (Hash.Hash (ADDRHASH crypto) EraIndependentScript) deriving (Show, Eq, Ord, Generic) diff --git a/libs/cardano-ledger-test/src/Test/Cardano/Ledger/Properties.hs b/libs/cardano-ledger-test/src/Test/Cardano/Ledger/Properties.hs index 8d4f88e9a7d..3e5f611a15c 100644 --- a/libs/cardano-ledger-test/src/Test/Cardano/Ledger/Properties.hs +++ b/libs/cardano-ledger-test/src/Test/Cardano/Ledger/Properties.hs @@ -17,7 +17,7 @@ import Cardano.Ledger.Alonzo.PParams (PParams, PParams' (..)) import Cardano.Ledger.Alonzo.PlutusScriptApi (scriptsNeeded) import Cardano.Ledger.Alonzo.Rules.Ledger (AlonzoLEDGER) import Cardano.Ledger.Alonzo.Rules.Utxow (AlonzoUTXOW) -import Cardano.Ledger.Alonzo.Scripts hiding (alwaysFails, alwaysSucceeds) +import Cardano.Ledger.Alonzo.Scripts import Cardano.Ledger.Alonzo.Tx ( IsValid (..), ScriptPurpose (..), diff --git a/libs/cardano-protocol-tpraos/cardano-protocol-tpraos.cabal b/libs/cardano-protocol-tpraos/cardano-protocol-tpraos.cabal index c9af3f3cb2a..5dbb43ec3d1 100644 --- a/libs/cardano-protocol-tpraos/cardano-protocol-tpraos.cabal +++ b/libs/cardano-protocol-tpraos/cardano-protocol-tpraos.cabal @@ -37,7 +37,6 @@ library hs-source-dirs: src exposed-modules: - Cardano.Protocol.TPraos Cardano.Protocol.TPraos.BHeader Cardano.Protocol.TPraos.OCert Cardano.Protocol.TPraos.Rules.OCert diff --git a/libs/cardano-protocol-tpraos/src/Cardano/Protocol/TPraos.hs b/libs/cardano-protocol-tpraos/src/Cardano/Protocol/TPraos.hs deleted file mode 100644 index e8e4848f5ce..00000000000 --- a/libs/cardano-protocol-tpraos/src/Cardano/Protocol/TPraos.hs +++ /dev/null @@ -1,7 +0,0 @@ -module Cardano.Protocol.TPraos - {-# DEPRECATED "Use 'import Cardano.Ledger.BaseTypes' instead." #-} - (IndividualPoolStake (..), PoolDistr (..), ProtVer (..)) -where - -import Cardano.Ledger.BaseTypes (ProtVer (..)) -import Cardano.Ledger.PoolDistr (IndividualPoolStake (..), PoolDistr (..)) diff --git a/libs/ledger-state/src/Cardano/Ledger/State/Vector.hs b/libs/ledger-state/src/Cardano/Ledger/State/Vector.hs index 16156f8d7f2..c5393a4f077 100644 --- a/libs/ledger-state/src/Cardano/Ledger/State/Vector.hs +++ b/libs/ledger-state/src/Cardano/Ledger/State/Vector.hs @@ -16,7 +16,7 @@ module Cardano.Ledger.State.Vector where import Cardano.Ledger.Coin import Cardano.Ledger.Credential import Cardano.Ledger.Keys as Keys -import Cardano.Ledger.Shelley.TxBody hiding (TxId, TxIn) +import Cardano.Ledger.Shelley.TxBody import Cardano.Ledger.State.UTxO import Control.DeepSeq import Data.Map.Strict as Map diff --git a/plutus-preprocessor b/plutus-preprocessor deleted file mode 120000 index 9dcbfa4a53f..00000000000 --- a/plutus-preprocessor +++ /dev/null @@ -1 +0,0 @@ -libs/plutus-preprocessor \ No newline at end of file diff --git a/shelley b/shelley deleted file mode 120000 index e21fa8c2568..00000000000 --- a/shelley +++ /dev/null @@ -1 +0,0 @@ -eras/shelley \ No newline at end of file