TOSQUASH small stylish diff

Author: nfrisby

ouroboros-consensus-diffusion/src/ouroboros-consensus-diffusion/Ouroboros/Consensus/Network/NodeToNode.hs

@@ -63,7 +63,8 @@ import           Ouroboros.Consensus.MiniProtocol.BlockFetch.Server
 import           Ouroboros.Consensus.MiniProtocol.ChainSync.Client
                      (ChainSyncStateView (..))
 import qualified Ouroboros.Consensus.MiniProtocol.ChainSync.Client as CsClient
-import           Ouroboros.Consensus.MiniProtocol.ChainSync.Client.State (ImmutableJumpInfo)
+import           Ouroboros.Consensus.MiniProtocol.ChainSync.Client.State
+                     (ImmutableJumpInfo)
 import           Ouroboros.Consensus.MiniProtocol.ChainSync.Server
 import           Ouroboros.Consensus.Node.ExitPolicy
 import           Ouroboros.Consensus.Node.NetworkProtocolVersion

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

@@ -20,7 +20,7 @@ import           Data.Proxy (Proxy (..))
 import           Network.TypedProtocol.Codec (AnyMessage)
 import           Ouroboros.Consensus.Block (Header, Point)
 import           Ouroboros.Consensus.Block.RealPoint
-                    (pointToWithOriginRealPoint, realPointSlot)
+                     (pointToWithOriginRealPoint, realPointSlot)
 import           Ouroboros.Consensus.BlockchainTime (RelativeTime (..))
 import           Ouroboros.Consensus.Config (DiffusionPipeliningSupport (..),
                      TopLevelConfig (..))
@@ -70,8 +70,8 @@ import           Test.Consensus.PeerSimulator.Trace
 import           Test.Consensus.PointSchedule.Peers (PeerId)
 import qualified Test.CsjModel as CsjModel
 import qualified Test.CsjModel.Jumping as CsjModel
-import           Test.Util.Orphans.IOLike ()
 import           Test.Util.NoThunks ()
+import           Test.Util.Orphans.IOLike ()
 
 -- | A basic ChainSync client. It wraps around 'chainSyncClient', but simplifies
 -- quite a few aspects. In particular, the size of the pipeline cannot exceed 20

ouroboros-consensus-diffusion/test/consensus-test/Test/Util/NoThunks.hs

@@ -1,5 +1,3 @@
-{-# LANGUAGE StandaloneDeriving #-}
-
 {-# OPTIONS_GHC -Wno-orphans #-}
 
 module Test.Util.NoThunks () where

ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/MiniProtocol/ChainSync/Client.hs

@@ -673,7 +673,7 @@ instance
 -- | State used when the intersection between the candidate and the current
 -- chain is known.
 data KnownIntersectionState blk = KnownIntersectionState {
-    genuine :: !Bool
+    genuine                 :: !Bool
     -- ^ 'False' if and only if this data structure is not actually the known
     -- intersection state but is rather merely bundling the 'kBestBlockNo' and
     -- a non-truncated 'JumpInfo'
@@ -950,7 +950,7 @@ chainSyncClient cfgEnv dynEnv mbImmJumpInfo =
                     dynEnv
                     intEnv
                     (ForkTooDeep GenesisPoint)
-              
+
   where
     ConfigEnv {
         cfg

ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/MiniProtocol/ChainSync/Client/Jumping.hs

@@ -4,7 +4,6 @@
 {-# LANGUAGE FlexibleContexts #-}
 {-# LANGUAGE FlexibleInstances #-}
 {-# LANGUAGE LambdaCase #-}
-{-# LANGUAGE NamedFieldPuns #-}
 {-# LANGUAGE RankNTypes #-}
 {-# LANGUAGE ScopedTypeVariables #-}
 {-# LANGUAGE StandaloneDeriving #-}

ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/MiniProtocol/ChainSync/Client/State.hs

@@ -15,9 +15,9 @@ module Ouroboros.Consensus.MiniProtocol.ChainSync.Client.State (
   , ChainSyncState (..)
   , DisengagedInitState (..)
   , DynamoInitState (..)
+  , ImmutableJumpInfo (..)
   , JumpInfo (..)
   , JumperInitState (..)
-  , ImmutableJumpInfo (..)
   , ObjectorInitState (..)
   , immutableJumpInfo
   , newChainSyncClientHandleCollection
@@ -35,7 +35,9 @@ import           GHC.Generics (Generic)
 import           Ouroboros.Consensus.Block (HasHeader, Header, Point)
 import           Ouroboros.Consensus.Block.SupportsProtocol
                      (BlockSupportsProtocol)
-import           Ouroboros.Consensus.HeaderStateHistory (HeaderStateHistory (HeaderStateHistory), HeaderStateWithTime)
+import           Ouroboros.Consensus.HeaderStateHistory
+                     (HeaderStateHistory (HeaderStateHistory),
+                     HeaderStateWithTime)
 import           Ouroboros.Consensus.HeaderValidation (HasAnnTip,
                      HeaderWithTime (..))
 import           Ouroboros.Consensus.Ledger.SupportsProtocol
@@ -286,7 +288,7 @@ immutableJumpInfo immJumpInfo = JumpInfo {
     jMostRecentIntersection  = AF.castPoint $ AF.anchorToPoint immAnchor
   , jOurFragment             = AF.Empty $ AF.castAnchor immAnchor
   , jTheirFragment           = AF.Empty $ AF.castAnchor immAnchor
-  , jTheirHeaderStateHistory = HeaderStateHistory $ AF.Empty immHdrStateWithTime 
+  , jTheirHeaderStateHistory = HeaderStateHistory $ AF.Empty immHdrStateWithTime
   }
   where
     ImmutableJumpInfo immAnchor immHdrStateWithTime = immJumpInfo

ouroboros-consensus/src/unstable-consensus-testlib/Test/CsjModel.hs

@@ -2,8 +2,8 @@
 {-# LANGUAGE DeriveGeneric #-}
 {-# LANGUAGE DerivingStrategies #-}
 {-# LANGUAGE FlexibleContexts #-}
-{-# LANGUAGE StandaloneDeriving #-}
 {-# LANGUAGE LambdaCase #-}
+{-# LANGUAGE StandaloneDeriving #-}
 
 -- | An executable specification of the centralized CSJ logic
 --
@@ -24,7 +24,8 @@ module Test.CsjModel (
   , wpPoint
   ) where
 
-import           Cardano.Slotting.Slot (SlotNo (unSlotNo), WithOrigin (At, Origin))
+import           Cardano.Slotting.Slot (SlotNo (unSlotNo),
+                     WithOrigin (At, Origin))
 import           Control.Applicative ((<|>))
 import           Control.Arrow (first)
 import           Control.Monad (guard)
@@ -42,7 +43,8 @@ import           Data.Strict.Maybe (Maybe (Just, Nothing), fromMaybe, maybe)
 import           Data.Word (Word64)
 import           GHC.Generics (Generic)
 import           NoThunks.Class (NoThunks)
-import           Prelude hiding (Either (Left, Right), Maybe (Just, Nothing), either, maybe)
+import           Prelude hiding (Either (Left, Right), Maybe (Just, Nothing),
+                     either, maybe)
 import           Test.CsjModel.NonEmptySeq
 import           Test.CsjModel.Perm
 import           Test.CsjModel.StateTypes

ouroboros-consensus/src/unstable-consensus-testlib/Test/CsjModel/Jumping.hs

@@ -1,4 +1,3 @@
-{-# LANGUAGE DeriveAnyClass #-}
 {-# LANGUAGE ExistentialQuantification #-}
 {-# LANGUAGE FlexibleContexts #-}
 {-# LANGUAGE LambdaCase #-}
@@ -21,9 +20,10 @@ import           Ouroboros.Consensus.Block.SupportsProtocol
 import qualified Ouroboros.Consensus.HeaderValidation as HV
 import           Ouroboros.Consensus.Ledger.SupportsProtocol
                      (LedgerSupportsProtocol)
-import           Ouroboros.Consensus.MiniProtocol.ChainSync.Client.Jumping hiding (tracer)
+import           Ouroboros.Consensus.MiniProtocol.ChainSync.Client.Jumping hiding
+                     (tracer)
 import           Ouroboros.Consensus.MiniProtocol.ChainSync.Client.State
-                    (ImmutableJumpInfo (..), JumpInfo (..), immutableJumpInfo,
+                     (ImmutableJumpInfo (..), JumpInfo (..), immutableJumpInfo,
                      jTheirFragment)
 import           Ouroboros.Consensus.Util (whenJust)
 import           Ouroboros.Consensus.Util.IOLike
@@ -259,7 +259,7 @@ loopy m = atomically m >>= \case
 
 -----
 
-stimulateSTM :: 
+stimulateSTM ::
      (
        Ord pid, Show pid
      ,

ouroboros-consensus/src/unstable-consensus-testlib/Test/CsjModel/NonEmptySeq.hs

@@ -10,7 +10,6 @@ module Test.CsjModel.NonEmptySeq (module Test.CsjModel.NonEmptySeq) where
 
 import           Control.Monad (guard)
 import qualified Data.Maybe as L (Maybe (Just, Nothing))
--- TODO use AnchoredSeq?
 import           Data.Sequence (Seq)
 import qualified Data.Sequence as Seq
 import           GHC.Generics (Generic)

ouroboros-consensus/src/unstable-consensus-testlib/Test/CsjModel/StateTypes.hs

@@ -16,7 +16,6 @@ import           Data.Functor ((<&>))
 import           Data.Map (Map)
 import qualified Data.Map.Strict as Map
 import qualified Data.Maybe as L
--- TODO use AnchoredSeq?
 import           Data.Sequence (Seq)
 import qualified Data.Sequence as Seq
 import           Data.Set (Set)
@@ -25,7 +24,8 @@ import           Data.Strict.Either (Either (Left, Right), either)
 import           Data.Strict.Maybe (Maybe (Just, Nothing), maybe)
 import           GHC.Generics (Generic)
 import           NoThunks.Class (NoThunks)
-import           Prelude hiding (Either (Left, Right), Maybe (Just, Nothing), either, maybe)
+import           Prelude hiding (Either (Left, Right), Maybe (Just, Nothing),
+                     either, maybe)
 import           Test.CsjModel.NonEmptySeq
 import           Test.CsjModel.Perm
 

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

@@ -97,7 +97,8 @@ import qualified Ouroboros.Consensus.MiniProtocol.ChainSync.Client.HistoricityCh
 import           Ouroboros.Consensus.MiniProtocol.ChainSync.Client.InFutureCheck
                      (ClockSkew, clockSkewInSeconds, unClockSkew)
 import qualified Ouroboros.Consensus.MiniProtocol.ChainSync.Client.InFutureCheck as InFutureCheck
-import           Ouroboros.Consensus.MiniProtocol.ChainSync.Client.State (ImmutableJumpInfo)
+import           Ouroboros.Consensus.MiniProtocol.ChainSync.Client.State
+                     (ImmutableJumpInfo)
 import           Ouroboros.Consensus.Node.GsmState (GsmState (Syncing))
 import           Ouroboros.Consensus.Node.NetworkProtocolVersion
                      (NodeToNodeVersion)