stylish-haskell changes

IntersectMBO · Jan 31, 2023 · 21ec90f · 21ec90f
1 parent e6bed3b
commit 21ec90f
Show file tree

Hide file tree

Showing 27 changed files with 57 additions and 373 deletions.
diff --git a/cardano-node/src/Cardano/Node/Configuration/TopologyP2P.hs b/cardano-node/src/Cardano/Node/Configuration/TopologyP2P.hs
@@ -1,6 +1,6 @@
 {-# LANGUAGE FlexibleContexts #-}
 {-# LANGUAGE FlexibleInstances #-}
-{-# LANGUAGE NamedFieldPuns    #-}
+{-# LANGUAGE NamedFieldPuns #-}
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE PackageImports #-}
 
@@ -33,15 +33,15 @@ import qualified Data.ByteString as BS
 import qualified Data.ByteString.Lazy.Char8 as LBS
 import qualified Data.Text as Text
 
-import "contra-tracer" Control.Tracer (Tracer, traceWith)
+import           "contra-tracer" Control.Tracer (Tracer, traceWith)
 
 import           Cardano.Node.Configuration.POM (NodeConfiguration (..))
 import           Cardano.Slotting.Slot (SlotNo (..))
 
 import           Cardano.Node.Configuration.NodeAddress
-import           Cardano.Node.Types
-import           Cardano.Node.Startup (StartupTrace (..))
 import           Cardano.Node.Configuration.Topology (TopologyError (..))
+import           Cardano.Node.Startup (StartupTrace (..))
+import           Cardano.Node.Types
 
 import           Ouroboros.Network.NodeToNode (PeerAdvertise (..))
 import           Ouroboros.Network.PeerSelection.LedgerPeers (UseLedgerAfter (..))

diff --git a/cardano-node/src/Cardano/Node/Tracing.hs b/cardano-node/src/Cardano/Node/Tracing.hs
@@ -25,7 +25,8 @@ import           Cardano.Node.Startup (NodeInfo, NodeStartupInfo, StartupTrace)
 
 import           Cardano.Logging.Resources
 import           Cardano.Node.Tracing.StateRep (NodeState)
-import           Cardano.Node.Tracing.Tracers.ConsensusStartupException(ConsensusStartupException(..))
+import           Cardano.Node.Tracing.Tracers.ConsensusStartupException
+                   (ConsensusStartupException (..))
 import           Cardano.Node.Tracing.Tracers.Peer (PeerT)
 
 data Tracers peer localPeer blk p2p = Tracers

diff --git a/cardano-node/src/Cardano/Node/Tracing/Era/Shelley.hs b/cardano-node/src/Cardano/Node/Tracing/Era/Shelley.hs
@@ -17,8 +17,8 @@ module Cardano.Node.Tracing.Era.Shelley () where
 
 import           Data.Aeson (ToJSON (..), Value (..), (.=))
 import qualified Data.Aeson as Aeson
-import qualified Data.Aeson.Types as Aeson
 import qualified Data.Aeson.Key as Aeson
+import qualified Data.Aeson.Types as Aeson
 import qualified Data.Set as Set
 
 import           Cardano.Api (textShow)

diff --git a/cardano-node/src/Cardano/Node/Tracing/Tracers/ConsensusStartupException.hs b/cardano-node/src/Cardano/Node/Tracing/Tracers/ConsensusStartupException.hs
@@ -36,4 +36,4 @@ instance MetaTrace ConsensusStartupException where
     ""
   documentFor _ = Just ""
 
-  allNamespaces = [Namespace [] ["ConsensusStartupException"]]
+  allNamespaces = [Namespace [] ["ConsensusStartupException"]]
diff --git a/cardano-node/src/Cardano/Node/Tracing/Tracers/Diffusion.hs b/cardano-node/src/Cardano/Node/Tracing/Tracers/Diffusion.hs
@@ -576,4 +576,4 @@ instance MetaTrace TraceLedgerPeers where
       , Namespace [] ["RequestForPeers"]
       , Namespace [] ["ReusingLedgerState"]
       , Namespace [] ["FallingBackToBootstrapPeers"]
-      ]
+      ]
diff --git a/cardano-node/src/Cardano/Node/Tracing/Tracers/NodeToNode.hs b/cardano-node/src/Cardano/Node/Tracing/Tracers/NodeToNode.hs
@@ -22,8 +22,7 @@ import           Text.Show
 import           Cardano.Node.Queries (ConvertTxId)
 import           Cardano.Node.Tracing.Render (renderHeaderHash, renderTxIdForDetails)
 
-import           Ouroboros.Consensus.Block (ConvertRawHash, GetHeader, StandardHash,
-                   getHeader)
+import           Ouroboros.Consensus.Block (ConvertRawHash, GetHeader, StandardHash, getHeader)
 import           Ouroboros.Consensus.Ledger.SupportsMempool (GenTx, HasTxId, HasTxs,
                    LedgerSupportsMempool, extractTxs, txId)
 import           Ouroboros.Consensus.Node.Run (SerialiseNodeToNodeConstraints, estimateBlockSize)
@@ -335,4 +334,4 @@ instance MetaTrace (AnyMessageAndAgency (STX.TxSubmission2 txid tx)) where
       , Namespace [] ["RequestTxs"]
       , Namespace [] ["ReplyTxs"]
       , Namespace [] ["Done"]
-      ]
+      ]
diff --git a/cardano-node/src/Cardano/Node/Tracing/Tracers/NonP2P.hs b/cardano-node/src/Cardano/Node/Tracing/Tracers/NonP2P.hs
@@ -405,4 +405,4 @@ instance MetaTrace NtN.ErrorPolicyTrace where
       , Namespace [] ["UnhandledApplicationException"]
       , Namespace [] ["UnhandledConnectionException"]
       , Namespace [] ["AcceptException"]
-      ]
+      ]
diff --git a/cardano-node/src/Cardano/Node/Tracing/Tracers/P2P.hs b/cardano-node/src/Cardano/Node/Tracing/Tracers/P2P.hs
@@ -13,11 +13,12 @@ module Cardano.Node.Tracing.Tracers.P2P
 
 import           Cardano.Logging
 import           Cardano.Prelude hiding (group, show)
-import           Data.Aeson (ToJSON, ToJSONKey, Value (..), Object, object, toJSON, toJSONList, (.=))
+import           Data.Aeson (Object, ToJSON, ToJSONKey, Value (..), object, toJSON, toJSONList,
+                   (.=))
 import           Data.Aeson.Types (listValue)
+import           Data.List (last)
 import qualified Data.Map.Strict as Map
 import qualified Data.Set as Set
-import           Data.List (last)
 import           Data.Text (pack)
 import           Network.Socket (SockAddr (..))
 import           Prelude (show)
@@ -1375,4 +1376,4 @@ instance MetaTrace NtN.AcceptConnectionsPolicyTrace where
         Namespace [] ["ConnectionRateLimiting"]
       , Namespace [] ["ConnectionHardLimit"]
       , Namespace [] ["ConnectionLimitResume"]
-      ]
+      ]
diff --git a/cardano-node/src/Cardano/Node/Tracing/Tracers/Shutdown.hs b/cardano-node/src/Cardano/Node/Tracing/Tracers/Shutdown.hs
@@ -12,7 +12,7 @@ module Cardano.Node.Tracing.Tracers.Shutdown
 import           Data.Aeson (Value (..), (.=))
 import           Data.Monoid (mconcat, (<>))
 import           Data.Text (Text, pack)
-import           Prelude (show, Maybe(..))
+import           Prelude (Maybe (..), show)
 
 import           Cardano.Logging
 import           Cardano.Node.Handlers.Shutdown

diff --git a/cardano-tracer/src/Cardano/Tracer/Handlers/Logs/File.hs b/cardano-tracer/src/Cardano/Tracer/Handlers/Logs/File.hs
@@ -9,7 +9,7 @@ module Cardano.Tracer.Handlers.Logs.File
 import           Control.Concurrent.Extra (Lock, withLock)
 import           Control.Monad (unless)
 import           Control.Monad.Extra (ifM)
-import           Data.Aeson (Value, (.=), decodeStrict', pairs)
+import           Data.Aeson (Value, decodeStrict', pairs, (.=))
 import           Data.Aeson.Encoding (encodingToLazyByteString)
 import qualified Data.ByteString as BS
 import qualified Data.ByteString.Lazy as LBS

diff --git a/cardano-tracer/src/Cardano/Tracer/MetaTrace.hs b/cardano-tracer/src/Cardano/Tracer/MetaTrace.hs
@@ -172,4 +172,4 @@ mkTracerTracer defSeverity = do
                    [ ([],         [ConfSeverity defSeverity])
                    , (["Tracer"], [ConfDetail DMaximum])
                    ]
-     }
+     }
diff --git a/trace-dispatcher/examples/Examples/DataPoint.hs b/trace-dispatcher/examples/Examples/DataPoint.hs
@@ -1,5 +1,5 @@
-{-# LANGUAGE DeriveGeneric       #-}
-{-# LANGUAGE FlexibleInstances   #-}
+{-# LANGUAGE DeriveGeneric #-}
+{-# LANGUAGE FlexibleInstances #-}
 {-# LANGUAGE ScopedTypeVariables #-}
 
 {-# OPTIONS_GHC -Wno-orphans  #-}
@@ -11,9 +11,9 @@ module Examples.DataPoint (
 import qualified Data.Aeson as A
 import           Data.ByteString.Lazy.UTF8
 import qualified Data.Map.Strict as M
-import           Trace.Forward.Utils.DataPoint (DataPoint (..))
 import           GHC.Conc
 import           GHC.Generics (Generic)
+import           Trace.Forward.Utils.DataPoint (DataPoint (..))
 
 import           Cardano.Logging
 

diff --git a/trace-dispatcher/examples/Examples/Documentation.hs b/trace-dispatcher/examples/Examples/Documentation.hs
@@ -7,8 +7,8 @@ module Examples.Documentation (
   docTracers
 ) where
 
-import qualified Data.Text.IO as T
 import qualified Data.Map as Map
+import qualified Data.Text.IO as T
 
 import           Cardano.Logging
 import           Examples.TestObjects
@@ -54,4 +54,4 @@ config1 = TraceConfig {
     , tcNodeName = Nothing
     , tcPeerFrequency = Nothing
     , tcResourceFrequency = Nothing
-    }
+    }
diff --git a/trace-dispatcher/src/Cardano/Logging.hs b/trace-dispatcher/src/Cardano/Logging.hs
@@ -6,13 +6,13 @@ import           Cardano.Logging.Configuration as X
 import           Cardano.Logging.ConfigurationParser as X
 import           Cardano.Logging.DocuGenerator as X
 import           Cardano.Logging.Formatter as X
+import           Cardano.Logging.Forwarding as X
 import           Cardano.Logging.FrequencyLimiter as X
 import           Cardano.Logging.Trace as X
+import           Cardano.Logging.Tracer.Composed as X
+import           Cardano.Logging.Tracer.DataPoint as X
 import           Cardano.Logging.Tracer.EKG as X
-import           Cardano.Logging.Tracer.Standard as X
-import           Cardano.Logging.Forwarding as X
 import           Cardano.Logging.Tracer.Forward as X
-import           Cardano.Logging.Tracer.DataPoint as X
+import           Cardano.Logging.Tracer.Standard as X
 import           Cardano.Logging.Types as X
-import           Cardano.Logging.Tracer.Composed as X
-import           Control.Tracer as X hiding (traceWith, nullTracer, Tracer)
+import           Control.Tracer as X hiding (Tracer, nullTracer, traceWith)
diff --git a/trace-dispatcher/src/Cardano/Logging/Configuration.hs b/trace-dispatcher/src/Cardano/Logging/Configuration.hs
@@ -34,8 +34,8 @@ import qualified Control.Tracer as T
 import           Cardano.Logging.DocuGenerator (addFiltered, addLimiter)
 import           Cardano.Logging.FrequencyLimiter (limitFrequency)
 import           Cardano.Logging.Trace
-import           Cardano.Logging.Types
 import           Cardano.Logging.TraceDispatcherMessage
+import           Cardano.Logging.Types
 
 
 -- | Call this function at initialisation, and later for reconfiguration

diff --git a/trace-dispatcher/src/Cardano/Logging/Formatter.hs b/trace-dispatcher/src/Cardano/Logging/Formatter.hs
@@ -1,9 +1,9 @@
-{-# LANGUAGE FlexibleContexts      #-}
-{-# LANGUAGE LambdaCase            #-}
+{-# LANGUAGE FlexibleContexts #-}
+{-# LANGUAGE LambdaCase #-}
 {-# LANGUAGE PartialTypeSignatures #-}
-{-# LANGUAGE RankNTypes            #-}
-{-# LANGUAGE RecordWildCards       #-}
-{-# LANGUAGE ScopedTypeVariables   #-}
+{-# LANGUAGE RankNTypes #-}
+{-# LANGUAGE RecordWildCards #-}
+{-# LANGUAGE ScopedTypeVariables #-}
 
 module Cardano.Logging.Formatter (
     humanFormatter
@@ -21,7 +21,7 @@ import qualified Data.ByteString.Lazy as BS
 import           Data.Functor.Contravariant
 import           Data.List (intersperse)
 import           Data.Maybe (fromMaybe)
-import           Data.Text (Text, pack, stripPrefix, replace)
+import           Data.Text (Text, pack, replace, stripPrefix)
 import           Data.Text.Encoding (decodeUtf8)
 import           Data.Text.Lazy (toStrict)
 import           Data.Text.Lazy.Builder as TB

diff --git a/trace-dispatcher/src/Cardano/Logging/FrequencyLimiter.hs b/trace-dispatcher/src/Cardano/Logging/FrequencyLimiter.hs
@@ -8,14 +8,14 @@ module Cardano.Logging.FrequencyLimiter (
 )where
 
 import           Control.Monad.IO.Unlift
-import           Data.Time.Clock.System
 import           Data.Text
+import           Data.Time.Clock.System
 
 import qualified Control.Tracer as T
 
 import           Cardano.Logging.Trace
-import           Cardano.Logging.Types
 import           Cardano.Logging.TraceDispatcherMessage
+import           Cardano.Logging.Types
 
 -- | Threshold for starting and stopping of the limiter
 budgetLimit :: Double

diff --git a/trace-dispatcher/src/Cardano/Logging/TraceDispatcherMessage.hs b/trace-dispatcher/src/Cardano/Logging/TraceDispatcherMessage.hs
@@ -4,10 +4,10 @@ module Cardano.Logging.TraceDispatcherMessage
   , TraceDispatcherMessage (..)
   ) where
 
-import Data.Aeson hiding (Error)
-import Data.Text
+import           Data.Aeson hiding (Error)
+import           Data.Text
 
-import Cardano.Logging.Types
+import           Cardano.Logging.Types
 
 
 data UnknownNamespaceKind =
@@ -96,4 +96,4 @@ instance MetaTrace TraceDispatcherMessage where
       , Namespace [] ["StopLimiting"]
       , Namespace [] ["RememberLimiting"]
       , Namespace [] ["UnknownNamespace"]
-      ]
+      ]
diff --git a/trace-dispatcher/src/Cardano/Logging/Tracer/DataPoint.hs b/trace-dispatcher/src/Cardano/Logging/Tracer/DataPoint.hs
@@ -1,6 +1,6 @@
-{-# LANGUAGE DataKinds           #-}
-{-# LANGUAGE FlexibleInstances   #-}
-{-# LANGUAGE RecordWildCards     #-}
+{-# LANGUAGE DataKinds #-}
+{-# LANGUAGE FlexibleInstances #-}
+{-# LANGUAGE RecordWildCards #-}
 {-# LANGUAGE ScopedTypeVariables #-}
 
 module Cardano.Logging.Tracer.DataPoint
@@ -54,4 +54,4 @@ mkDataPointTracer :: forall dp. (ToJSON dp, MetaTrace dp)
   -> IO (Trace IO dp)
 mkDataPointTracer trDataPoint = do
     let tr = NT.contramap DataPoint trDataPoint
-    pure $ withInnerNames tr
+    pure $ withInnerNames tr
diff --git a/trace-dispatcher/src/Cardano/Logging/Tracer/EKG.hs b/trace-dispatcher/src/Cardano/Logging/Tracer/EKG.hs
@@ -9,9 +9,9 @@ module Cardano.Logging.Tracer.EKG (
 import           Cardano.Logging.DocuGenerator
 import           Cardano.Logging.Types
 
+import           Control.Concurrent.MVar
 import           Control.Monad.IO.Class (MonadIO, liftIO)
 import qualified Control.Tracer as T
-import           Control.Concurrent.MVar
 import qualified Data.Map.Strict as Map
 import           Data.Text (Text, pack)
 import qualified System.Metrics as Metrics

diff --git a/trace-dispatcher/src/Cardano/Logging/Tracer/Forward.hs b/trace-dispatcher/src/Cardano/Logging/Tracer/Forward.hs
@@ -1,5 +1,5 @@
-{-# LANGUAGE DataKinds           #-}
-{-# LANGUAGE FlexibleInstances   #-}
+{-# LANGUAGE DataKinds #-}
+{-# LANGUAGE FlexibleInstances #-}
 {-# LANGUAGE ScopedTypeVariables #-}
 
 module Cardano.Logging.Tracer.Forward
@@ -37,4 +37,4 @@ forwardTracer forwardSink =
     docIt Forwarder (lk, Left c)
   output _sink LoggingContext {} (Right _)  = pure ()
    -- writeToSink sink lo
-  output _sink LoggingContext {} _  = pure ()
+  output _sink LoggingContext {} _  = pure ()
diff --git a/trace-dispatcher/src/Cardano/Logging/Tracer/Standard.hs b/trace-dispatcher/src/Cardano/Logging/Tracer/Standard.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE RankNTypes          #-}
+{-# LANGUAGE RankNTypes #-}
 {-# LANGUAGE ScopedTypeVariables #-}
 
 module Cardano.Logging.Tracer.Standard (
@@ -7,7 +7,7 @@ module Cardano.Logging.Tracer.Standard (
 
 import           Control.Concurrent.Async
 import           Control.Concurrent.Chan.Unagi.Bounded
-import           Control.Exception (catch, BlockedIndefinitelyOnMVar)
+import           Control.Exception (BlockedIndefinitelyOnMVar, catch)
 import           Control.Monad (forever, when)
 import           Control.Monad.IO.Class
 import           Data.IORef (IORef, modifyIORef', newIORef, readIORef)

diff --git a/trace-dispatcher/src/Cardano/Logging/Utils.hs b/trace-dispatcher/src/Cardano/Logging/Utils.hs
@@ -9,7 +9,7 @@ module Cardano.Logging.Utils (
 
 import           Control.Concurrent (threadDelay)
 import           Control.Exception (SomeAsyncException (..), fromException, tryJust)
-import "contra-tracer" Control.Tracer (showTracing, stdoutTracer, traceWith)
+import           "contra-tracer" Control.Tracer (showTracing, stdoutTracer, traceWith)
 
 -- | Run monadic action in a loop. If there's an exception, it will re-run
 --   the action again, after pause that grows.

diff --git a/trace-dispatcher/src/Cardano/Logging/Version.hs b/trace-dispatcher/src/Cardano/Logging/Version.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE NamedFieldPuns    #-}
+{-# LANGUAGE NamedFieldPuns #-}
 {-# LANGUAGE OverloadedStrings #-}
 
 module Cardano.Logging.Version