diff --git a/lib/api/src/Cardano/Wallet/Api/Http/Server/Handlers/TxCBOR.hs b/lib/api/src/Cardano/Wallet/Api/Http/Server/Handlers/TxCBOR.hs index f9378893d60..1d0dd331d1a 100644 --- a/lib/api/src/Cardano/Wallet/Api/Http/Server/Handlers/TxCBOR.hs +++ b/lib/api/src/Cardano/Wallet/Api/Http/Server/Handlers/TxCBOR.hs @@ -65,11 +65,9 @@ import Cardano.Wallet.Read ) import Cardano.Wallet.Read.Eras ( K (..) + , applyEraFun , (:*:) (..) ) -import Cardano.Wallet.Read.Eras.EraFun - ( applyEraFun - ) import Cardano.Wallet.Transaction ( TokenMapWithScripts , ValidityIntervalExplicit diff --git a/lib/read/lib/Cardano/Read/Ledger/Block/BHeader.hs b/lib/read/lib/Cardano/Read/Ledger/Block/BHeader.hs index 054a906100b..56238fceb97 100644 --- a/lib/read/lib/Cardano/Read/Ledger/Block/BHeader.hs +++ b/lib/read/lib/Cardano/Read/Ledger/Block/BHeader.hs @@ -34,13 +34,11 @@ import Cardano.Wallet.Read.Eras , Babbage , Byron , Conway + , Era (..) + , IsEra (..) , Mary , Shelley ) -import Cardano.Wallet.Read.Eras.KnownEras - ( Era (..) - , IsEra (..) - ) import GHC.Generics ( Generic ) diff --git a/lib/read/lib/Cardano/Read/Ledger/Block/Block.hs b/lib/read/lib/Cardano/Read/Ledger/Block/Block.hs index bae6de9de4d..98bb604a93f 100644 --- a/lib/read/lib/Cardano/Read/Ledger/Block/Block.hs +++ b/lib/read/lib/Cardano/Read/Ledger/Block/Block.hs @@ -30,16 +30,13 @@ import Cardano.Wallet.Read.Eras , Babbage , Byron , Conway + , Era (..) , EraValue (..) - , IsEra + , IsEra (..) , Mary , Shelley , eraValue ) -import Cardano.Wallet.Read.Eras.KnownEras - ( Era (..) - , IsEra (..) - ) import Ouroboros.Consensus.Protocol.Praos ( Praos ) diff --git a/lib/read/lib/Cardano/Read/Ledger/Block/HeaderHash.hs b/lib/read/lib/Cardano/Read/Ledger/Block/HeaderHash.hs index 5151392b3c1..c02f6f40fa3 100644 --- a/lib/read/lib/Cardano/Read/Ledger/Block/HeaderHash.hs +++ b/lib/read/lib/Cardano/Read/Ledger/Block/HeaderHash.hs @@ -49,14 +49,11 @@ import Cardano.Wallet.Read.Eras , Babbage , Byron , Conway - , IsEra + , Era (..) + , IsEra (..) , Mary , Shelley ) -import Cardano.Wallet.Read.Eras.KnownEras - ( Era (..) - , IsEra (..) - ) import Cardano.Wallet.Read.Hash ( Blake2b_256 , Hash diff --git a/lib/read/lib/Cardano/Read/Ledger/Block/SlotNo.hs b/lib/read/lib/Cardano/Read/Ledger/Block/SlotNo.hs index ef3197a50c7..f99c4c26d11 100644 --- a/lib/read/lib/Cardano/Read/Ledger/Block/SlotNo.hs +++ b/lib/read/lib/Cardano/Read/Ledger/Block/SlotNo.hs @@ -15,7 +15,7 @@ import Prelude import Cardano.Read.Ledger.Block.BHeader ( BHeader (..) ) -import Cardano.Wallet.Read.Eras.KnownEras +import Cardano.Wallet.Read.Eras ( Era (..) , IsEra (..) ) diff --git a/lib/read/lib/Cardano/Read/Ledger/Block/Txs.hs b/lib/read/lib/Cardano/Read/Ledger/Block/Txs.hs index e6cd8fba914..2cf534f2695 100644 --- a/lib/read/lib/Cardano/Read/Ledger/Block/Txs.hs +++ b/lib/read/lib/Cardano/Read/Ledger/Block/Txs.hs @@ -17,9 +17,7 @@ import Cardano.Read.Ledger.Block.Block ) import Cardano.Wallet.Read.Eras ( Byron - ) -import Cardano.Wallet.Read.Eras.KnownEras - ( Era (..) + , Era (..) , IsEra (..) ) import Cardano.Wallet.Read.Tx diff --git a/lib/read/lib/Cardano/Read/Ledger/Tx/CBOR.hs b/lib/read/lib/Cardano/Read/Ledger/Tx/CBOR.hs index b4fcaf29dbc..7e0f0bdf3f2 100644 --- a/lib/read/lib/Cardano/Read/Ledger/Tx/CBOR.hs +++ b/lib/read/lib/Cardano/Read/Ledger/Tx/CBOR.hs @@ -42,8 +42,9 @@ import Cardano.Ledger.Binary.Decoding , shelleyProtVer ) import Cardano.Wallet.Read.Eras - ( EraValue - , IsEra + ( Era (..) + , EraValue + , IsEra (..) , K (..) , applyEraFunValue , extractEraValue @@ -51,10 +52,6 @@ import Cardano.Wallet.Read.Eras , unK , (:.:) (..) ) -import Cardano.Wallet.Read.Eras.KnownEras - ( Era (..) - , IsEra (..) - ) import Cardano.Wallet.Read.Tx ( Tx (..) , TxT diff --git a/lib/read/lib/Cardano/Read/Ledger/Tx/Cardano.hs b/lib/read/lib/Cardano/Read/Ledger/Tx/Cardano.hs index 92e99894801..4c49c9faaa9 100644 --- a/lib/read/lib/Cardano/Read/Ledger/Tx/Cardano.hs +++ b/lib/read/lib/Cardano/Read/Ledger/Tx/Cardano.hs @@ -15,16 +15,14 @@ module Cardano.Read.Ledger.Tx.Cardano import Prelude import Cardano.Wallet.Read.Eras - ( EraValue - , eraValue - ) -import Cardano.Wallet.Read.Eras.KnownEras ( Allegra , Alonzo , Babbage , Conway + , EraValue , Mary , Shelley + , eraValue ) import Cardano.Wallet.Read.Tx ( Tx (..) diff --git a/lib/read/lib/Cardano/Read/Ledger/Tx/Witnesses.hs b/lib/read/lib/Cardano/Read/Ledger/Tx/Witnesses.hs index 73419e3f3db..e108baeec1d 100644 --- a/lib/read/lib/Cardano/Read/Ledger/Tx/Witnesses.hs +++ b/lib/read/lib/Cardano/Read/Ledger/Tx/Witnesses.hs @@ -40,13 +40,11 @@ import Cardano.Wallet.Read.Eras , Babbage , Byron , Conway + , Era (..) + , IsEra (..) , Mary , Shelley ) -import Cardano.Wallet.Read.Eras.KnownEras - ( Era (..) - , IsEra (..) - ) import Cardano.Wallet.Read.Tx ( Tx (..) ) diff --git a/lib/unit/test/unit/Cardano/Wallet/DB/Arbitrary.hs b/lib/unit/test/unit/Cardano/Wallet/DB/Arbitrary.hs index eb7f5dbc6ef..52cb364d884 100644 --- a/lib/unit/test/unit/Cardano/Wallet/DB/Arbitrary.hs +++ b/lib/unit/test/unit/Cardano/Wallet/DB/Arbitrary.hs @@ -217,11 +217,9 @@ import Cardano.Wallet.Primitive.Types.Tx.TxOut.Gen import Cardano.Wallet.Primitive.Types.UTxO ( UTxO (..) ) -import Cardano.Wallet.Read.Eras.EraValue +import Cardano.Wallet.Read.Eras ( eraValueSerialize - ) -import Cardano.Wallet.Read.Eras.KnownEras - ( knownEraIndices + , knownEraIndices ) import Cardano.Wallet.Unsafe ( someDummyMnemonic diff --git a/lib/wallet/src/Cardano/Wallet/DB/Store/Transactions/Decoration.hs b/lib/wallet/src/Cardano/Wallet/DB/Store/Transactions/Decoration.hs index 26e79f90ed2..02ab44db2d6 100644 --- a/lib/wallet/src/Cardano/Wallet/DB/Store/Transactions/Decoration.hs +++ b/lib/wallet/src/Cardano/Wallet/DB/Store/Transactions/Decoration.hs @@ -58,9 +58,7 @@ import Cardano.Wallet.Primitive.Ledger.Read.Tx.Features.Inputs ) import Cardano.Wallet.Read.Eras ( EraValue - ) -import Cardano.Wallet.Read.Eras.EraFun - ( applyEraFun + , applyEraFun ) import Control.Applicative ( (<|>)