diff --git a/lib/address-derivation-discovery/lib/Cardano/Wallet/Address/Derivation.hs b/lib/address-derivation-discovery/lib/Cardano/Wallet/Address/Derivation.hs index e9b7d9d8a7d..092788b4ec3 100644 --- a/lib/address-derivation-discovery/lib/Cardano/Wallet/Address/Derivation.hs +++ b/lib/address-derivation-discovery/lib/Cardano/Wallet/Address/Derivation.hs @@ -155,8 +155,8 @@ import Data.Text.Class , toTextFromBoundedEnum ) import Data.Type.Equality - ( (:~:) (..) - , testEquality + ( testEquality + , (:~:) (..) ) import Data.Word ( Word32 diff --git a/lib/application-extras/cardano-wallet-application-extras.cabal b/lib/application-extras/cardano-wallet-application-extras.cabal index 2a07aab6a4f..8ed19f2509c 100644 --- a/lib/application-extras/cardano-wallet-application-extras.cabal +++ b/lib/application-extras/cardano-wallet-application-extras.cabal @@ -31,7 +31,7 @@ library hs-source-dirs: lib build-depends: - , base ^>=4.14.3.0 + , base >=4.14.3.0 , contra-tracer ^>=0.1.0.2 , iohk-monitoring ^>=0.1.11.3 , iohk-monitoring-extra ^>=0.1 diff --git a/lib/balance-tx/lib/internal/Internal/Cardano/Write/Tx.hs b/lib/balance-tx/lib/internal/Internal/Cardano/Write/Tx.hs index b35be4351e5..bc67614035a 100644 --- a/lib/balance-tx/lib/internal/Internal/Cardano/Write/Tx.hs +++ b/lib/balance-tx/lib/internal/Internal/Cardano/Write/Tx.hs @@ -237,8 +237,8 @@ import Data.Maybe , isJust ) import Data.Type.Equality - ( (:~:) (Refl) - , TestEquality (testEquality) + ( TestEquality (testEquality) + , (:~:) (Refl) ) import Data.Typeable ( Typeable diff --git a/lib/balance-tx/lib/internal/Internal/Cardano/Write/Tx/Balance.hs b/lib/balance-tx/lib/internal/Internal/Cardano/Write/Tx/Balance.hs index 0b00a06d854..bae5e49dd93 100644 --- a/lib/balance-tx/lib/internal/Internal/Cardano/Write/Tx/Balance.hs +++ b/lib/balance-tx/lib/internal/Internal/Cardano/Write/Tx/Balance.hs @@ -184,8 +184,8 @@ import Data.Semigroup.Cancellative ( Reductive (()) ) import Data.Type.Equality - ( (:~:) (..) - , testEquality + ( testEquality + , (:~:) (..) ) import Fmt ( Buildable @@ -290,18 +290,18 @@ import qualified Cardano.Wallet.Primitive.Ledger.Convert as Convert import qualified Cardano.Wallet.Primitive.Types.Address as W ( Address ) -import qualified Cardano.Wallet.Primitive.Types.Coin as W.Coin import qualified Cardano.Wallet.Primitive.Types.Coin as W ( Coin (..) ) -import qualified Cardano.Wallet.Primitive.Types.TokenBundle as W.TokenBundle +import qualified Cardano.Wallet.Primitive.Types.Coin as W.Coin import qualified Cardano.Wallet.Primitive.Types.TokenBundle as W ( TokenBundle (..) ) -import qualified Cardano.Wallet.Primitive.Types.TokenMap as W.TokenMap +import qualified Cardano.Wallet.Primitive.Types.TokenBundle as W.TokenBundle import qualified Cardano.Wallet.Primitive.Types.TokenMap as W ( AssetId (..) ) +import qualified Cardano.Wallet.Primitive.Types.TokenMap as W.TokenMap import qualified Cardano.Wallet.Primitive.Types.TokenQuantity as W ( TokenQuantity (..) ) @@ -313,14 +313,14 @@ import qualified Cardano.Wallet.Primitive.Types.Tx.Constraints as W import qualified Cardano.Wallet.Primitive.Types.Tx.TxIn as W ( TxIn ) -import qualified Cardano.Wallet.Primitive.Types.Tx.TxOut as W.TxOut import qualified Cardano.Wallet.Primitive.Types.Tx.TxOut as W ( TxOut (..) ) -import qualified Cardano.Wallet.Primitive.Types.UTxO as W.UTxO +import qualified Cardano.Wallet.Primitive.Types.Tx.TxOut as W.TxOut import qualified Cardano.Wallet.Primitive.Types.UTxO as W ( UTxO (..) ) +import qualified Cardano.Wallet.Primitive.Types.UTxO as W.UTxO import qualified Data.Foldable as F import qualified Data.List as L import qualified Data.Map as Map diff --git a/lib/balance-tx/lib/internal/Internal/Cardano/Write/Tx/Balance/CoinSelection.hs b/lib/balance-tx/lib/internal/Internal/Cardano/Write/Tx/Balance/CoinSelection.hs index b7fedbe8274..88cdb7c76e4 100644 --- a/lib/balance-tx/lib/internal/Internal/Cardano/Write/Tx/Balance/CoinSelection.hs +++ b/lib/balance-tx/lib/internal/Internal/Cardano/Write/Tx/Balance/CoinSelection.hs @@ -128,10 +128,10 @@ import qualified Cardano.Wallet.Primitive.Types.Address as W import qualified Cardano.Wallet.Primitive.Types.Coin as W ( Coin ) -import qualified Cardano.Wallet.Primitive.Types.TokenBundle as W.TokenBundle import qualified Cardano.Wallet.Primitive.Types.TokenBundle as W ( TokenBundle (..) ) +import qualified Cardano.Wallet.Primitive.Types.TokenBundle as W.TokenBundle import qualified Cardano.Wallet.Primitive.Types.TokenMap as W ( AssetId , TokenMap diff --git a/lib/balance-tx/test/spec/Internal/Cardano/Write/Tx/Balance/TokenBundleSizeSpec.hs b/lib/balance-tx/test/spec/Internal/Cardano/Write/Tx/Balance/TokenBundleSizeSpec.hs index 4eaf6f4b03e..b9a121f1ae6 100644 --- a/lib/balance-tx/test/spec/Internal/Cardano/Write/Tx/Balance/TokenBundleSizeSpec.hs +++ b/lib/balance-tx/test/spec/Internal/Cardano/Write/Tx/Balance/TokenBundleSizeSpec.hs @@ -68,10 +68,10 @@ import Test.QuickCheck , (==>) ) -import qualified Cardano.Wallet.Primitive.Types.TokenBundle as W.TokenBundle import qualified Cardano.Wallet.Primitive.Types.TokenBundle as W ( TokenBundle ) +import qualified Cardano.Wallet.Primitive.Types.TokenBundle as W.TokenBundle import qualified Cardano.Wallet.Primitive.Types.TokenBundle.Gen as W import qualified Cardano.Wallet.Primitive.Types.Tx.Constraints as W ( TxSize (..) diff --git a/lib/coin-selection/lib/Cardano/CoinSelection/UTxOIndex/Internal.hs b/lib/coin-selection/lib/Cardano/CoinSelection/UTxOIndex/Internal.hs index fe0c09fffcc..eadfb10d4c2 100644 --- a/lib/coin-selection/lib/Cardano/CoinSelection/UTxOIndex/Internal.hs +++ b/lib/coin-selection/lib/Cardano/CoinSelection/UTxOIndex/Internal.hs @@ -145,14 +145,14 @@ import GHC.Generics ( Generic ) -import qualified Cardano.Wallet.Primitive.Types.TokenBundle as W.TokenBundle import qualified Cardano.Wallet.Primitive.Types.TokenBundle as W ( TokenBundle ) -import qualified Cardano.Wallet.Primitive.Types.TokenMap as W.TokenMap +import qualified Cardano.Wallet.Primitive.Types.TokenBundle as W.TokenBundle import qualified Cardano.Wallet.Primitive.Types.TokenMap as W ( AssetId ) +import qualified Cardano.Wallet.Primitive.Types.TokenMap as W.TokenMap import qualified Data.Foldable as F import qualified Data.List as L import qualified Data.List.NonEmpty as NE diff --git a/lib/crypto-hash-extra/crypto-hash-extra.cabal b/lib/crypto-hash-extra/crypto-hash-extra.cabal index b489ced11a3..08edf08a2cc 100644 --- a/lib/crypto-hash-extra/crypto-hash-extra.cabal +++ b/lib/crypto-hash-extra/crypto-hash-extra.cabal @@ -26,7 +26,7 @@ library hs-source-dirs: src exposed-modules: Crypto.Hash.Extra build-depends: - , base ^>=4.14.3 - , bytestring ^>=0.10.12 - , cryptonite ^>=0.30 - , memory ^>=0.18 + , base >=4.14.3 + , bytestring >=0.10.12 + , cryptonite >=0.30 + , memory >=0.18 diff --git a/lib/delta-table/src/Database/Persist/Delta.hs b/lib/delta-table/src/Database/Persist/Delta.hs index 5a330eaa0ab..bbbb5737d97 100644 --- a/lib/delta-table/src/Database/Persist/Delta.hs +++ b/lib/delta-table/src/Database/Persist/Delta.hs @@ -60,10 +60,10 @@ import Database.Persist.Sql , toSqlKey ) import Database.Schema - ( (:.) (..) - , Col (..) + ( Col (..) , IsRow , Primary (..) + , (:.) (..) ) import Say ( say diff --git a/lib/delta-table/src/Demo/Database.hs b/lib/delta-table/src/Demo/Database.hs index ba937e616e0..1113d03042f 100644 --- a/lib/delta-table/src/Demo/Database.hs +++ b/lib/delta-table/src/Demo/Database.hs @@ -93,10 +93,10 @@ import Database.Persist.TH , sqlSettings ) import Database.Schema - ( (:.) (..) - , Col (..) + ( Col (..) , Primary , Table (..) + , (:.) (..) ) import GHC.Generics ( Generic diff --git a/lib/iohk-monitoring-extra/iohk-monitoring-extra.cabal b/lib/iohk-monitoring-extra/iohk-monitoring-extra.cabal index 9998b638013..60e0394b516 100644 --- a/lib/iohk-monitoring-extra/iohk-monitoring-extra.cabal +++ b/lib/iohk-monitoring-extra/iohk-monitoring-extra.cabal @@ -27,18 +27,18 @@ library hs-source-dirs: src exposed-modules: Cardano.BM.Extra build-depends: - , aeson ^>=2.1.2.1 - , base ^>=4.14.3 - , bytestring ^>=0.10.12 - , contra-tracer ^>=0.1.0.2 - , deepseq ^>=1.4.4 - , exceptions ^>=0.10.4 - , fmt ^>=0.6.3 - , iohk-monitoring ^>=0.1.11.3 - , text ^>=1.2.4.1 - , text-class ^>=2023.7.18 - , time ^>=1.9.3 - , tracer-transformers ^>=0.1.0.4 - , transformers ^>=0.5.6.2 - , unliftio ^>=0.2.24 - , unliftio-core ^>=0.2.1 + , aeson >=2.1.2.1 + , base >=4.14.3 + , bytestring >=0.10.12 + , contra-tracer >=0.1.0.2 + , deepseq >=1.4.4 + , exceptions >=0.10.4 + , fmt >=0.6.3 + , iohk-monitoring >=0.1.11.3 + , text >=1.2.4.1 + , text-class >=2023.7.18 + , time >=1.9.3 + , tracer-transformers >=0.1.0.4 + , transformers >=0.5.6.2 + , unliftio >=0.2.24 + , unliftio-core >=0.2.1 diff --git a/lib/local-cluster/local-cluster.cabal b/lib/local-cluster/local-cluster.cabal index b81c2617a35..82c2ff2ffaf 100644 --- a/lib/local-cluster/local-cluster.cabal +++ b/lib/local-cluster/local-cluster.cabal @@ -54,19 +54,19 @@ library hs-source-dirs: lib build-depends: - , aeson ^>=2.1.2.1 - , aeson-qq ^>=0.8.4 + , aeson >=2.1.2.1 + , aeson-qq >=0.8.4 , base - , base58-bytestring ^>=0.1 - , bech32 ^>=1.1.2 + , base58-bytestring >=0.1 + , bech32 >=1.1.2 , bech32-th - , binary ^>=0.8.8 - , bytestring ^>=0.10.12 + , binary >=0.8.8 + , bytestring >=0.10.12 , cardano-addresses , cardano-api - , cardano-binary ^>=1.7.0.1 + , cardano-binary >=1.7.0.1 , cardano-cli - , cardano-crypto ^>=1.1.2 + , cardano-crypto >=1.1.2 , cardano-data , cardano-ledger-api , cardano-ledger-core @@ -75,40 +75,40 @@ library , cardano-wallet-launcher , cardano-wallet-primitive , cardano-wallet-test-utils - , cborg ^>=0.2.9 - , containers ^>=0.6.5 + , cborg >=0.2.9 + , containers >=0.6.5 , contra-tracer - , crypto-hash-extra ^>=0.1 - , cryptonite ^>=0.30 + , crypto-hash-extra >=0.1 + , cryptonite >=0.30 , directory - , extra ^>=1.7 + , extra >=1.7 , filepath - , generic-lens ^>=2.2.2 - , int-cast ^>=0.2 + , generic-lens >=2.2.2 + , int-cast >=0.2 , iohk-monitoring , iohk-monitoring-extra - , lens ^>=5.1.1 + , lens >=5.1.1 , lobemo-backend-ekg - , memory ^>=0.18 - , network-uri ^>=2.6.4.2 - , OddWord ^>=1.0.1 + , memory >=0.18 + , network-uri >=2.6.4.2 + , OddWord >=1.0.1 , optparse-applicative - , ouroboros-network ^>=0.8.1 - , ouroboros-network-api ^>=0.5 - , path ^>=0.9.2 - , path-io ^>=1.7.0 - , resourcet ^>=1.3 - , retry ^>=0.9.3.1 - , tagged ^>=0.8.7 - , temporary ^>=1.3 + , ouroboros-network >=0.8.1 + , ouroboros-network-api >=0.5 + , path >=0.9.2 + , path-io >=1.7.0 + , resourcet >=1.3 + , retry >=0.9.3.1 + , tagged >=0.8.7 + , temporary >=1.3 , temporary-extra , text , text-class - , time ^>=1.9.3 - , typed-process ^>=0.2.11 - , unliftio ^>=0.2 - , with-utf8 ^>=1.0.2.4 - , yaml ^>=0.11.11 + , time >=1.9.3 + , typed-process >=0.2.11 + , unliftio >=0.2 + , with-utf8 >=1.0.2.4 + , yaml >=0.11.11 executable local-cluster import: language, opts-exe diff --git a/lib/network-layer/cardano-wallet-network-layer.cabal b/lib/network-layer/cardano-wallet-network-layer.cabal index c5a1f10a7b6..2700ade511a 100644 --- a/lib/network-layer/cardano-wallet-network-layer.cabal +++ b/lib/network-layer/cardano-wallet-network-layer.cabal @@ -33,7 +33,7 @@ library -- other-modules: -- other-extensions: build-depends: - , base ^>=4.14.3.0 + , base >=4.14.3.0 , bytestring , cardano-api , cardano-balance-tx:internal diff --git a/lib/primitive/lib/Cardano/Wallet/Primitive/Ledger/Read/Tx/Features/Mint.hs b/lib/primitive/lib/Cardano/Wallet/Primitive/Ledger/Read/Tx/Features/Mint.hs index b0644c209e0..a6ad567f7fb 100644 --- a/lib/primitive/lib/Cardano/Wallet/Primitive/Ledger/Read/Tx/Features/Mint.hs +++ b/lib/primitive/lib/Cardano/Wallet/Primitive/Ledger/Read/Tx/Features/Mint.hs @@ -71,9 +71,9 @@ import Cardano.Wallet.Primitive.Types.TokenPolicy ( TokenPolicyId (..) ) import Cardano.Wallet.Read.Eras - ( (:*:) (..) - , EraFun (..) + ( EraFun (..) , K (..) + , (:*:) (..) ) import Cardano.Wallet.Read.Tx.Mint ( Mint (..) diff --git a/lib/primitive/lib/Cardano/Wallet/Primitive/Ledger/Shelley.hs b/lib/primitive/lib/Cardano/Wallet/Primitive/Ledger/Shelley.hs index 757a8ac6dc1..41a41a69ab6 100644 --- a/lib/primitive/lib/Cardano/Wallet/Primitive/Ledger/Shelley.hs +++ b/lib/primitive/lib/Cardano/Wallet/Primitive/Ledger/Shelley.hs @@ -304,8 +304,8 @@ import Data.Quantity , mkPercentage ) import Data.Type.Equality - ( (:~:) (..) - , testEquality + ( testEquality + , (:~:) (..) ) import Data.Word ( Word16 diff --git a/lib/primitive/lib/Cardano/Wallet/Primitive/Types/Tx/SealedTx.hs b/lib/primitive/lib/Cardano/Wallet/Primitive/Types/Tx/SealedTx.hs index 475c644e6fc..f785020b249 100644 --- a/lib/primitive/lib/Cardano/Wallet/Primitive/Types/Tx/SealedTx.hs +++ b/lib/primitive/lib/Cardano/Wallet/Primitive/Types/Tx/SealedTx.hs @@ -83,8 +83,8 @@ import Data.Text ( Text ) import Data.Type.Equality - ( (:~:) (..) - , testEquality + ( testEquality + , (:~:) (..) ) import Fmt ( Buildable (..) diff --git a/lib/read/lib/Cardano/Wallet/Read/Block/Txs.hs b/lib/read/lib/Cardano/Wallet/Read/Block/Txs.hs index 72186d1f939..ab4624f5409 100644 --- a/lib/read/lib/Cardano/Wallet/Read/Block/Txs.hs +++ b/lib/read/lib/Cardano/Wallet/Read/Block/Txs.hs @@ -18,8 +18,8 @@ import Cardano.Wallet.Read.Block ( Block (..) ) import Cardano.Wallet.Read.Eras - ( (:.:) (..) - , EraFun (..) + ( EraFun (..) + , (:.:) (..) ) import Cardano.Wallet.Read.Tx ( Tx (..) diff --git a/lib/read/lib/Cardano/Wallet/Read/Eras.hs b/lib/read/lib/Cardano/Wallet/Read/Eras.hs index 9dfbe867e69..b3152689966 100644 --- a/lib/read/lib/Cardano/Wallet/Read/Eras.hs +++ b/lib/read/lib/Cardano/Wallet/Read/Eras.hs @@ -74,9 +74,9 @@ import Cardano.Wallet.Read.Eras.KnownEras , knownEraIndices ) import Generics.SOP - ( (:.:) (..) - , K (..) + ( K (..) , unK + , (:.:) (..) ) import GHC.Generics ( (:*:) (..) diff --git a/lib/read/lib/Cardano/Wallet/Read/Eras/EraFun.hs b/lib/read/lib/Cardano/Wallet/Read/Eras/EraFun.hs index 72ee77cd2a9..2ac1b154596 100644 --- a/lib/read/lib/Cardano/Wallet/Read/Eras/EraFun.hs +++ b/lib/read/lib/Cardano/Wallet/Read/Eras/EraFun.hs @@ -90,11 +90,11 @@ import Control.Category ( Category (..) ) import Generics.SOP - ( (:.:) (..) - , K (..) + ( K (..) , NP , unComp , unK + , (:.:) (..) ) import Generics.SOP.Classes import Generics.SOP.NP diff --git a/lib/read/lib/Cardano/Wallet/Read/Eras/EraValue.hs b/lib/read/lib/Cardano/Wallet/Read/Eras/EraValue.hs index f057034d20f..0475984ecbf 100644 --- a/lib/read/lib/Cardano/Wallet/Read/Eras/EraValue.hs +++ b/lib/read/lib/Cardano/Wallet/Read/Eras/EraValue.hs @@ -76,8 +76,7 @@ import Data.Generics.Internal.VL , prism ) import Generics.SOP - ( (:.:) - , All + ( All , Compose , K (..) , NP (..) @@ -87,6 +86,7 @@ import Generics.SOP , injections , unComp , unK + , (:.:) ) import Generics.SOP.Classes import Generics.SOP.NP diff --git a/lib/read/lib/Cardano/Wallet/Read/Tx/CBOR.hs b/lib/read/lib/Cardano/Wallet/Read/Tx/CBOR.hs index 730eee42f7d..c2b77577f96 100644 --- a/lib/read/lib/Cardano/Wallet/Read/Tx/CBOR.hs +++ b/lib/read/lib/Cardano/Wallet/Read/Tx/CBOR.hs @@ -41,13 +41,13 @@ import Cardano.Ledger.Binary.Decoding , shelleyProtVer ) import Cardano.Wallet.Read.Eras - ( (:.:) (..) - , EraFun (..) + ( EraFun (..) , EraValue , K (..) , applyEraFun , extractEraValue , sequenceEraValue + , (:.:) (..) ) import Cardano.Wallet.Read.Tx ( Tx (..) diff --git a/lib/temporary-extra/temporary-extra.cabal b/lib/temporary-extra/temporary-extra.cabal index 43222ab87e7..0b779805efc 100644 --- a/lib/temporary-extra/temporary-extra.cabal +++ b/lib/temporary-extra/temporary-extra.cabal @@ -27,7 +27,7 @@ library hs-source-dirs: src exposed-modules: System.IO.Temp.Extra build-depends: - , base ^>=4.14.3.0 + , base >=4.14.3.0 , iohk-monitoring ^>=0.1.11.3 , iohk-monitoring-extra ^>=0.1 , temporary ^>=1.3 diff --git a/lib/test-utils/src/Test/QuickCheck/Extra.hs b/lib/test-utils/src/Test/QuickCheck/Extra.hs index 021dd9f995a..524568c5729 100644 --- a/lib/test-utils/src/Test/QuickCheck/Extra.hs +++ b/lib/test-utils/src/Test/QuickCheck/Extra.hs @@ -116,10 +116,10 @@ import Fmt ) import Generics.SOP import GHC.TypeNats - ( type (<=) - , KnownNat + ( KnownNat , Nat , natVal + , type (<=) ) import Numeric.Natural ( Natural diff --git a/lib/wai-middleware-logging/test/Network/Wai/Middleware/LoggingSpec.hs b/lib/wai-middleware-logging/test/Network/Wai/Middleware/LoggingSpec.hs index 076cf1f6339..9b38d37471a 100644 --- a/lib/wai-middleware-logging/test/Network/Wai/Middleware/LoggingSpec.hs +++ b/lib/wai-middleware-logging/test/Network/Wai/Middleware/LoggingSpec.hs @@ -98,9 +98,7 @@ import Network.Wai.Middleware.Logging , withApiLogger ) import Servant - ( (:<|>) (..) - , (:>) - , Application + ( Application , DeleteNoContent , Get , JSON @@ -114,6 +112,8 @@ import Servant , err503 , serve , throwError + , (:<|>) (..) + , (:>) ) import Servant.Server ( Handler diff --git a/lib/wallet-e2e/cardano-wallet-e2e.cabal b/lib/wallet-e2e/cardano-wallet-e2e.cabal index d3f6ecaea80..7bafaebc018 100644 --- a/lib/wallet-e2e/cardano-wallet-e2e.cabal +++ b/lib/wallet-e2e/cardano-wallet-e2e.cabal @@ -55,37 +55,37 @@ common options common dependencies build-depends: - , base ^>=4.14.3.0 - , path ^>=0.9.2 - , path-io ^>=1.7.0 - , relude ^>=1.2.0.0 - , sydtest ^>=0.15 - , tagged ^>=0.8.7 - , text ^>=1.2.4.1 + , base >=4.14.3.0 + , path >=0.9.2 + , path-io >=1.7.0 + , relude >=1.2.0.0 + , sydtest >=0.15 + , tagged >=0.8.7 + , text >=1.2.4.1 library import: options, dependencies hs-source-dirs: src build-depends: - , aeson ^>=2.1.2.1 - , base58-bytestring ^>=0.1 - , cardano-addresses ^>=3.12 - , cardano-crypto ^>=1.1.2 - , cardano-wallet-client ^>=0.1 - , effectful ^>=2.2.2.0 - , effectful-th ^>=1.0.0.1 - , http-client ^>=0.7.13.1 - , http-types ^>=0.12.3 - , local-cluster ^>=0.1 - , memory ^>=0.18 - , random ^>=1.2.1.1 - , resourcet ^>=1.3 - , retry ^>=0.9.3.1 - , scientific ^>=0.3.7 - , tagged ^>=0.8.7 - , time ^>=1.9.3 - , timespan ^>=0.4 - , typed-process ^>=0.2.11 + , aeson >=2.1.2.1 + , base58-bytestring >=0.1 + , cardano-addresses >=3.12 + , cardano-crypto >=1.1.2 + , cardano-wallet-client >=0.1 + , effectful >=2.2.2.0 + , effectful-th >=1.0.0.1 + , http-client >=0.7.13.1 + , http-types >=0.12.3 + , local-cluster >=0.1 + , memory >=0.18 + , random >=1.2.1.1 + , resourcet >=1.3 + , retry >=0.9.3.1 + , scientific >=0.3.7 + , tagged >=0.8.7 + , time >=1.9.3 + , timespan >=0.4 + , typed-process >=0.2.11 exposed-modules: Cardano.Wallet.Spec @@ -123,7 +123,7 @@ executable wallet-e2e ghc-options: -threaded -rtsopts -with-rtsopts=-N build-depends: , cardano-wallet-e2e - , optparse-applicative ^>=0.17.1 - , prettyprinter ^>=1.7.1 - , prettyprinter-ansi-terminal ^>=1.1.3 - , with-utf8 ^>=1.0.2.4 + , optparse-applicative >=0.17.1 + , prettyprinter >=1.7.1 + , prettyprinter-ansi-terminal >=1.1.3 + , with-utf8 >=1.0.2.4 diff --git a/lib/wallet-e2e/src/Cardano/Wallet/Spec/Effect/Assert.hs b/lib/wallet-e2e/src/Cardano/Wallet/Spec/Effect/Assert.hs index 4686ed7c7a2..d4d8ad75060 100644 --- a/lib/wallet-e2e/src/Cardano/Wallet/Spec/Effect/Assert.hs +++ b/lib/wallet-e2e/src/Cardano/Wallet/Spec/Effect/Assert.hs @@ -16,9 +16,9 @@ import Cardano.Wallet.Spec.Effect.Trace , trace ) import Effectful - ( (:>) - , Eff + ( Eff , Effect + , (:>) ) import Effectful.Dispatch.Dynamic ( interpret diff --git a/lib/wallet-e2e/src/Cardano/Wallet/Spec/Effect/Http.hs b/lib/wallet-e2e/src/Cardano/Wallet/Spec/Effect/Http.hs index fb8c30ca445..4c20b662691 100644 --- a/lib/wallet-e2e/src/Cardano/Wallet/Spec/Effect/Http.hs +++ b/lib/wallet-e2e/src/Cardano/Wallet/Spec/Effect/Http.hs @@ -14,10 +14,10 @@ import Control.Exception ( try ) import Effectful - ( (:>) - , Eff + ( Eff , Effect , IOE + , (:>) ) import Effectful.Dispatch.Dynamic ( interpret diff --git a/lib/wallet-e2e/src/Cardano/Wallet/Spec/Effect/Query.hs b/lib/wallet-e2e/src/Cardano/Wallet/Spec/Effect/Query.hs index cde54b70e4c..6c404d8ce27 100644 --- a/lib/wallet-e2e/src/Cardano/Wallet/Spec/Effect/Query.hs +++ b/lib/wallet-e2e/src/Cardano/Wallet/Spec/Effect/Query.hs @@ -57,9 +57,9 @@ import Cardano.Wallet.Spec.Network.Configured ( ConfiguredNetwork (..) ) import Effectful - ( (:>) - , Eff + ( Eff , Effect + , (:>) ) import Effectful.Dispatch.Dynamic ( interpret diff --git a/lib/wallet-e2e/src/Cardano/Wallet/Spec/Effect/Random.hs b/lib/wallet-e2e/src/Cardano/Wallet/Spec/Effect/Random.hs index 9cb565a08b2..e5a3dfd280a 100644 --- a/lib/wallet-e2e/src/Cardano/Wallet/Spec/Effect/Random.hs +++ b/lib/wallet-e2e/src/Cardano/Wallet/Spec/Effect/Random.hs @@ -28,9 +28,9 @@ import Data.Tagged ( Tagged (..) ) import Effectful - ( (:>) - , Eff + ( Eff , Effect + , (:>) ) import Effectful.Dispatch.Dynamic ( interpret diff --git a/lib/wallet-e2e/src/Cardano/Wallet/Spec/Effect/Timeout.hs b/lib/wallet-e2e/src/Cardano/Wallet/Spec/Effect/Timeout.hs index 944097f868a..fe5c1954e2d 100644 --- a/lib/wallet-e2e/src/Cardano/Wallet/Spec/Effect/Timeout.hs +++ b/lib/wallet-e2e/src/Cardano/Wallet/Spec/Effect/Timeout.hs @@ -21,10 +21,10 @@ import Data.Time.TimeSpan , timeoutTS ) import Effectful - ( (:>) - , Eff + ( Eff , Effect , IOE + , (:>) ) import Effectful.Dispatch.Dynamic ( interpret diff --git a/lib/wallet-e2e/src/Cardano/Wallet/Spec/Stories/Language.hs b/lib/wallet-e2e/src/Cardano/Wallet/Spec/Stories/Language.hs index 0d63b5dc107..d62d0c4b4dd 100644 --- a/lib/wallet-e2e/src/Cardano/Wallet/Spec/Stories/Language.hs +++ b/lib/wallet-e2e/src/Cardano/Wallet/Spec/Stories/Language.hs @@ -1,8 +1,8 @@ module Cardano.Wallet.Spec.Stories.Language (FxStory) where import Effectful - ( (:>) - , Eff + ( Eff + , (:>) ) type FxStory otherEffects knownEffects a = diff --git a/lib/wallet/api/http/Cardano/Wallet/Api.hs b/lib/wallet/api/http/Cardano/Wallet/Api.hs index c2ea617b621..f84fbee3c1b 100644 --- a/lib/wallet/api/http/Cardano/Wallet/Api.hs +++ b/lib/wallet/api/http/Cardano/Wallet/Api.hs @@ -330,14 +330,14 @@ import GHC.Generics ( Generic ) import Servant.API - ( (:<|>) - , (:>) - , Capture + ( Capture , JSON , OctetStream , QueryFlag , QueryParam , ReqBody + , (:<|>) + , (:>) ) import Servant.API.Verbs ( DeleteAccepted diff --git a/lib/wallet/api/http/Cardano/Wallet/Api/Client.hs b/lib/wallet/api/http/Cardano/Wallet/Api/Client.hs index 47ba344d1bf..21907fad952 100644 --- a/lib/wallet/api/http/Cardano/Wallet/Api/Client.hs +++ b/lib/wallet/api/http/Cardano/Wallet/Api/Client.hs @@ -137,9 +137,9 @@ import Data.Text ( Text ) import Servant - ( (:<|>) (..) + ( NoContent + , (:<|>) (..) , (:>) - , NoContent ) import Servant.Client ( ClientM diff --git a/lib/wallet/api/http/Cardano/Wallet/Api/Http/Server.hs b/lib/wallet/api/http/Cardano/Wallet/Api/Http/Server.hs index 7a181e41a43..32686655146 100644 --- a/lib/wallet/api/http/Cardano/Wallet/Api/Http/Server.hs +++ b/lib/wallet/api/http/Cardano/Wallet/Api/Http/Server.hs @@ -265,11 +265,11 @@ import Network.Ntp ( NtpClient ) import Servant - ( (:<|>) (..) - , Handler (..) + ( Handler (..) , NoContent (..) , Server , err400 + , (:<|>) (..) ) import Servant.Server ( ServerError (..) diff --git a/lib/wallet/api/http/Cardano/Wallet/Api/Http/Server/Handlers/TxCBOR.hs b/lib/wallet/api/http/Cardano/Wallet/Api/Http/Server/Handlers/TxCBOR.hs index 9fa40d2e1ff..92604c8328b 100644 --- a/lib/wallet/api/http/Cardano/Wallet/Api/Http/Server/Handlers/TxCBOR.hs +++ b/lib/wallet/api/http/Cardano/Wallet/Api/Http/Server/Handlers/TxCBOR.hs @@ -37,14 +37,14 @@ import Cardano.Wallet.Read ( Tx (..) ) import Cardano.Wallet.Read.Eras - ( (:.:) - , EraFun (..) + ( EraFun (..) , K (..) , applyEraFun , extractEraValue , sequenceEraValue , (*&&&*) , (*.**) + , (:.:) ) import Cardano.Wallet.Read.Eras.EraFun ( EraFunK (..) diff --git a/lib/wallet/api/http/Cardano/Wallet/Api/Link.hs b/lib/wallet/api/http/Cardano/Wallet/Api/Link.hs index 72bdbdc73fb..20ba40e51ec 100644 --- a/lib/wallet/api/http/Cardano/Wallet/Api/Link.hs +++ b/lib/wallet/api/http/Cardano/Wallet/Api/Link.hs @@ -200,8 +200,7 @@ import Numeric.Natural ( Natural ) import Servant.API - ( (:>) - , Capture' + ( Capture' , Header' , IsElem , NoContentVerb @@ -210,6 +209,7 @@ import Servant.API , ReflectMethod (..) , ReqBody , Verb + , (:>) ) import Servant.Links ( HasLink (..) diff --git a/lib/wallet/bench/api-bench.hs b/lib/wallet/bench/api-bench.hs index 03324f3df0d..7b3f6ac3071 100644 --- a/lib/wallet/bench/api-bench.hs +++ b/lib/wallet/bench/api-bench.hs @@ -175,8 +175,8 @@ import Say ( sayErr ) -import qualified Cardano.Api as Cardano import qualified Cardano.Api as C +import qualified Cardano.Api as Cardano import qualified Cardano.Wallet as W import qualified Cardano.Wallet.DB as DB import qualified Cardano.Wallet.DB.Layer as DB diff --git a/lib/wallet/mock-token-metadata/src/Cardano/Wallet/TokenMetadata/MockServer.hs b/lib/wallet/mock-token-metadata/src/Cardano/Wallet/TokenMetadata/MockServer.hs index 7260e304dcb..f7da099014b 100644 --- a/lib/wallet/mock-token-metadata/src/Cardano/Wallet/TokenMetadata/MockServer.hs +++ b/lib/wallet/mock-token-metadata/src/Cardano/Wallet/TokenMetadata/MockServer.hs @@ -106,10 +106,10 @@ import Network.Wai.Handler.Warp , withApplication ) import Servant.API - ( (:>) - , JSON + ( JSON , Post , ReqBody + , (:>) ) import Servant.Server ( Handler (..) diff --git a/lib/wallet/src/Cardano/Wallet.hs b/lib/wallet/src/Cardano/Wallet.hs index 9ada22b0ad7..47cfd3f163c 100644 --- a/lib/wallet/src/Cardano/Wallet.hs +++ b/lib/wallet/src/Cardano/Wallet.hs @@ -567,11 +567,11 @@ import Cardano.Wallet.Read.Tx.CBOR ( TxCBOR ) import Cardano.Wallet.Shelley.Transaction - ( mkTransaction + ( _txRewardWithdrawalCost + , mkTransaction , mkUnsignedTransaction , txConstraints , txWitnessTagForKey - , _txRewardWithdrawalCost ) import Cardano.Wallet.Transaction ( DelegationAction (..) diff --git a/lib/wallet/src/Cardano/Wallet/Compat.hs b/lib/wallet/src/Cardano/Wallet/Compat.hs index 7ecf8fddf2c..a4a7a59499e 100644 --- a/lib/wallet/src/Cardano/Wallet/Compat.hs +++ b/lib/wallet/src/Cardano/Wallet/Compat.hs @@ -17,7 +17,7 @@ import Data.Monoid ( First (..) ) import Data.Profunctor.Unsafe - ( ( #. ) + ( (#.) ) infixl 8 ^? diff --git a/lib/wallet/src/Cardano/Wallet/DB/Migration.hs b/lib/wallet/src/Cardano/Wallet/DB/Migration.hs index 1b6806cdb61..8503eaafd86 100644 --- a/lib/wallet/src/Cardano/Wallet/DB/Migration.hs +++ b/lib/wallet/src/Cardano/Wallet/DB/Migration.hs @@ -59,10 +59,10 @@ import GHC.Natural ( Natural ) import GHC.TypeNats - ( type (+) - , KnownNat + ( KnownNat , Nat , natVal + , type (+) ) -------------------------------------------------------------------------------- diff --git a/lib/wallet/src/Cardano/Wallet/DB/Store/Submissions/Layer.hs b/lib/wallet/src/Cardano/Wallet/DB/Store/Submissions/Layer.hs index f057feb1e6d..0dbe6d5c59d 100644 --- a/lib/wallet/src/Cardano/Wallet/DB/Store/Submissions/Layer.hs +++ b/lib/wallet/src/Cardano/Wallet/DB/Store/Submissions/Layer.hs @@ -68,10 +68,10 @@ import Cardano.Wallet.Submissions.Submissions ) import Cardano.Wallet.Submissions.TxStatus ( TxStatus (..) + , _InSubmission , expirySlot , getTx , status - , _InSubmission ) import Cardano.Wallet.Transaction.Built ( BuiltTx (..) diff --git a/lib/wallet/src/Cardano/Wallet/Primitive/Types/StateDeltaSeq.hs b/lib/wallet/src/Cardano/Wallet/Primitive/Types/StateDeltaSeq.hs index 399c79f2336..b508e7af335 100644 --- a/lib/wallet/src/Cardano/Wallet/Primitive/Types/StateDeltaSeq.hs +++ b/lib/wallet/src/Cardano/Wallet/Primitive/Types/StateDeltaSeq.hs @@ -134,7 +134,7 @@ import Data.List.NonEmpty ( NonEmpty (..) ) import Data.Sequence - ( Seq ((:<|), (:|>), Empty) + ( Seq (Empty, (:<|), (:|>)) ) import qualified Data.Foldable as F diff --git a/lib/wallet/src/Cardano/Wallet/Transaction.hs b/lib/wallet/src/Cardano/Wallet/Transaction.hs index 63398c2aac0..6e8df4047d5 100644 --- a/lib/wallet/src/Cardano/Wallet/Transaction.hs +++ b/lib/wallet/src/Cardano/Wallet/Transaction.hs @@ -132,10 +132,8 @@ import Cardano.Wallet.Primitive.Types.ValidityIntervalExplicit ) import Cardano.Wallet.Primitive.Types.WitnessCount ( WitnessCount (..) - , WitnessCount (..) , WitnessCountCtx (..) , emptyWitnessCount - , emptyWitnessCount , toKeyRole ) import Control.DeepSeq diff --git a/lib/wallet/test/unit/Cardano/Wallet/Api/TypesSpec.hs b/lib/wallet/test/unit/Cardano/Wallet/Api/TypesSpec.hs index a8af2cee7de..767c3989757 100644 --- a/lib/wallet/test/unit/Cardano/Wallet/Api/TypesSpec.hs +++ b/lib/wallet/test/unit/Cardano/Wallet/Api/TypesSpec.hs @@ -566,9 +566,7 @@ import Numeric.Natural ( Natural ) import Servant - ( (:<|>) - , (:>) - , Capture + ( Capture , Header' , JSON , PostNoContent @@ -577,6 +575,8 @@ import Servant , ReqBody , StdMethod (..) , Verb + , (:<|>) + , (:>) ) import Servant.API.Verbs ( NoContentVerb diff --git a/lib/wallet/test/unit/Cardano/Wallet/ApiSpec.hs b/lib/wallet/test/unit/Cardano/Wallet/ApiSpec.hs index 0d34b418ca8..a597adf0477 100644 --- a/lib/wallet/test/unit/Cardano/Wallet/ApiSpec.hs +++ b/lib/wallet/test/unit/Cardano/Wallet/ApiSpec.hs @@ -93,8 +93,8 @@ import Data.Tuple ( swap ) import Data.Type.Equality - ( (:~:) (..) - , testEquality + ( testEquality + , (:~:) (..) ) import Data.Typeable ( Typeable @@ -151,10 +151,10 @@ import Servant , serve ) import Servant.API - ( (:<|>) (..) - , (:>) - , Capture + ( Capture , OctetStream + , (:<|>) (..) + , (:>) ) import Servant.API.Verbs ( NoContentVerb diff --git a/lib/wallet/test/unit/Cardano/Wallet/Submissions/Gen.hs b/lib/wallet/test/unit/Cardano/Wallet/Submissions/Gen.hs index 218d98a573a..e9601c85887 100644 --- a/lib/wallet/test/unit/Cardano/Wallet/Submissions/Gen.hs +++ b/lib/wallet/test/unit/Cardano/Wallet/Submissions/Gen.hs @@ -29,20 +29,20 @@ import Cardano.Wallet.Submissions.Submissions ) import Cardano.Wallet.Submissions.TxStatus ( HasTxId (..) - , getTx , _Expired , _InLedger , _InSubmission + , getTx ) import Control.Arrow ( (&&&) ) import Control.Lens - ( lastOf + ( _2 + , lastOf , to , view , (&) - , _2 ) import Control.Lens.Extras ( is diff --git a/lib/wallet/test/unit/Internal/Cardano/Write/Tx/BalanceSpec.hs b/lib/wallet/test/unit/Internal/Cardano/Write/Tx/BalanceSpec.hs index 6739286a2f1..9f173e650c6 100644 --- a/lib/wallet/test/unit/Internal/Cardano/Write/Tx/BalanceSpec.hs +++ b/lib/wallet/test/unit/Internal/Cardano/Write/Tx/BalanceSpec.hs @@ -257,7 +257,6 @@ import Internal.Cardano.Write.Tx , TxIn , TxOut , TxOutInRecentEra (..) - , TxOutInRecentEra (..) , UTxO , fromCardanoApiTx , fromCardanoApiUTxO @@ -426,10 +425,10 @@ import qualified Cardano.Wallet.Primitive.Types as W.Block import qualified Cardano.Wallet.Primitive.Types.Address as W ( Address (..) ) -import qualified Cardano.Wallet.Primitive.Types.Coin as W.Coin import qualified Cardano.Wallet.Primitive.Types.Coin as W ( Coin (..) ) +import qualified Cardano.Wallet.Primitive.Types.Coin as W.Coin import qualified Cardano.Wallet.Primitive.Types.Coin.Gen as W import qualified Cardano.Wallet.Primitive.Types.Credentials as W ( RootCredentials (..) @@ -438,20 +437,20 @@ import qualified Cardano.Wallet.Primitive.Types.Hash as W ( Hash (..) , mockHash ) -import qualified Cardano.Wallet.Primitive.Types.TokenBundle as W.TokenBundle import qualified Cardano.Wallet.Primitive.Types.TokenBundle as W ( TokenBundle ) +import qualified Cardano.Wallet.Primitive.Types.TokenBundle as W.TokenBundle import qualified Cardano.Wallet.Primitive.Types.TokenBundle.Gen as W import qualified Cardano.Wallet.Primitive.Types.Tx.Constraints as W ( TxSize (..) ) import qualified Cardano.Wallet.Primitive.Types.Tx.TxIn as W import qualified Cardano.Wallet.Primitive.Types.Tx.TxIn.Gen as W -import qualified Cardano.Wallet.Primitive.Types.Tx.TxOut as W.TxOut import qualified Cardano.Wallet.Primitive.Types.Tx.TxOut as W ( TxOut (..) ) +import qualified Cardano.Wallet.Primitive.Types.Tx.TxOut as W.TxOut import qualified Cardano.Wallet.Primitive.Types.Tx.TxOut.Gen as W import qualified Cardano.Wallet.Primitive.Types.UTxO as W import qualified Codec.CBOR.Encoding as CBOR diff --git a/nix/haskell.nix b/nix/haskell.nix index ba2e4d94eee..232d35de7f2 100644 --- a/nix/haskell.nix +++ b/nix/haskell.nix @@ -100,7 +100,7 @@ CHaP: haskell-nix: nixpkgs-recent: nodePkgs: haskell-nix.cabalProject' [ localClusterConfigs = config.src + /lib/local-cluster/test/data/cluster-configs; in { name = "cardano-wallet"; - compiler-nix-name = "ghc8107"; + compiler-nix-name = "ghc928"; src = haskellLib.cleanSourceWith { name = "cardano-wallet-src"; @@ -122,7 +122,7 @@ CHaP: haskell-nix: nixpkgs-recent: nodePkgs: haskell-nix.cabalProject' [ lentil = { index-state = indexState; }; weeder = { index-state = indexState; - version = "2.2.0"; + version = "2.4.0"; }; }; nativeBuildInputs = with buildProject.hsPkgs; [ @@ -145,11 +145,11 @@ CHaP: haskell-nix: nixpkgs-recent: nodePkgs: haskell-nix.cabalProject' [ yq nixWrapped mdbook - (haskell-nix.tool "ghc8107" "hp2pretty" "latest") - (haskell-nix.tool "ghc8107" "stylish-haskell" "0.11.0.3") - (haskell-nix.tool "ghc8107" "hlint" "3.3") + (haskell-nix.tool "ghc928" "hp2pretty" "latest") + (haskell-nix.tool "ghc928" "stylish-haskell" "0.14.5.0") + (haskell-nix.tool "ghc928" "hlint" "3.6.1") (haskell-nix.tool "ghc928" "fourmolu" "0.13.1.0") - (haskell-nix.tool "ghc8107" "haskell-language-server" ({pkgs, ...}: rec { + (haskell-nix.tool "ghc928" "haskell-language-server" ({pkgs, ...}: rec { # Use the github source of HLS that is tested with haskell.nix CI src = pkgs.haskell-nix.sources."hls-2.0"; # `tool` normally ignores the `cabal.project` (if there is one in the hackage source). diff --git a/prototypes/light-mode-test/light-mode-test.cabal b/prototypes/light-mode-test/light-mode-test.cabal index 6f96ef7e60c..ced5ee677cb 100644 --- a/prototypes/light-mode-test/light-mode-test.cabal +++ b/prototypes/light-mode-test/light-mode-test.cabal @@ -38,7 +38,7 @@ library default-extensions: OverloadedStrings build-depends: - base ^>=4.14.3.0 + base >=4.14.3.0 , blockfrost-api , blockfrost-client , blockfrost-client-core