[CBR-275] more stylish; removed some redundant constraints; compiles everything

Signed-off-by: Alexander Diemand <[email protected]>

Author: CodiePP

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 (CanLog, 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 :: (CanLog m,  MonadIO m) => Maybe FilePath -> m (Hash Raw)
 hashFile Nothing  = pure dummyHash
 hashFile (Just filename) = do
     fileData <- liftIO $ BSL.readFile filename

util/src/Pos/Util/Wlog.hs

@@ -70,21 +70,17 @@ module Pos.Util.Wlog
         , setLevel              -- call sites: 1 networking/src/Network/Broadcast/OutboundQueue/Demo.hs
         ) where
 
-import           System.Wlog ({-CanLog (..),-} HandlerWrap (..), HasLoggerName (..),
-                     {-LogEvent (..),-} LoggerConfig (..), LoggerName (..),
-                     LoggerNameBox (..), {-NamedPureLogger (..),-} Severity (..),
-                     {-WithLogger,-} consoleActionB, debugPlus,
-                     defaultHandleAction, {-dispatchEvents,-} errorPlus,
-                     fromScratch, hwFilePath, infoPlus, {-launchNamedPureLog,-}
-                     lcLogsDirectory, lcTermSeverityOut, lcTree, {-logDebug,-}
-                     {-logError,-} {-logInfo,-} logMCond, {-logMessage,-} {-logNotice,-}
-                     {-logWarning,-} ltFiles, ltSeverity, ltSubloggers,
+import           System.Wlog (HandlerWrap (..), HasLoggerName (..),
+                     LoggerConfig (..), LoggerName (..), LoggerNameBox (..),
+                     Severity (..), consoleActionB, debugPlus,
+                     defaultHandleAction, errorPlus, fromScratch, hwFilePath,
+                     infoPlus, lcLogsDirectory, lcTermSeverityOut, lcTree,
+                     logMCond, ltFiles, ltSeverity, ltSubloggers,
                      maybeLogsDirB, modifyLoggerName, noticePlus,
                      parseLoggerConfig, productionB, removeAllHandlers,
-                     retrieveLogContent, {-runNamedPureLog,-} setLevel,
-                     setupLogging, showTidB, termSeveritiesOutB,
-                     updateGlobalLogger, usingLoggerName, warningPlus,
-                     zoomLogger)
+                     retrieveLogContent, setLevel, setupLogging, showTidB,
+                     termSeveritiesOutB, updateGlobalLogger, usingLoggerName,
+                     warningPlus, zoomLogger)
 import           System.Wlog.Formatter (centiUtcTimeF)
 import           System.Wlog.LogHandler (LogHandlerTag (HandlerFilelike))
 

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

@@ -735,7 +735,6 @@ calculateEstimatedRemainingTime (WS.SyncThroughput blocks) remainingBlocks =
 -- | Apply the given 'CAccModifier' to a wallet.
 applyModifierToWallet
     :: ( CanLog m
-       , HasLoggerName m
        , MonadIO m
        )
     => WalletDB
@@ -773,7 +772,7 @@ applyModifierToWallet db trackingOperation wid newBlockHeaderTip CAccModifier{..
       newSyncState
 
 rollbackModifierFromWallet
-    :: (CanLog m, HasLoggerName m, MonadSlots ctx m)
+    :: (CanLog m, MonadSlots ctx m)
     => ProtocolConstants
     -> WalletDB
     -> TrackingOperation