Merge pull request #4837 from input-output-hk/newhoggy/fix-hlint-warnings

Fix hlint warnings

Author: newhoggy

.hlint.template.yaml

@@ -7,7 +7,7 @@
 
 
 # Warnings currently triggered by your code
-# - ignore: {name: "Move brackets to avoid $"}
+- ignore: {name: "Move brackets to avoid $"}
 
 # Specify additional command line arguments
 #

bench/locli/app/locli.hs

@@ -1,12 +1,10 @@
-{-# LANGUAGE OverloadedStrings #-}
-
 import           Cardano.Prelude hiding (option)
 
 import           Control.Monad.Trans.Except.Exit (orDie)
 import qualified Options.Applicative as Opt
 
-import           Cardano.TopHandler
 import           Cardano.Command (opts, pref, renderCommandError, runCommand)
+import           Cardano.TopHandler
 
 
 main :: IO ()

cardano-cli/src/Cardano/CLI/Shelley/Run/Query.hs

@@ -1036,7 +1036,7 @@ runQueryStakePools (AnyConsensusModeParams cModeParams)
 
         sbe <- getSbe $ cardanoEraStyle era
 
-        lift (queryExpr (QueryInEra eInMode $ QueryInShelleyBasedEra sbe $ QueryStakePools))
+        lift (queryExpr (QueryInEra eInMode $ QueryInShelleyBasedEra sbe QueryStakePools))
           & onLeft (left . ShelleyQueryCmdUnsupportedNtcVersion)
           & onLeft (left . ShelleyQueryCmdEraMismatch)
     ) & onLeft (left . ShelleyQueryCmdAcquireFailure)

cardano-tracer/src/Cardano/Tracer/Handlers/RTView/State/EraSettings.hs

@@ -1,5 +1,3 @@
-{-# LANGUAGE OverloadedStrings #-}
-
 module Cardano.Tracer.Handlers.RTView.State.EraSettings
   ( EraSettings (..)
   , ErasSettings

cardano-tracer/src/Cardano/Tracer/Handlers/RTView/Update/Reload.hs

@@ -1,4 +1,3 @@
-{-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE ScopedTypeVariables #-}
 
 module Cardano.Tracer.Handlers.RTView.Update.Reload

cardano-tracer/src/Cardano/Tracer/Run.hs

@@ -1,5 +1,4 @@
 {-# LANGUAGE NamedFieldPuns #-}
-{-# LANGUAGE OverloadedStrings #-}
 
 -- | This top-level module is used by 'cardano-tracer' app.
 module Cardano.Tracer.Run

trace-dispatcher/src/Cardano/Logging/FrequencyLimiter.hs

@@ -138,7 +138,7 @@ limitFrequency thresholdFrequency limiterName vtracer ltracer = do
                                 then 10.0
                                 else thresholdPeriod / elapsedTime
       let spendReward = if rawSpendReward < 1.0 && rawSpendReward > 0.0
-                                then - ((1.0 / rawSpendReward) - 1.0)
+                                then 1.0 - (1.0 / rawSpendReward)
                                 else rawSpendReward - 1.0
       -- Normalize so that (0.0-10.0) means message
       -- arrive quicker then threshold

trace-forward/src/Trace/Forward/Run/DataPoint/Acceptor.hs

@@ -1,5 +1,4 @@
 {-# LANGUAGE DataKinds #-}
-{-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE NamedFieldPuns #-}
 
 module Trace.Forward.Run.DataPoint.Acceptor
@@ -8,21 +7,21 @@ module Trace.Forward.Run.DataPoint.Acceptor
   ) where
 
 import qualified Codec.Serialise as CBOR
+import           Control.Concurrent.STM.TMVar (putTMVar)
+import           Control.Concurrent.STM.TVar (modifyTVar', readTVar, readTVarIO)
 import           Control.Exception (finally)
 import           Control.Monad (unless)
 import           Control.Monad.Extra (ifM)
 import           Control.Monad.STM (atomically, check)
-import           Control.Concurrent.STM.TVar (modifyTVar', readTVar, readTVarIO)
-import           Control.Concurrent.STM.TMVar (putTMVar)
 import qualified Data.ByteString.Lazy as LBS
 import           Data.Void (Void)
-import           Ouroboros.Network.Mux (MuxMode (..), MuxPeer (..), RunMiniProtocol (..))
 import           Ouroboros.Network.Driver.Simple (runPeer)
+import           Ouroboros.Network.Mux (MuxMode (..), MuxPeer (..), RunMiniProtocol (..))
 
+import           Trace.Forward.Configuration.DataPoint (AcceptorConfiguration (..))
 import qualified Trace.Forward.Protocol.DataPoint.Acceptor as Acceptor
 import qualified Trace.Forward.Protocol.DataPoint.Codec as Acceptor
 import           Trace.Forward.Protocol.DataPoint.Type (DataPointName)
-import           Trace.Forward.Configuration.DataPoint (AcceptorConfiguration (..))
 import           Trace.Forward.Utils.DataPoint (DataPointRequestor (..))
 
 acceptDataPointsInit
@@ -46,7 +45,7 @@ runPeerWithRequestor
   -> IO DataPointRequestor
   -> IO ()
   -> MuxPeer LBS.ByteString IO ()
-runPeerWithRequestor config mkDPRequestor peerErrorHandler = 
+runPeerWithRequestor config mkDPRequestor peerErrorHandler =
   MuxPeerRaw $ \channel -> do
     dpRequestor <- mkDPRequestor
     runPeer