[CDEC-432] Switch JsonLog & Mockable imports from networking to core

auxx/Main.hs

@@ -7,14 +7,14 @@ 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)
 
 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)

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

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,

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)

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)

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

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)

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,

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

explorer/src/Pos/Explorer/ExplorerMode.hs

@@ -48,16 +48,16 @@ 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)
 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)

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))
 

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)

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 ()

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)

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)

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)

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,

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)

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)

lib/src/Pos/Launcher/Scenario.hs

@@ -13,14 +13,14 @@ 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)
 
 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

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)

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)

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)

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

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)

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)
 

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)