[CDEC-383] Add stylish-haskell to nix and CI

.buildkite/pipeline.yml

@@ -4,6 +4,11 @@ steps:
     agents:
       system: x86_64-linux
 
+  - label: 'stylish-haskell'
+    command: 'scripts/ci/nix-shell.sh --run scripts/check-stylish.sh'
+    agents:
+      system: x86_64-linux
+
   - label: 'stack2nix'
     command: 'scripts/ci/nix-shell.sh -p cabal2nix stack cabal-install ghc moreutils expect -Q -j 4 --run scripts/check-stack2nix.sh'
     agents:

.editorconfig

@@ -14,4 +14,4 @@ indent_size = 8
 
 [*.hs]
 indent_size = 4
-max_line_length = 80
+max_line_length = 100

.hindent.yaml

@@ -1,3 +1,3 @@
 indent-size: 4
-line-length: 80
+line-length: 100
 force-trailing-newline: true

.stylish-haskell.yaml

@@ -63,7 +63,7 @@ steps:
       #   >     (concat, foldl, foldr, head, init, last, length)
       #
       # Default: after_alias
-      list_align: after_alias
+      list_align: with_module_name
 
       # Right-pad the module names to align imports in a group:
       #

acid-state-exts/Setup.hs

@@ -1,2 +1,2 @@
-import Distribution.Simple
+import           Distribution.Simple
 main = defaultMain

acid-state-exts/src/Serokell/AcidState/ExtendedState.hs

@@ -14,16 +14,15 @@ module Serokell.AcidState.ExtendedState
        , updateExtended
        ) where
 
-import           Control.Monad.Extra     (whenM)
-import           Control.Monad.Trans     (MonadIO (liftIO))
-import           Data.Acid               (AcidState, EventResult, EventState, IsAcidic,
-                                          QueryEvent, UpdateEvent, closeAcidState,
-                                          openLocalStateFrom)
-import           Data.Acid.Advanced      (query', update')
-import           Data.Acid.Memory        (openMemoryState)
-import           Data.Typeable           (Typeable)
+import           Control.Monad.Extra (whenM)
+import           Control.Monad.Trans (MonadIO (liftIO))
+import           Data.Acid (AcidState, EventResult, EventState, IsAcidic, QueryEvent, UpdateEvent,
+                     closeAcidState, openLocalStateFrom)
+import           Data.Acid.Advanced (query', update')
+import           Data.Acid.Memory (openMemoryState)
+import           Data.Typeable (Typeable)
 
-import           System.Directory        (doesDirectoryExist, removeDirectoryRecursive)
+import           System.Directory (doesDirectoryExist, removeDirectoryRecursive)
 
 import           Serokell.AcidState.Util (tidyLocalState)
 

acid-state-exts/src/Serokell/AcidState/Instances.hs

@@ -5,18 +5,17 @@
 
 module Serokell.AcidState.Instances where
 
-import           Control.Exception   (throw)
+import           Control.Exception (throw)
 import           Control.Monad.Catch (MonadThrow (throwM))
 
-import qualified Data.Time.Units     as Time
-import           Data.Acid           (Query, Update)
-import           Data.Hashable       (Hashable)
+import           Data.Acid (Query, Update)
+import           Data.Hashable (Hashable)
 import           Data.HashMap.Strict (HashMap)
 import qualified Data.HashMap.Strict as HM hiding (HashMap)
-import           Data.HashSet        (HashSet)
-import qualified Data.HashSet        as HS hiding (HashSet)
-import           Data.SafeCopy       (SafeCopy (..), contain, safeGet,
-                                      safePut)
+import           Data.HashSet (HashSet)
+import qualified Data.HashSet as HS hiding (HashSet)
+import           Data.SafeCopy (SafeCopy (..), contain, safeGet, safePut)
+import qualified Data.Time.Units as Time
 
 instance MonadThrow (Update s) where
     throwM = throw

acid-state-exts/src/Serokell/AcidState/Util.hs

@@ -13,15 +13,14 @@ module Serokell.AcidState.Util
        , tidyLocalState
        ) where
 
-import           Control.Exception    (Exception, throw)
+import           Control.Exception (Exception, throw)
 import           Control.Monad.Except (ExceptT, runExceptT)
 import           Control.Monad.Reader (Reader, asks, runReader)
-import           Control.Monad.State  (State, runState, state)
-import           Control.Monad.Trans  (MonadIO (liftIO))
-import           Data.Acid            (AcidState, Query, Update, createArchive,
-                                       createCheckpoint)
-import           System.Directory     (removeDirectoryRecursive)
-import           System.FilePath      ((</>))
+import           Control.Monad.State (State, runState, state)
+import           Control.Monad.Trans (MonadIO (liftIO))
+import           Data.Acid (AcidState, Query, Update, createArchive, createCheckpoint)
+import           System.Directory (removeDirectoryRecursive)
+import           System.FilePath ((</>))
 
 readerToQuery :: Reader s a -> Query s a
 readerToQuery = asks . runReader

block/src/Pos/Block/BHelpers.hs

@@ -22,11 +22,11 @@ import           Control.Monad.Except (MonadError (throwError))
 
 import           Pos.Binary.Class (Bi)
 import           Pos.Core.Block (Block, GenesisBlockchain, MainBlockchain, MainConsensusData (..),
-                                 MainToSign (..))
+                     MainToSign (..))
 import           Pos.Core.Block.Blockchain (Blockchain (..), GenericBlock (..),
-                                            GenericBlockHeader (..), gbExtra)
+                     GenericBlockHeader (..), gbExtra)
 import           Pos.Core.Block.Main (MainBody (..), MainExtraHeaderData (..), MainProof,
-                                      mainBlockEBDataProof)
+                     mainBlockEBDataProof)
 import           Pos.Core.Block.Union (BlockHeader (..), BlockSignature (..))
 import           Pos.Core.Configuration (HasProtocolConstants)
 import           Pos.Core.Delegation (LightDlgIndices (..), checkDlgPayload)
@@ -35,7 +35,7 @@ import           Pos.Core.Ssc (checkSscPayload)
 import           Pos.Core.Txp (checkTxPayload)
 import           Pos.Core.Update (checkSoftwareVersion, checkUpdatePayload)
 import           Pos.Crypto (ProtocolMagic, ProxySignature (..), SignTag (..), checkSig, hash,
-                             isSelfSignedPsk, proxyVerify)
+                     isSelfSignedPsk, proxyVerify)
 import           Pos.Ssc.Functions (verifySscPayload)
 import           Pos.Util.Some (Some (Some))
 

block/src/Pos/Block/Logic/Integrity.hs

@@ -27,12 +27,12 @@ import qualified Pos.Binary.Class as Bi
 import           Pos.Binary.Update ()
 import qualified Pos.Block.BHelpers as BHelpers
 import           Pos.Core (BlockVersionData (..), ChainDifficulty, EpochOrSlot, HasDifficulty (..),
-                           HasEpochIndex (..), HasEpochOrSlot (..), HasHeaderHash (..),
-                           HasProtocolConstants, HeaderHash, SlotId (..), SlotLeaders, addressHash,
-                           gbExtra, gbhExtra, getSlotIndex, headerSlotL, prevBlockL)
+                     HasEpochIndex (..), HasEpochOrSlot (..), HasHeaderHash (..),
+                     HasProtocolConstants, HeaderHash, SlotId (..), SlotLeaders, addressHash,
+                     gbExtra, gbhExtra, getSlotIndex, headerSlotL, prevBlockL)
 import           Pos.Core.Block (Block, BlockHeader (..), blockHeaderProtocolMagic, gebAttributes,
-                                 gehAttributes, genBlockLeaders, getBlockHeader,
-                                 mainHeaderLeaderKey, mebAttributes, mehAttributes)
+                     gehAttributes, genBlockLeaders, getBlockHeader, mainHeaderLeaderKey,
+                     mebAttributes, mehAttributes)
 import           Pos.Core.Chrono (NewestFirst (..), OldestFirst)
 import           Pos.Crypto (ProtocolMagic (getProtocolMagic))
 import           Pos.Data.Attributes (areAttributesKnown)

block/src/Pos/Block/Slog/Logic.hs

@@ -37,17 +37,17 @@ import           Pos.Block.Slog.Context (slogGetLastSlots, slogPutLastSlots)
 import           Pos.Block.Slog.Types (HasSlogGState)
 import           Pos.Block.Types (Blund, SlogUndo (..), Undo (..))
 import           Pos.Core (BlockVersion (..), FlatSlotId, blkSecurityParam, difficultyL,
-                           epochIndexL, flattenSlotId, headerHash, headerHashG, prevBlockL)
+                     epochIndexL, flattenSlotId, headerHash, headerHashG, prevBlockL)
 import           Pos.Core.Block (Block, genBlockLeaders, mainBlockSlot)
 import           Pos.Core.Chrono (NE, NewestFirst (getNewestFirst), OldestFirst (..), toOldestFirst,
-                                  _OldestFirst)
+                     _OldestFirst)
 import           Pos.Crypto (ProtocolMagic)
 import           Pos.DB (SomeBatchOp (..))
 import           Pos.DB.Block (putBlunds)
 import qualified Pos.DB.BlockIndex as DB
 import           Pos.DB.Class (MonadDB (..), MonadDBRead)
 import qualified Pos.DB.GState.Common as GS (CommonOp (PutMaxSeenDifficulty, PutTip),
-                                             getMaxSeenDifficulty)
+                     getMaxSeenDifficulty)
 import           Pos.Exception (assertionFailed, reportFatalError)
 import qualified Pos.GState.BlockExtra as GS
 import           Pos.Infra.Slotting (MonadSlots (getCurrentSlot))

block/src/Pos/DB/Block.hs

@@ -53,7 +53,7 @@ import qualified Pos.Core.Block as CB
 import           Pos.Crypto (hashHexF)
 import           Pos.DB.BlockIndex (deleteHeaderIndex, putHeadersIndex)
 import           Pos.DB.Class (MonadDB (..), MonadDBRead (..), Serialized (..), SerializedBlock,
-                               SerializedUndo, SerializedBlund, getBlock, getDeserialized)
+                     SerializedBlund, SerializedUndo, getBlock, getDeserialized)
 import           Pos.DB.Error (DBError (..))
 import           Pos.DB.GState.Common (getTipSomething)
 import           Pos.DB.Pure (DBPureVar, MonadPureDB, atomicModifyIORefPure, pureBlocksStorage)
@@ -315,11 +315,11 @@ deleteData fp = (liftIO $ removeFile fp) `catch` handler
 
 -- | Paths at which we store the block data.
 data BlockStoragePaths = BlockStoragePaths
-  { bspRoot :: FilePath
+  { bspRoot  :: FilePath
     -- | Block data itself.
   , bspBlock :: FilePath
     -- | Undo information for a block.
-  , bspUndo :: FilePath
+  , bspUndo  :: FilePath
     -- | Combined storage format. Either this or a combination of 'Block' and
     -- 'Undo' files will be present.
   , bspBlund :: FilePath

block/src/Pos/DB/Block/Load.hs

@@ -20,17 +20,17 @@ import           Control.Lens (_Wrapped)
 import           Formatting (sformat, (%))
 
 import           Pos.Block.Types (Blund)
-import           Pos.Core (BlockCount, HasDifficulty (difficultyL),
-                           HasPrevBlock (prevBlockL), HeaderHash, HasGenesisHash)
+import           Pos.Core (BlockCount, HasDifficulty (difficultyL), HasGenesisHash,
+                     HasPrevBlock (prevBlockL), HeaderHash)
 import           Pos.Core.Block (Block, BlockHeader)
+import           Pos.Core.Chrono (NewestFirst (..))
 import           Pos.Core.Configuration (genesisHash)
 import           Pos.Crypto (shortHashF)
 import           Pos.DB.Block (getBlund)
 import           Pos.DB.BlockIndex (getHeader)
 import           Pos.DB.Class (MonadBlockDBRead, MonadDBRead, getBlock)
 import           Pos.DB.Error (DBError (..))
 import           Pos.DB.GState.Common (getTip)
-import           Pos.Core.Chrono (NewestFirst (..))
 import           Pos.Util.Util (maybeThrow)
 
 type LoadHeadersMode m =

block/test/Test/Pos/Block/Arbitrary.hs

@@ -28,13 +28,13 @@ import           Test.QuickCheck (Arbitrary (..), Gen, choose, suchThat, vectorO
 import           Test.QuickCheck.Arbitrary.Generic (genericArbitrary, genericShrink)
 
 import           Pos.Arbitrary.Ssc (SscPayloadDependsOnSlot (..), genSscPayload,
-                                    genSscPayloadForSlot)
+                     genSscPayloadForSlot)
 import           Pos.Binary.Class (biSize)
 import qualified Pos.Block.Logic.Integrity as T
 import           Pos.Block.Slog (SlogUndo)
 import           Pos.Block.Types (Undo (..))
 import           Pos.Core (GenesisHash (..), HasGenesisHash, HasProtocolConstants, HeaderHash,
-                           epochSlots, genesisHash)
+                     epochSlots, genesisHash)
 import qualified Pos.Core as Core
 import qualified Pos.Core.Block as T
 import           Pos.Crypto (ProtocolMagic, PublicKey, SecretKey, createPsk, hash, toPublic)

block/test/Test/Pos/Block/Arbitrary/Message.hs

@@ -1,4 +1,4 @@
-{-# LANGUAGE FlexibleContexts #-}
+{-# LANGUAGE FlexibleContexts     #-}
 {-# LANGUAGE UndecidableInstances #-}
 
 {-# OPTIONS_GHC -fno-warn-orphans #-}

core/src/Pos/Aeson/Core.hs

@@ -9,7 +9,7 @@ module Pos.Aeson.Core
 import           Universum
 
 import           Data.Aeson (FromJSON (..), FromJSONKey (..), FromJSONKeyFunction (..),
-                             ToJSON (toJSON), ToJSONKey (..), object, withObject, (.:), (.=))
+                     ToJSON (toJSON), ToJSONKey (..), object, withObject, (.:), (.=))
 import           Data.Aeson.TH (defaultOptions, deriveJSON, deriveToJSON)
 import           Data.Aeson.Types (toJSONKeyText)
 import qualified Data.ByteString.Lazy as LBS
@@ -23,15 +23,14 @@ import           Pos.Aeson.Fee ()
 import           Pos.Binary.Class (AsBinary (..))
 import           Pos.Core.Binary ()
 import           Pos.Core.Common (Address, BlockCount (..), ChainDifficulty, Coin, CoinPortion,
-                                  Script (..), SharedSeed (..), addressF, coinPortionToDouble,
-                                  decodeTextAddress, mkCoin, unsafeCoinPortionFromDouble,
-                                  unsafeGetCoin)
+                     Script (..), SharedSeed (..), addressF, coinPortionToDouble,
+                     decodeTextAddress, mkCoin, unsafeCoinPortionFromDouble, unsafeGetCoin)
 import           Pos.Core.Delegation (HeavyDlgIndex (..))
 import           Pos.Core.Slotting (EpochIndex (..), LocalSlotIndex, SlotCount (..), SlotId,
-                                    Timestamp (..))
+                     Timestamp (..))
 import           Pos.Core.Ssc (VssCertificate)
 import           Pos.Core.Update (ApplicationName (..), BlockVersion, BlockVersionData,
-                                  SoftforkRule, SoftwareVersion (..))
+                     SoftforkRule, SoftwareVersion (..))
 import           Pos.Data.Attributes (Attributes, UnparsedFields (..))
 import           Pos.Util.Util (toAesonError)
 

core/src/Pos/Aeson/Genesis.hs

@@ -36,7 +36,7 @@ import           Universum hiding (elems)
 
 import           Control.Lens (_Left)
 import           Data.Aeson (FromJSON (..), FromJSONKey (..), FromJSONKeyFunction (..), ToJSON (..),
-                             ToJSONKey (..), ToJSONKeyFunction (..))
+                     ToJSONKey (..), ToJSONKeyFunction (..))
 import           Data.Aeson.Encoding (text)
 import           Data.Aeson.TH (deriveJSON)
 import qualified Data.HashMap.Strict as HM
@@ -47,14 +47,13 @@ import           Pos.Aeson.Core ()
 import           Pos.Core.Common (Address, Coin, StakeholderId, unsafeGetCoin)
 import           Pos.Core.Delegation (ProxySKHeavy)
 import           Pos.Core.Genesis (FakeAvvmOptions, GenesisAvvmBalances (..), GenesisDelegation,
-                                   GenesisInitializer, GenesisNonAvvmBalances (..),
-                                   GenesisProtocolConstants (..), GenesisSpec,
-                                   GenesisVssCertificatesMap (..), GenesisWStakeholders (..),
-                                   TestnetBalanceOptions, convertNonAvvmDataToBalances,
-                                   recreateGenesisDelegation, unGenesisDelegation)
+                     GenesisInitializer, GenesisNonAvvmBalances (..),
+                     GenesisProtocolConstants (..), GenesisSpec, GenesisVssCertificatesMap (..),
+                     GenesisWStakeholders (..), TestnetBalanceOptions,
+                     convertNonAvvmDataToBalances, recreateGenesisDelegation, unGenesisDelegation)
 import           Pos.Core.ProtocolConstants (VssMaxTTL (..), VssMinTTL (..))
 import           Pos.Core.Ssc (VssCertificatesMap (..), getVssCertificatesMap,
-                               validateVssCertificatesMap)
+                     validateVssCertificatesMap)
 import           Pos.Crypto (RedeemPublicKey, fromAvvmPk, redeemPkB64UrlF)
 import           Pos.Util.Util (toAesonError)
 

core/src/Pos/Core/Block/Constructors.hs

@@ -15,20 +15,19 @@ import           Universum
 
 import           Pos.Core.Block.Blockchain (GenericBlock (..), mkGenericHeader)
 import           Pos.Core.Block.Genesis (GenesisBody (..), GenesisConsensusData (..),
-                                         GenesisExtraBodyData (..), GenesisExtraHeaderData (..))
+                     GenesisExtraBodyData (..), GenesisExtraHeaderData (..))
 import           Pos.Core.Block.Main (MainBody (..), MainExtraBodyData (..),
-                                      MainExtraHeaderData (..))
+                     MainExtraHeaderData (..))
 import           Pos.Core.Block.Union (BlockHeader, BlockSignature (..), GenesisBlock,
-                                       GenesisBlockHeader, HeaderHash, MainBlock,
-                                       MainBlockHeader, MainConsensusData (..), MainToSign (..),
-                                       headerHash)
+                     GenesisBlockHeader, HeaderHash, MainBlock, MainBlockHeader,
+                     MainConsensusData (..), MainToSign (..), headerHash)
 import           Pos.Core.Common (ChainDifficulty, HasDifficulty (..), SlotLeaders)
 import           Pos.Core.Configuration (GenesisHash (..))
 import           Pos.Core.Delegation.HeavyDlgIndex (ProxySKBlockInfo)
 import           Pos.Core.Slotting (EpochIndex, SlotId)
 import           Pos.Core.Update (BlockVersion, SoftwareVersion)
 import           Pos.Crypto (ProtocolMagic, SecretKey, SignTag (..), hash, proxySign, sign,
-                             toPublic)
+                     toPublic)
 import           Pos.Data.Attributes (mkAttributes)
 
 ----------------------------------------------------------------------------

core/src/Pos/Core/Block/Genesis/Instances.hs

@@ -13,12 +13,11 @@ import           Formatting (bprint, build, int, sformat, stext, (%))
 import           Serokell.Util (Color (Magenta), colorize)
 
 import           Pos.Core.Block.Blockchain (GenericBlock (..), GenericBlockHeader (..), gbHeader,
-                                            gbhConsensus)
+                     gbhConsensus)
 import           Pos.Core.Block.Genesis.Lens (gcdDifficulty, gcdEpoch)
 import           Pos.Core.Block.Genesis.Types (GenesisBody (..), GenesisConsensusData (..))
 import           Pos.Core.Block.Union.Types (BlockHeader (..), GenesisBlock, GenesisBlockHeader,
-                                             HasHeaderHash (..), HeaderHash, IsGenesisHeader,
-                                             IsHeader, blockHeaderHash)
+                     HasHeaderHash (..), HeaderHash, IsGenesisHeader, IsHeader, blockHeaderHash)
 import           Pos.Core.Common (HasDifficulty (..), slotLeadersF)
 import           Pos.Core.Slotting (EpochOrSlot (..), HasEpochIndex (..), HasEpochOrSlot (..))
 import           Pos.Crypto (hashHexF)

core/src/Pos/Core/Block/Genesis/Types.hs

@@ -15,9 +15,8 @@ import           Universum
 import qualified Data.Text.Buildable as Buildable
 import           Formatting (bprint, build, (%))
 
-import           Pos.Binary.Class (Bi (..), Cons (..), Field (..),
-                                   deriveSimpleBi, encodeListLen,
-                                   enforceSize)
+import           Pos.Binary.Class (Bi (..), Cons (..), Field (..), deriveSimpleBi, encodeListLen,
+                     enforceSize)
 import           Pos.Core.Common (ChainDifficulty, SlotLeaders)
 import           Pos.Core.Slotting (EpochIndex (..))
 import           Pos.Crypto (Hash)