Skip to content

Commit

Permalink
Do not re-export UTxO-related types from Primitive.Types.
Browse files Browse the repository at this point in the history 
This forces modules that import UTxO-related to import them from
`Primitive.Types.UTxO`.
  • Loading branch information
@jonathanknowles
jonathanknowles committed Nov 19, 2020
1 parent be246f6 commit 255e01e
Show file tree
Hide file tree
Showing 26 changed files with 78 additions and 103 deletions.
12 changes: 7 additions & 5 deletions lib/core-integration/src/Test/Integration/Framework/DSL.hs
View file
Expand Up @@ -244,19 +244,14 @@ import Cardano.Wallet.Primitive.Types
( ActiveSlotCoefficient (..)
, EpochLength (..)
, EpochNo
, HistogramBar (..)
, PoolId (..)
, PoolMetadataGCStatus (..)
, PoolMetadataSource
, Settings
, SlotLength (..)
, SlotNo (..)
, SortOrder (..)
, UTxO (..)
, UTxOStatistics (..)
, WalletId (..)
, computeUtxoStatistics
, log10
)
import Cardano.Wallet.Primitive.Types.Address
( Address (..) )
Expand All @@ -266,6 +261,13 @@ import Cardano.Wallet.Primitive.Types.Hash
( Hash (..) )
import Cardano.Wallet.Primitive.Types.Tx
( TxIn (..), TxOut (..), TxStatus (..) )
import Cardano.Wallet.Primitive.Types.UTxO
( HistogramBar (..)
, UTxO (..)
, UTxOStatistics (..)
, computeUtxoStatistics
, log10
)
import Control.Arrow
( second )
import Control.Concurrent
Expand Down
7 changes: 3 additions & 4 deletions lib/core/src/Cardano/Wallet.hs
View file
Expand Up @@ -313,18 +313,14 @@ import Cardano.Wallet.Primitive.Types
, Range (..)
, Signature (..)
, SortOrder (..)
, UTxO (..)
, UTxOStatistics
, WalletDelegation (..)
, WalletDelegationStatus (..)
, WalletId (..)
, WalletMetadata (..)
, WalletName (..)
, WalletPassphraseInfo (..)
, computeUtxoStatistics
, distance
, dlgCertPoolId
, log10
, wholeRange
)
import Cardano.Wallet.Primitive.Types.Address
Expand All @@ -351,6 +347,8 @@ import Cardano.Wallet.Primitive.Types.Tx
, fromTransactionInfo
, withdrawals
)
import Cardano.Wallet.Primitive.Types.UTxO
( UTxO (..), UTxOStatistics, computeUtxoStatistics, log10 )
import Cardano.Wallet.Transaction
( DelegationAction (..)
, ErrDecodeSignedTx (..)
Expand Down Expand Up @@ -453,6 +451,7 @@ import qualified Cardano.Wallet.Primitive.CoinSelection.Random as CoinSelection
import qualified Cardano.Wallet.Primitive.Types as W
import qualified Cardano.Wallet.Primitive.Types.Coin as W
import qualified Cardano.Wallet.Primitive.Types.Tx as W
import qualified Cardano.Wallet.Primitive.Types.UTxO as W
import qualified Data.ByteArray as BA
import qualified Data.ByteString as BS
import qualified Data.List as L
Expand Down
5 changes: 2 additions & 3 deletions lib/core/src/Cardano/Wallet/Api/Types.hs
View file
Expand Up @@ -190,12 +190,10 @@ import Cardano.Wallet.Primitive.SyncProgress
( SyncProgress (..) )
import Cardano.Wallet.Primitive.Types
( ActiveSlotCoefficient (..)
, BoundType
, DecentralizationLevel (..)
, EpochLength (..)
, EpochNo (..)
, GenesisParameters (..)
, HistogramBar (..)
, NetworkParameters (..)
, PoolId (..)
, PoolMetadataGCStatus (..)
Expand All @@ -206,7 +204,6 @@ import Cardano.Wallet.Primitive.Types
, SlottingParameters (..)
, StakePoolMetadata
, StartTime (..)
, UTxOStatistics (..)
, WalletBalance (..)
, WalletId (..)
, WalletName (..)
Expand All @@ -222,6 +219,8 @@ import Cardano.Wallet.Primitive.Types.Hash
( Hash (..) )
import Cardano.Wallet.Primitive.Types.Tx
( Direction (..), TxIn (..), TxMetadata, TxStatus (..), txMetadataIsNull )
import Cardano.Wallet.Primitive.Types.UTxO
( BoundType, HistogramBar (..), UTxOStatistics (..) )
import Cardano.Wallet.Transaction
( DelegationAction (..) )
import Codec.Binary.Bech32
Expand Down
3 changes: 2 additions & 1 deletion lib/core/src/Cardano/Wallet/DB/Model.hs
View file
Expand Up @@ -80,7 +80,6 @@ import Cardano.Wallet.Primitive.Types
, SlotNo (..)
, SortOrder (..)
, StakeKeyCertificate (..)
, UTxO (..)
, WalletDelegation (..)
, WalletDelegationNext (..)
, WalletDelegationStatus (..)
Expand All @@ -99,6 +98,8 @@ import Cardano.Wallet.Primitive.Types.Tx
, TxMeta (..)
, TxStatus (..)
)
import Cardano.Wallet.Primitive.Types.UTxO
( UTxO (..) )
import Control.Monad
( when )
import Data.Bifunctor
Expand Down
1 change: 1 addition & 0 deletions lib/core/src/Cardano/Wallet/DB/Sqlite.hs
View file
Expand Up @@ -207,6 +207,7 @@ import qualified Cardano.Wallet.Primitive.Types.Address as W
import qualified Cardano.Wallet.Primitive.Types.Coin as W
import qualified Cardano.Wallet.Primitive.Types.Hash as W
import qualified Cardano.Wallet.Primitive.Types.Tx as W
import qualified Cardano.Wallet.Primitive.Types.UTxO as W
import qualified Data.Map as Map
import qualified Data.Text as T
import qualified Database.Sqlite as Sqlite
Expand Down
4 changes: 2 additions & 2 deletions lib/core/src/Cardano/Wallet/Primitive/CoinSelection.hs
View file
Expand Up @@ -27,12 +27,12 @@ module Cardano.Wallet.Primitive.CoinSelection

import Prelude

import Cardano.Wallet.Primitive.Types
( balance' )
import Cardano.Wallet.Primitive.Types.Coin
( Coin (..) )
import Cardano.Wallet.Primitive.Types.Tx
( TxIn, TxOut (..) )
import Cardano.Wallet.Primitive.Types.UTxO
( balance' )
import Data.List
( foldl' )
import Data.Quantity
Expand Down
4 changes: 2 additions & 2 deletions lib/core/src/Cardano/Wallet/Primitive/CoinSelection/LargestFirst.hs
View file
Expand Up @@ -24,12 +24,12 @@ import Cardano.Wallet.Primitive.CoinSelection
, ErrCoinSelection (..)
, totalBalance
)
import Cardano.Wallet.Primitive.Types
( UTxO (..) )
import Cardano.Wallet.Primitive.Types.Coin
( Coin (..) )
import Cardano.Wallet.Primitive.Types.Tx
( TxIn, TxOut (..) )
import Cardano.Wallet.Primitive.Types.UTxO
( UTxO (..) )
import Control.Arrow
( left )
import Control.Monad
Expand Down
4 changes: 2 additions & 2 deletions lib/core/src/Cardano/Wallet/Primitive/CoinSelection/Migration.hs
View file
Expand Up @@ -46,12 +46,12 @@ import Cardano.Wallet.Primitive.CoinSelection
)
import Cardano.Wallet.Primitive.Fee
( Fee (..), FeeOptions (..) )
import Cardano.Wallet.Primitive.Types
( UTxO (..) )
import Cardano.Wallet.Primitive.Types.Coin
( Coin (..) )
import Cardano.Wallet.Primitive.Types.Tx
( TxIn (..), TxOut (..) )
import Cardano.Wallet.Primitive.Types.UTxO
( UTxO (..) )
import Control.Monad.Trans.State
( State, evalState, get, put )
import Data.List
Expand Down
4 changes: 3 additions & 1 deletion lib/core/src/Cardano/Wallet/Primitive/CoinSelection/Random.hs
View file
Expand Up @@ -27,11 +27,13 @@ import Cardano.Wallet.Primitive.CoinSelection
import Cardano.Wallet.Primitive.CoinSelection.LargestFirst
( largestFirst )
import Cardano.Wallet.Primitive.Types
( UTxO (..), distance, invariant, pickRandom )
( distance, invariant )
import Cardano.Wallet.Primitive.Types.Coin
( Coin (..) )
import Cardano.Wallet.Primitive.Types.Tx
( TxIn, TxOut (..) )
import Cardano.Wallet.Primitive.Types.UTxO
( UTxO (..), pickRandom )
import Control.Arrow
( left )
import Control.Monad
Expand Down
4 changes: 3 additions & 1 deletion lib/core/src/Cardano/Wallet/Primitive/Fee.hs
View file
Expand Up @@ -44,11 +44,13 @@ import Cardano.Wallet.Primitive.CoinSelection
, outputBalance
)
import Cardano.Wallet.Primitive.Types
( FeePolicy (..), UTxO (..), invariant, pickRandom )
( FeePolicy (..), invariant )
import Cardano.Wallet.Primitive.Types.Coin
( Coin (..), isValidCoin )
import Cardano.Wallet.Primitive.Types.Tx
( TxIn, TxOut (..) )
import Cardano.Wallet.Primitive.Types.UTxO
( UTxO (..), pickRandom )
import Control.Monad
( when )
import Control.Monad.Trans.Class
Expand Down
7 changes: 2 additions & 5 deletions lib/core/src/Cardano/Wallet/Primitive/Model.hs
View file
Expand Up @@ -59,14 +59,9 @@ import Cardano.Wallet.Primitive.Types
( Block (..)
, BlockHeader (..)
, DelegationCertificate (..)
, Dom (..)
, GenesisParameters (..)
, UTxO (..)
, balance
, distance
, dlgCertAccount
, excluding
, restrictedBy
)
import Cardano.Wallet.Primitive.Types.Address
( Address (..) )
Expand All @@ -84,6 +79,8 @@ import Cardano.Wallet.Primitive.Types.Tx
, inputs
, txIns
)
import Cardano.Wallet.Primitive.Types.UTxO
( Dom (..), UTxO (..), balance, excluding, restrictedBy )
import Control.DeepSeq
( NFData (..), deepseq )
import Control.Monad
Expand Down
34 changes: 0 additions & 34 deletions lib/core/src/Cardano/Wallet/Primitive/Types.hs
View file
Expand Up @@ -53,23 +53,6 @@ module Cardano.Wallet.Primitive.Types
, getPoolRegistrationCertificate
, getPoolRetirementCertificate

-- * UTxO
, UTxO (..)
, balance
, balance'
, pickRandom
, excluding
, isSubsetOf
, restrictedBy
, restrictedTo
, Dom(..)
, UTxOStatistics (..)
, HistogramBar (..)
, BoundType
, computeUtxoStatistics
, computeStatistics
, log10

-- * Network Parameters
, NetworkParameters (..)
, GenesisParameters (..)
Expand Down Expand Up @@ -178,23 +161,6 @@ import Cardano.Wallet.Primitive.Types.RewardAccount
( RewardAccount (..) )
import Cardano.Wallet.Primitive.Types.Tx
( Tx (..) )
import Cardano.Wallet.Primitive.Types.UTxO
( BoundType
, Dom (..)
, HistogramBar (..)
, UTxO (..)
, UTxOStatistics (..)
, balance
, balance'
, computeStatistics
, computeUtxoStatistics
, excluding
, isSubsetOf
, log10
, pickRandom
, restrictedBy
, restrictedTo
)
import Control.Arrow
( left, right )
import Control.DeepSeq
Expand Down
10 changes: 3 additions & 7 deletions lib/core/src/Cardano/Wallet/Primitive/Types/UTxO.hs
View file
Expand Up @@ -12,11 +12,11 @@
--
module Cardano.Wallet.Primitive.Types.UTxO
(
-- * UTxO Types
-- * UTxO types
UTxO (..)
, UTxOStatistics (..)

-- * Auxilliary Types
-- * Auxilliary types
, BoundType
, Dom (..)
, HistogramBar (..)
Expand Down Expand Up @@ -54,11 +54,7 @@ import Data.Set
import Data.Word
( Word64 )
import Fmt
( Buildable (..)
, blockListF'
, padRightF
, tupleF
)
( Buildable (..), blockListF', padRightF, tupleF )
import GHC.Generics
( Generic )
import Numeric.Natural
Expand Down
3 changes: 2 additions & 1 deletion lib/core/test/bench/db/Main.hs
View file
Expand Up @@ -108,7 +108,6 @@ import Cardano.Wallet.Primitive.Types
, SlottingParameters (..)
, SortOrder (..)
, StartTime (..)
, UTxO (..)
, WalletDelegation (..)
, WalletDelegationStatus (..)
, WalletId (..)
Expand All @@ -130,6 +129,8 @@ import Cardano.Wallet.Primitive.Types.Tx
, TxOut (..)
, TxStatus (..)
)
import Cardano.Wallet.Primitive.Types.UTxO
( UTxO (..) )
import Cardano.Wallet.Unsafe
( someDummyMnemonic, unsafeRunExceptT )
import Control.DeepSeq
Expand Down
12 changes: 7 additions & 5 deletions lib/core/test/unit/Cardano/Wallet/Api/TypesSpec.hs
View file
Expand Up @@ -150,7 +150,6 @@ import Cardano.Wallet.Primitive.SyncProgress
( SyncProgress (..) )
import Cardano.Wallet.Primitive.Types
( EpochNo (..)
, HistogramBar (..)
, PoolId (..)
, PoolMetadataGCStatus (..)
, PoolMetadataSource
Expand All @@ -164,13 +163,9 @@ import Cardano.Wallet.Primitive.Types
, StakePoolMetadata (..)
, StakePoolTicker
, StartTime (..)
, UTxO (..)
, UTxOStatistics (..)
, WalletDelegationStatus (..)
, WalletId (..)
, WalletName (..)
, computeUtxoStatistics
, log10
, walletNameMaxLength
, walletNameMinLength
)
Expand All @@ -191,6 +186,13 @@ import Cardano.Wallet.Primitive.Types.Tx
, TxOut (..)
, TxStatus (..)
)
import Cardano.Wallet.Primitive.Types.UTxO
( HistogramBar (..)
, UTxO (..)
, UTxOStatistics (..)
, computeUtxoStatistics
, log10
)
import Cardano.Wallet.Transaction
( DelegationAction (..) )
import Cardano.Wallet.Unsafe
Expand Down
3 changes: 2 additions & 1 deletion lib/core/test/unit/Cardano/Wallet/DB/Arbitrary.hs
View file
Expand Up @@ -94,7 +94,6 @@ import Cardano.Wallet.Primitive.Types
, SlotNo (..)
, SortOrder (..)
, TxParameters (..)
, UTxO (..)
, WalletDelegation (..)
, WalletDelegationStatus (..)
, WalletId (..)
Expand Down Expand Up @@ -122,6 +121,8 @@ import Cardano.Wallet.Primitive.Types.Tx
, TxStatus (..)
, isPending
)
import Cardano.Wallet.Primitive.Types.UTxO
( UTxO (..) )
import Cardano.Wallet.Unsafe
( someDummyMnemonic, unsafeMkPercentage )
import Control.Arrow
Expand Down
3 changes: 2 additions & 1 deletion lib/core/test/unit/Cardano/Wallet/DB/StateMachine.hs
View file
Expand Up @@ -123,7 +123,6 @@ import Cardano.Wallet.Primitive.Types
, SortOrder (..)
, StakeKeyCertificate
, TxParameters (..)
, UTxO (..)
, WalletId (..)
, WalletMetadata (..)
)
Expand All @@ -146,6 +145,8 @@ import Cardano.Wallet.Primitive.Types.Tx
, TxStatus
, inputs
)
import Cardano.Wallet.Primitive.Types.UTxO
( UTxO (..) )
import Control.Foldl
( Fold (..) )
import Control.Monad.IO.Class
Expand Down

0 comments on commit 255e01e

Please sign in to comment.