Merge pull request #3534 from input-output-hk/adiemand/CBR-275/cleanu…

…p-interface-for-structured-logging

[CBR-275] cleanup interface required for structured logging

WithLogger m = CanLog m, HasLoggerName m

auxx/src/Command/Update.hs

@@ -27,8 +27,7 @@ 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           Pos.Util.Wlog (WithLogger, logDebug, logError, logInfo)
 
 import           Lang.Value (ProposeUpdateParams (..), ProposeUpdateSystem (..))
 import           Mode (MonadAuxxMode)
@@ -105,7 +104,7 @@ updateDataElement ProposeUpdateSystem{..} = do
 dummyHash :: Hash Raw
 dummyHash = unsafeHash (0 :: Integer)
 
-hashFile :: (CanLog m, HasLoggerName m, MonadIO m) => Maybe FilePath -> m (Hash Raw)
+hashFile :: (WithLogger m, MonadIO m) => Maybe FilePath -> m (Hash Raw)
 hashFile Nothing  = pure dummyHash
 hashFile (Just filename) = do
     fileData <- liftIO $ BSL.readFile filename

wallet/src/Pos/Wallet/Web/Tracking/Sync.hs

@@ -80,8 +80,8 @@ import           Pos.Infra.Util.LogSafe (buildSafe, logDebugSP, logErrorSP,
 import qualified Pos.Util.Modifier as MM
 import           Pos.Util.Servant (encodeCType)
 import           Pos.Util.Util (HasLens (..), getKeys, timed)
-import           Pos.Util.Wlog (CanLog, HasLoggerName, WithLogger, logDebug,
-                     logError, logInfo, logWarning, modifyLoggerName)
+import           Pos.Util.Wlog (HasLoggerName, WithLogger, logDebug, logError,
+                     logInfo, logWarning, modifyLoggerName)
 
 import           Pos.Wallet.Web.ClientTypes (CId, CTxMeta (..), Wal)
 import           Pos.Wallet.Web.Error.Types (WalletError (..))
@@ -734,8 +734,7 @@ calculateEstimatedRemainingTime (WS.SyncThroughput blocks) remainingBlocks =
 
 -- | Apply the given 'CAccModifier' to a wallet.
 applyModifierToWallet
-    :: ( CanLog m
-       , HasLoggerName m
+    :: ( WithLogger m
        , MonadIO m
        )
     => WalletDB
@@ -773,7 +772,7 @@ applyModifierToWallet db trackingOperation wid newBlockHeaderTip CAccModifier{..
       newSyncState
 
 rollbackModifierFromWallet
-    :: (CanLog m, HasLoggerName m, MonadSlots ctx m)
+    :: (WithLogger m, MonadSlots ctx m)
     => ProtocolConstants
     -> WalletDB
     -> TrackingOperation