Import StandardCrypto from Cardano.Ledger.Api

cardano-foundation · Aug 5, 2024 · 7774faa · 7774faa
1 parent 0e6a163
commit 7774faa
Show file tree

Hide file tree

Showing 22 changed files with 49 additions and 53 deletions.
diff --git a/lib/read/lib/Cardano/Read/Ledger/Block/HeaderHash.hs b/lib/read/lib/Cardano/Read/Ledger/Block/HeaderHash.hs
@@ -24,13 +24,13 @@ where
 
 import Prelude
 
+import Cardano.Ledger.Api
+    ( StandardCrypto
+    )
 import Cardano.Ledger.Binary
     ( EncCBOR
     , EncCBORGroup
     )
-import Cardano.Ledger.Crypto
-    ( StandardCrypto
-    )
 import Cardano.Ledger.Era
     ( EraSegWits (..)
     )

diff --git a/lib/read/lib/Cardano/Read/Ledger/Tx/Certificates.hs b/lib/read/lib/Cardano/Read/Ledger/Tx/Certificates.hs
@@ -24,15 +24,13 @@ module Cardano.Read.Ledger.Tx.Certificates
 import Prelude
 
 import Cardano.Ledger.Api
-    ( bodyTxL
+    ( StandardCrypto
+    , bodyTxL
     , certsTxBodyL
     )
 import Cardano.Ledger.Conway.TxCert
     ( ConwayTxCert
     )
-import Cardano.Ledger.Crypto
-    ( StandardCrypto
-    )
 import Cardano.Ledger.Shelley.TxCert
     ( ShelleyTxCert
     )

diff --git a/lib/read/lib/Cardano/Read/Ledger/Tx/CollateralInputs.hs b/lib/read/lib/Cardano/Read/Ledger/Tx/CollateralInputs.hs
@@ -24,14 +24,12 @@ module Cardano.Read.Ledger.Tx.CollateralInputs
 import Prelude
 
 import Cardano.Ledger.Api
-    ( collateralInputsTxBodyL
+    ( StandardCrypto
+    , collateralInputsTxBodyL
     )
 import Cardano.Ledger.Core
     ( bodyTxL
     )
-import Cardano.Ledger.Crypto
-    ( StandardCrypto
-    )
 import Cardano.Read.Ledger.Tx.Eras
     ( onTx
     )

diff --git a/lib/read/lib/Cardano/Read/Ledger/Tx/CollateralOutputs.hs b/lib/read/lib/Cardano/Read/Ledger/Tx/CollateralOutputs.hs
@@ -23,6 +23,9 @@ module Cardano.Read.Ledger.Tx.CollateralOutputs
 
 import Prelude
 
+import Cardano.Ledger.Api
+    ( StandardCrypto
+    )
 import Cardano.Ledger.Babbage.Collateral
     ()
 import Cardano.Ledger.Babbage.Rules
@@ -36,9 +39,6 @@ import Cardano.Ledger.Babbage.TxBody
 import Cardano.Ledger.Core
     ( bodyTxL
     )
-import Cardano.Ledger.Crypto
-    ( StandardCrypto
-    )
 import Cardano.Read.Ledger.Tx.Eras
     ( onTx
     )

diff --git a/lib/read/lib/Cardano/Read/Ledger/Tx/ExtraSigs.hs b/lib/read/lib/Cardano/Read/Ledger/Tx/ExtraSigs.hs
@@ -21,12 +21,12 @@ import Prelude
 import Cardano.Ledger.Alonzo.TxBody
     ( reqSignerHashesTxBodyL
     )
+import Cardano.Ledger.Api
+    ( StandardCrypto
+    )
 import Cardano.Ledger.Core
     ( bodyTxL
     )
-import Cardano.Ledger.Crypto
-    ( StandardCrypto
-    )
 import Cardano.Ledger.Keys
     ( KeyHash
     , KeyRole (..)

diff --git a/lib/read/lib/Cardano/Read/Ledger/Tx/Inputs.hs b/lib/read/lib/Cardano/Read/Ledger/Tx/Inputs.hs
@@ -21,13 +21,13 @@ module Cardano.Read.Ledger.Tx.Inputs
 
 import Prelude
 
+import Cardano.Ledger.Api
+    ( StandardCrypto
+    )
 import Cardano.Ledger.Core
     ( bodyTxL
     , inputsTxBodyL
     )
-import Cardano.Ledger.Crypto
-    ( StandardCrypto
-    )
 import Cardano.Read.Ledger.Tx.Eras
     ( onTx
     )

diff --git a/lib/read/lib/Cardano/Read/Ledger/Tx/Integrity.hs b/lib/read/lib/Cardano/Read/Ledger/Tx/Integrity.hs
@@ -29,12 +29,12 @@ import Cardano.Ledger.Alonzo.Tx
 import Cardano.Ledger.Alonzo.TxBody
     ( scriptIntegrityHashTxBodyL
     )
+import Cardano.Ledger.Api
+    ( StandardCrypto
+    )
 import Cardano.Ledger.Core
     ( bodyTxL
     )
-import Cardano.Ledger.Crypto
-    ( StandardCrypto
-    )
 import Cardano.Read.Ledger.Tx.Eras
     ( onTx
     )

diff --git a/lib/read/lib/Cardano/Read/Ledger/Tx/Mint.hs b/lib/read/lib/Cardano/Read/Ledger/Tx/Mint.hs
@@ -23,12 +23,12 @@ module Cardano.Read.Ledger.Tx.Mint
 
 import Prelude
 
+import Cardano.Ledger.Api
+    ( StandardCrypto
+    )
 import Cardano.Ledger.Core
     ( bodyTxL
     )
-import Cardano.Ledger.Crypto
-    ( StandardCrypto
-    )
 import Cardano.Ledger.Mary.Core
     ( mintTxBodyL
     )

diff --git a/lib/read/lib/Cardano/Read/Ledger/Tx/ReferenceInputs.hs b/lib/read/lib/Cardano/Read/Ledger/Tx/ReferenceInputs.hs
@@ -23,15 +23,15 @@ module Cardano.Read.Ledger.Tx.ReferenceInputs
 
 import Prelude
 
+import Cardano.Ledger.Api
+    ( StandardCrypto
+    )
 import Cardano.Ledger.Babbage.TxBody
     ( referenceInputsTxBodyL
     )
 import Cardano.Ledger.Core
     ( bodyTxL
     )
-import Cardano.Ledger.Crypto
-    ( StandardCrypto
-    )
 import Cardano.Read.Ledger.Tx.Eras
     ( onTx
     )

diff --git a/lib/read/lib/Cardano/Read/Ledger/Tx/TxId.hs b/lib/read/lib/Cardano/Read/Ledger/Tx/TxId.hs
@@ -20,13 +20,13 @@ import Cardano.Chain.UTxO
 import Cardano.Crypto.Hashing
     ( serializeCborHash
     )
+import Cardano.Ledger.Api
+    ( StandardCrypto
+    )
 import Cardano.Ledger.Core
     ( bodyTxL
     , txIdTxBody
     )
-import Cardano.Ledger.Crypto
-    ( StandardCrypto
-    )
 import Cardano.Read.Ledger.Tx.Eras
     ( onTx
     )

diff --git a/lib/read/lib/Cardano/Read/Ledger/Tx/Withdrawals.hs b/lib/read/lib/Cardano/Read/Ledger/Tx/Withdrawals.hs
@@ -28,16 +28,16 @@ import Cardano.Ledger.Address
     ( RewardAccount
     , unWithdrawals
     )
+import Cardano.Ledger.Api
+    ( StandardCrypto
+    )
 import Cardano.Ledger.Coin
     ( Coin
     )
 import Cardano.Ledger.Core
     ( bodyTxL
     , withdrawalsTxBodyL
     )
-import Cardano.Ledger.Crypto
-    ( StandardCrypto
-    )
 import Cardano.Read.Ledger.Tx.Eras
     ( onTx
     )

diff --git a/lib/read/lib/Cardano/Read/Ledger/Value.hs b/lib/read/lib/Cardano/Read/Ledger/Value.hs
@@ -20,7 +20,7 @@ module Cardano.Read.Ledger.Value
 
 import Prelude
 
-import Cardano.Ledger.Crypto
+import Cardano.Ledger.Api
     ( StandardCrypto
     )
 import Cardano.Wallet.Read.Eras

diff --git a/lib/read/lib/Cardano/Wallet/Read/Block/Gen/Babbage.hs b/lib/read/lib/Cardano/Wallet/Read/Block/Gen/Babbage.hs
@@ -21,6 +21,9 @@ import Cardano.Crypto.VRF
     ( CertifiedVRF (CertifiedVRF)
     , VRFAlgorithm (..)
     )
+import Cardano.Ledger.Api
+    ( StandardCrypto
+    )
 import Cardano.Ledger.BaseTypes
     ( ProtVer (..)
     )
@@ -63,9 +66,6 @@ import Ouroboros.Consensus.Protocol.Praos.Header
     ( Header (..)
     , HeaderBody (..)
     )
-import Ouroboros.Consensus.Protocol.TPraos
-    ( StandardCrypto
-    )
 
 import qualified Cardano.Ledger.Core as L
 import qualified Cardano.Ledger.Slot as L

diff --git a/lib/read/lib/Cardano/Wallet/Read/Block/Gen/Shelley.hs b/lib/read/lib/Cardano/Wallet/Read/Block/Gen/Shelley.hs
@@ -46,6 +46,9 @@ import Cardano.Crypto.VRF
 import Cardano.Crypto.VRF.Praos
     ( PraosVRF
     )
+import Cardano.Ledger.Api
+    ( StandardCrypto
+    )
 import Cardano.Ledger.BaseTypes
     ( ProtVer (..)
     , Version
@@ -94,8 +97,7 @@ import Ouroboros.Consensus.Protocol.Praos.Header
     ( Header (..)
     )
 import Ouroboros.Consensus.Protocol.TPraos
-    ( StandardCrypto
-    , TPraos
+    ( TPraos
     )
 
 import qualified Cardano.Crypto.DSIGN as Crypto

diff --git a/lib/read/lib/Cardano/Wallet/Read/Tx/Gen/Allegra.hs b/lib/read/lib/Cardano/Wallet/Read/Tx/Gen/Allegra.hs
@@ -17,7 +17,7 @@ import Cardano.Ledger.Allegra.TxBody
     , StrictMaybe (..)
     , ValidityInterval (..)
     )
-import Cardano.Ledger.Api.Era
+import Cardano.Ledger.Api
     ( AllegraEra
     , StandardCrypto
     )

diff --git a/lib/read/lib/Cardano/Wallet/Read/Tx/Gen/Alonzo.hs b/lib/read/lib/Cardano/Wallet/Read/Tx/Gen/Alonzo.hs
@@ -25,7 +25,7 @@ import Cardano.Ledger.Alonzo.TxBody
 import Cardano.Ledger.Alonzo.TxWits
     ( AlonzoTxWits
     )
-import Cardano.Ledger.Api.Era
+import Cardano.Ledger.Api
     ( AlonzoEra
     , StandardCrypto
     )

diff --git a/lib/read/lib/Cardano/Wallet/Read/Tx/Gen/Babbage.hs b/lib/read/lib/Cardano/Wallet/Read/Tx/Gen/Babbage.hs
@@ -20,10 +20,10 @@ import Cardano.Ledger.Alonzo.TxAuxData
     )
 import Cardano.Ledger.Api
     ( Datum (NoDatum)
+    , StandardCrypto
     )
 import Cardano.Ledger.Api.Era
     ( BabbageEra
-    , StandardCrypto
     )
 import Cardano.Ledger.Babbage.Tx
     ( AlonzoTx (AlonzoTx)

diff --git a/lib/read/lib/Cardano/Wallet/Read/Tx/Gen/Conway.hs b/lib/read/lib/Cardano/Wallet/Read/Tx/Gen/Conway.hs
@@ -21,10 +21,8 @@ import Cardano.Ledger.Alonzo.TxAuxData
     ( AuxiliaryDataHash
     )
 import Cardano.Ledger.Api
-    ( Datum (NoDatum)
-    )
-import Cardano.Ledger.Api.Era
     ( ConwayEra
+    , Datum (NoDatum)
     , StandardCrypto
     )
 import Cardano.Ledger.Api.Tx.In

diff --git a/lib/read/lib/Cardano/Wallet/Read/Tx/Gen/Mary.hs b/lib/read/lib/Cardano/Wallet/Read/Tx/Gen/Mary.hs
@@ -15,7 +15,7 @@ import Cardano.Ledger.Allegra.Core
 import Cardano.Ledger.Allegra.TxAuxData
     ( AllegraTxAuxData
     )
-import Cardano.Ledger.Api.Era
+import Cardano.Ledger.Api
     ( MaryEra
     , StandardCrypto
     )

diff --git a/lib/read/lib/Cardano/Wallet/Read/Tx/Gen/Shelley.hs b/lib/read/lib/Cardano/Wallet/Read/Tx/Gen/Shelley.hs
@@ -25,7 +25,7 @@ import Cardano.Crypto.Hash
 import Cardano.Ledger.Address
     ( Addr (..)
     )
-import Cardano.Ledger.Api.Era
+import Cardano.Ledger.Api
     ( Era
     , ShelleyEra
     , StandardCrypto

diff --git a/lib/read/lib/Cardano/Wallet/Read/Tx/TxIn.hs b/lib/read/lib/Cardano/Wallet/Read/Tx/TxIn.hs
@@ -21,7 +21,7 @@ module Cardano.Wallet.Read.Tx.TxIn
 
 import Prelude
 
-import Cardano.Ledger.Crypto
+import Cardano.Ledger.Api
     ( StandardCrypto
     )
 import Cardano.Wallet.Read.Tx.TxId

diff --git a/lib/read/lib/Cardano/Wallet/Read/Value.hs b/lib/read/lib/Cardano/Wallet/Read/Value.hs
@@ -37,12 +37,12 @@ import Prelude hiding
     ( subtract
     )
 
+import Cardano.Ledger.Api
+    ( StandardCrypto
+    )
 import Cardano.Ledger.Coin
     ( Coin (unCoin)
     )
-import Cardano.Ledger.Crypto
-    ( StandardCrypto
-    )
 import Cardano.Ledger.Val
     ( pointwise
     , (<->)