[CBR-207] Remove dependency on log-warper

Author: Andreas Triantafyllos

auxx/Main.hs

@@ -11,7 +11,6 @@ import           Data.Maybe (fromMaybe)
 import           Formatting (sformat, shown, (%))
 import qualified Network.Transport.TCP as TCP (TCPAddr (..))
 import qualified System.IO.Temp as Temp
-import           System.Wlog (LoggerName, logInfo)
 
 import           Ntp.Client (NtpConfiguration)
 
@@ -34,6 +33,7 @@ import           Pos.Util (logException)
 import           Pos.Util.CompileInfo (HasCompileInfo, withCompileInfo)
 import           Pos.Util.Config (ConfigurationException (..))
 import           Pos.Util.UserSecret (usVss)
+import           Pos.Util.Wlog (LoggerName, logInfo)
 import           Pos.WorkMode (EmptyMempoolExt, RealMode)
 
 import           AuxxOptions (AuxxAction (..), AuxxOptions (..),

auxx/cardano-sl-auxx.cabal

@@ -66,7 +66,6 @@ library
                      , haskeline
                      , lens
                      , loc
-                     , log-warper
                      , megaparsec
                      , mtl
                      , neat-interpolation
@@ -133,7 +132,6 @@ executable cardano-auxx
                      , cardano-sl-networking
                      , cardano-sl-chain
                      , cardano-sl-util
-                     , log-warper
                      , temporary
                      , network-transport-tcp
                      , safe-exceptions

auxx/src/Command/BlockGen.hs

@@ -11,7 +11,6 @@ import           Universum
 import           Control.Monad.Random.Strict (evalRandT)
 import           Data.Default (def)
 import           System.Random (mkStdGen, randomIO)
-import           System.Wlog (logInfo)
 
 import           Pos.AllSecrets (mkAllSecretsSimple)
 import           Pos.Chain.Txp (TxpConfiguration)
@@ -25,6 +24,7 @@ import           Pos.Generator.Block (BlockGenParams (..), genBlocks,
 import           Pos.Infra.StateLock (Priority (..), withStateLock)
 import           Pos.Infra.Util.JsonLog.Events (MemPoolModifyReason (..))
 import           Pos.Util.CompileInfo (withCompileInfo)
+import           Pos.Util.Wlog (logInfo)
 
 import           Lang.Value (GenBlocksParams (..))
 import           Mode (MonadAuxxMode)

auxx/src/Command/Proc.hs

@@ -13,8 +13,6 @@ import           Data.Default (def)
 import           Data.List ((!!))
 import qualified Data.Map as Map
 import           Formatting (build, int, sformat, stext, (%))
-import           System.Wlog (CanLog, HasLoggerName, logError, logInfo,
-                     logWarning)
 import qualified Text.JSON.Canonical as CanonicalJSON
 
 import           Pos.Chain.Txp (TxpConfiguration)
@@ -39,6 +37,8 @@ import           Pos.Infra.Diffusion.Types (Diffusion (..))
 import           Pos.Util.UserSecret (WalletUserSecret (..), readUserSecret,
                      usKeys, usPrimKey, usWallet, userSecret)
 import           Pos.Util.Util (eitherToThrow)
+import           Pos.Util.Wlog (CanLog, HasLoggerName, logError, logInfo,
+                     logWarning)
 
 import           Command.BlockGen (generateBlocks)
 import           Command.Help (mkHelpMessage)

auxx/src/Command/Rollback.hs

@@ -11,7 +11,6 @@ import           Data.Aeson (encode)
 import qualified Data.ByteString.Lazy as BSL
 import           Data.List (genericTake)
 import           Formatting (build, int, sformat, string, (%))
-import           System.Wlog (logInfo)
 
 import           Pos.Chain.Block (Blund, mainBlockTxPayload)
 import           Pos.Chain.Txp (flattenTxPayload)
@@ -25,6 +24,7 @@ import qualified Pos.DB.Block as DB
 import qualified Pos.DB.BlockIndex as DB
 import           Pos.Infra.StateLock (Priority (..), withStateLock)
 import           Pos.Infra.Util.JsonLog.Events (MemPoolModifyReason (..))
+import           Pos.Util.Wlog (logInfo)
 
 import           Mode (MonadAuxxMode)
 

auxx/src/Command/Tx.hs

@@ -31,7 +31,6 @@ import           Data.Time.Units (Microsecond, fromMicroseconds, toMicroseconds)
 import           Formatting (build, int, sformat, shown, stext, (%))
 import           System.Environment (lookupEnv)
 import           System.IO (BufferMode (LineBuffering), hClose, hSetBuffering)
-import           System.Wlog (logError, logInfo)
 import           UnliftIO (MonadUnliftIO)
 
 import           Pos.Chain.Txp (topsortTxAuxes)
@@ -53,6 +52,7 @@ import           Pos.Crypto (EncryptedSecretKey, ProtocolMagic, SecretKey,
 import           Pos.Infra.Diffusion.Types (Diffusion (..))
 import           Pos.Util.UserSecret (usWallet, userSecret, wusRootKey)
 import           Pos.Util.Util (maybeThrow)
+import           Pos.Util.Wlog (logError, logInfo)
 
 import           Mode (MonadAuxxMode, makePubKeyAddressAuxx)
 

auxx/src/Command/Update.hs

@@ -16,8 +16,6 @@ import           Data.Default (def)
 import qualified Data.HashMap.Strict as HM
 import           Data.List ((!!))
 import           Formatting (sformat, string, (%))
-import           System.Wlog (CanLog, HasLoggerName, logDebug, logError,
-                     logInfo)
 
 import           Pos.Binary (Raw)
 import           Pos.Chain.Update (SystemTag, UpId, UpdateData (..),
@@ -29,6 +27,8 @@ import           Pos.Crypto (Hash, ProtocolMagic, emptyPassphrase, hash,
                      hashHexF, unsafeHash, withSafeSigner, withSafeSigners)
 import           Pos.Infra.Diffusion.Types (Diffusion (..))
 import           Pos.Network.Update.Download (installerHash)
+import           Pos.Util.Wlog (CanLog, HasLoggerName, logDebug, logError,
+                     logInfo)
 
 import           Lang.Value (ProposeUpdateParams (..), ProposeUpdateSystem (..))
 import           Mode (MonadAuxxMode)

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           System.Wlog (HasLoggerName (..))
 
 import           Pos.Chain.Block (HasSlogContext (..), HasSlogGState (..))
 import           Pos.Chain.Ssc (HasSscContext (..))
@@ -68,6 +67,7 @@ import           Pos.Util.CompileInfo (HasCompileInfo, withCompileInfo)
 import           Pos.Util.LoggerName (HasLoggerName' (..))
 import           Pos.Util.UserPublic (HasUserPublic (..))
 import           Pos.Util.UserSecret (HasUserSecret (..))
+import           Pos.Util.Wlog (HasLoggerName (..))
 import           Pos.WorkMode (EmptyMempoolExt, RealMode, RealModeContext (..))
 
 type AuxxMode = ReaderT AuxxContext IO

auxx/src/Plugin.hs

@@ -20,13 +20,13 @@ import           Data.Constraint (Dict (..))
 import           Data.Time.Units (Second)
 import           Formatting (float, int, sformat, (%))
 import           System.IO (hFlush, stdout)
-import           System.Wlog (CanLog, HasLoggerName, logInfo)
 
 import           Pos.Chain.Txp (TxpConfiguration, genesisUtxo, unGenesisUtxo)
 import           Pos.Core as Core (Config)
 import           Pos.Core.Conc (delay)
 import           Pos.Crypto (AHash (..), fullPublicKeyF, hashHexF)
 import           Pos.Infra.Diffusion.Types (Diffusion)
+import           Pos.Util.Wlog (CanLog, HasLoggerName, logInfo)
 
 import           AuxxOptions (AuxxOptions (..))
 import           Command (createCommandProcs)

chain/cardano-sl-chain.cabal

@@ -136,7 +136,6 @@ library
                      , free
                      , hashable
                      , lens
-                     , log-warper
                      , lrucache
                      , memory
                      , mtl

chain/src/Pos/Chain/Ssc/Mem.hs

@@ -28,11 +28,11 @@ import           Universum
 
 import           Control.Monad.Morph (hoist)
 import qualified Crypto.Random as Rand
-import           System.Wlog (NamedPureLogger, WithLogger, launchNamedPureLog)
 
 import           Pos.Chain.Ssc.Types (SscGlobalState, SscLocalData, SscState,
                      sscGlobal, sscLocal)
 import           Pos.Util.Util (HasLens (..))
+import           Pos.Util.Wlog (NamedPureLogger, WithLogger, launchNamedPureLog)
 
 ----------------------------------------------------------------------------
 -- MonadSscMem

chain/src/Pos/Chain/Ssc/Shares.hs

@@ -12,7 +12,6 @@ import           Universum hiding (id)
 import           Crypto.Random (drgNewSeed, seedNew, withDRG)
 import qualified Data.HashMap.Strict as HM
 import           Formatting (build, sformat, (%))
-import           System.Wlog (WithLogger, launchNamedPureLog, logWarning)
 
 import           Pos.Binary.Class (AsBinary, asBinary, fromBinary)
 import           Pos.Chain.Ssc.Mem (MonadSscMem, SscGlobalQuery,
@@ -22,6 +21,7 @@ import           Pos.Core.Common (StakeholderId, addressHash)
 import           Pos.Core.Ssc (Commitment (..), getCommitmentsMap)
 import           Pos.Crypto (DecShare, EncShare, VssKeyPair, VssPublicKey,
                      decryptShare, toVssPublicKey)
+import           Pos.Util.Wlog (WithLogger, launchNamedPureLog, logWarning)
 
 -- | Decrypt shares (in commitments) that are intended for us and that we can
 -- decrypt.

chain/src/Pos/Chain/Ssc/Toss/Base.hs

@@ -45,7 +45,6 @@ import qualified Data.HashSet as HS
 import qualified Data.List.NonEmpty as NE
 import           Data.STRef (newSTRef, readSTRef, writeSTRef)
 import           Formatting (ords, sformat, (%))
-import           System.Wlog (logWarning)
 
 import           Pos.Binary.Class (AsBinary, fromBinary)
 import           Pos.Chain.Lrc (RichmenSet, RichmenStakes)
@@ -64,6 +63,7 @@ import           Pos.Core.Ssc (Commitment (..),
 import           Pos.Core.Update (bvdMpcThd)
 import           Pos.Crypto (DecShare, verifyDecShare, verifyEncShares)
 import           Pos.Util.Util (getKeys)
+import           Pos.Util.Wlog (logWarning)
 
 ----------------------------------------------------------------------------
 -- Trivial getters (proper interface of MonadTossRead)

chain/src/Pos/Chain/Ssc/Toss/Class.hs

@@ -12,14 +12,14 @@ import           Universum hiding (id)
 
 import           Control.Monad.Except (ExceptT)
 import           Control.Monad.Trans (MonadTrans)
-import           System.Wlog (WithLogger)
 
 import           Pos.Chain.Lrc (RichmenStakes)
 import           Pos.Core (EpochIndex, EpochOrSlot, StakeholderId)
 import           Pos.Core.Ssc (CommitmentsMap, InnerSharesMap, Opening,
                      OpeningsMap, SharesMap, SignedCommitment, VssCertificate,
                      VssCertificatesMap)
 import           Pos.Core.Update (BlockVersionData)
+import           Pos.Util.Wlog (WithLogger)
 
 ----------------------------------------------------------------------------
 -- Read-only

chain/src/Pos/Chain/Ssc/Toss/Logic.hs

@@ -16,7 +16,6 @@ import           Control.Lens (at)
 import           Control.Monad.Except (MonadError, runExceptT, throwError)
 import           Crypto.Random (MonadRandom)
 import qualified Data.HashMap.Strict as HM
-import           System.Wlog (logError)
 
 import           Pos.Chain.Block.Union (IsMainHeader, headerSlotL)
 import           Pos.Chain.Ssc.Error (SscVerifyError (..))
@@ -38,6 +37,7 @@ import           Pos.Crypto (ProtocolMagic)
 import           Pos.Util.AssertMode (inAssertMode)
 import           Pos.Util.Some (Some)
 import           Pos.Util.Util (sortWithMDesc)
+import           Pos.Util.Wlog (logError)
 
 -- | Verify 'SscPayload' with respect to data provided by
 -- MonadToss. If data is valid it is also applied.  Otherwise

chain/src/Pos/Chain/Ssc/Toss/Pure.hs

@@ -16,9 +16,6 @@ import           Universum hiding (id)
 
 import           Control.Lens (at, uses, (%=), (.=))
 import qualified Crypto.Random as Rand
-import           System.Wlog (CanLog, HasLoggerName (..), LogEvent,
-                     NamedPureLogger (..), WithLogger, dispatchEvents,
-                     runNamedPureLog)
 
 import           Pos.Chain.Lrc (RichmenSet, RichmenStakes)
 import           Pos.Chain.Ssc.Base (deleteSignedCommitment,
@@ -31,6 +28,9 @@ import qualified Pos.Chain.Ssc.VssCertData as VCD
 import           Pos.Core (EpochIndex, HasGenesisData, HasProtocolConstants,
                      crucialSlot, genesisVssCerts)
 import           Pos.Core.Update (BlockVersionData)
+import           Pos.Util.Wlog (CanLog, HasLoggerName (..), LogEvent,
+                     NamedPureLogger (..), WithLogger, dispatchEvents,
+                     runNamedPureLog)
 
 type MultiRichmenStakes = HashMap EpochIndex RichmenStakes
 type MultiRichmenSet   = HashMap EpochIndex RichmenSet

chain/src/Pos/Chain/Txp/Toil/Monad.hs

@@ -57,7 +57,6 @@ import           Control.Monad.Reader (mapReaderT)
 import           Control.Monad.State.Strict (mapStateT)
 import           Data.Default (def)
 import           Fmt ((+|), (|+))
-import           System.Wlog (NamedPureLogger, WithLogger, launchNamedPureLog)
 
 import           Pos.Chain.Txp.Toil.Types (MemPool, StakesView, UndoMap,
                      UtxoLookup, UtxoModifier, mpLocalTxs, mpSize, svStakes,
@@ -66,6 +65,7 @@ import           Pos.Core.Common (Coin, StakeholderId)
 import           Pos.Core.Txp (TxAux, TxId, TxIn, TxOutAux, TxUndo)
 import           Pos.Util (type (~>))
 import qualified Pos.Util.Modifier as MM
+import           Pos.Util.Wlog (NamedPureLogger, WithLogger, launchNamedPureLog)
 
 ----------------------------------------------------------------------------
 -- Monadic actions with Utxo.

chain/src/Pos/Chain/Txp/Toil/Stakes.hs

@@ -15,7 +15,6 @@ import qualified Data.HashMap.Strict as HM
 import qualified Data.HashSet as HS
 import           Formatting (sformat, (%))
 import           Serokell.Util.Text (listJson)
-import           System.Wlog (logDebug)
 
 import           Pos.Chain.Txp.Base (txOutStake)
 import           Pos.Chain.Txp.Toil.Monad (GlobalToilM, getStake, getTotalStake,
@@ -24,6 +23,7 @@ import           Pos.Core (HasGenesisData, StakesList, coinToInteger,
                      genesisData, mkCoin, sumCoins, unsafeIntegerToCoin)
 import           Pos.Core.Genesis (GenesisData (..))
 import           Pos.Core.Txp (Tx (..), TxAux (..), TxOutAux (..), TxUndo)
+import           Pos.Util.Wlog (logDebug)
 
 -- | Apply transactions to stakes.
 applyTxsToStakes :: HasGenesisData => [(TxAux, TxUndo)] -> GlobalToilM ()

chain/src/Pos/Chain/Update/Poll/Class.hs

@@ -29,7 +29,6 @@ import qualified Data.HashMap.Strict as HM
 import qualified Data.HashSet as HS
 import qualified Data.List as List (find)
 import qualified Ether
-import           System.Wlog (WithLogger, logWarning)
 
 import           Pos.Chain.Update.BlockVersion (applyBVM)
 import           Pos.Chain.Update.Poll.Modifier (PollModifier (..),
@@ -51,6 +50,7 @@ import           Pos.Core.Update (ApplicationName, BlockVersion,
 import           Pos.Crypto (hash)
 import qualified Pos.Util.Modifier as MM
 import           Pos.Util.Util (ether)
+import           Pos.Util.Wlog (WithLogger, logWarning)
 
 ----------------------------------------------------------------------------
 -- Read-only

client/cardano-sl-client.cabal

@@ -38,7 +38,6 @@ library
                      , data-default
                      , formatting
                      , lens
-                     , log-warper
                      , mtl
                      , safe-exceptions
                      , serokell-util

client/src/Pos/Client/Txp/History.hs

@@ -35,7 +35,6 @@ import qualified Data.Map.Strict as M (fromList, insert)
 import           Formatting (bprint, build, (%))
 import qualified Formatting.Buildable
 import           Serokell.Util.Text (listJson)
-import           System.Wlog (WithLogger)
 
 import           Pos.Chain.Block (Block, MainBlock, genesisBlock0, headerHash,
                      mainBlockSlot, mainBlockTxPayload)
@@ -63,6 +62,7 @@ import           Pos.Infra.StateLock (StateLock, StateLockMetrics)
 import           Pos.Infra.Util.JsonLog.Events (MemPoolModifyReason)
 import           Pos.Util (eitherToThrow, maybeThrow)
 import           Pos.Util.Util (HasLens')
+import           Pos.Util.Wlog (WithLogger)
 
 ----------------------------------------------------------------------
 -- Deduction of history

client/src/Pos/Client/Txp/Network.hs

@@ -16,7 +16,6 @@ module Pos.Client.Txp.Network
 import           Universum
 
 import           Formatting (build, sformat, (%))
-import           System.Wlog (logInfo)
 
 import           Pos.Client.Txp.Addresses (MonadAddresses (..))
 import           Pos.Client.Txp.Balances (MonadBalances (..), getOwnUtxo)
@@ -35,6 +34,7 @@ import           Pos.Infra.Communication.Protocol (OutSpecs)
 import           Pos.Infra.Communication.Specs (createOutSpecs)
 import           Pos.Infra.Diffusion.Types (Diffusion (sendTx))
 import           Pos.Util.Util (eitherToThrow)
+import           Pos.Util.Wlog (logInfo)
 import           Pos.WorkMode.Class (MinWorkMode)
 
 type TxMode m

client/src/Pos/Client/Update/Network.hs

@@ -10,14 +10,14 @@ module Pos.Client.Update.Network
 import           Universum
 
 import           Formatting (sformat, (%))
-import           System.Wlog (logInfo)
 
 import           Pos.Chain.Update (UpId, UpdateProposal, UpdateVote (..),
                      mkUpdateVoteSafe)
 import           Pos.Crypto (ProtocolMagic, SafeSigner, hash, hashHexF)
 import           Pos.Infra.Diffusion.Types (Diffusion)
 import qualified Pos.Infra.Diffusion.Types as Diffusion
                      (Diffusion (sendUpdateProposal, sendVote))
+import           Pos.Util.Wlog (logInfo)
 import           Pos.WorkMode.Class (MinWorkMode)
 
 -- | Send UpdateVote to given addresses

core/cardano-sl-core.cabal

@@ -204,7 +204,6 @@ library
                      , formatting
                      , hashable
                      , lens
-                     , log-warper >= 1.0.3
                      , parsec
                      , memory
                      , mmorph

core/src/Pos/Core/Conc.hs

@@ -27,14 +27,14 @@ import qualified Control.Concurrent as Conc
 import           Control.Monad.IO.Class (MonadIO (..))
 import           Data.Time.Units (Microsecond, TimeUnit, convertUnit,
                      toMicroseconds)
-import           System.Wlog (HasLoggerName (..))
 import           UnliftIO (MonadUnliftIO)
 import           UnliftIO.Async (async, cancel, concurrently, forConcurrently,
                      mapConcurrently, race, wait, withAsync,
                      withAsyncWithUnmask)
 import           UnliftIO.MVar (modifyMVar, newMVar)
 
 import           Pos.Util (realTime)
+import           Pos.Util.Wlog (HasLoggerName (..))
 
 currentTime :: MonadIO m => m Microsecond
 currentTime = liftIO realTime

core/src/Pos/Core/Exception.hs

@@ -16,8 +16,8 @@ import           Control.Exception.Safe (Exception (..))
 import           Data.Typeable (cast)
 import           Formatting (bprint, stext, (%))
 import qualified Formatting.Buildable
+import           Pos.Util.Wlog (WithLogger, logError)
 import           Serokell.Util (Color (Red), colorize)
-import           System.Wlog (WithLogger, logError)
 import qualified Text.Show
 import           Universum
 

core/src/Pos/Core/JsonLog/CanJsonLog.hs

@@ -27,7 +27,7 @@ import           Control.Monad.Trans.Resource (ResourceT)
 import           Control.Monad.Writer (WriterT)
 import           Data.Aeson.Types (ToJSON)
 import qualified Ether
-import           System.Wlog.LoggerNameBox (LoggerNameBox)
+import           Pos.Util.Wlog (LoggerNameBox)
 
 -- | An instance of class @'CanJsonLog'@ supports the effect of
 -- JSON logging.