[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`.

Author: Michael Hueschen

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)

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

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)

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

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)

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.

src/Cardano/Wallet/Kernel/Mode.hs

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

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)

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)