[CDEC-416] Move Infra.Util.{LogSafe,TimeLimit} to sinbin

Author: Michael Hueschen

block/src/Pos/Block/Error.hs

@@ -9,8 +9,8 @@ module Pos.Block.Error
 
 import           Universum
 
-import           Control.Exception.Safe (Exception (..))
 import           Control.DeepSeq (NFData)
+import           Control.Exception.Safe (Exception (..))
 import           Data.Text.Buildable (Buildable (..))
 import           Data.Text.Lazy.Builder (Builder, fromText)
 import           Formatting (bprint, stext, (%))

block/src/Pos/Block/Logic/Creation.hs

@@ -49,14 +49,14 @@ import           Pos.DB.Class (MonadDBRead)
 import           Pos.Delegation (DelegationVar, DlgPayload (..),
                      ProxySKBlockInfo, clearDlgMemPool, getDlgMempool)
 import           Pos.Exception (assertionFailed, reportFatalError)
-import           Pos.Infra.Util.LogSafe (logInfoS)
 import           Pos.Lrc (HasLrcContext)
 import           Pos.Lrc.Context (lrcActionOnEpochReason)
 import qualified Pos.Lrc.DB as LrcDB
 import           Pos.Sinbin.Reporting (HasMisbehaviorMetrics, reportError)
 import           Pos.Sinbin.StateLock (Priority (..), StateLock,
                      StateLockMetrics, modifyStateLock)
 import           Pos.Sinbin.Util.JsonLog.Events (MemPoolModifyReason (..))
+import           Pos.Sinbin.Util.LogSafe (logInfoS)
 import           Pos.Ssc.Base (defaultSscPayload, stripSscPayload)
 import           Pos.Ssc.Logic (sscGetLocalPayload)
 import           Pos.Ssc.Mem (MonadSscMem)

block/src/Pos/Block/Lrc.hs

@@ -38,7 +38,6 @@ import           Pos.DB.Class (MonadDBRead, MonadGState)
 import qualified Pos.DB.GState.Stakes as GS (getRealStake, getRealTotalStake)
 import           Pos.Delegation (getDelegators, isIssuerByAddressHash)
 import qualified Pos.GState.SanityCheck as DB (sanityCheckDB)
-import           Pos.Infra.Util.TimeLimit (logWarningWaitLinear)
 import           Pos.Lrc.Consumer (LrcConsumer (..))
 import           Pos.Lrc.Consumers (allLrcConsumers)
 import           Pos.Lrc.Context (LrcContext (lcLrcSync), LrcSyncData (..))
@@ -53,6 +52,7 @@ import           Pos.Lrc.Types (RichmenStakes)
 import           Pos.Sinbin.Reporting (HasMisbehaviorMetrics (..),
                      MisbehaviorMetrics (..))
 import           Pos.Sinbin.Slotting (MonadSlots)
+import           Pos.Sinbin.Util.TimeLimit (logWarningWaitLinear)
 import           Pos.Ssc (MonadSscMem, noReportNoSecretsForEpoch1,
                      sscCalculateSeed)
 import           Pos.Ssc.Message (SscMessageConstraints)

block/src/Pos/Block/Worker.hs

@@ -54,8 +54,6 @@ import qualified Pos.Infra.Diffusion.Types as Diffusion
 import           Pos.Infra.Recovery.Info (getSyncStatus, getSyncStatusK,
                      needTriggerRecovery, recoveryCommGuard)
 import           Pos.Infra.Slotting (getSlotStartEmpatically, onNewSlot)
-import           Pos.Infra.Util.LogSafe (logDebugS, logInfoS, logWarningS)
-import           Pos.Infra.Util.TimeLimit (logWarningSWaitLinear)
 import qualified Pos.Lrc.DB as LrcDB (getLeadersForEpoch)
 import           Pos.Sinbin.Reporting (HasMisbehaviorMetrics,
                      MetricMonitor (..), MetricMonitorState, noReportMonitor,
@@ -65,6 +63,8 @@ import           Pos.Sinbin.Slotting (ActionTerminationPolicy (..),
                      OnNewSlotParams (..), currentTimeSlotting,
                      defaultOnNewSlotParams)
 import           Pos.Sinbin.Util.JsonLog.Events (jlCreatedBlock)
+import           Pos.Sinbin.Util.LogSafe (logDebugS, logInfoS, logWarningS)
+import           Pos.Sinbin.Util.TimeLimit (logWarningSWaitLinear)
 import           Pos.Sinbin.Util.TimeWarp (CanJsonLog (..))
 
 import           Pos.Update.DB (getAdoptedBVData)