Skip to content

Commit 3d55d7e

Browse files
nbacqueyfacundominguez
authored andcommitted
lint: stylish-haskell
1 parent dcbe058 commit 3d55d7e

File tree

10 files changed

+34
-33
lines changed

10 files changed

+34
-33
lines changed

ouroboros-consensus-diffusion/src/ouroboros-consensus-diffusion/Ouroboros/Consensus/Node/Genesis.hs

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
{-# LANGUAGE DeriveTraversable #-}
21
{-# LANGUAGE DeriveGeneric #-}
2+
{-# LANGUAGE DeriveTraversable #-}
33
{-# LANGUAGE DerivingStrategies #-}
44
{-# LANGUAGE LambdaCase #-}
55
{-# LANGUAGE NamedFieldPuns #-}
@@ -60,14 +60,14 @@ data GenesisConfig = GenesisConfig
6060

6161
-- | Genesis configuration flags and low-level args, as parsed from config file or CLI
6262
data GenesisConfigFlags = GenesisConfigFlags
63-
{ gcfEnableCSJ :: Bool
64-
, gcfEnableLoEAndGDD :: Bool
65-
, gcfEnableLoP :: Bool
66-
, gcfBulkSyncGracePeriod :: Maybe Integer
67-
, gcfBucketCapacity :: Maybe Integer
68-
, gcfBucketRate :: Maybe Integer
69-
, gcfCSJJumpSize :: Maybe Integer
70-
, gcfGDDRateLimit :: Maybe DiffTime
63+
{ gcfEnableCSJ :: Bool
64+
, gcfEnableLoEAndGDD :: Bool
65+
, gcfEnableLoP :: Bool
66+
, gcfBulkSyncGracePeriod :: Maybe Integer
67+
, gcfBucketCapacity :: Maybe Integer
68+
, gcfBucketRate :: Maybe Integer
69+
, gcfCSJJumpSize :: Maybe Integer
70+
, gcfGDDRateLimit :: Maybe DiffTime
7171
} deriving stock (Eq, Generic, Show)
7272

7373
defaultGenesisConfigFlags :: GenesisConfigFlags
@@ -153,7 +153,7 @@ data LoEAndGDDNodeKernelArgs m blk = LoEAndGDDNodeKernelArgs {
153153
-- opened the ChainDB (which happens before we initialize the NodeKernel).
154154
-- After that, this TVar will not be modified again.
155155
lgnkaLoEFragmentTVar :: !(StrictTVar m (ChainDB.GetLoEFragment m blk))
156-
, lgnkaGDDRateLimit :: DiffTime
156+
, lgnkaGDDRateLimit :: DiffTime
157157
}
158158
-- | Create the initial 'GenesisNodeKernelArgs" (with a temporary
159159
-- 'ChainDB.GetLoEFragment' that will be replaced via 'setGetLoEFragment') and a

ouroboros-consensus-diffusion/src/ouroboros-consensus-diffusion/Ouroboros/Consensus/NodeKernel.hs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,8 @@ import Ouroboros.Consensus.MiniProtocol.ChainSync.Client
6666
import Ouroboros.Consensus.MiniProtocol.ChainSync.Client.InFutureCheck
6767
(SomeHeaderInFutureCheck)
6868
import Ouroboros.Consensus.Node.Genesis (GenesisNodeKernelArgs (..),
69-
LoEAndGDDConfig (..), LoEAndGDDNodeKernelArgs (..), setGetLoEFragment)
69+
LoEAndGDDConfig (..), LoEAndGDDNodeKernelArgs (..),
70+
setGetLoEFragment)
7071
import Ouroboros.Consensus.Node.GSM (GsmNodeKernelArgs (..))
7172
import qualified Ouroboros.Consensus.Node.GSM as GSM
7273
import Ouroboros.Consensus.Node.Run

ouroboros-consensus-diffusion/test/consensus-test/Test/Consensus/Genesis/Tests/CSJ.hs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,8 @@ import Test.Tasty.QuickCheck
3131
import Test.Util.Orphans.IOLike ()
3232
import Test.Util.PartialAccessors
3333
import Test.Util.TestBlock (TestBlock)
34-
import Test.Util.TestEnv (adjustQuickCheckMaxSize, adjustQuickCheckTests)
34+
import Test.Util.TestEnv (adjustQuickCheckMaxSize,
35+
adjustQuickCheckTests)
3536

3637
tests :: TestTree
3738
tests =

ouroboros-consensus-diffusion/test/consensus-test/Test/Consensus/Genesis/Tests/DensityDisconnect.hs

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,7 @@ import Ouroboros.Consensus.Config.SecurityParam
3131
import Ouroboros.Consensus.Genesis.Governor (DensityBounds,
3232
densityDisconnect, sharedCandidatePrefix)
3333
import Ouroboros.Consensus.MiniProtocol.ChainSync.Client
34-
(ChainSyncClientException (..),
35-
ChainSyncState (..))
34+
(ChainSyncClientException (..), ChainSyncState (..))
3635
import Ouroboros.Consensus.Util.Condense (condense)
3736
import Ouroboros.Network.AnchoredFragment (AnchoredFragment)
3837
import qualified Ouroboros.Network.AnchoredFragment as AF
@@ -474,10 +473,10 @@ prop_densityDisconnectTriggersChainSel =
474473
let
475474
othersCount = Map.size (adversarialPeers $ psSchedule gtSchedule)
476475
exnCorrect = case exceptionsByComponent ChainSyncClient stateView of
477-
[fromException -> Just DensityTooLow] -> True
476+
[fromException -> Just DensityTooLow] -> True
478477
[fromException -> Just CandidateTooSparse{}] -> True
479-
[] | othersCount == 0 -> True
480-
_ -> False
478+
[] | othersCount == 0 -> True
479+
_ -> False
481480
tipPointCorrect = Just (getTrunkTip gtBlockTree) == svTipBlock
482481
in counterexample "Unexpected exceptions" exnCorrect
483482
.&&.

ouroboros-consensus-diffusion/test/consensus-test/Test/Consensus/Genesis/Tests/LoE.hs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,8 @@ import Test.Tasty
2626
import Test.Tasty.QuickCheck
2727
import Test.Util.Orphans.IOLike ()
2828
import Test.Util.PartialAccessors
29-
import Test.Util.TestEnv (adjustQuickCheckMaxSize, adjustQuickCheckTests)
29+
import Test.Util.TestEnv (adjustQuickCheckMaxSize,
30+
adjustQuickCheckTests)
3031

3132
tests :: TestTree
3233
tests =

ouroboros-consensus-diffusion/test/consensus-test/Test/Consensus/Genesis/Tests/LoP.hs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,8 @@ import Test.Tasty
3131
import Test.Tasty.QuickCheck
3232
import Test.Util.Orphans.IOLike ()
3333
import Test.Util.PartialAccessors
34-
import Test.Util.TestEnv (adjustQuickCheckMaxSize, adjustQuickCheckTests)
34+
import Test.Util.TestEnv (adjustQuickCheckMaxSize,
35+
adjustQuickCheckTests)
3536

3637
tests :: TestTree
3738
tests =

ouroboros-consensus-diffusion/test/consensus-test/Test/Consensus/PeerSimulator/Run.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@ itIsTimeToRestartTheNode :: NodeLifecycle blk m -> DiffTime -> Bool
234234
itIsTimeToRestartTheNode NodeLifecycle {nlMinDuration} duration =
235235
case nlMinDuration of
236236
Just minInterval -> duration > minInterval
237-
Nothing -> False
237+
Nothing -> False
238238

239239
-- | The 'Tick' contains a state update for a specific peer.
240240
-- If the peer has not terminated by protocol rules, this will update its TMVar

ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/Genesis/Governor.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@ sharedCandidatePrefix curChain candidates =
253253
-- When there is no intersection, we assume the candidate fragment is
254254
-- empty and anchored at the immutable tip.
255255
-- See Note [CSJ truncates the candidate fragments].
256-
Nothing -> (peer, AF.takeOldest 0 curChain)
256+
Nothing -> (peer, AF.takeOldest 0 curChain)
257257
Just (_, suffix) -> (peer, suffix)
258258

259259
immutableTipSuffixes =

ouroboros-consensus/test/consensus-test/Test/Consensus/MiniProtocol/BlockFetch/Client.hs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,11 +52,11 @@ import Ouroboros.Consensus.Util.STM (blockUntilJust,
5252
forkLinkedWatcher)
5353
import Ouroboros.Network.AnchoredFragment (AnchoredFragment)
5454
import qualified Ouroboros.Network.AnchoredFragment as AF
55-
import Ouroboros.Network.BlockFetch (BlockFetchConfiguration (..), GenesisBlockFetchConfiguration (..),
55+
import Ouroboros.Network.BlockFetch (BlockFetchConfiguration (..),
5656
BlockFetchConsensusInterface (..), FetchMode (..),
57-
blockFetchLogic, bracketFetchClient,
58-
bracketKeepAliveClient, bracketSyncWithFetchClient,
59-
newFetchClientRegistry)
57+
GenesisBlockFetchConfiguration (..), blockFetchLogic,
58+
bracketFetchClient, bracketKeepAliveClient,
59+
bracketSyncWithFetchClient, newFetchClientRegistry)
6060
import Ouroboros.Network.BlockFetch.Client (blockFetchClient)
6161
import Ouroboros.Network.ControlMessage (ControlMessage (..))
6262
import Ouroboros.Network.Mock.Chain (Chain)

ouroboros-consensus/test/consensus-test/Test/Consensus/MiniProtocol/ChainSync/Client.hs

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -84,14 +84,12 @@ import Ouroboros.Consensus.MiniProtocol.ChainSync.Client
8484
(CSJConfig (..), ChainDbView (..),
8585
ChainSyncClientException,
8686
ChainSyncClientHandleCollection (..),
87-
ChainSyncClientResult (..),
88-
ChainSyncLoPBucketConfig (..), ChainSyncState (..),
89-
ChainSyncStateView (..), ConfigEnv (..), Consensus,
90-
DynamicEnv (..), Our (..), Their (..),
91-
TraceChainSyncClientEvent (..), bracketChainSyncClient,
92-
chainSyncClient, chainSyncStateFor,
93-
newChainSyncClientHandleCollection,
94-
viewChainSyncState)
87+
ChainSyncClientResult (..), ChainSyncLoPBucketConfig (..),
88+
ChainSyncState (..), ChainSyncStateView (..),
89+
ConfigEnv (..), Consensus, DynamicEnv (..), Our (..),
90+
Their (..), TraceChainSyncClientEvent (..),
91+
bracketChainSyncClient, chainSyncClient, chainSyncStateFor,
92+
newChainSyncClientHandleCollection, viewChainSyncState)
9593
import qualified Ouroboros.Consensus.MiniProtocol.ChainSync.Client.InFutureCheck as InFutureCheck
9694
import Ouroboros.Consensus.Node.GsmState (GsmState (Syncing))
9795
import Ouroboros.Consensus.Node.NetworkProtocolVersion

0 commit comments

Comments
 (0)