[CDEC-383] Appease new stylish-haskell CI check

.stylish-haskell.yaml

@@ -198,7 +198,7 @@ steps:
 # Note: we tend to write code which fits into 80 characters, in some cases
 # 100 is acceptable. For imports we always permit 100 characters because it
 # decreases verbosity of diffs and makes merging easier.
-columns: 80
+columns: 100
 
 # By default, line endings are converted according to the OS. You can override
 # preferred format here.

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,16 @@ 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,15 @@ 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

@@ -21,21 +21,21 @@ import           Universum
 import           Control.Monad.Except (MonadError (throwError))
 
 import           Pos.Binary.Class (Bi)
-import           Pos.Core.Block (Block, GenesisBlockchain, MainBlockchain, MainConsensusData (..),
-                                 MainToSign (..))
+import           Pos.Core.Block (Block, GenesisBlockchain, MainBlockchain,
+                     MainConsensusData (..), MainToSign (..))
 import           Pos.Core.Block.Blockchain (Blockchain (..), GenericBlock (..),
-                                            GenericBlockHeader (..), gbExtra)
-import           Pos.Core.Block.Main (MainBody (..), MainExtraHeaderData (..), MainProof,
-                                      mainBlockEBDataProof)
+                     GenericBlockHeader (..), gbExtra)
+import           Pos.Core.Block.Main (MainBody (..), MainExtraHeaderData (..),
+                     MainProof, mainBlockEBDataProof)
 import           Pos.Core.Block.Union (BlockHeader (..), BlockSignature (..))
 import           Pos.Core.Configuration (HasProtocolConstants)
 import           Pos.Core.Delegation (LightDlgIndices (..), checkDlgPayload)
 import           Pos.Core.Slotting (SlotId (..))
 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)
+import           Pos.Crypto (ProtocolMagic, ProxySignature (..), SignTag (..),
+                     checkSig, hash, isSelfSignedPsk, proxyVerify)
 import           Pos.Ssc.Functions (verifySscPayload)
 import           Pos.Util.Some (Some (Some))
 

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

@@ -26,13 +26,16 @@ import           Serokell.Util (VerificationRes (..), verifyGeneric)
 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)
-import           Pos.Core.Block (Block, BlockHeader (..), blockHeaderProtocolMagic, gebAttributes,
-                                 gehAttributes, genBlockLeaders, getBlockHeader,
-                                 mainHeaderLeaderKey, mebAttributes, mehAttributes)
+import           Pos.Core (BlockVersionData (..), ChainDifficulty, EpochOrSlot,
+                     HasDifficulty (..), 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)
 import           Pos.Core.Chrono (NewestFirst (..), OldestFirst)
 import           Pos.Crypto (ProtocolMagic (getProtocolMagic))
 import           Pos.Data.Attributes (areAttributesKnown)

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

@@ -36,24 +36,27 @@ import           Pos.Block.Logic.Integrity (verifyBlocks)
 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)
+import           Pos.Core (BlockVersion (..), FlatSlotId, blkSecurityParam,
+                     difficultyL, epochIndexL, flattenSlotId, headerHash,
+                     headerHashG, prevBlockL)
 import           Pos.Core.Block (Block, genBlockLeaders, mainBlockSlot)
-import           Pos.Core.Chrono (NE, NewestFirst (getNewestFirst), OldestFirst (..), toOldestFirst,
-                                  _OldestFirst)
+import           Pos.Core.Chrono (NE, NewestFirst (getNewestFirst),
+                     OldestFirst (..), toOldestFirst, _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)
+import qualified Pos.DB.GState.Common as GS
+                     (CommonOp (PutMaxSeenDifficulty, PutTip),
+                     getMaxSeenDifficulty)
 import           Pos.Exception (assertionFailed, reportFatalError)
 import qualified Pos.GState.BlockExtra as GS
 import           Pos.Infra.Slotting (MonadSlots (getCurrentSlot))
 import           Pos.Lrc.Context (HasLrcContext, lrcActionOnEpochReason)
 import qualified Pos.Lrc.DB as LrcDB
-import           Pos.Update.Configuration (HasUpdateConfiguration, lastKnownBlockVersion)
+import           Pos.Update.Configuration (HasUpdateConfiguration,
+                     lastKnownBlockVersion)
 import qualified Pos.Update.DB as GS (getAdoptedBVFull)
 import           Pos.Util (_neHead, _neLast)
 import           Pos.Util.AssertMode (inAssertMode)

block/src/Pos/Block/Types.hs

@@ -22,7 +22,8 @@ import           Formatting (bprint, build, (%))
 import           Serokell.Util.Text (listJson)
 
 import           Pos.Block.Slog.Types (SlogUndo (..))
-import           Pos.Core (HasConfiguration, HasDifficulty (..), HasHeaderHash (..))
+import           Pos.Core (HasConfiguration, HasDifficulty (..),
+                     HasHeaderHash (..))
 import           Pos.Core.Block (Block, BlockHeader)
 import           Pos.Core.Txp (TxpUndo)
 import           Pos.Delegation.Types (DlgUndo)

block/src/Pos/DB/Block.hs

@@ -38,7 +38,8 @@ import           Control.Lens (at)
 import qualified Data.ByteString as BS (hPut, readFile)
 import           Data.Default (Default (def))
 import           Formatting (formatToString)
-import           System.Directory (createDirectoryIfMissing, doesFileExist, removeFile)
+import           System.Directory (createDirectoryIfMissing, doesFileExist,
+                     removeFile)
 import           System.FilePath ((</>))
 import           System.IO (IOMode (WriteMode), hClose, hFlush, openBinaryFile)
 import           System.IO.Error (IOError, isDoesNotExistError)
@@ -52,11 +53,13 @@ import           Pos.Core.Block (Block, GenesisBlock)
 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)
+import           Pos.DB.Class (MonadDB (..), MonadDBRead (..), Serialized (..),
+                     SerializedBlock, SerializedBlund, SerializedUndo,
+                     getBlock, getDeserialized)
 import           Pos.DB.Error (DBError (..))
 import           Pos.DB.GState.Common (getTipSomething)
-import           Pos.DB.Pure (DBPureVar, MonadPureDB, atomicModifyIORefPure, pureBlocksStorage)
+import           Pos.DB.Pure (DBPureVar, MonadPureDB, atomicModifyIORefPure,
+                     pureBlocksStorage)
 import           Pos.DB.Rocks (MonadRealDB, blockDataDir, getNodeDBs)
 import           Pos.DB.Sum (MonadDBSum, eitherDB)
 import           Pos.Delegation.Types (DlgUndo (..))
@@ -315,11 +318,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

@@ -21,16 +21,16 @@ import           Formatting (sformat, (%))
 
 import           Pos.Block.Types (Blund)
 import           Pos.Core (BlockCount, HasDifficulty (difficultyL),
-                           HasPrevBlock (prevBlockL), HeaderHash, HasGenesisHash)
+                     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

@@ -24,20 +24,23 @@ import qualified Data.Text.Buildable as Buildable
 import           Formatting (bprint, build, (%))
 import qualified Prelude
 import           System.Random (Random, mkStdGen, randomR)
-import           Test.QuickCheck (Arbitrary (..), Gen, choose, suchThat, vectorOf)
-import           Test.QuickCheck.Arbitrary.Generic (genericArbitrary, genericShrink)
+import           Test.QuickCheck (Arbitrary (..), Gen, choose, suchThat,
+                     vectorOf)
+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)
+import           Pos.Core (GenesisHash (..), HasGenesisHash,
+                     HasProtocolConstants, HeaderHash, epochSlots, genesisHash)
 import qualified Pos.Core as Core
 import qualified Pos.Core.Block as T
-import           Pos.Crypto (ProtocolMagic, PublicKey, SecretKey, createPsk, hash, toPublic)
+import           Pos.Crypto (ProtocolMagic, PublicKey, SecretKey, createPsk,
+                     hash, toPublic)
 import           Pos.Data.Attributes (areAttributesKnown)
 
 import           Test.Pos.Core.Arbitrary (genSlotId)

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

@@ -1,4 +1,4 @@
-{-# LANGUAGE FlexibleContexts #-}
+{-# LANGUAGE FlexibleContexts     #-}
 {-# LANGUAGE UndecidableInstances #-}
 
 {-# OPTIONS_GHC -fno-warn-orphans #-}
@@ -8,7 +8,8 @@ module Test.Pos.Block.Arbitrary.Message
        ) where
 
 import           Test.QuickCheck (Arbitrary (..))
-import           Test.QuickCheck.Arbitrary.Generic (genericArbitrary, genericShrink)
+import           Test.QuickCheck.Arbitrary.Generic (genericArbitrary,
+                     genericShrink)
 
 import           Pos.Arbitrary.Ssc ()
 import qualified Pos.Block.Network.Types as T

core/src/Pos/Aeson/Core.hs

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

core/src/Pos/Aeson/Genesis.hs

@@ -35,8 +35,9 @@ module Pos.Aeson.Genesis
 import           Universum hiding (elems)
 
 import           Control.Lens (_Left)
-import           Data.Aeson (FromJSON (..), FromJSONKey (..), FromJSONKeyFunction (..), ToJSON (..),
-                             ToJSONKey (..), ToJSONKeyFunction (..))
+import           Data.Aeson (FromJSON (..), FromJSONKey (..),
+                     FromJSONKeyFunction (..), ToJSON (..), ToJSONKey (..),
+                     ToJSONKeyFunction (..))
 import           Data.Aeson.Encoding (text)
 import           Data.Aeson.TH (deriveJSON)
 import qualified Data.HashMap.Strict as HM
@@ -46,15 +47,16 @@ import           Serokell.Aeson.Options (defaultOptions)
 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)
+import           Pos.Core.Genesis (FakeAvvmOptions, GenesisAvvmBalances (..),
+                     GenesisDelegation, 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/Binary/Orphans.hs

@@ -15,7 +15,8 @@ import qualified Utils.ABT as ABT
 import qualified Utils.Names as Names
 import qualified Utils.Vars as Vars
 
-import           Pos.Binary.Class (Bi (..), genericDecode, genericEncode, serialize')
+import           Pos.Binary.Class (Bi (..), genericDecode, genericEncode,
+                     serialize')
 import           Pos.Core.Script ()