Skip to content
This repository was archived by the owner on Aug 18, 2020. It is now read-only.

Commit 6a59cc6

Browse files
ruhatchruhatch
committed
[CDEC-383] Appease new stylish-haskell CI check
1 parent 7533d49 commit 6a59cc6

File tree

111 files changed

+425
-507
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

111 files changed

+425
-507
lines changed

‎.stylish-haskell.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ steps:
198198
# Note: we tend to write code which fits into 80 characters, in some cases
199199
# 100 is acceptable. For imports we always permit 100 characters because it
200200
# decreases verbosity of diffs and makes merging easier.
201-
columns: 80
201+
columns: 100
202202

203203
# By default, line endings are converted according to the OS. You can override
204204
# preferred format here.

‎acid-state-exts/Setup.hs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
import Distribution.Simple
1+
import Distribution.Simple
22
main = defaultMain

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

+8-9
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,15 @@ module Serokell.AcidState.ExtendedState
1414
, updateExtended
1515
) where
1616

17-
import Control.Monad.Extra (whenM)
18-
import Control.Monad.Trans (MonadIO (liftIO))
19-
import Data.Acid (AcidState, EventResult, EventState, IsAcidic,
20-
QueryEvent, UpdateEvent, closeAcidState,
21-
openLocalStateFrom)
22-
import Data.Acid.Advanced (query', update')
23-
import Data.Acid.Memory (openMemoryState)
24-
import Data.Typeable (Typeable)
17+
import Control.Monad.Extra (whenM)
18+
import Control.Monad.Trans (MonadIO (liftIO))
19+
import Data.Acid (AcidState, EventResult, EventState, IsAcidic, QueryEvent, UpdateEvent,
20+
closeAcidState, openLocalStateFrom)
21+
import Data.Acid.Advanced (query', update')
22+
import Data.Acid.Memory (openMemoryState)
23+
import Data.Typeable (Typeable)
2524

26-
import System.Directory (doesDirectoryExist, removeDirectoryRecursive)
25+
import System.Directory (doesDirectoryExist, removeDirectoryRecursive)
2726

2827
import Serokell.AcidState.Util (tidyLocalState)
2928

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

+7-8
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,17 @@
55

66
module Serokell.AcidState.Instances where
77

8-
import Control.Exception (throw)
8+
import Control.Exception (throw)
99
import Control.Monad.Catch (MonadThrow (throwM))
1010

11-
import qualified Data.Time.Units as Time
12-
import Data.Acid (Query, Update)
13-
import Data.Hashable (Hashable)
11+
import Data.Acid (Query, Update)
12+
import Data.Hashable (Hashable)
1413
import Data.HashMap.Strict (HashMap)
1514
import qualified Data.HashMap.Strict as HM hiding (HashMap)
16-
import Data.HashSet (HashSet)
17-
import qualified Data.HashSet as HS hiding (HashSet)
18-
import Data.SafeCopy (SafeCopy (..), contain, safeGet,
19-
safePut)
15+
import Data.HashSet (HashSet)
16+
import qualified Data.HashSet as HS hiding (HashSet)
17+
import Data.SafeCopy (SafeCopy (..), contain, safeGet, safePut)
18+
import qualified Data.Time.Units as Time
2019

2120
instance MonadThrow (Update s) where
2221
throwM = throw

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

+6-7
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,14 @@ module Serokell.AcidState.Util
1313
, tidyLocalState
1414
) where
1515

16-
import Control.Exception (Exception, throw)
16+
import Control.Exception (Exception, throw)
1717
import Control.Monad.Except (ExceptT, runExceptT)
1818
import Control.Monad.Reader (Reader, asks, runReader)
19-
import Control.Monad.State (State, runState, state)
20-
import Control.Monad.Trans (MonadIO (liftIO))
21-
import Data.Acid (AcidState, Query, Update, createArchive,
22-
createCheckpoint)
23-
import System.Directory (removeDirectoryRecursive)
24-
import System.FilePath ((</>))
19+
import Control.Monad.State (State, runState, state)
20+
import Control.Monad.Trans (MonadIO (liftIO))
21+
import Data.Acid (AcidState, Query, Update, createArchive, createCheckpoint)
22+
import System.Directory (removeDirectoryRecursive)
23+
import System.FilePath ((</>))
2524

2625
readerToQuery :: Reader s a -> Query s a
2726
readerToQuery = asks . runReader

‎block/src/Pos/Block/BHelpers.hs

+4-4
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@ import Control.Monad.Except (MonadError (throwError))
2222

2323
import Pos.Binary.Class (Bi)
2424
import Pos.Core.Block (Block, GenesisBlockchain, MainBlockchain, MainConsensusData (..),
25-
MainToSign (..))
25+
MainToSign (..))
2626
import Pos.Core.Block.Blockchain (Blockchain (..), GenericBlock (..),
27-
GenericBlockHeader (..), gbExtra)
27+
GenericBlockHeader (..), gbExtra)
2828
import Pos.Core.Block.Main (MainBody (..), MainExtraHeaderData (..), MainProof,
29-
mainBlockEBDataProof)
29+
mainBlockEBDataProof)
3030
import Pos.Core.Block.Union (BlockHeader (..), BlockSignature (..))
3131
import Pos.Core.Configuration (HasProtocolConstants)
3232
import Pos.Core.Delegation (LightDlgIndices (..), checkDlgPayload)
@@ -35,7 +35,7 @@ import Pos.Core.Ssc (checkSscPayload)
3535
import Pos.Core.Txp (checkTxPayload)
3636
import Pos.Core.Update (checkSoftwareVersion, checkUpdatePayload)
3737
import Pos.Crypto (ProtocolMagic, ProxySignature (..), SignTag (..), checkSig, hash,
38-
isSelfSignedPsk, proxyVerify)
38+
isSelfSignedPsk, proxyVerify)
3939
import Pos.Ssc.Functions (verifySscPayload)
4040
import Pos.Util.Some (Some (Some))
4141

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

+5-5
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,12 @@ import qualified Pos.Binary.Class as Bi
2727
import Pos.Binary.Update ()
2828
import qualified Pos.Block.BHelpers as BHelpers
2929
import Pos.Core (BlockVersionData (..), ChainDifficulty, EpochOrSlot, HasDifficulty (..),
30-
HasEpochIndex (..), HasEpochOrSlot (..), HasHeaderHash (..),
31-
HasProtocolConstants, HeaderHash, SlotId (..), SlotLeaders, addressHash,
32-
gbExtra, gbhExtra, getSlotIndex, headerSlotL, prevBlockL)
30+
HasEpochIndex (..), HasEpochOrSlot (..), HasHeaderHash (..),
31+
HasProtocolConstants, HeaderHash, SlotId (..), SlotLeaders, addressHash,
32+
gbExtra, gbhExtra, getSlotIndex, headerSlotL, prevBlockL)
3333
import Pos.Core.Block (Block, BlockHeader (..), blockHeaderProtocolMagic, gebAttributes,
34-
gehAttributes, genBlockLeaders, getBlockHeader,
35-
mainHeaderLeaderKey, mebAttributes, mehAttributes)
34+
gehAttributes, genBlockLeaders, getBlockHeader, mainHeaderLeaderKey,
35+
mebAttributes, mehAttributes)
3636
import Pos.Core.Chrono (NewestFirst (..), OldestFirst)
3737
import Pos.Crypto (ProtocolMagic (getProtocolMagic))
3838
import Pos.Data.Attributes (areAttributesKnown)

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -37,17 +37,17 @@ import Pos.Block.Slog.Context (slogGetLastSlots, slogPutLastSlots)
3737
import Pos.Block.Slog.Types (HasSlogGState)
3838
import Pos.Block.Types (Blund, SlogUndo (..), Undo (..))
3939
import Pos.Core (BlockVersion (..), FlatSlotId, blkSecurityParam, difficultyL,
40-
epochIndexL, flattenSlotId, headerHash, headerHashG, prevBlockL)
40+
epochIndexL, flattenSlotId, headerHash, headerHashG, prevBlockL)
4141
import Pos.Core.Block (Block, genBlockLeaders, mainBlockSlot)
4242
import Pos.Core.Chrono (NE, NewestFirst (getNewestFirst), OldestFirst (..), toOldestFirst,
43-
_OldestFirst)
43+
_OldestFirst)
4444
import Pos.Crypto (ProtocolMagic)
4545
import Pos.DB (SomeBatchOp (..))
4646
import Pos.DB.Block (putBlunds)
4747
import qualified Pos.DB.BlockIndex as DB
4848
import Pos.DB.Class (MonadDB (..), MonadDBRead)
4949
import qualified Pos.DB.GState.Common as GS (CommonOp (PutMaxSeenDifficulty, PutTip),
50-
getMaxSeenDifficulty)
50+
getMaxSeenDifficulty)
5151
import Pos.Exception (assertionFailed, reportFatalError)
5252
import qualified Pos.GState.BlockExtra as GS
5353
import Pos.Infra.Slotting (MonadSlots (getCurrentSlot))

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ import qualified Pos.Core.Block as CB
5353
import Pos.Crypto (hashHexF)
5454
import Pos.DB.BlockIndex (deleteHeaderIndex, putHeadersIndex)
5555
import Pos.DB.Class (MonadDB (..), MonadDBRead (..), Serialized (..), SerializedBlock,
56-
SerializedUndo, SerializedBlund, getBlock, getDeserialized)
56+
SerializedBlund, SerializedUndo, getBlock, getDeserialized)
5757
import Pos.DB.Error (DBError (..))
5858
import Pos.DB.GState.Common (getTipSomething)
5959
import Pos.DB.Pure (DBPureVar, MonadPureDB, atomicModifyIORefPure, pureBlocksStorage)
@@ -315,11 +315,11 @@ deleteData fp = (liftIO $ removeFile fp) `catch` handler
315315

316316
-- | Paths at which we store the block data.
317317
data BlockStoragePaths = BlockStoragePaths
318-
{ bspRoot :: FilePath
318+
{ bspRoot :: FilePath
319319
-- | Block data itself.
320320
, bspBlock :: FilePath
321321
-- | Undo information for a block.
322-
, bspUndo :: FilePath
322+
, bspUndo :: FilePath
323323
-- | Combined storage format. Either this or a combination of 'Block' and
324324
-- 'Undo' files will be present.
325325
, bspBlund :: FilePath

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -20,17 +20,17 @@ import Control.Lens (_Wrapped)
2020
import Formatting (sformat, (%))
2121

2222
import Pos.Block.Types (Blund)
23-
import Pos.Core (BlockCount, HasDifficulty (difficultyL),
24-
HasPrevBlock (prevBlockL), HeaderHash, HasGenesisHash)
23+
import Pos.Core (BlockCount, HasDifficulty (difficultyL), HasGenesisHash,
24+
HasPrevBlock (prevBlockL), HeaderHash)
2525
import Pos.Core.Block (Block, BlockHeader)
26+
import Pos.Core.Chrono (NewestFirst (..))
2627
import Pos.Core.Configuration (genesisHash)
2728
import Pos.Crypto (shortHashF)
2829
import Pos.DB.Block (getBlund)
2930
import Pos.DB.BlockIndex (getHeader)
3031
import Pos.DB.Class (MonadBlockDBRead, MonadDBRead, getBlock)
3132
import Pos.DB.Error (DBError (..))
3233
import Pos.DB.GState.Common (getTip)
33-
import Pos.Core.Chrono (NewestFirst (..))
3434
import Pos.Util.Util (maybeThrow)
3535

3636
type LoadHeadersMode m =

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,13 @@ import Test.QuickCheck (Arbitrary (..), Gen, choose, suchThat, vectorO
2828
import Test.QuickCheck.Arbitrary.Generic (genericArbitrary, genericShrink)
2929

3030
import Pos.Arbitrary.Ssc (SscPayloadDependsOnSlot (..), genSscPayload,
31-
genSscPayloadForSlot)
31+
genSscPayloadForSlot)
3232
import Pos.Binary.Class (biSize)
3333
import qualified Pos.Block.Logic.Integrity as T
3434
import Pos.Block.Slog (SlogUndo)
3535
import Pos.Block.Types (Undo (..))
3636
import Pos.Core (GenesisHash (..), HasGenesisHash, HasProtocolConstants, HeaderHash,
37-
epochSlots, genesisHash)
37+
epochSlots, genesisHash)
3838
import qualified Pos.Core as Core
3939
import qualified Pos.Core.Block as T
4040
import Pos.Crypto (ProtocolMagic, PublicKey, SecretKey, createPsk, hash, toPublic)

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{-# LANGUAGE FlexibleContexts #-}
1+
{-# LANGUAGE FlexibleContexts #-}
22
{-# LANGUAGE UndecidableInstances #-}
33

44
{-# OPTIONS_GHC -fno-warn-orphans #-}

‎core/src/Pos/Aeson/Core.hs

+5-6
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ module Pos.Aeson.Core
99
import Universum
1010

1111
import Data.Aeson (FromJSON (..), FromJSONKey (..), FromJSONKeyFunction (..),
12-
ToJSON (toJSON), ToJSONKey (..), object, withObject, (.:), (.=))
12+
ToJSON (toJSON), ToJSONKey (..), object, withObject, (.:), (.=))
1313
import Data.Aeson.TH (defaultOptions, deriveJSON, deriveToJSON)
1414
import Data.Aeson.Types (toJSONKeyText)
1515
import qualified Data.ByteString.Lazy as LBS
@@ -23,15 +23,14 @@ import Pos.Aeson.Fee ()
2323
import Pos.Binary.Class (AsBinary (..))
2424
import Pos.Core.Binary ()
2525
import Pos.Core.Common (Address, BlockCount (..), ChainDifficulty, Coin, CoinPortion,
26-
Script (..), SharedSeed (..), addressF, coinPortionToDouble,
27-
decodeTextAddress, mkCoin, unsafeCoinPortionFromDouble,
28-
unsafeGetCoin)
26+
Script (..), SharedSeed (..), addressF, coinPortionToDouble,
27+
decodeTextAddress, mkCoin, unsafeCoinPortionFromDouble, unsafeGetCoin)
2928
import Pos.Core.Delegation (HeavyDlgIndex (..))
3029
import Pos.Core.Slotting (EpochIndex (..), LocalSlotIndex, SlotCount (..), SlotId,
31-
Timestamp (..))
30+
Timestamp (..))
3231
import Pos.Core.Ssc (VssCertificate)
3332
import Pos.Core.Update (ApplicationName (..), BlockVersion, BlockVersionData,
34-
SoftforkRule, SoftwareVersion (..))
33+
SoftforkRule, SoftwareVersion (..))
3534
import Pos.Data.Attributes (Attributes, UnparsedFields (..))
3635
import Pos.Util.Util (toAesonError)
3736

‎core/src/Pos/Aeson/Genesis.hs

+6-7
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ import Universum hiding (elems)
3636

3737
import Control.Lens (_Left)
3838
import Data.Aeson (FromJSON (..), FromJSONKey (..), FromJSONKeyFunction (..), ToJSON (..),
39-
ToJSONKey (..), ToJSONKeyFunction (..))
39+
ToJSONKey (..), ToJSONKeyFunction (..))
4040
import Data.Aeson.Encoding (text)
4141
import Data.Aeson.TH (deriveJSON)
4242
import qualified Data.HashMap.Strict as HM
@@ -47,14 +47,13 @@ import Pos.Aeson.Core ()
4747
import Pos.Core.Common (Address, Coin, StakeholderId, unsafeGetCoin)
4848
import Pos.Core.Delegation (ProxySKHeavy)
4949
import Pos.Core.Genesis (FakeAvvmOptions, GenesisAvvmBalances (..), GenesisDelegation,
50-
GenesisInitializer, GenesisNonAvvmBalances (..),
51-
GenesisProtocolConstants (..), GenesisSpec,
52-
GenesisVssCertificatesMap (..), GenesisWStakeholders (..),
53-
TestnetBalanceOptions, convertNonAvvmDataToBalances,
54-
recreateGenesisDelegation, unGenesisDelegation)
50+
GenesisInitializer, GenesisNonAvvmBalances (..),
51+
GenesisProtocolConstants (..), GenesisSpec, GenesisVssCertificatesMap (..),
52+
GenesisWStakeholders (..), TestnetBalanceOptions,
53+
convertNonAvvmDataToBalances, recreateGenesisDelegation, unGenesisDelegation)
5554
import Pos.Core.ProtocolConstants (VssMaxTTL (..), VssMinTTL (..))
5655
import Pos.Core.Ssc (VssCertificatesMap (..), getVssCertificatesMap,
57-
validateVssCertificatesMap)
56+
validateVssCertificatesMap)
5857
import Pos.Crypto (RedeemPublicKey, fromAvvmPk, redeemPkB64UrlF)
5958
import Pos.Util.Util (toAesonError)
6059

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

+5-6
Original file line numberDiff line numberDiff line change
@@ -15,20 +15,19 @@ import Universum
1515

1616
import Pos.Core.Block.Blockchain (GenericBlock (..), mkGenericHeader)
1717
import Pos.Core.Block.Genesis (GenesisBody (..), GenesisConsensusData (..),
18-
GenesisExtraBodyData (..), GenesisExtraHeaderData (..))
18+
GenesisExtraBodyData (..), GenesisExtraHeaderData (..))
1919
import Pos.Core.Block.Main (MainBody (..), MainExtraBodyData (..),
20-
MainExtraHeaderData (..))
20+
MainExtraHeaderData (..))
2121
import Pos.Core.Block.Union (BlockHeader, BlockSignature (..), GenesisBlock,
22-
GenesisBlockHeader, HeaderHash, MainBlock,
23-
MainBlockHeader, MainConsensusData (..), MainToSign (..),
24-
headerHash)
22+
GenesisBlockHeader, HeaderHash, MainBlock, MainBlockHeader,
23+
MainConsensusData (..), MainToSign (..), headerHash)
2524
import Pos.Core.Common (ChainDifficulty, HasDifficulty (..), SlotLeaders)
2625
import Pos.Core.Configuration (GenesisHash (..))
2726
import Pos.Core.Delegation.HeavyDlgIndex (ProxySKBlockInfo)
2827
import Pos.Core.Slotting (EpochIndex, SlotId)
2928
import Pos.Core.Update (BlockVersion, SoftwareVersion)
3029
import Pos.Crypto (ProtocolMagic, SecretKey, SignTag (..), hash, proxySign, sign,
31-
toPublic)
30+
toPublic)
3231
import Pos.Data.Attributes (mkAttributes)
3332

3433
----------------------------------------------------------------------------

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

+2-3
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,11 @@ import Formatting (bprint, build, int, sformat, stext, (%))
1313
import Serokell.Util (Color (Magenta), colorize)
1414

1515
import Pos.Core.Block.Blockchain (GenericBlock (..), GenericBlockHeader (..), gbHeader,
16-
gbhConsensus)
16+
gbhConsensus)
1717
import Pos.Core.Block.Genesis.Lens (gcdDifficulty, gcdEpoch)
1818
import Pos.Core.Block.Genesis.Types (GenesisBody (..), GenesisConsensusData (..))
1919
import Pos.Core.Block.Union.Types (BlockHeader (..), GenesisBlock, GenesisBlockHeader,
20-
HasHeaderHash (..), HeaderHash, IsGenesisHeader,
21-
IsHeader, blockHeaderHash)
20+
HasHeaderHash (..), HeaderHash, IsGenesisHeader, IsHeader, blockHeaderHash)
2221
import Pos.Core.Common (HasDifficulty (..), slotLeadersF)
2322
import Pos.Core.Slotting (EpochOrSlot (..), HasEpochIndex (..), HasEpochOrSlot (..))
2423
import Pos.Crypto (hashHexF)

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

+2-3
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,8 @@ import Universum
1515
import qualified Data.Text.Buildable as Buildable
1616
import Formatting (bprint, build, (%))
1717

18-
import Pos.Binary.Class (Bi (..), Cons (..), Field (..),
19-
deriveSimpleBi, encodeListLen,
20-
enforceSize)
18+
import Pos.Binary.Class (Bi (..), Cons (..), Field (..), deriveSimpleBi, encodeListLen,
19+
enforceSize)
2120
import Pos.Core.Common (ChainDifficulty, SlotLeaders)
2221
import Pos.Core.Slotting (EpochIndex (..))
2322
import Pos.Crypto (Hash)

‎core/src/Pos/Core/Block/Main/Instances.hs

+7-9
Original file line numberDiff line numberDiff line change
@@ -14,19 +14,17 @@ import Serokell.Util (Color (Magenta), colorize, listJson)
1414

1515
import Pos.Core.Block.Blockchain (GenericBlock (..), GenericBlockHeader (..))
1616
import Pos.Core.Block.Main.Lens (mainBlockBlockVersion, mainBlockDifficulty,
17-
mainBlockSlot, mainBlockSoftwareVersion,
18-
mainHeaderBlockVersion, mainHeaderDifficulty,
19-
mainHeaderLeaderKey, mainHeaderSlot,
20-
mainHeaderSoftwareVersion, mbTxs, mcdDifficulty,
21-
mehBlockVersion, mehSoftwareVersion)
17+
mainBlockSlot, mainBlockSoftwareVersion, mainHeaderBlockVersion,
18+
mainHeaderDifficulty, mainHeaderLeaderKey, mainHeaderSlot,
19+
mainHeaderSoftwareVersion, mbTxs, mcdDifficulty, mehBlockVersion,
20+
mehSoftwareVersion)
2221
import Pos.Core.Block.Main.Types (MainBody (..), MainExtraHeaderData (..))
2322
import Pos.Core.Block.Union.Types (BlockHeader (..), HasHeaderHash (..), HeaderHash,
24-
IsHeader, IsMainHeader (..), MainBlock,
25-
MainBlockHeader, MainConsensusData (..),
26-
blockHeaderHash)
23+
IsHeader, IsMainHeader (..), MainBlock, MainBlockHeader,
24+
MainConsensusData (..), blockHeaderHash)
2725
import Pos.Core.Common (HasDifficulty (..))
2826
import Pos.Core.Slotting (EpochOrSlot (..), HasEpochIndex (..), HasEpochOrSlot (..),
29-
slotIdF)
27+
slotIdF)
3028
import Pos.Core.Update (HasBlockVersion (..), HasSoftwareVersion (..))
3129
import Pos.Crypto (hashHexF)
3230

0 commit comments

Comments
 (0)