Skip to content

Commit

Permalink
Run stylish-haskell over changed files
Browse files Browse the repository at this point in the history
  • Loading branch information
nc6 committed Mar 21, 2022
1 parent 445b9ea commit 397101a
Show file tree
Hide file tree
Showing 17 changed files with 69 additions and 72 deletions.
30 changes: 15 additions & 15 deletions bench/tx-generator/src/Cardano/Benchmarking/Tracer.hs
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{-# LANGUAGE ConstraintKinds #-}
{-# LANGUAGE DeriveGeneric #-}
{-# LANGUAGE DerivingStrategies #-}
{-# LANGUAGE FlexibleInstances #-}
{-# LANGUAGE FlexibleContexts #-}
{-# LANGUAGE FlexibleInstances #-}
{-# LANGUAGE GADTs #-}
{-# LANGUAGE LambdaCase #-}
{-# LANGUAGE MultiParamTypeClasses #-}
Expand All @@ -25,40 +25,40 @@ module Cardano.Benchmarking.Tracer
) where


import Prelude (Show(..), String)
import Data.Aeson (ToJSON (..), (.=), encode)
import Data.Aeson (ToJSON (..), encode, (.=))
import qualified Data.Aeson as A
import qualified Data.ByteString.Lazy.Char8 as BSL (unpack)
import qualified Data.Text as T
import Data.Time.Clock (DiffTime, NominalDiffTime, getCurrentTime)
import Prelude (Show (..), String)

import Control.Tracer (debugTracer)

import qualified Codec.CBOR.Term as CBOR
import Cardano.Api
import qualified Codec.CBOR.Term as CBOR

import Cardano.Prelude hiding (TypeError, show)


import Cardano.BM.Tracing
import Cardano.BM.Data.Tracer (trStructured)
import Network.Mux (WithMuxBearer(..))
import Cardano.BM.Tracing
import Network.Mux (WithMuxBearer (..))


import Cardano.Node.Configuration.Logging (LOContent(..), LoggingLayer (..))
import Cardano.Tracing.OrphanInstances.Byron()
import Cardano.Tracing.OrphanInstances.Common()
import Cardano.Tracing.OrphanInstances.Consensus()
import Cardano.Tracing.OrphanInstances.Network()
import Cardano.Tracing.OrphanInstances.Shelley()
import Cardano.Node.Configuration.Logging (LOContent (..), LoggingLayer (..))
import Cardano.Tracing.OrphanInstances.Byron ()
import Cardano.Tracing.OrphanInstances.Common ()
import Cardano.Tracing.OrphanInstances.Consensus ()
import Cardano.Tracing.OrphanInstances.Network ()
import Cardano.Tracing.OrphanInstances.Shelley ()


import Cardano.Benchmarking.OuroborosImports
import Ouroboros.Network.Driver (TraceSendRecv (..))
import Ouroboros.Network.Protocol.TxSubmission2.Type (TxSubmission2)
import Ouroboros.Consensus.Ledger.SupportsMempool (GenTx, GenTxId)
import Ouroboros.Network.NodeToNode (RemoteConnectionId, NodeToNodeVersion)
import Ouroboros.Network.Driver (TraceSendRecv (..))
import Ouroboros.Network.NodeToNode (NodeToNodeVersion, RemoteConnectionId)
import Ouroboros.Network.Protocol.Handshake.Type (Handshake)
import Ouroboros.Network.Protocol.TxSubmission2.Type (TxSubmission2)

import Cardano.Benchmarking.Types
import qualified Data.Aeson.KeyMap as KeyMap
Expand Down
4 changes: 2 additions & 2 deletions cardano-api/gen/Gen/Cardano/Api/Metadata.hs
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,13 @@ module Gen.Cardano.Api.Metadata
, genJsonForTxMetadata
) where

import Cardano.Prelude
import Cardano.Api
import Cardano.Prelude
import Data.Aeson (ToJSON (..))
import Hedgehog (Gen)

import qualified Data.Aeson as Aeson
import qualified Data.Aeson.Key as Aeson
import qualified Data.ByteString as BS
import qualified Data.ByteString.Base16 as Base16
import qualified Data.Map.Strict as Map
Expand All @@ -20,7 +21,6 @@ import qualified Data.Text.Encoding as Text
import qualified Hedgehog.Gen as Gen
import qualified Hedgehog.Internal.Gen as Gen
import qualified Hedgehog.Range as Range
import qualified Data.Aeson.Key as Aeson

-- ----------------------------------------------------------------------------
-- Generators
Expand Down
4 changes: 2 additions & 2 deletions cardano-api/src/Cardano/Api/Query.hs
Original file line number Diff line number Diff line change
Expand Up @@ -119,10 +119,10 @@ import Cardano.Api.ProtocolParameters
import Cardano.Api.TxBody
import Cardano.Api.Value

import Data.Word (Word64)
import qualified Cardano.Protocol.TPraos.API as TPraos
import qualified Data.Compact.SplitMap as SplitMap
import qualified Data.Aeson.KeyMap as KeyMap
import qualified Data.Compact.SplitMap as SplitMap
import Data.Word (Word64)

-- ----------------------------------------------------------------------------
-- Queries
Expand Down
6 changes: 3 additions & 3 deletions cardano-api/src/Cardano/Api/ScriptData.hs
Original file line number Diff line number Diff line change
Expand Up @@ -71,16 +71,16 @@ import Cardano.Api.Error
import Cardano.Api.HasTypeProxy
import Cardano.Api.Hash
import Cardano.Api.KeysShelley
import Cardano.Api.SerialiseJSON
import Cardano.Api.SerialiseCBOR
import Cardano.Api.SerialiseJSON
import Cardano.Api.SerialiseRaw
import qualified Cardano.Binary as CBOR

import Cardano.Api.SerialiseUsing
import Cardano.Api.TxMetadata (pBytes, pSigned, parseAll)
import Codec.Serialise.Class (Serialise(..))
import qualified Data.Aeson.KeyMap as KeyMap
import Codec.Serialise.Class (Serialise (..))
import qualified Data.Aeson.Key as Aeson
import qualified Data.Aeson.KeyMap as KeyMap

-- ----------------------------------------------------------------------------
-- Script data
Expand Down
18 changes: 9 additions & 9 deletions cardano-api/src/Cardano/Api/TxMetadata.hs
Original file line number Diff line number Diff line change
Expand Up @@ -43,23 +43,23 @@ module Cardano.Api.TxMetadata (
import Prelude

import Data.Bifunctor (first)
import Data.Maybe (fromMaybe)
import Data.Word
import qualified Data.Scientific as Scientific
import Data.ByteString (ByteString)
import qualified Data.ByteString as BS
import qualified Data.ByteString.Base16 as Base16
import qualified Data.ByteString.Char8 as BSC
import qualified Data.ByteString.Lazy.Char8 as LBS
import qualified Data.ByteString.Base16 as Base16
import qualified Data.List as List
import qualified Data.Map.Lazy as Map.Lazy
import Data.Map.Strict (Map)
import qualified Data.Map.Strict as Map
import Data.Maybe (fromMaybe)
import qualified Data.Scientific as Scientific
import Data.Text (Text)
import qualified Data.Text as Text
import qualified Data.Text.Encoding as Text
import qualified Data.Text.Lazy as Text.Lazy
import qualified Data.Map.Lazy as Map.Lazy
import Data.Map.Strict (Map)
import qualified Data.Map.Strict as Map
import qualified Data.List as List
import qualified Data.Vector as Vector
import Data.Word

import qualified Data.Aeson as Aeson
import qualified Data.Aeson.Text as Aeson.Text
Expand All @@ -76,8 +76,8 @@ import Cardano.Api.Eras
import Cardano.Api.Error
import Cardano.Api.HasTypeProxy
import Cardano.Api.SerialiseCBOR
import qualified Data.Aeson.KeyMap as KeyMap
import qualified Data.Aeson.Key as Aeson
import qualified Data.Aeson.KeyMap as KeyMap

{- HLINT ignore "Use lambda-case" -}

Expand Down
2 changes: 1 addition & 1 deletion cardano-cli/test/Test/Golden/Shelley/Genesis/Create.hs
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ import Prelude (String)
import Test.OptParse as OP

import qualified Data.Aeson as J
import qualified Data.Aeson.KeyMap as KeyMap
import qualified Data.Aeson.Key as J
import qualified Data.Aeson.KeyMap as KeyMap
import qualified Data.Aeson.Types as J
import qualified Data.ByteString.Lazy as LBS
import qualified Data.HashMap.Lazy as HM
Expand Down
18 changes: 8 additions & 10 deletions cardano-node/src/Cardano/Node/TraceConstraints.hs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{-# LANGUAGE ConstraintKinds #-}
{-# LANGUAGE DataKinds #-}
{-# LANGUAGE ConstraintKinds #-}
{-# LANGUAGE DataKinds #-}
{-# LANGUAGE FlexibleContexts #-}
module Cardano.Node.TraceConstraints (TraceConstraints) where

Expand All @@ -9,23 +9,21 @@ import Data.Aeson

import Cardano.BM.Tracing (ToObject)
import Cardano.Logging (LogFormatting)
import Cardano.Node.Queries (ConvertTxId, GetKESInfo (..),
HasKESInfo (..), HasKESMetricsData (..), LedgerQueries)
import Cardano.Node.Queries (ConvertTxId, GetKESInfo (..), HasKESInfo (..),
HasKESMetricsData (..), LedgerQueries)

import Cardano.Ledger.Alonzo (AlonzoEra)
import Cardano.Ledger.Alonzo.Rules.Bbody (AlonzoBbodyPredFail)
import Cardano.Ledger.Alonzo.Rules.Utxo (UtxoPredicateFailure)
import Cardano.Ledger.Alonzo.Rules.Utxow (UtxowPredicateFail)
import Cardano.Ledger.Crypto (StandardCrypto)

import Ouroboros.Consensus.Block (BlockProtocol, CannotForge,
ConvertRawHash, ForgeStateUpdateError, Header)
import Ouroboros.Consensus.Block (BlockProtocol, CannotForge, ConvertRawHash,
ForgeStateUpdateError, Header)
import Ouroboros.Consensus.HeaderValidation (OtherHeaderEnvelopeError)
import Ouroboros.Consensus.Ledger.Abstract (LedgerError)
import Ouroboros.Consensus.Ledger.Inspect (LedgerEvent, LedgerUpdate,
LedgerWarning)
import Ouroboros.Consensus.Ledger.SupportsMempool (ApplyTxErr,
HasTxId, HasTxs (..))
import Ouroboros.Consensus.Ledger.Inspect (LedgerEvent, LedgerUpdate, LedgerWarning)
import Ouroboros.Consensus.Ledger.SupportsMempool (ApplyTxErr, HasTxId, HasTxs (..))
import Ouroboros.Consensus.Protocol.Abstract (ValidationErr)
import Ouroboros.Consensus.Shelley.Ledger.Mempool (GenTx, TxId)
import qualified Ouroboros.Consensus.Storage.ChainDB as ChainDB
Expand Down
2 changes: 1 addition & 1 deletion cardano-node/src/Cardano/Node/Tracing/Tracers/ChainDB.hs
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@ import qualified Ouroboros.Consensus.Storage.VolatileDB as VolDB
import qualified Ouroboros.Consensus.Storage.VolatileDB.Impl as VolDb
import Ouroboros.Consensus.Util.Condense (condense)

import qualified Ouroboros.Network.AnchoredFragment as AF
import qualified Data.Aeson.KeyMap as KeyMap
import qualified Ouroboros.Network.AnchoredFragment as AF

{-# ANN module ("HLint: ignore Redundant bracket" :: Text) #-}

Expand Down
14 changes: 7 additions & 7 deletions cardano-node/src/Cardano/Node/Tracing/Tracers/Consensus.hs
Original file line number Diff line number Diff line change
Expand Up @@ -83,22 +83,23 @@ import Cardano.Prelude hiding (All, Show, show)

import Cardano.Protocol.TPraos.OCert (KESPeriod (..))

import Ouroboros.Network.Block hiding (blockPrevHash)
import Ouroboros.Network.BlockFetch.ClientState (TraceLabelPeer (..))
import qualified Ouroboros.Network.BlockFetch.ClientState as BlockFetch
import Ouroboros.Network.KeepAlive (TraceKeepAliveClient (..))
import Ouroboros.Network.TxSubmission.Inbound hiding(txId)
import Ouroboros.Network.TxSubmission.Outbound
import Ouroboros.Network.Block hiding (blockPrevHash)
import Ouroboros.Network.BlockFetch.Decision
import Ouroboros.Network.DeltaQ (GSV (..), PeerGSV (..))
import Ouroboros.Network.KeepAlive (TraceKeepAliveClient (..))
import Ouroboros.Network.TxSubmission.Inbound hiding (txId)
import Ouroboros.Network.TxSubmission.Outbound

import qualified Data.Aeson as Aeson
import Ouroboros.Consensus.Block
import Ouroboros.Consensus.BlockchainTime (SystemStart (..))
import Ouroboros.Consensus.BlockchainTime.WallClock.Util (TraceBlockchainTimeEvent (..))
import Ouroboros.Consensus.Cardano.Block
import Ouroboros.Consensus.Ledger.Inspect (LedgerEvent (..), LedgerUpdate, LedgerWarning)
import Ouroboros.Consensus.Ledger.SupportsMempool (ApplyTxErr, GenTxId,
LedgerSupportsMempool, txForgetValidated, txId, HasTxId)
import Ouroboros.Consensus.Ledger.SupportsMempool (ApplyTxErr, GenTxId, HasTxId,
LedgerSupportsMempool, txForgetValidated, txId)
import Ouroboros.Consensus.Ledger.SupportsProtocol
import Ouroboros.Consensus.Mempool.API (MempoolSize (..), TraceEventMempool (..))
import Ouroboros.Consensus.MiniProtocol.BlockFetch.Server
Expand All @@ -110,7 +111,6 @@ import Ouroboros.Consensus.MiniProtocol.LocalTxSubmission.Server
import Ouroboros.Consensus.Node.Run (SerialiseNodeToNodeConstraints, estimateBlockSize)
import Ouroboros.Consensus.Node.Tracers
import qualified Ouroboros.Consensus.Protocol.Ledger.HotKey as HotKey
import qualified Data.Aeson as Aeson



Expand Down
2 changes: 1 addition & 1 deletion cardano-node/src/Cardano/Tracing/OrphanInstances/Byron.hs
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ import Data.Aeson (Value (..))
import qualified Data.Set as Set
import qualified Data.Text as Text

import Cardano.Tracing.Render (renderTxId)
import Cardano.Tracing.OrphanInstances.Common
import Cardano.Tracing.OrphanInstances.Consensus ()
import Cardano.Tracing.Render (renderTxId)

import Ouroboros.Consensus.Block (Header)
import Ouroboros.Network.Block (blockHash, blockNo, blockSlot)
Expand Down
6 changes: 3 additions & 3 deletions cardano-node/src/Cardano/Tracing/OrphanInstances/Consensus.hs
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,9 @@ import qualified Ouroboros.Consensus.Protocol.PBFT as PBFT
import Ouroboros.Consensus.Storage.ImmutableDB.Chunks.Internal (ChunkNo (..),
chunkNoToInt)
import Ouroboros.Consensus.Storage.LedgerDB.Types
import qualified Ouroboros.Consensus.Storage.LedgerDB.Types as LedgerDB
import qualified Ouroboros.Consensus.Storage.VolatileDB.Impl as VolDb
import Ouroboros.Network.BlockFetch.ClientState (TraceLabelPeer (..))
import qualified Ouroboros.Consensus.Storage.LedgerDB.Types as LedgerDB

import Ouroboros.Consensus.Util.Condense
import Ouroboros.Consensus.Util.Orphans ()
Expand All @@ -71,10 +71,10 @@ import Ouroboros.Network.Point (withOrigin)

import qualified Ouroboros.Consensus.Storage.ChainDB as ChainDB
-- TODO: 'TraceCacheEvent' should be exported by the 'Impl' module
import qualified Ouroboros.Consensus.Storage.ImmutableDB.Impl.Types as ImmDB
import qualified Data.Aeson as Aeson
import qualified Ouroboros.Consensus.Storage.ImmutableDB.API as ImmDB
import qualified Ouroboros.Consensus.Storage.ImmutableDB.Impl.Types as ImmDB
import qualified Ouroboros.Consensus.Storage.LedgerDB.OnDisk as LedgerDB
import qualified Data.Aeson as Aeson


{- HLINT ignore "Use const" -}
Expand Down
10 changes: 5 additions & 5 deletions cardano-node/src/Cardano/Tracing/OrphanInstances/HardFork.hs
Original file line number Diff line number Diff line change
Expand Up @@ -29,15 +29,15 @@ import Cardano.Tracing.OrphanInstances.Consensus ()

import Cardano.Slotting.Slot (EpochSize (..))
import Ouroboros.Consensus.Block (BlockProtocol, CannotForge, ForgeStateInfo,
ForgeStateUpdateError)
ForgeStateUpdateError)
import Ouroboros.Consensus.BlockchainTime (getSlotLength)
import Ouroboros.Consensus.Cardano.Condense ()
import Ouroboros.Consensus.HardFork.Combinator
import Ouroboros.Consensus.HardFork.Combinator.AcrossEras (EraMismatch (..),
OneEraCannotForge (..), OneEraEnvelopeErr (..), OneEraForgeStateInfo (..),
OneEraForgeStateUpdateError (..), OneEraLedgerError (..),
OneEraLedgerUpdate (..), OneEraLedgerWarning (..), OneEraValidationErr (..),
mkEraMismatch)
OneEraCannotForge (..), OneEraEnvelopeErr (..), OneEraForgeStateInfo (..),
OneEraForgeStateUpdateError (..), OneEraLedgerError (..),
OneEraLedgerUpdate (..), OneEraLedgerWarning (..), OneEraValidationErr (..),
mkEraMismatch)
import Ouroboros.Consensus.HardFork.Combinator.Condense ()
import Ouroboros.Consensus.HardFork.History.EraParams (EraParams (..), SafeZone)
import Ouroboros.Consensus.HeaderValidation (OtherHeaderEnvelopeError)
Expand Down
2 changes: 1 addition & 1 deletion cardano-node/src/Cardano/Tracing/Peer.hs
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ import Cardano.BM.Trace (traceNamedObject)
import Cardano.BM.Tracing

import Ouroboros.Consensus.Block (Header)
import Ouroboros.Network.ConnectionId (remoteAddress)
import Ouroboros.Consensus.Util.Orphans ()
import Ouroboros.Network.ConnectionId (remoteAddress)

import qualified Ouroboros.Network.AnchoredFragment as Net
import Ouroboros.Network.Block (unSlotNo)
Expand Down
4 changes: 2 additions & 2 deletions cardano-node/src/Cardano/Tracing/Tracers.hs
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ import qualified System.Metrics.Gauge as Gauge
import qualified System.Metrics.Label as Label
import qualified System.Remote.Monitoring as EKG

import "contra-tracer" Control.Tracer
import "contra-tracer" Control.Tracer
import Control.Tracer.Transformers

import Cardano.Slotting.Slot (EpochNo (..), SlotNo (..), WithOrigin (..))
Expand Down Expand Up @@ -104,8 +104,8 @@ import qualified Ouroboros.Consensus.Storage.LedgerDB.Types as LedgerDB

import Cardano.Tracing.Config
import Cardano.Tracing.Metrics
import Cardano.Tracing.Startup ()
import Cardano.Tracing.Shutdown ()
import Cardano.Tracing.Startup ()

import Cardano.Node.Configuration.Logging
import Cardano.Node.TraceConstraints
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,16 @@ module Cardano.TxSubmit.Tracing.ToObjectOrphans () where

import Cardano.BM.Data.Severity (Severity (Debug, Error, Notice, Warning))
import Cardano.BM.Data.Tracer (HasPrivacyAnnotation, HasSeverityAnnotation (..),
HasTextFormatter, ToObject (toObject), Transformable (..),
trStructured)
HasTextFormatter, ToObject (toObject), Transformable (..), trStructured)
import Data.Aeson ((.=))
import Data.String (String)
import Data.Text (Text)
import Ouroboros.Network.NodeToClient (ErrorPolicyTrace (..), WithAddr (..))
import System.IO (IO)
import Text.Show (Show (..))

import Data.Monoid (mconcat)
import qualified Network.Socket as Socket
import Data.Monoid (mconcat)

instance HasPrivacyAnnotation (WithAddr Socket.SockAddr ErrorPolicyTrace)
instance HasSeverityAnnotation (WithAddr Socket.SockAddr ErrorPolicyTrace) where
Expand Down
4 changes: 2 additions & 2 deletions trace-dispatcher/src/Cardano/Logging/FrequencyLimiter.hs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{-# LANGUAGE DeriveGeneric #-}
{-# LANGUAGE RecordWildCards #-}
{-# LANGUAGE DeriveGeneric #-}
{-# LANGUAGE RecordWildCards #-}
{-# LANGUAGE ScopedTypeVariables #-}

module Cardano.Logging.FrequencyLimiter (
Expand Down
10 changes: 5 additions & 5 deletions trace-dispatcher/src/Cardano/Logging/Types.hs
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{-# LANGUAGE DeriveGeneric #-}
{-# LANGUAGE GADTs #-}
{-# LANGUAGE RankNTypes #-}
{-# LANGUAGE RecordWildCards #-}
{-# LANGUAGE StandaloneDeriving #-}
{-# LANGUAGE DeriveGeneric #-}
{-# LANGUAGE GADTs #-}
{-# LANGUAGE RankNTypes #-}
{-# LANGUAGE RecordWildCards #-}
{-# LANGUAGE StandaloneDeriving #-}
{-# LANGUAGE TypeSynonymInstances #-}

module Cardano.Logging.Types (
Expand Down

0 comments on commit 397101a

Please sign in to comment.