From 4dfd42d7d7e77b698a7c50c68a01ea57df48ada3 Mon Sep 17 00:00:00 2001 From: Michael Hueschen Date: Wed, 18 Jul 2018 10:03:02 -0400 Subject: [PATCH 1/2] [CDEC-432] Switch `JsonLog` & `Mockable` imports Change imports from `networking` to `core` (modules now have a `Pos.Core.` prefix. A few dependencies on `networking` disappear or switch to deps on `core`. --- auxx/Main.hs | 2 +- auxx/cardano-sl-auxx.cabal | 2 -- auxx/src/Command/Tx.hs | 6 +++--- auxx/src/Mode.hs | 2 +- auxx/src/Plugin.hs | 2 +- client/cardano-sl-client.cabal | 1 - client/src/Pos/Client/Txp/History.hs | 4 ++-- client/src/Pos/Client/Txp/Network.hs | 2 +- explorer/cardano-sl-explorer.cabal | 1 - explorer/src/Pos/Explorer/ExplorerMode.hs | 4 ++-- explorer/src/Pos/Explorer/Socket/App.hs | 2 +- explorer/src/Pos/Explorer/Txp/Local.hs | 2 +- explorer/src/Pos/Explorer/Web/Transform.hs | 2 +- explorer/src/explorer/Main.hs | 2 +- lib/src/Pos/Client/CLI/Util.hs | 2 +- lib/src/Pos/Launcher/Launcher.hs | 2 +- lib/src/Pos/Launcher/Mode.hs | 2 +- lib/src/Pos/Launcher/Resource.hs | 2 +- lib/src/Pos/Launcher/Runner.hs | 4 ++-- lib/src/Pos/Launcher/Scenario.hs | 2 +- lib/src/Pos/Listener/Delegation.hs | 2 +- lib/src/Pos/Listener/Update.hs | 2 +- lib/src/Pos/Network/Block/Logic.hs | 2 +- lib/src/Pos/Network/Block/Retrieval.hs | 2 +- lib/src/Pos/Network/Block/WorkMode.hs | 2 +- lib/src/Pos/Util/Mockable.hs | 3 ++- lib/src/Pos/Web/Mode.hs | 2 +- lib/src/Pos/Web/Server.hs | 2 +- lib/src/Pos/WorkMode.hs | 2 +- lib/src/Pos/WorkMode/Class.hs | 2 +- lib/src/Pos/Worker/Block.hs | 2 +- lib/src/Pos/Worker/Delegation.hs | 3 ++- lib/src/Pos/Worker/Ssc.hs | 2 +- lib/test/Test/Pos/SlottingSpec.hs.unused | 19 ++++++++++--------- networking/cardano-sl-networking.cabal | 3 --- .../Network/Transport/ConnectionBuffers.hs | 5 +++-- node/Main.hs | 2 +- node/cardano-sl-node.cabal | 2 +- pkgs/default.nix | 13 ++----------- tools/cardano-sl-tools.cabal | 2 -- tools/src/blockchain-analyser/Main.hs | 2 +- tools/src/blockchain-analyser/Types.hs | 2 +- tools/src/dbgen/Main.hs | 2 +- wallet-new/server/Main.hs | 2 +- .../src/Cardano/Wallet/API/V1/Handlers.hs | 2 +- .../Wallet/API/V1/Handlers/Addresses.hs | 4 ++-- .../Wallet/API/V1/Handlers/Transactions.hs | 2 +- .../Wallet/API/V1/LegacyHandlers/Info.hs | 2 +- .../Cardano/Wallet/API/V1/Migration/Monads.hs | 2 +- wallet-new/src/Cardano/Wallet/Kernel/Mode.hs | 2 +- wallet-new/src/Cardano/Wallet/Server.hs | 2 +- .../src/Cardano/Wallet/Server/Plugins.hs | 2 +- wallet/cardano-sl-wallet.cabal | 1 - wallet/src/Pos/Wallet/Web/Methods/Misc.hs | 3 ++- wallet/src/Pos/Wallet/Web/Methods/Payment.hs | 3 ++- wallet/src/Pos/Wallet/Web/Mode.hs | 4 ++-- wallet/src/Pos/Wallet/Web/Pending/Worker.hs | 2 +- wallet/src/Pos/Wallet/Web/Server/Runner.hs | 2 +- wallet/src/Pos/Wallet/Web/State/Util.hs | 2 +- 59 files changed, 76 insertions(+), 89 deletions(-) diff --git a/auxx/Main.hs b/auxx/Main.hs index d8d72f05ed8..aee0ea8da48 100644 --- a/auxx/Main.hs +++ b/auxx/Main.hs @@ -7,7 +7,6 @@ import Universum import Control.Exception.Safe (handle) import Data.Maybe (fromMaybe) import Formatting (sformat, shown, (%)) -import Mockable (Production (..), runProduction) import qualified Network.Transport.TCP as TCP (TCPAddr (..)) import qualified System.IO.Temp as Temp import System.Wlog (LoggerName, logInfo) @@ -15,6 +14,7 @@ import System.Wlog (LoggerName, logInfo) import qualified Pos.Client.CLI as CLI import Pos.Context (NodeContext (..)) import Pos.Core (ConfigurationError, epochSlots) +import Pos.Core.Mockable (Production (..), runProduction) import Pos.Crypto (ProtocolMagic) import Pos.DB.DB (initNodeDBs) import Pos.Infra.Diffusion.Types (Diffusion, hoistDiffusion) diff --git a/auxx/cardano-sl-auxx.cabal b/auxx/cardano-sl-auxx.cabal index f69d225b7f5..b9209c2c640 100644 --- a/auxx/cardano-sl-auxx.cabal +++ b/auxx/cardano-sl-auxx.cabal @@ -56,7 +56,6 @@ library , cardano-sl-db , cardano-sl-generator , cardano-sl-infra - , cardano-sl-networking , cardano-sl-ssc , cardano-sl-txp , cardano-sl-update @@ -133,7 +132,6 @@ executable cardano-auxx , cardano-sl-core , cardano-sl-crypto , cardano-sl-infra - , cardano-sl-networking , cardano-sl-txp , cardano-sl-util , log-warper diff --git a/auxx/src/Command/Tx.hs b/auxx/src/Command/Tx.hs index eb6db3af8e6..57f77f97a6f 100644 --- a/auxx/src/Command/Tx.hs +++ b/auxx/src/Command/Tx.hs @@ -28,9 +28,6 @@ import qualified Data.Text as T import qualified Data.Text.IO as T import Data.Time.Units (Microsecond, fromMicroseconds, toMicroseconds) import Formatting (build, int, sformat, shown, stext, (%)) -import Mockable (Mockable, SharedAtomic, SharedAtomicT, concurrently, - currentTime, delay, forConcurrently, modifySharedAtomic, - newSharedAtomic) import System.Environment (lookupEnv) import System.IO (BufferMode (LineBuffering), hClose, hSetBuffering) import System.Wlog (logError, logInfo) @@ -44,6 +41,9 @@ import Pos.Core (BlockVersionData (bvdSlotDuration), deriveFirstHDAddress, makePubKeyAddress, mkCoin) import Pos.Core.Configuration (genesisBlockVersionData, genesisSecretKeys) +import Pos.Core.Mockable (Mockable, SharedAtomic, SharedAtomicT, + concurrently, currentTime, delay, forConcurrently, + modifySharedAtomic, newSharedAtomic) import Pos.Core.Txp (TxAux (..), TxIn (TxInUtxo), TxOut (..), TxOutAux (..), txaF) import Pos.Crypto (EncryptedSecretKey, ProtocolMagic, emptyPassphrase, diff --git a/auxx/src/Mode.hs b/auxx/src/Mode.hs index 61a987d8e68..12ee53e85e3 100644 --- a/auxx/src/Mode.hs +++ b/auxx/src/Mode.hs @@ -26,7 +26,6 @@ import Control.Lens (lens, makeLensesWith) import Control.Monad.Reader (withReaderT) import Control.Monad.Trans.Resource (transResourceT) import Data.Conduit (transPipe) -import Mockable (Production) import System.Wlog (HasLoggerName (..)) import Pos.Block.BListener (MonadBListener (..)) @@ -45,6 +44,7 @@ import Pos.Core (Address, HasConfiguration, HasPrimaryKey (..), largestPubKeyAddressBoot, largestPubKeyAddressSingleKey, makePubKeyAddress, siEpoch) import Pos.Core.JsonLog (CanJsonLog (..)) +import Pos.Core.Mockable (Production) import Pos.Core.Reporting (HasMisbehaviorMetrics (..), MonadReporting (..)) import Pos.Core.Slotting (HasSlottingVar (..), MonadSlotsData) diff --git a/auxx/src/Plugin.hs b/auxx/src/Plugin.hs index 582d56bd72a..d67ad7e14ed 100644 --- a/auxx/src/Plugin.hs +++ b/auxx/src/Plugin.hs @@ -18,10 +18,10 @@ import Control.Monad.Except (ExceptT (..), withExceptT) import Data.Constraint (Dict (..)) import Data.Time.Units (Second) import Formatting (float, int, sformat, (%)) -import Mockable (Delay, Mockable, delay) import System.IO (hFlush, stdout) import System.Wlog (CanLog, HasLoggerName, logInfo) +import Pos.Core.Mockable (Delay, Mockable, delay) import Pos.Crypto (AHash (..), ProtocolMagic, fullPublicKeyF, hashHexF) import Pos.Infra.Diffusion.Types (Diffusion) diff --git a/client/cardano-sl-client.cabal b/client/cardano-sl-client.cabal index a7dbfedfe65..00ddbc30157 100644 --- a/client/cardano-sl-client.cabal +++ b/client/cardano-sl-client.cabal @@ -34,7 +34,6 @@ library , cardano-sl-db , cardano-sl-infra , cardano-sl-lrc - , cardano-sl-networking , cardano-sl-txp , cardano-sl-update , cardano-sl-util diff --git a/client/src/Pos/Client/Txp/History.hs b/client/src/Pos/Client/Txp/History.hs index 366434830de..05d15db8c01 100644 --- a/client/src/Pos/Client/Txp/History.hs +++ b/client/src/Pos/Client/Txp/History.hs @@ -33,8 +33,6 @@ import Control.Monad.Trans (MonadTrans) import qualified Data.Map.Strict as M (fromList, insert) import Formatting (bprint, build, (%)) import qualified Formatting.Buildable -import JsonLog (CanJsonLog (..)) -import Mockable (CurrentTime, Mockable) import Serokell.Util.Text (listJson) import System.Wlog (WithLogger) @@ -44,6 +42,8 @@ import Pos.Core (Address, ChainDifficulty, GenesisHash (..), import Pos.Core.Block (Block, MainBlock, mainBlockSlot, mainBlockTxPayload) import Pos.Core.Block.Constructors (genesisBlock0) +import Pos.Core.JsonLog (CanJsonLog (..)) +import Pos.Core.Mockable (CurrentTime, Mockable) import Pos.Crypto (ProtocolMagic, WithHash (..), withHash) import Pos.DB (MonadDBRead, MonadGState) import Pos.DB.Block (getBlock) diff --git a/client/src/Pos/Client/Txp/Network.hs b/client/src/Pos/Client/Txp/Network.hs index 4f6de5d06e9..f8974d7ab60 100644 --- a/client/src/Pos/Client/Txp/Network.hs +++ b/client/src/Pos/Client/Txp/Network.hs @@ -14,7 +14,6 @@ module Pos.Client.Txp.Network import Universum import Formatting (build, sformat, (%)) -import Mockable (MonadMockable) import System.Wlog (logInfo) import Pos.Client.Txp.Addresses (MonadAddresses (..)) @@ -27,6 +26,7 @@ import Pos.Communication.Message () import Pos.Communication.Types (InvOrDataTK) import Pos.Core (Address, Coin, makeRedeemAddress, mkCoin, unsafeAddCoin) +import Pos.Core.Mockable (MonadMockable) import Pos.Core.Txp (TxAux (..), TxId, TxMsgContents (..), TxOut (..), TxOutAux (..), txaF) import Pos.Crypto (ProtocolMagic, RedeemSecretKey, SafeSigner, hash, diff --git a/explorer/cardano-sl-explorer.cabal b/explorer/cardano-sl-explorer.cabal index 02a48d35622..d36acae940d 100644 --- a/explorer/cardano-sl-explorer.cabal +++ b/explorer/cardano-sl-explorer.cabal @@ -164,7 +164,6 @@ executable cardano-explorer , cardano-sl-crypto , cardano-sl-infra , cardano-sl-explorer - , cardano-sl-networking , cardano-sl-util , log-warper , optparse-applicative diff --git a/explorer/src/Pos/Explorer/ExplorerMode.hs b/explorer/src/Pos/Explorer/ExplorerMode.hs index 4ed2fb564ac..23ab6b03898 100644 --- a/explorer/src/Pos/Explorer/ExplorerMode.hs +++ b/explorer/src/Pos/Explorer/ExplorerMode.hs @@ -48,9 +48,8 @@ import Pos.Explorer.ExtraContext (ExtraContext, ExtraContextT, import Pos.Explorer.Socket.Holder (ConnectionsState) import Pos.Explorer.Txp (ExplorerExtraModifier (..)) --- Need Emulation because it has instance Mockable CurrentTime -import Mockable (Production, currentTime, runProduction) import Pos.Core.JsonLog (CanJsonLog (..)) +import Pos.Core.Mockable (Production, currentTime, runProduction) import Pos.Infra.Util.JsonLog.Events (HasJsonLogConfig (..), jsonLogDefault) import Pos.Launcher.Configuration (HasConfigurations) @@ -58,6 +57,7 @@ import Pos.Util.LoggerName (HasLoggerName' (..), askLoggerNameDefault, modifyLoggerNameDefault) import Pos.WorkMode (MinWorkMode) +-- Need Emulation because it has instance Mockable CurrentTime import Test.Pos.Block.Logic.Emulation (Emulation (..), runEmulation) import Test.Pos.Block.Logic.Mode (TestParams (..)) import Test.Pos.Crypto.Dummy (dummyProtocolMagic) diff --git a/explorer/src/Pos/Explorer/Socket/App.hs b/explorer/src/Pos/Explorer/Socket/App.hs index a763775e3c6..3303cd128f6 100644 --- a/explorer/src/Pos/Explorer/Socket/App.hs +++ b/explorer/src/Pos/Explorer/Socket/App.hs @@ -22,7 +22,6 @@ import Data.Time.Units (Millisecond) import Ether.TaggedTrans () import Formatting (int, sformat, (%)) import qualified GHC.Exts as Exts -import Mockable (withAsync) import Network.EngineIO (SocketId) import Network.EngineIO.Wai (WaiMonad, toWaiApplication, waiAPI) import Network.HTTP.Types.Status (status404) @@ -41,6 +40,7 @@ import System.Wlog (CanLog, HasLoggerName, LoggerName, import Pos.Block.Types (Blund) import Pos.Core (addressF, siEpoch) +import Pos.Core.Mockable (withAsync) import qualified Pos.GState as DB import Pos.Infra.Slotting (MonadSlots (getCurrentSlot)) diff --git a/explorer/src/Pos/Explorer/Txp/Local.hs b/explorer/src/Pos/Explorer/Txp/Local.hs index 09b6454b2b2..ec70a8e7b83 100644 --- a/explorer/src/Pos/Explorer/Txp/Local.hs +++ b/explorer/src/Pos/Explorer/Txp/Local.hs @@ -8,12 +8,12 @@ module Pos.Explorer.Txp.Local , eTxNormalize ) where -import JsonLog (CanJsonLog (..)) import Universum import qualified Data.HashMap.Strict as HM import Pos.Core (BlockVersionData, EpochIndex, Timestamp) +import Pos.Core.JsonLog (CanJsonLog (..)) import Pos.Core.Txp (TxAux (..), TxId) import Pos.Crypto (ProtocolMagic) import Pos.Infra.Slotting (MonadSlots (getCurrentSlot), getSlotStart) diff --git a/explorer/src/Pos/Explorer/Web/Transform.hs b/explorer/src/Pos/Explorer/Web/Transform.hs index cb944f2191e..50b95efebe6 100644 --- a/explorer/src/Pos/Explorer/Web/Transform.hs +++ b/explorer/src/Pos/Explorer/Web/Transform.hs @@ -19,12 +19,12 @@ import Universum import qualified Control.Exception.Safe as E import Control.Monad.Except (MonadError (throwError)) import qualified Control.Monad.Reader as Mtl -import Mockable (runProduction) import Servant.Server (Handler, hoistServer) import Pos.Block.Configuration (HasBlockConfiguration) import Pos.Configuration (HasNodeConfiguration) import Pos.Core (HasConfiguration) +import Pos.Core.Mockable (runProduction) import Pos.Infra.Diffusion.Types (Diffusion) import Pos.Infra.Reporting (MonadReporting (..)) import Pos.Recovery () diff --git a/explorer/src/explorer/Main.hs b/explorer/src/explorer/Main.hs index 221c278411f..b59a0b004a0 100644 --- a/explorer/src/explorer/Main.hs +++ b/explorer/src/explorer/Main.hs @@ -12,7 +12,6 @@ module Main import Universum import Data.Maybe (fromJust) -import Mockable (Production (..), runProduction) import System.Wlog (LoggerName, logInfo) import ExplorerNodeOptions (ExplorerArgs (..), ExplorerNodeArgs (..), @@ -23,6 +22,7 @@ import Pos.Client.CLI (CommonNodeArgs (..), NodeArgs (..), import qualified Pos.Client.CLI as CLI import Pos.Context (NodeContext (..)) import Pos.Core (epochSlots) +import Pos.Core.Mockable (Production (..), runProduction) import Pos.Crypto (ProtocolMagic) import Pos.Explorer.DB (explorerInitDB) import Pos.Explorer.ExtraContext (makeExtraCtx) diff --git a/lib/src/Pos/Client/CLI/Util.hs b/lib/src/Pos/Client/CLI/Util.hs index 3ed94ba1de7..27d211ab58a 100644 --- a/lib/src/Pos/Client/CLI/Util.hs +++ b/lib/src/Pos/Client/CLI/Util.hs @@ -17,7 +17,6 @@ import Universum hiding (try) import qualified Data.ByteString.Lazy as BSL import qualified Data.Yaml as Yaml import Formatting (sformat, shown, (%)) -import Mockable (CurrentTime, Mockable, currentTime) import System.Wlog (LoggerConfig (..), WithLogger, logInfo, parseLoggerConfig, productionB) import Text.Parsec (parserFail, try) @@ -32,6 +31,7 @@ import Pos.Core (StakeholderId, Timestamp (..)) import Pos.Core.Configuration (HasConfiguration, canonicalGenesisJson, coreConfiguration, genesisData, prettyGenesisJson) import Pos.Core.Genesis (gdStartTime) +import Pos.Core.Mockable (CurrentTime, Mockable, currentTime) import Pos.Core.NetworkAddress (addrParser) import Pos.Crypto (decodeAbstractHash) import Pos.Delegation.Configuration (dlgConfiguration) diff --git a/lib/src/Pos/Launcher/Launcher.hs b/lib/src/Pos/Launcher/Launcher.hs index 5a7a7b62c40..d962167eea5 100644 --- a/lib/src/Pos/Launcher/Launcher.hs +++ b/lib/src/Pos/Launcher/Launcher.hs @@ -12,7 +12,7 @@ import Universum -- FIXME we use Production in here only because it gives a 'HasLoggerName' -- instance so that 'bracketNodeResources' can log. -- Get rid of production and use a 'Trace IO' instead. -import Mockable.Production (Production (..)) +import Pos.Core.Mockable.Production (Production (..)) import Pos.Core.Configuration (epochSlots) import Pos.Crypto (ProtocolMagic) diff --git a/lib/src/Pos/Launcher/Mode.hs b/lib/src/Pos/Launcher/Mode.hs index cc8b2ab33fc..d82ace61821 100644 --- a/lib/src/Pos/Launcher/Mode.hs +++ b/lib/src/Pos/Launcher/Mode.hs @@ -26,9 +26,9 @@ import Universum import Control.Lens (makeLensesWith) import qualified Control.Monad.Reader as Mtl -import Mockable.Production (Production) import Pos.Core (HasConfiguration, Timestamp) +import Pos.Core.Mockable.Production (Production) import Pos.Core.Slotting (MonadSlotsData) import Pos.DB (NodeDBs) import Pos.DB.Block (dbGetSerBlockRealDefault, diff --git a/lib/src/Pos/Launcher/Resource.hs b/lib/src/Pos/Launcher/Resource.hs index 4eee62b0691..27f381da891 100644 --- a/lib/src/Pos/Launcher/Resource.hs +++ b/lib/src/Pos/Launcher/Resource.hs @@ -25,7 +25,6 @@ import Control.Exception.Base (ErrorCall (..)) import Data.Default (Default) import qualified Data.Time as Time import Formatting (sformat, shown, (%)) -import Mockable (Production (..)) import System.IO (BufferMode (..), hClose, hSetBuffering) import qualified System.Metrics as Metrics import System.Wlog (LoggerConfig (..), WithLogger, consoleActionB, @@ -42,6 +41,7 @@ import Pos.Context (ConnectedPeers (..), NodeContext (..), StartTime (..)) import Pos.Core (HasConfiguration, Timestamp, gdStartTime, genesisData) +import Pos.Core.Mockable (Production (..)) import Pos.Core.Reporting (initializeMisbehaviorMetrics) import Pos.DB (MonadDBRead, NodeDBs) import Pos.DB.Rocks (closeNodeDBs, openNodeDBs) diff --git a/lib/src/Pos/Launcher/Runner.hs b/lib/src/Pos/Launcher/Runner.hs index 1466ff40303..4b81668c27e 100644 --- a/lib/src/Pos/Launcher/Runner.hs +++ b/lib/src/Pos/Launcher/Runner.hs @@ -19,8 +19,6 @@ import Universum import Control.Concurrent.Async (race) import qualified Control.Monad.Reader as Mtl import Data.Default (Default) -import JsonLog (jsonLog) -import Mockable.Production (Production (..)) import System.Exit (ExitCode (..)) import Pos.Behavior (bcSecurityParams) @@ -33,6 +31,8 @@ import Pos.Context.Context (NodeContext (..)) import Pos.Core (StakeholderId, addressHash) import Pos.Core.Configuration (HasProtocolConstants, protocolConstants) +import Pos.Core.JsonLog (jsonLog) +import Pos.Core.Mockable.Production (Production (..)) import Pos.Crypto (ProtocolMagic, toPublic) import Pos.Diffusion.Full (FullDiffusionConfiguration (..), diffusionLayerFull) diff --git a/lib/src/Pos/Launcher/Scenario.hs b/lib/src/Pos/Launcher/Scenario.hs index 5ef7065980b..c20cfe704a4 100644 --- a/lib/src/Pos/Launcher/Scenario.hs +++ b/lib/src/Pos/Launcher/Scenario.hs @@ -13,7 +13,6 @@ import Universum import qualified Data.HashMap.Strict as HM import Formatting (bprint, build, int, sformat, shown, (%)) -import Mockable (mapConcurrently) import Serokell.Util (listJson) import System.Wlog (WithLogger, askLoggerName, logInfo) @@ -21,6 +20,7 @@ import Pos.Context (getOurPublicKey) import Pos.Core (GenesisData (gdBootStakeholders, gdHeavyDelegation), GenesisDelegation (..), GenesisWStakeholders (..), addressHash, gdFtsSeed, genesisData) +import Pos.Core.Mockable (mapConcurrently) import Pos.Crypto (ProtocolMagic, pskDelegatePk) import qualified Pos.DB.BlockIndex as DB import qualified Pos.GState as GS diff --git a/lib/src/Pos/Listener/Delegation.hs b/lib/src/Pos/Listener/Delegation.hs index 25a50c1e128..71fafd7af5d 100644 --- a/lib/src/Pos/Listener/Delegation.hs +++ b/lib/src/Pos/Listener/Delegation.hs @@ -11,11 +11,11 @@ module Pos.Listener.Delegation import Universum import Formatting (build, sformat, shown, (%)) -import Mockable (CurrentTime, Delay, Mockable) import System.Wlog (WithLogger, logDebug, logWarning) import UnliftIO (MonadUnliftIO) import Pos.Core (ProxySKHeavy) +import Pos.Core.Mockable (CurrentTime, Delay, Mockable) import Pos.Crypto (ProtocolMagic) import Pos.DB.Class (MonadBlockDBRead, MonadGState) import Pos.Delegation.Class (MonadDelegation) diff --git a/lib/src/Pos/Listener/Update.hs b/lib/src/Pos/Listener/Update.hs index c2d03605de3..4e87c2cfd2f 100644 --- a/lib/src/Pos/Listener/Update.hs +++ b/lib/src/Pos/Listener/Update.hs @@ -13,11 +13,11 @@ module Pos.Listener.Update import Universum import Formatting (build, sformat, (%)) -import Mockable (MonadMockable) import System.Wlog (WithLogger, logNotice, logWarning) import UnliftIO (MonadUnliftIO) import Pos.Core (ProtocolMagic) +import Pos.Core.Mockable (MonadMockable) import Pos.Core.Update (UpdateProposal (..), UpdateVote (..)) import Pos.DB.Class (MonadDB, MonadGState) import Pos.Infra.Recovery.Info (MonadRecoveryInfo) diff --git a/lib/src/Pos/Network/Block/Logic.hs b/lib/src/Pos/Network/Block/Logic.hs index 853914741ab..d22c25ac48f 100644 --- a/lib/src/Pos/Network/Block/Logic.hs +++ b/lib/src/Pos/Network/Block/Logic.hs @@ -23,7 +23,6 @@ import qualified Data.List.NonEmpty as NE import qualified Data.Map.Strict as M import Formatting (bprint, build, sformat, shown, stext, (%)) import qualified Formatting.Buildable as B -import Mockable (forConcurrently) import Serokell.Util.Text (listJson) import qualified System.Metrics.Gauge as Metrics import System.Wlog (logDebug, logInfo, logWarning) @@ -39,6 +38,7 @@ import Pos.Core.Block (Block, BlockHeader, blockHeader) import Pos.Core.Chrono (NE, NewestFirst (..), OldestFirst (..), _NewestFirst, _OldestFirst) import Pos.Core.JsonLog (CanJsonLog (..)) +import Pos.Core.Mockable (forConcurrently) import Pos.Core.Reporting (HasMisbehaviorMetrics (..), MisbehaviorMetrics (..)) import Pos.Crypto (ProtocolMagic, shortHashF) diff --git a/lib/src/Pos/Network/Block/Retrieval.hs b/lib/src/Pos/Network/Block/Retrieval.hs index d102ac00fec..be0014525fc 100644 --- a/lib/src/Pos/Network/Block/Retrieval.hs +++ b/lib/src/Pos/Network/Block/Retrieval.hs @@ -16,7 +16,6 @@ import Control.Monad.STM (retry) import qualified Data.List.NonEmpty as NE import Data.Time.Units (Second) import Formatting (build, int, sformat, (%)) -import Mockable (delay) import System.Wlog (logDebug, logError, logInfo, logWarning) import Pos.Block.Logic (ClassifyHeaderRes (..), classifyNewHeader, @@ -25,6 +24,7 @@ import Pos.Core (Block, HasHeaderHash (..), HeaderHash, difficultyL, isMoreDifficult) import Pos.Core.Block (BlockHeader) import Pos.Core.Chrono (NE, OldestFirst (..), _OldestFirst) +import Pos.Core.Mockable (delay) import Pos.Core.Reporting (HasMisbehaviorMetrics) import Pos.Crypto (ProtocolMagic, shortHashF) import qualified Pos.DB.BlockIndex as DB diff --git a/lib/src/Pos/Network/Block/WorkMode.hs b/lib/src/Pos/Network/Block/WorkMode.hs index aa8f4a071c5..e43c1f59e70 100644 --- a/lib/src/Pos/Network/Block/WorkMode.hs +++ b/lib/src/Pos/Network/Block/WorkMode.hs @@ -10,7 +10,6 @@ module Pos.Network.Block.WorkMode import Universum import Data.Default (Default) -import Mockable (Delay, Mockables, SharedAtomic) import System.Wlog (WithLogger) import Pos.Binary.Class (Bi) @@ -20,6 +19,7 @@ import Pos.Block.Slog (HasSlogContext) import Pos.Block.Types (LastKnownHeader, LastKnownHeaderTag) import Pos.Core.Context (HasPrimaryKey) import Pos.Core.JsonLog (CanJsonLog) +import Pos.Core.Mockable (Delay, Mockables, SharedAtomic) import Pos.Infra.Communication.Protocol (Message) import Pos.Infra.Recovery.Info (MonadRecoveryInfo) import Pos.Infra.Shutdown.Class (HasShutdownContext) diff --git a/lib/src/Pos/Util/Mockable.hs b/lib/src/Pos/Util/Mockable.hs index 3e9722d3054..a48e83b4d35 100644 --- a/lib/src/Pos/Util/Mockable.hs +++ b/lib/src/Pos/Util/Mockable.hs @@ -14,7 +14,8 @@ import Universum import Control.Monad.Morph (MFunctor (..)) import Control.Monad.Trans.Identity (IdentityT (..)) import qualified Ether -import Mockable (ChannelT, Counter, Distribution, Gauge, + +import Pos.Core.Mockable (ChannelT, Counter, Distribution, Gauge, MFunctor' (..), Mockable (..), Promise, SharedAtomicT, SharedExclusiveT, ThreadId) diff --git a/lib/src/Pos/Web/Mode.hs b/lib/src/Pos/Web/Mode.hs index e9cb6a8141b..64fec70ff61 100644 --- a/lib/src/Pos/Web/Mode.hs +++ b/lib/src/Pos/Web/Mode.hs @@ -10,11 +10,11 @@ import Universum import Control.Lens (makeLensesWith) import qualified Control.Monad.Reader as Mtl -import Mockable (Production) import Pos.Context (HasPrimaryKey (..), HasSscContext (..), NodeContext) import Pos.Core.Configuration (HasConfiguration) +import Pos.Core.Mockable (Production) import Pos.DB (NodeDBs) import Pos.DB.Block (dbGetSerBlockRealDefault, dbGetSerUndoRealDefault, dbPutSerBlundsRealDefault) diff --git a/lib/src/Pos/Web/Server.hs b/lib/src/Pos/Web/Server.hs index 46a15ecaa55..fdcafcc9002 100644 --- a/lib/src/Pos/Web/Server.hs +++ b/lib/src/Pos/Web/Server.hs @@ -29,7 +29,6 @@ import Data.X509.CertificateStore (readCertificateStore) import Data.X509.Validation (ValidationChecks (..), ValidationHooks (..)) import qualified Data.X509.Validation as X509 -import Mockable (Production (runProduction)) import Network.TLS (CertificateRejectReason (..), CertificateUsage (..), ServerHooks (..)) import Network.Wai (Application) @@ -48,6 +47,7 @@ import Pos.Context (HasNodeContext (..), HasSscContext (..), NodeContext, getOurPublicKey) import Pos.Core (EpochIndex (..), SlotLeaders) import Pos.Core.Configuration (HasConfiguration) +import Pos.Core.Mockable (Production (runProduction)) import Pos.DB (MonadDBRead) import qualified Pos.DB as DB import qualified Pos.GState as GS diff --git a/lib/src/Pos/WorkMode.hs b/lib/src/Pos/WorkMode.hs index 557fb744137..ffa1b1d9d45 100644 --- a/lib/src/Pos/WorkMode.hs +++ b/lib/src/Pos/WorkMode.hs @@ -18,7 +18,6 @@ import Universum import Control.Lens (makeLensesWith) import qualified Control.Monad.Reader as Mtl -import Mockable (Production) import System.Wlog (HasLoggerName (..), LoggerName) import Pos.Block.BListener (MonadBListener (..), onApplyBlocksStub, @@ -28,6 +27,7 @@ import Pos.Context (HasNodeContext (..), HasPrimaryKey (..), HasSscContext (..), NodeContext) import Pos.Core (HasConfiguration) import Pos.Core.JsonLog (CanJsonLog (..)) +import Pos.Core.Mockable (Production) import Pos.Core.Reporting (HasMisbehaviorMetrics (..)) import Pos.Core.Slotting (HasSlottingVar (..), MonadSlotsData) import Pos.DB (MonadGState (..), NodeDBs) diff --git a/lib/src/Pos/WorkMode/Class.hs b/lib/src/Pos/WorkMode/Class.hs index ad85390027c..93c322492b5 100644 --- a/lib/src/Pos/WorkMode/Class.hs +++ b/lib/src/Pos/WorkMode/Class.hs @@ -14,7 +14,6 @@ import Universum import Control.Monad.Trans.Control (MonadBaseControl) import qualified Crypto.Random as Rand -import Mockable (MonadMockable) import System.Wlog (WithLogger) import UnliftIO (MonadUnliftIO) @@ -27,6 +26,7 @@ import Pos.Context (BlockRetrievalQueue, BlockRetrievalQueueTag, HasSscContext, StartTime, TxpGlobalSettings) import Pos.Core (HasConfiguration, HasPrimaryKey) import Pos.Core.JsonLog (CanJsonLog) +import Pos.Core.Mockable (MonadMockable) import Pos.Core.Reporting (HasMisbehaviorMetrics, MonadReporting) import Pos.DB.Class (MonadDB, MonadGState) import Pos.DB.Rocks (MonadRealDB) diff --git a/lib/src/Pos/Worker/Block.hs b/lib/src/Pos/Worker/Block.hs index c4fb4ca3627..f737f2de30a 100644 --- a/lib/src/Pos/Worker/Block.hs +++ b/lib/src/Pos/Worker/Block.hs @@ -15,7 +15,6 @@ import qualified Data.List.NonEmpty as NE import Data.Time.Units (Microsecond, Second, fromMicroseconds) import Formatting (Format, bprint, build, fixed, int, now, sformat, shown, (%)) -import Mockable (delay) import Serokell.Util (enumerate, listJson, pairF) import qualified System.Metrics.Label as Label import System.Random (randomRIO) @@ -40,6 +39,7 @@ import Pos.Core (BlockVersionData (..), ChainDifficulty, FlatSlotId, unflattenSlotId) import Pos.Core.Chrono (OldestFirst (..)) import Pos.Core.JsonLog (CanJsonLog (..)) +import Pos.Core.Mockable (delay) import Pos.Core.Reporting (HasMisbehaviorMetrics, MetricMonitor (..), MetricMonitorState, noReportMonitor, recordValue) import Pos.Crypto (ProtocolMagic, ProxySecretKey (pskDelegatePk)) diff --git a/lib/src/Pos/Worker/Delegation.hs b/lib/src/Pos/Worker/Delegation.hs index ee68f58d752..4bd6a073545 100644 --- a/lib/src/Pos/Worker/Delegation.hs +++ b/lib/src/Pos/Worker/Delegation.hs @@ -9,9 +9,10 @@ import Universum import Control.Lens ((%=)) import Data.Time.Clock (UTCTime, addUTCTime) import Data.Time.Units (Second) -import Mockable (CurrentTime, Delay, Mockable, currentTime, delay) import System.Wlog (WithLogger) +import Pos.Core.Mockable (CurrentTime, Delay, Mockable, currentTime, + delay) import Pos.Delegation.Class (MonadDelegation, dwMessageCache) import Pos.Delegation.Configuration (HasDlgConfiguration, dlgMessageCacheTimeout) diff --git a/lib/src/Pos/Worker/Ssc.hs b/lib/src/Pos/Worker/Ssc.hs index f46601bf100..24a0e3643cb 100644 --- a/lib/src/Pos/Worker/Ssc.hs +++ b/lib/src/Pos/Worker/Ssc.hs @@ -13,7 +13,6 @@ import qualified Data.HashMap.Strict as HM import qualified Data.List.NonEmpty as NE import Data.Time.Units (Microsecond, Millisecond, convertUnit) import Formatting (build, ords, sformat, shown, (%)) -import Mockable (MonadMockable, currentTime, delay) import Serokell.Util.Exceptions () import Serokell.Util.Text (listJson) import qualified System.Metrics.Gauge as Metrics @@ -29,6 +28,7 @@ import Pos.Core (EpochIndex, HasPrimaryKey, SlotId (..), lookupVss, memberVss, mkLocalSlotIndex, mkVssCertificate, slotSecurityParam, vssMaxTTL) import Pos.Core.JsonLog (CanJsonLog) +import Pos.Core.Mockable (MonadMockable, currentTime, delay) import Pos.Core.Reporting (HasMisbehaviorMetrics (..), MisbehaviorMetrics (..), MonadReporting) import Pos.Core.Ssc (InnerSharesMap, Opening, SignedCommitment, diff --git a/lib/test/Test/Pos/SlottingSpec.hs.unused b/lib/test/Test/Pos/SlottingSpec.hs.unused index 7cbcac2fafe..9e8f276cfd9 100644 --- a/lib/test/Test/Pos/SlottingSpec.hs.unused +++ b/lib/test/Test/Pos/SlottingSpec.hs.unused @@ -4,18 +4,19 @@ module Test.Pos.Infra.SlottingSpec ( spec ) where -import Data.Time.Units (fromMicroseconds, toMicroseconds) -import Mockable (Production, currentTime, delay, runProduction) -import Test.Hspec (Spec, describe, it, shouldBe) -import Test.Hspec.QuickCheck (prop) -import Test.QuickCheck (Property, choose, ioProperty) +import Data.Time.Units (fromMicroseconds, toMicroseconds) +import Test.Hspec (Spec, describe, it, shouldBe) +import Test.Hspec.QuickCheck (prop) +import Test.QuickCheck (Property, choose, ioProperty) import Test.QuickCheck.Monadic (PropertyM, assert, monadic, pick, run) import Universum -import Pos.Constants (epochDuration, slotDuration) -import Pos.Infra.Slotting (MonadSlots (..), getCurrentSlot) -import Pos.Types (EpochIndex, LocalSlotIndex, SlotId (..), - Timestamp (..), unflattenSlotId) +import Pos.Constants (epochDuration, slotDuration) +import Pos.Core.Mockable (Production, currentTime, delay, + runProduction) +import Pos.Infra.Slotting (MonadSlots (..), getCurrentSlot) +import Pos.Types (EpochIndex, LocalSlotIndex, SlotId (..), + Timestamp (..), unflattenSlotId) -- | These tests are not included into .cabal diff --git a/networking/cardano-sl-networking.cabal b/networking/cardano-sl-networking.cabal index 9455a75aca5..bd4d8ecbac6 100644 --- a/networking/cardano-sl-networking.cabal +++ b/networking/cardano-sl-networking.cabal @@ -152,7 +152,6 @@ executable bench-sender other-modules: SenderOptions build-depends: async , base - , cardano-sl-networking , cardano-sl-util , contravariant , lens @@ -184,7 +183,6 @@ executable bench-receiver main-is: Main.hs other-modules: ReceiverOptions build-depends: base - , cardano-sl-networking , cardano-sl-util , contravariant , network-transport-tcp @@ -211,7 +209,6 @@ executable bench-log-reader other-modules: LogReaderOptions build-depends: base == 4.* , attoparsec - , cardano-sl-networking , cardano-sl-util , conduit , conduit-extra diff --git a/networking/src/Network/Transport/ConnectionBuffers.hs b/networking/src/Network/Transport/ConnectionBuffers.hs index 5c5fe54f2d6..2dc4390b9a7 100644 --- a/networking/src/Network/Transport/ConnectionBuffers.hs +++ b/networking/src/Network/Transport/ConnectionBuffers.hs @@ -39,8 +39,9 @@ import Control.Concurrent.STM import Control.Concurrent.STM.TBQueue import qualified Data.Set as S import Data.Typeable -import Mockable.Class -import Mockable.SharedAtomic + +import Pos.Core.Mockable.Class +import Pos.Core.Mockable.SharedAtomic -- This connection-buffers QDisc needs an implementation of a bounded fifo -- buffer such that the head can be inspected and modified. diff --git a/node/Main.hs b/node/Main.hs index 4847ee8745a..9d373cbf2a9 100644 --- a/node/Main.hs +++ b/node/Main.hs @@ -11,13 +11,13 @@ module Main import Universum import Data.Maybe (fromJust) -import Mockable (Production (..), runProduction) import System.Wlog (LoggerName, logInfo) import Pos.Binary () import Pos.Client.CLI (CommonNodeArgs (..), NodeArgs (..), SimpleNodeArgs (..)) import qualified Pos.Client.CLI as CLI +import Pos.Core.Mockable (Production (..), runProduction) import Pos.Crypto (ProtocolMagic) import Pos.Infra.Ntp.Configuration (NtpConfiguration) import Pos.Launcher (HasConfigurations, NodeParams (..), diff --git a/node/cardano-sl-node.cabal b/node/cardano-sl-node.cabal index 300aa7662ea..0da5c92e0b3 100644 --- a/node/cardano-sl-node.cabal +++ b/node/cardano-sl-node.cabal @@ -16,10 +16,10 @@ executable cardano-node-simple hs-source-dirs: . main-is: Main.hs build-depends: base + , cardano-sl-core , cardano-sl-crypto , cardano-sl-ssc , cardano-sl-infra - , cardano-sl-networking , cardano-sl-util , cardano-sl , log-warper diff --git a/pkgs/default.nix b/pkgs/default.nix index 88bba44409e..09818c8fe83 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -14995,7 +14995,6 @@ license = stdenv.lib.licenses.mit; , cardano-sl-db , cardano-sl-generator , cardano-sl-infra -, cardano-sl-networking , cardano-sl-ssc , cardano-sl-txp , cardano-sl-update @@ -15067,7 +15066,6 @@ cardano-sl-crypto cardano-sl-db cardano-sl-generator cardano-sl-infra -cardano-sl-networking cardano-sl-ssc cardano-sl-txp cardano-sl-update @@ -15115,7 +15113,6 @@ cardano-sl cardano-sl-core cardano-sl-crypto cardano-sl-infra -cardano-sl-networking cardano-sl-txp cardano-sl-util formatting @@ -15577,7 +15574,6 @@ license = stdenv.lib.licenses.mit; , cardano-sl-db , cardano-sl-infra , cardano-sl-lrc -, cardano-sl-networking , cardano-sl-ssc , cardano-sl-txp , cardano-sl-update @@ -15620,7 +15616,6 @@ cardano-sl-crypto cardano-sl-db cardano-sl-infra cardano-sl-lrc -cardano-sl-networking cardano-sl-txp cardano-sl-update cardano-sl-util @@ -16436,7 +16431,6 @@ cardano-sl cardano-sl-core cardano-sl-crypto cardano-sl-infra -cardano-sl-networking cardano-sl-util lens log-warper @@ -17091,9 +17085,9 @@ license = stdenv.lib.licenses.mit; mkDerivation , base , cardano-sl +, cardano-sl-core , cardano-sl-crypto , cardano-sl-infra -, cardano-sl-networking , cardano-sl-ssc , cardano-sl-util , cpphs @@ -17116,9 +17110,9 @@ isExecutable = true; executableHaskellDepends = [ base cardano-sl +cardano-sl-core cardano-sl-crypto cardano-sl-infra -cardano-sl-networking cardano-sl-ssc cardano-sl-util log-warper @@ -17328,7 +17322,6 @@ license = stdenv.lib.licenses.mit; , cardano-sl-crypto , cardano-sl-db , cardano-sl-infra -, cardano-sl-networking , cardano-sl-txp , cardano-sl-update , cardano-sl-util @@ -17423,7 +17416,6 @@ cardano-sl-core-test cardano-sl-crypto cardano-sl-db cardano-sl-infra -cardano-sl-networking cardano-sl-txp cardano-sl-update cardano-sl-util @@ -18153,7 +18145,6 @@ cardano-sl-delegation cardano-sl-generator cardano-sl-infra cardano-sl-lrc -cardano-sl-networking cardano-sl-ssc cardano-sl-txp cardano-sl-update diff --git a/tools/cardano-sl-tools.cabal b/tools/cardano-sl-tools.cabal index 4e87b992635..5c4ac9868e5 100644 --- a/tools/cardano-sl-tools.cabal +++ b/tools/cardano-sl-tools.cabal @@ -50,7 +50,6 @@ executable dbgen , cardano-sl-core-test , cardano-sl-db , cardano-sl-infra - , cardano-sl-networking , cardano-sl-txp , cardano-sl-util , cardano-sl-wallet @@ -448,7 +447,6 @@ executable cardano-blockchain-analyser , cardano-sl-core , cardano-sl-crypto , cardano-sl-db - , cardano-sl-networking , cardano-sl-util , directory , formatting diff --git a/tools/src/blockchain-analyser/Main.hs b/tools/src/blockchain-analyser/Main.hs index 6952e3ff0cd..3881be26425 100644 --- a/tools/src/blockchain-analyser/Main.hs +++ b/tools/src/blockchain-analyser/Main.hs @@ -4,7 +4,6 @@ module Main where import Universum -import Mockable (Production, runProduction) import System.Directory (canonicalizePath, doesDirectoryExist, getFileSize, listDirectory, withCurrentDirectory) @@ -13,6 +12,7 @@ import qualified Pos.Client.CLI as CLI import Pos.Core (HasConfiguration, HeaderHash, headerHash) import Pos.Core.Block (Block) import Pos.Core.Chrono (NewestFirst (..)) +import Pos.Core.Mockable (Production, runProduction) import Pos.DB (closeNodeDBs, openNodeDBs) import Pos.DB.Block (getUndo) import qualified Pos.DB.Block.Load as DB diff --git a/tools/src/blockchain-analyser/Types.hs b/tools/src/blockchain-analyser/Types.hs index 1a0bd434325..165b8b5da35 100644 --- a/tools/src/blockchain-analyser/Types.hs +++ b/tools/src/blockchain-analyser/Types.hs @@ -17,10 +17,10 @@ import Universum import Control.Lens (makeLensesWith) import qualified Control.Monad.Reader as Mtl -import Mockable (Production) import Pos.Core (HasConfiguration, HeaderHash, prevBlockL) import Pos.Core.Block (Block) +import Pos.Core.Mockable (Production) import Pos.DB (MonadDBRead (..)) import qualified Pos.DB as DB import qualified Pos.DB.Block as BDB diff --git a/tools/src/dbgen/Main.hs b/tools/src/dbgen/Main.hs index 46b158b2add..95d27bf8cfe 100644 --- a/tools/src/dbgen/Main.hs +++ b/tools/src/dbgen/Main.hs @@ -15,12 +15,12 @@ import Control.Concurrent.STM (newTQueueIO) import Data.Default (def) import Data.Maybe (fromJust, isJust) import Data.Time.Units (fromMicroseconds) -import Mockable (Production, runProduction) import qualified Network.Transport.TCP as TCP import Options.Generic (getRecord) import Pos.Client.CLI (CommonArgs (..), CommonNodeArgs (..), NodeArgs (..), getNodeParams, gtSscParams) import Pos.Core (ProtocolMagic, Timestamp (..), epochSlots) +import Pos.Core.Mockable (Production, runProduction) import Pos.DB.DB (initNodeDBs) import Pos.DB.Rocks.Functions (openNodeDBs) import Pos.DB.Rocks.Types (NodeDBs) diff --git a/wallet-new/server/Main.hs b/wallet-new/server/Main.hs index f97d70be70a..f06e616ee9e 100644 --- a/wallet-new/server/Main.hs +++ b/wallet-new/server/Main.hs @@ -10,11 +10,11 @@ import Universum import Control.Concurrent.STM (newTQueueIO) import Data.Maybe (fromJust) -import Mockable (Production (..), runProduction) import Ntp.Client (NtpStatus, withNtpClient) import qualified Pos.Client.CLI as CLI import Pos.Context (ncUserSecret) import Pos.Core (epochSlots) +import Pos.Core.Mockable (Production (..), runProduction) import Pos.Crypto (ProtocolMagic) import Pos.DB.DB (initNodeDBs) import Pos.Infra.Diffusion.Types (Diffusion) diff --git a/wallet-new/src/Cardano/Wallet/API/V1/Handlers.hs b/wallet-new/src/Cardano/Wallet/API/V1/Handlers.hs index 2b71c76d7ce..e98f40ceac1 100644 --- a/wallet-new/src/Cardano/Wallet/API/V1/Handlers.hs +++ b/wallet-new/src/Cardano/Wallet/API/V1/Handlers.hs @@ -8,7 +8,7 @@ import qualified Cardano.Wallet.API.V1.Handlers.Addresses as Addresses import qualified Cardano.Wallet.API.V1.Handlers.Transactions as Transactions import Cardano.Wallet.WalletLayer (ActiveWalletLayer) import Cardano.Wallet.WalletLayer.Types -import Mockable +import Pos.Core.Mockable handlers :: ActiveWalletLayer Production -> Server V1.API handlers w = Addresses.handlers w diff --git a/wallet-new/src/Cardano/Wallet/API/V1/Handlers/Addresses.hs b/wallet-new/src/Cardano/Wallet/API/V1/Handlers/Addresses.hs index db7e7425eba..6dcda6ab955 100644 --- a/wallet-new/src/Cardano/Wallet/API/V1/Handlers/Addresses.hs +++ b/wallet-new/src/Cardano/Wallet/API/V1/Handlers/Addresses.hs @@ -7,8 +7,6 @@ import Universum import Servant -import Mockable.Production (Production, runProduction) - import Cardano.Wallet.WalletLayer.Types (ActiveWalletLayer, PassiveWalletLayer (..), walletPassiveLayer) @@ -17,6 +15,8 @@ import Cardano.Wallet.API.Response import qualified Cardano.Wallet.API.V1.Addresses as Addresses import Cardano.Wallet.API.V1.Types +import Pos.Core.Mockable.Production (Production, runProduction) + handlers :: ActiveWalletLayer Production -> ServerT Addresses.API Handler handlers w = listAddresses :<|> newAddress (walletPassiveLayer w) diff --git a/wallet-new/src/Cardano/Wallet/API/V1/Handlers/Transactions.hs b/wallet-new/src/Cardano/Wallet/API/V1/Handlers/Transactions.hs index 8450af56cff..0074722b590 100644 --- a/wallet-new/src/Cardano/Wallet/API/V1/Handlers/Transactions.hs +++ b/wallet-new/src/Cardano/Wallet/API/V1/Handlers/Transactions.hs @@ -13,7 +13,6 @@ import Universum import Servant import Data.Coerce (coerce) -import Mockable.Production (Production, runProduction) import Cardano.Wallet.Kernel.CoinSelection.FromGeneric (ExpenseRegulation (..), InputGrouping (..)) @@ -24,6 +23,7 @@ import Cardano.Wallet.WalletLayer.Types (ActiveWalletLayer) import Pos.Client.Txp.Util (InputSelectionPolicy (..), defaultInputSelectionPolicy) import Pos.Core (Address, Tx (..), TxOut (..)) +import Pos.Core.Mockable.Production (Production, runProduction) import Pos.Crypto (hash) import Cardano.Wallet.API.Request diff --git a/wallet-new/src/Cardano/Wallet/API/V1/LegacyHandlers/Info.hs b/wallet-new/src/Cardano/Wallet/API/V1/LegacyHandlers/Info.hs index 70b148868b1..aed39371b4f 100644 --- a/wallet-new/src/Cardano/Wallet/API/V1/LegacyHandlers/Info.hs +++ b/wallet-new/src/Cardano/Wallet/API/V1/LegacyHandlers/Info.hs @@ -9,8 +9,8 @@ import qualified Cardano.Wallet.API.V1.Info as Info import Cardano.Wallet.API.V1.Migration import Cardano.Wallet.API.V1.Types as V1 -import Mockable (MonadMockable) import Ntp.Client (NtpStatus) +import Pos.Core.Mockable (MonadMockable) import Pos.Infra.Diffusion.Subscription.Status (ssMap) import Pos.Infra.Diffusion.Types (Diffusion (..)) import Pos.Wallet.WalletMode (MonadBlockchainInfo) diff --git a/wallet-new/src/Cardano/Wallet/API/V1/Migration/Monads.hs b/wallet-new/src/Cardano/Wallet/API/V1/Migration/Monads.hs index 7ca18220048..21444687fb6 100644 --- a/wallet-new/src/Cardano/Wallet/API/V1/Migration/Monads.hs +++ b/wallet-new/src/Cardano/Wallet/API/V1/Migration/Monads.hs @@ -11,9 +11,9 @@ module Cardano.Wallet.API.V1.Migration.Monads ( import Universum import qualified Control.Monad.Catch as Catch -import Mockable (runProduction) import Servant +import Pos.Core.Mockable (runProduction) import Pos.Wallet.Web.Mode (WalletWebMode, WalletWebModeContext) -- | Temporary monad to handle the migration from the V0 & V1 stacks. diff --git a/wallet-new/src/Cardano/Wallet/Kernel/Mode.hs b/wallet-new/src/Cardano/Wallet/Kernel/Mode.hs index 2df1b29cbc3..f90c94195dd 100644 --- a/wallet-new/src/Cardano/Wallet/Kernel/Mode.hs +++ b/wallet-new/src/Cardano/Wallet/Kernel/Mode.hs @@ -11,7 +11,6 @@ module Cardano.Wallet.Kernel.Mode import Control.Lens (makeLensesWith) import Universum -import Mockable import Pos.Block.BListener import Pos.Block.Slog import Pos.Block.Types @@ -19,6 +18,7 @@ import Pos.Context import Pos.Core import Pos.Core.Chrono import Pos.Core.JsonLog (CanJsonLog (..)) +import Pos.Core.Mockable import Pos.Core.Reporting (HasMisbehaviorMetrics (..)) import Pos.DB import Pos.DB.Block diff --git a/wallet-new/src/Cardano/Wallet/Server.hs b/wallet-new/src/Cardano/Wallet/Server.hs index 6e31f0ebc77..a831a398c7f 100644 --- a/wallet-new/src/Cardano/Wallet/Server.hs +++ b/wallet-new/src/Cardano/Wallet/Server.hs @@ -15,7 +15,7 @@ import Cardano.Wallet.API.V1.Swagger (swaggerSchemaUIServer) import qualified Cardano.Wallet.API.V1.Swagger as Swagger import Cardano.Wallet.Server.CLI (RunMode (..)) import Cardano.Wallet.WalletLayer (ActiveWalletLayer) -import Mockable +import Pos.Core.Mockable import Pos.Update.Configuration (HasUpdateConfiguration, curSoftwareVersion) import Pos.Util.CompileInfo (HasCompileInfo, compileInfo) diff --git a/wallet-new/src/Cardano/Wallet/Server/Plugins.hs b/wallet-new/src/Cardano/Wallet/Server/Plugins.hs index 18a1c615080..185aa3cc84a 100644 --- a/wallet-new/src/Cardano/Wallet/Server/Plugins.hs +++ b/wallet-new/src/Cardano/Wallet/Server/Plugins.hs @@ -36,7 +36,6 @@ import qualified Pos.Wallet.Web.Error.Types as V0 import Control.Exception (fromException) import Data.Aeson import Formatting (build, sformat, (%)) -import Mockable import Network.HTTP.Types.Status (badRequest400) import Network.Wai (Application, Middleware, Response, responseLBS) import Network.Wai.Handler.Warp (defaultSettings, @@ -45,6 +44,7 @@ import Network.Wai.Middleware.Cors (cors, corsMethods, corsRequestHeaders, simpleCorsResourcePolicy, simpleMethods) import Ntp.Client (NtpStatus) +import Pos.Core.Mockable import Pos.Infra.Diffusion.Types (Diffusion (..)) import Pos.Wallet.Web (cleanupAcidStatePeriodically) import Pos.Wallet.Web.Pending.Worker (startPendingTxsResubmitter) diff --git a/wallet/cardano-sl-wallet.cabal b/wallet/cardano-sl-wallet.cabal index 90479ae2e97..602faca0e21 100644 --- a/wallet/cardano-sl-wallet.cabal +++ b/wallet/cardano-sl-wallet.cabal @@ -258,7 +258,6 @@ test-suite cardano-wallet-test , cardano-sl-generator , cardano-sl-infra , cardano-sl-lrc - , cardano-sl-networking , cardano-sl-ssc , cardano-sl-txp , cardano-sl-update diff --git a/wallet/src/Pos/Wallet/Web/Methods/Misc.hs b/wallet/src/Pos/Wallet/Web/Methods/Misc.hs index 2d6b4fda983..25f359aacdf 100644 --- a/wallet/src/Pos/Wallet/Web/Methods/Misc.hs +++ b/wallet/src/Pos/Wallet/Web/Methods/Misc.hs @@ -36,7 +36,6 @@ import Data.Aeson.TH (defaultOptions, deriveJSON) import Data.Time.Units (Second, toMicroseconds) import Formatting (bprint, build, sformat, (%)) import qualified Formatting.Buildable -import Mockable (Delay, LowLevelAsync, Mockables, async, delay) import Serokell.Util (listJson) import Servant.API.ContentTypes (MimeRender (..), NoContent (..), OctetStream) @@ -47,6 +46,8 @@ import Ntp.Client (NtpStatus (..)) import Pos.Client.KeyStorage (MonadKeys (..), deleteAllSecretKeys) import Pos.Configuration (HasNodeConfiguration) import Pos.Core (HasConfiguration, SlotId, SoftwareVersion (..)) +import Pos.Core.Mockable (Delay, LowLevelAsync, Mockables, async, + delay) import Pos.Crypto (hashHexF) import Pos.Infra.Shutdown (HasShutdownContext, triggerShutdown) import Pos.Infra.Slotting (MonadSlots, getCurrentSlotBlocking) diff --git a/wallet/src/Pos/Wallet/Web/Methods/Payment.hs b/wallet/src/Pos/Wallet/Web/Methods/Payment.hs index ad418836ec9..e6567cd4696 100644 --- a/wallet/src/Pos/Wallet/Web/Methods/Payment.hs +++ b/wallet/src/Pos/Wallet/Web/Methods/Payment.hs @@ -17,7 +17,6 @@ import Universum import Control.Monad.Except (runExcept) import qualified Data.Map as M import Data.Time.Units (Second) -import Mockable (Concurrently, Delay, Mockable, concurrently, delay) import Servant.Server (err403, err405, errReasonPhrase) import System.Wlog (logDebug) @@ -31,6 +30,8 @@ import Pos.Client.Txp.Util (InputSelectionPolicy (..), computeTxFee, import Pos.Configuration (walletTxCreationDisabled) import Pos.Core (Address, Coin, HasConfiguration, TxAux (..), TxOut (..), getCurrentTimestamp) +import Pos.Core.Mockable (Concurrently, Delay, Mockable, concurrently, + delay) import Pos.Core.Txp (_txOutputs) import Pos.Crypto (PassPhrase, ProtocolMagic, SafeSigner, ShouldCheckPassphrase (..), checkPassMatches, hash, diff --git a/wallet/src/Pos/Wallet/Web/Mode.hs b/wallet/src/Pos/Wallet/Web/Mode.hs index 56c041ed61b..a5bf640e8be 100644 --- a/wallet/src/Pos/Wallet/Web/Mode.hs +++ b/wallet/src/Pos/Wallet/Web/Mode.hs @@ -28,8 +28,6 @@ import qualified Data.HashMap.Strict as HM import qualified Data.HashSet as HS import Data.List (partition) import qualified Data.Map.Strict as M -import Mockable (LowLevelAsync, Mockable, Production) -import Pos.Wallet.Web.Tracking.Types (SyncQueue) import System.Wlog (HasLoggerName (..)) import UnliftIO (MonadUnliftIO) @@ -45,6 +43,7 @@ import Pos.Context (HasNodeContext (..)) import Pos.Core (Address, Coin, HasConfiguration, HasPrimaryKey (..), isRedeemAddress, largestHDAddressBoot, mkCoin) import Pos.Core.JsonLog (CanJsonLog (..)) +import Pos.Core.Mockable (LowLevelAsync, Mockable, Production) import Pos.Core.Reporting (HasMisbehaviorMetrics (..), MonadReporting (..), Reporter (..)) import Pos.Core.Slotting (HasSlottingVar (..), MonadSlotsData) @@ -80,6 +79,7 @@ import Pos.Util.LoggerName (HasLoggerName' (..), askLoggerNameDefault, import qualified Pos.Util.Modifier as MM import Pos.Util.UserSecret (HasUserSecret (..)) import Pos.Util.Util (HasLens (..)) +import Pos.Wallet.Web.Tracking.Types (SyncQueue) import Pos.WorkMode (MinWorkMode, RealMode, RealModeContext (..)) import Pos.Wallet.Redirect (MonadBlockchainInfo (..), diff --git a/wallet/src/Pos/Wallet/Web/Pending/Worker.hs b/wallet/src/Pos/Wallet/Web/Pending/Worker.hs index 1371a0c48b1..660f0ec5afa 100644 --- a/wallet/src/Pos/Wallet/Web/Pending/Worker.hs +++ b/wallet/src/Pos/Wallet/Web/Pending/Worker.hs @@ -13,7 +13,6 @@ import Control.Exception.Safe (handleAny) import Control.Lens (has) import Data.Time.Units (Microsecond, Second, convertUnit) import Formatting (build, sformat, (%)) -import Mockable (delay, forConcurrently) import Serokell.Util (enumerate, listJson) import System.Wlog (logDebug, logInfo, modifyLoggerName) @@ -25,6 +24,7 @@ import Pos.Core (ChainDifficulty (..), SlotId (..), TxAux, difficultyL) import Pos.Core.Chrono (getOldestFirst) import Pos.Core.Configuration (HasConfiguration) +import Pos.Core.Mockable (delay, forConcurrently) import Pos.Crypto (ProtocolMagic) import qualified Pos.DB.BlockIndex as DB import Pos.DB.Class (MonadDBRead) diff --git a/wallet/src/Pos/Wallet/Web/Server/Runner.hs b/wallet/src/Pos/Wallet/Web/Server/Runner.hs index 674e509467e..17a0956c0a7 100644 --- a/wallet/src/Pos/Wallet/Web/Server/Runner.hs +++ b/wallet/src/Pos/Wallet/Web/Server/Runner.hs @@ -19,13 +19,13 @@ import Universum import qualified Control.Exception.Safe as E import Control.Monad.Except (MonadError (throwError)) import qualified Control.Monad.Reader as Mtl -import Mockable (Production (..), runProduction) import Network.Wai (Application) import Ntp.Client (NtpStatus) import Servant.Server (Handler) import System.Wlog (logInfo, usingLoggerName) import Cardano.NodeIPC (startNodeJsIPC) +import Pos.Core.Mockable (Production (..), runProduction) import Pos.Core.NetworkAddress (NetworkAddress) import Pos.Crypto (ProtocolMagic) import Pos.Infra.Diffusion.Types (Diffusion, hoistDiffusion) diff --git a/wallet/src/Pos/Wallet/Web/State/Util.hs b/wallet/src/Pos/Wallet/Web/State/Util.hs index d3e6a401483..872416f07ea 100644 --- a/wallet/src/Pos/Wallet/Web/State/Util.hs +++ b/wallet/src/Pos/Wallet/Web/State/Util.hs @@ -9,7 +9,6 @@ import Universum import Data.Acid (createArchive, createCheckpoint) import Data.Time.Units (Second, TimeUnit) import Formatting (sformat, shown, (%)) -import Mockable (Delay, Mockable, delay) import Serokell.AcidState.ExtendedState (ExtendedState (..), extendedStateToAcid) import System.Directory (getModificationTime, listDirectory, @@ -17,6 +16,7 @@ import System.Directory (getModificationTime, listDirectory, import System.FilePath (()) import System.Wlog (WithLogger, logDebug, logError) +import Pos.Core.Mockable (Delay, Mockable, delay) import Pos.Wallet.Web.State.State (WalletDB) type MonadAcidCleanup ctx m = From 85e1411ad4504abcfc0e4ae70ad7f01f70a90072 Mon Sep 17 00:00:00 2001 From: Michael Hueschen Date: Wed, 18 Jul 2018 10:06:53 -0400 Subject: [PATCH 2/2] [CDEC-432] Remove ununsed `JsonLog`/`Mockable` re-exports All imports of these were removed in the previous commit. --- networking/cardano-sl-networking.cabal | 18 ------------------ networking/src/JsonLog.hs | 21 --------------------- networking/src/JsonLog/CanJsonLog.hs | 5 ----- networking/src/JsonLog/Event.hs | 5 ----- networking/src/JsonLog/JsonLogT.hs | 5 ----- networking/src/Mockable.hs | 14 -------------- networking/src/Mockable/Channel.hs | 5 ----- networking/src/Mockable/Class.hs | 5 ----- networking/src/Mockable/Concurrent.hs | 5 ----- networking/src/Mockable/CurrentTime.hs | 5 ----- networking/src/Mockable/Instances.hs | 3 --- networking/src/Mockable/Metrics.hs | 5 ----- networking/src/Mockable/Monad.hs | 5 ----- networking/src/Mockable/Production.hs | 5 ----- networking/src/Mockable/SharedAtomic.hs | 5 ----- networking/src/Mockable/SharedExclusive.hs | 5 ----- 16 files changed, 116 deletions(-) delete mode 100644 networking/src/JsonLog.hs delete mode 100644 networking/src/JsonLog/CanJsonLog.hs delete mode 100644 networking/src/JsonLog/Event.hs delete mode 100644 networking/src/JsonLog/JsonLogT.hs delete mode 100644 networking/src/Mockable.hs delete mode 100644 networking/src/Mockable/Channel.hs delete mode 100644 networking/src/Mockable/Class.hs delete mode 100644 networking/src/Mockable/Concurrent.hs delete mode 100644 networking/src/Mockable/CurrentTime.hs delete mode 100644 networking/src/Mockable/Instances.hs delete mode 100644 networking/src/Mockable/Metrics.hs delete mode 100644 networking/src/Mockable/Monad.hs delete mode 100644 networking/src/Mockable/Production.hs delete mode 100644 networking/src/Mockable/SharedAtomic.hs delete mode 100644 networking/src/Mockable/SharedExclusive.hs diff --git a/networking/cardano-sl-networking.cabal b/networking/cardano-sl-networking.cabal index bd4d8ecbac6..648d393b2d3 100644 --- a/networking/cardano-sl-networking.cabal +++ b/networking/cardano-sl-networking.cabal @@ -24,19 +24,6 @@ Library Network.Broadcast.OutboundQueue.Demo Node - - Mockable - Mockable.Channel - Mockable.Class - Mockable.Concurrent - Mockable.CurrentTime - Mockable.Instances - Mockable.Monad - Mockable.Production - Mockable.SharedAtomic - Mockable.SharedExclusive - Mockable.Metrics - Node.Internal Node.Conversation Node.Message.Decoder @@ -49,11 +36,6 @@ Library Bench.Network.Commons - JsonLog - JsonLog.CanJsonLog - JsonLog.Event - JsonLog.JsonLogT - other-modules: Ntp.Packet Ntp.Util Data.NonEmptySet diff --git a/networking/src/JsonLog.hs b/networking/src/JsonLog.hs deleted file mode 100644 index 2eb496f86e8..00000000000 --- a/networking/src/JsonLog.hs +++ /dev/null @@ -1,21 +0,0 @@ -{-| -Module : JsonLog -Description : Logging to JSON files -License: MIT -Maintainer: lars.bruenjes@iohk.io -Stability: experimental -Portability: GHC - -This module provides types and functions to support -logging to JSON files. --} - -module JsonLog - ( module JsonLog.CanJsonLog - , module JsonLog.Event - , module JsonLog.JsonLogT - ) where - -import JsonLog.CanJsonLog -import JsonLog.Event -import JsonLog.JsonLogT diff --git a/networking/src/JsonLog/CanJsonLog.hs b/networking/src/JsonLog/CanJsonLog.hs deleted file mode 100644 index 13da16baaaa..00000000000 --- a/networking/src/JsonLog/CanJsonLog.hs +++ /dev/null @@ -1,5 +0,0 @@ -module JsonLog.CanJsonLog - ( module X - ) where - -import Pos.Core.JsonLog.CanJsonLog as X diff --git a/networking/src/JsonLog/Event.hs b/networking/src/JsonLog/Event.hs deleted file mode 100644 index cc9001ebd7c..00000000000 --- a/networking/src/JsonLog/Event.hs +++ /dev/null @@ -1,5 +0,0 @@ -module JsonLog.Event - ( module X - ) where - -import Pos.Core.JsonLog.Event as X diff --git a/networking/src/JsonLog/JsonLogT.hs b/networking/src/JsonLog/JsonLogT.hs deleted file mode 100644 index f6bcd72451b..00000000000 --- a/networking/src/JsonLog/JsonLogT.hs +++ /dev/null @@ -1,5 +0,0 @@ -module JsonLog.JsonLogT - ( module X - ) where - -import Pos.Core.JsonLog.JsonLogT as X diff --git a/networking/src/Mockable.hs b/networking/src/Mockable.hs deleted file mode 100644 index 003d22d5bce..00000000000 --- a/networking/src/Mockable.hs +++ /dev/null @@ -1,14 +0,0 @@ -module Mockable - ( module M - ) where - -import Mockable.Channel as M -import Mockable.Class as M -import Mockable.Concurrent as M -import Mockable.CurrentTime as M -import Mockable.Instances () -import Mockable.Metrics as M -import Mockable.Monad as M -import Mockable.Production as M -import Mockable.SharedAtomic as M -import Mockable.SharedExclusive as M diff --git a/networking/src/Mockable/Channel.hs b/networking/src/Mockable/Channel.hs deleted file mode 100644 index 40e0076dc05..00000000000 --- a/networking/src/Mockable/Channel.hs +++ /dev/null @@ -1,5 +0,0 @@ -module Mockable.Channel - ( module X - ) where - -import Pos.Core.Mockable.Channel as X diff --git a/networking/src/Mockable/Class.hs b/networking/src/Mockable/Class.hs deleted file mode 100644 index 700a7dbb7ef..00000000000 --- a/networking/src/Mockable/Class.hs +++ /dev/null @@ -1,5 +0,0 @@ -module Mockable.Class - ( module X - ) where - -import Pos.Core.Mockable.Class as X diff --git a/networking/src/Mockable/Concurrent.hs b/networking/src/Mockable/Concurrent.hs deleted file mode 100644 index 04c2a3f2936..00000000000 --- a/networking/src/Mockable/Concurrent.hs +++ /dev/null @@ -1,5 +0,0 @@ -module Mockable.Concurrent - ( module X - ) where - -import Pos.Core.Mockable.Concurrent as X diff --git a/networking/src/Mockable/CurrentTime.hs b/networking/src/Mockable/CurrentTime.hs deleted file mode 100644 index a3f0538ef28..00000000000 --- a/networking/src/Mockable/CurrentTime.hs +++ /dev/null @@ -1,5 +0,0 @@ -module Mockable.CurrentTime - ( module X - ) where - -import Pos.Core.Mockable.CurrentTime as X diff --git a/networking/src/Mockable/Instances.hs b/networking/src/Mockable/Instances.hs deleted file mode 100644 index e4b5c436380..00000000000 --- a/networking/src/Mockable/Instances.hs +++ /dev/null @@ -1,3 +0,0 @@ -module Mockable.Instances () where - -import Pos.Core.Mockable.Instances () diff --git a/networking/src/Mockable/Metrics.hs b/networking/src/Mockable/Metrics.hs deleted file mode 100644 index ff7aef6869d..00000000000 --- a/networking/src/Mockable/Metrics.hs +++ /dev/null @@ -1,5 +0,0 @@ -module Mockable.Metrics - ( module X - ) where - -import Pos.Core.Mockable.Metrics as X diff --git a/networking/src/Mockable/Monad.hs b/networking/src/Mockable/Monad.hs deleted file mode 100644 index 86b40e517d0..00000000000 --- a/networking/src/Mockable/Monad.hs +++ /dev/null @@ -1,5 +0,0 @@ -module Mockable.Monad - ( module X - ) where - -import Pos.Core.Mockable.Monad as X diff --git a/networking/src/Mockable/Production.hs b/networking/src/Mockable/Production.hs deleted file mode 100644 index c5b5560c816..00000000000 --- a/networking/src/Mockable/Production.hs +++ /dev/null @@ -1,5 +0,0 @@ -module Mockable.Production - ( module X - ) where - -import Pos.Core.Mockable.Production as X diff --git a/networking/src/Mockable/SharedAtomic.hs b/networking/src/Mockable/SharedAtomic.hs deleted file mode 100644 index dc66719fc44..00000000000 --- a/networking/src/Mockable/SharedAtomic.hs +++ /dev/null @@ -1,5 +0,0 @@ -module Mockable.SharedAtomic - ( module X - ) where - -import Pos.Core.Mockable.SharedAtomic as X diff --git a/networking/src/Mockable/SharedExclusive.hs b/networking/src/Mockable/SharedExclusive.hs deleted file mode 100644 index e7ba8178b80..00000000000 --- a/networking/src/Mockable/SharedExclusive.hs +++ /dev/null @@ -1,5 +0,0 @@ -module Mockable.SharedExclusive - ( module X - ) where - -import Pos.Core.Mockable.SharedExclusive as X