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

Commit ad6d773

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

File tree

129 files changed

+976
-785
lines changed

Some content is hidden

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

129 files changed

+976
-785
lines changed

Diff for: ‎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

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

+9-9
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,16 @@ 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,
20+
QueryEvent, UpdateEvent, closeAcidState,
21+
openLocalStateFrom)
22+
import Data.Acid.Advanced (query', update')
23+
import Data.Acid.Memory (openMemoryState)
24+
import Data.Typeable (Typeable)
2525

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

2828
import Serokell.AcidState.Util (tidyLocalState)
2929

Diff for: ‎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

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

+7-7
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@ 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,
22+
createCheckpoint)
23+
import System.Directory (removeDirectoryRecursive)
24+
import System.FilePath ((</>))
2525

2626
readerToQuery :: Reader s a -> Query s a
2727
readerToQuery = asks . runReader

Diff for: ‎block/src/Pos/Block/BHelpers.hs

+7-7
Original file line numberDiff line numberDiff line change
@@ -21,21 +21,21 @@ import Universum
2121
import Control.Monad.Except (MonadError (throwError))
2222

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

Diff for: ‎block/src/Pos/Block/Logic/Integrity.hs

+10-7
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,16 @@ import Serokell.Util (VerificationRes (..), verifyGeneric)
2626
import qualified Pos.Binary.Class as Bi
2727
import Pos.Binary.Update ()
2828
import qualified Pos.Block.BHelpers as BHelpers
29-
import Pos.Core (BlockVersionData (..), ChainDifficulty, EpochOrSlot, HasDifficulty (..),
30-
HasEpochIndex (..), HasEpochOrSlot (..), HasHeaderHash (..),
31-
HasProtocolConstants, HeaderHash, SlotId (..), SlotLeaders, addressHash,
32-
gbExtra, gbhExtra, getSlotIndex, headerSlotL, prevBlockL)
33-
import Pos.Core.Block (Block, BlockHeader (..), blockHeaderProtocolMagic, gebAttributes,
34-
gehAttributes, genBlockLeaders, getBlockHeader,
35-
mainHeaderLeaderKey, mebAttributes, mehAttributes)
29+
import Pos.Core (BlockVersionData (..), ChainDifficulty, EpochOrSlot,
30+
HasDifficulty (..), HasEpochIndex (..),
31+
HasEpochOrSlot (..), HasHeaderHash (..),
32+
HasProtocolConstants, HeaderHash, SlotId (..),
33+
SlotLeaders, addressHash, gbExtra, gbhExtra, getSlotIndex,
34+
headerSlotL, prevBlockL)
35+
import Pos.Core.Block (Block, BlockHeader (..),
36+
blockHeaderProtocolMagic, gebAttributes, gehAttributes,
37+
genBlockLeaders, getBlockHeader, mainHeaderLeaderKey,
38+
mebAttributes, mehAttributes)
3639
import Pos.Core.Chrono (NewestFirst (..), OldestFirst)
3740
import Pos.Crypto (ProtocolMagic (getProtocolMagic))
3841
import Pos.Data.Attributes (areAttributesKnown)

Diff for: ‎block/src/Pos/Block/Slog/Logic.hs

+10-7
Original file line numberDiff line numberDiff line change
@@ -36,24 +36,27 @@ import Pos.Block.Logic.Integrity (verifyBlocks)
3636
import Pos.Block.Slog.Context (slogGetLastSlots, slogPutLastSlots)
3737
import Pos.Block.Slog.Types (HasSlogGState)
3838
import Pos.Block.Types (Blund, SlogUndo (..), Undo (..))
39-
import Pos.Core (BlockVersion (..), FlatSlotId, blkSecurityParam, difficultyL,
40-
epochIndexL, flattenSlotId, headerHash, headerHashG, prevBlockL)
39+
import Pos.Core (BlockVersion (..), FlatSlotId, blkSecurityParam,
40+
difficultyL, epochIndexL, flattenSlotId, headerHash,
41+
headerHashG, prevBlockL)
4142
import Pos.Core.Block (Block, genBlockLeaders, mainBlockSlot)
42-
import Pos.Core.Chrono (NE, NewestFirst (getNewestFirst), OldestFirst (..), toOldestFirst,
43-
_OldestFirst)
43+
import Pos.Core.Chrono (NE, NewestFirst (getNewestFirst),
44+
OldestFirst (..), toOldestFirst, _OldestFirst)
4445
import Pos.Crypto (ProtocolMagic)
4546
import Pos.DB (SomeBatchOp (..))
4647
import Pos.DB.Block (putBlunds)
4748
import qualified Pos.DB.BlockIndex as DB
4849
import Pos.DB.Class (MonadDB (..), MonadDBRead)
49-
import qualified Pos.DB.GState.Common as GS (CommonOp (PutMaxSeenDifficulty, PutTip),
50-
getMaxSeenDifficulty)
50+
import qualified Pos.DB.GState.Common as GS
51+
(CommonOp (PutMaxSeenDifficulty, PutTip),
52+
getMaxSeenDifficulty)
5153
import Pos.Exception (assertionFailed, reportFatalError)
5254
import qualified Pos.GState.BlockExtra as GS
5355
import Pos.Infra.Slotting (MonadSlots (getCurrentSlot))
5456
import Pos.Lrc.Context (HasLrcContext, lrcActionOnEpochReason)
5557
import qualified Pos.Lrc.DB as LrcDB
56-
import Pos.Update.Configuration (HasUpdateConfiguration, lastKnownBlockVersion)
58+
import Pos.Update.Configuration (HasUpdateConfiguration,
59+
lastKnownBlockVersion)
5760
import qualified Pos.Update.DB as GS (getAdoptedBVFull)
5861
import Pos.Util (_neHead, _neLast)
5962
import Pos.Util.AssertMode (inAssertMode)

Diff for: ‎block/src/Pos/Block/Types.hs

+2-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@ import Formatting (bprint, build, (%))
2222
import Serokell.Util.Text (listJson)
2323

2424
import Pos.Block.Slog.Types (SlogUndo (..))
25-
import Pos.Core (HasConfiguration, HasDifficulty (..), HasHeaderHash (..))
25+
import Pos.Core (HasConfiguration, HasDifficulty (..),
26+
HasHeaderHash (..))
2627
import Pos.Core.Block (Block, BlockHeader)
2728
import Pos.Core.Txp (TxpUndo)
2829
import Pos.Delegation.Types (DlgUndo)

Diff for: ‎block/src/Pos/DB/Block.hs

+9-6
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,8 @@ import Control.Lens (at)
3838
import qualified Data.ByteString as BS (hPut, readFile)
3939
import Data.Default (Default (def))
4040
import Formatting (formatToString)
41-
import System.Directory (createDirectoryIfMissing, doesFileExist, removeFile)
41+
import System.Directory (createDirectoryIfMissing, doesFileExist,
42+
removeFile)
4243
import System.FilePath ((</>))
4344
import System.IO (IOMode (WriteMode), hClose, hFlush, openBinaryFile)
4445
import System.IO.Error (IOError, isDoesNotExistError)
@@ -52,11 +53,13 @@ import Pos.Core.Block (Block, GenesisBlock)
5253
import qualified Pos.Core.Block as CB
5354
import Pos.Crypto (hashHexF)
5455
import Pos.DB.BlockIndex (deleteHeaderIndex, putHeadersIndex)
55-
import Pos.DB.Class (MonadDB (..), MonadDBRead (..), Serialized (..), SerializedBlock,
56-
SerializedUndo, SerializedBlund, getBlock, getDeserialized)
56+
import Pos.DB.Class (MonadDB (..), MonadDBRead (..), Serialized (..),
57+
SerializedBlock, SerializedBlund, SerializedUndo,
58+
getBlock, getDeserialized)
5759
import Pos.DB.Error (DBError (..))
5860
import Pos.DB.GState.Common (getTipSomething)
59-
import Pos.DB.Pure (DBPureVar, MonadPureDB, atomicModifyIORefPure, pureBlocksStorage)
61+
import Pos.DB.Pure (DBPureVar, MonadPureDB, atomicModifyIORefPure,
62+
pureBlocksStorage)
6063
import Pos.DB.Rocks (MonadRealDB, blockDataDir, getNodeDBs)
6164
import Pos.DB.Sum (MonadDBSum, eitherDB)
6265
import Pos.Delegation.Types (DlgUndo (..))
@@ -315,11 +318,11 @@ deleteData fp = (liftIO $ removeFile fp) `catch` handler
315318

316319
-- | Paths at which we store the block data.
317320
data BlockStoragePaths = BlockStoragePaths
318-
{ bspRoot :: FilePath
321+
{ bspRoot :: FilePath
319322
-- | Block data itself.
320323
, bspBlock :: FilePath
321324
-- | Undo information for a block.
322-
, bspUndo :: FilePath
325+
, bspUndo :: FilePath
323326
-- | Combined storage format. Either this or a combination of 'Block' and
324327
-- 'Undo' files will be present.
325328
, bspBlund :: FilePath

Diff for: ‎block/src/Pos/DB/Block/Load.hs

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,16 @@ import Formatting (sformat, (%))
2121

2222
import Pos.Block.Types (Blund)
2323
import Pos.Core (BlockCount, HasDifficulty (difficultyL),
24-
HasPrevBlock (prevBlockL), HeaderHash, HasGenesisHash)
24+
HasGenesisHash, 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 =

Diff for: ‎block/test/Test/Pos/Block/Arbitrary.hs

+9-6
Original file line numberDiff line numberDiff line change
@@ -24,20 +24,23 @@ import qualified Data.Text.Buildable as Buildable
2424
import Formatting (bprint, build, (%))
2525
import qualified Prelude
2626
import System.Random (Random, mkStdGen, randomR)
27-
import Test.QuickCheck (Arbitrary (..), Gen, choose, suchThat, vectorOf)
28-
import Test.QuickCheck.Arbitrary.Generic (genericArbitrary, genericShrink)
27+
import Test.QuickCheck (Arbitrary (..), Gen, choose, suchThat,
28+
vectorOf)
29+
import Test.QuickCheck.Arbitrary.Generic (genericArbitrary,
30+
genericShrink)
2931

3032
import Pos.Arbitrary.Ssc (SscPayloadDependsOnSlot (..), genSscPayload,
31-
genSscPayloadForSlot)
33+
genSscPayloadForSlot)
3234
import Pos.Binary.Class (biSize)
3335
import qualified Pos.Block.Logic.Integrity as T
3436
import Pos.Block.Slog (SlogUndo)
3537
import Pos.Block.Types (Undo (..))
36-
import Pos.Core (GenesisHash (..), HasGenesisHash, HasProtocolConstants, HeaderHash,
37-
epochSlots, genesisHash)
38+
import Pos.Core (GenesisHash (..), HasGenesisHash,
39+
HasProtocolConstants, HeaderHash, epochSlots, genesisHash)
3840
import qualified Pos.Core as Core
3941
import qualified Pos.Core.Block as T
40-
import Pos.Crypto (ProtocolMagic, PublicKey, SecretKey, createPsk, hash, toPublic)
42+
import Pos.Crypto (ProtocolMagic, PublicKey, SecretKey, createPsk,
43+
hash, toPublic)
4144
import Pos.Data.Attributes (areAttributesKnown)
4245

4346
import Test.Pos.Core.Arbitrary (genSlotId)

Diff for: ‎block/test/Test/Pos/Block/Arbitrary/Message.hs

+3-2
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 #-}
@@ -8,7 +8,8 @@ module Test.Pos.Block.Arbitrary.Message
88
) where
99

1010
import Test.QuickCheck (Arbitrary (..))
11-
import Test.QuickCheck.Arbitrary.Generic (genericArbitrary, genericShrink)
11+
import Test.QuickCheck.Arbitrary.Generic (genericArbitrary,
12+
genericShrink)
1213

1314
import Pos.Arbitrary.Ssc ()
1415
import qualified Pos.Block.Network.Types as T

Diff for: ‎core/src/Pos/Aeson/Core.hs

+11-10
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,9 @@ module Pos.Aeson.Core
88

99
import Universum
1010

11-
import Data.Aeson (FromJSON (..), FromJSONKey (..), FromJSONKeyFunction (..),
12-
ToJSON (toJSON), ToJSONKey (..), object, withObject, (.:), (.=))
11+
import Data.Aeson (FromJSON (..), FromJSONKey (..),
12+
FromJSONKeyFunction (..), ToJSON (toJSON), ToJSONKey (..),
13+
object, withObject, (.:), (.=))
1314
import Data.Aeson.TH (defaultOptions, deriveJSON, deriveToJSON)
1415
import Data.Aeson.Types (toJSONKeyText)
1516
import qualified Data.ByteString.Lazy as LBS
@@ -22,16 +23,16 @@ import Serokell.Util.Base64 (JsonByteString (..))
2223
import Pos.Aeson.Fee ()
2324
import Pos.Binary.Class (AsBinary (..))
2425
import Pos.Core.Binary ()
25-
import Pos.Core.Common (Address, BlockCount (..), ChainDifficulty, Coin, CoinPortion,
26-
Script (..), SharedSeed (..), addressF, coinPortionToDouble,
27-
decodeTextAddress, mkCoin, unsafeCoinPortionFromDouble,
28-
unsafeGetCoin)
26+
import Pos.Core.Common (Address, BlockCount (..), ChainDifficulty,
27+
Coin, CoinPortion, Script (..), SharedSeed (..), addressF,
28+
coinPortionToDouble, decodeTextAddress, mkCoin,
29+
unsafeCoinPortionFromDouble, unsafeGetCoin)
2930
import Pos.Core.Delegation (HeavyDlgIndex (..))
30-
import Pos.Core.Slotting (EpochIndex (..), LocalSlotIndex, SlotCount (..), SlotId,
31-
Timestamp (..))
31+
import Pos.Core.Slotting (EpochIndex (..), LocalSlotIndex,
32+
SlotCount (..), SlotId, Timestamp (..))
3233
import Pos.Core.Ssc (VssCertificate)
33-
import Pos.Core.Update (ApplicationName (..), BlockVersion, BlockVersionData,
34-
SoftforkRule, SoftwareVersion (..))
34+
import Pos.Core.Update (ApplicationName (..), BlockVersion,
35+
BlockVersionData, SoftforkRule, SoftwareVersion (..))
3536
import Pos.Data.Attributes (Attributes, UnparsedFields (..))
3637
import Pos.Util.Util (toAesonError)
3738

Diff for: ‎core/src/Pos/Aeson/Genesis.hs

+11-9
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,9 @@ module Pos.Aeson.Genesis
3535
import Universum hiding (elems)
3636

3737
import Control.Lens (_Left)
38-
import Data.Aeson (FromJSON (..), FromJSONKey (..), FromJSONKeyFunction (..), ToJSON (..),
39-
ToJSONKey (..), ToJSONKeyFunction (..))
38+
import Data.Aeson (FromJSON (..), FromJSONKey (..),
39+
FromJSONKeyFunction (..), ToJSON (..), ToJSONKey (..),
40+
ToJSONKeyFunction (..))
4041
import Data.Aeson.Encoding (text)
4142
import Data.Aeson.TH (deriveJSON)
4243
import qualified Data.HashMap.Strict as HM
@@ -46,15 +47,16 @@ import Serokell.Aeson.Options (defaultOptions)
4647
import Pos.Aeson.Core ()
4748
import Pos.Core.Common (Address, Coin, StakeholderId, unsafeGetCoin)
4849
import Pos.Core.Delegation (ProxySKHeavy)
49-
import Pos.Core.Genesis (FakeAvvmOptions, GenesisAvvmBalances (..), GenesisDelegation,
50-
GenesisInitializer, GenesisNonAvvmBalances (..),
51-
GenesisProtocolConstants (..), GenesisSpec,
52-
GenesisVssCertificatesMap (..), GenesisWStakeholders (..),
53-
TestnetBalanceOptions, convertNonAvvmDataToBalances,
54-
recreateGenesisDelegation, unGenesisDelegation)
50+
import Pos.Core.Genesis (FakeAvvmOptions, GenesisAvvmBalances (..),
51+
GenesisDelegation, GenesisInitializer,
52+
GenesisNonAvvmBalances (..),
53+
GenesisProtocolConstants (..), GenesisSpec,
54+
GenesisVssCertificatesMap (..), GenesisWStakeholders (..),
55+
TestnetBalanceOptions, convertNonAvvmDataToBalances,
56+
recreateGenesisDelegation, unGenesisDelegation)
5557
import Pos.Core.ProtocolConstants (VssMaxTTL (..), VssMinTTL (..))
5658
import Pos.Core.Ssc (VssCertificatesMap (..), getVssCertificatesMap,
57-
validateVssCertificatesMap)
59+
validateVssCertificatesMap)
5860
import Pos.Crypto (RedeemPublicKey, fromAvvmPk, redeemPkB64UrlF)
5961
import Pos.Util.Util (toAesonError)
6062

Diff for: ‎core/src/Pos/Core/Binary/Orphans.hs

+2-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@ import qualified Utils.ABT as ABT
1515
import qualified Utils.Names as Names
1616
import qualified Utils.Vars as Vars
1717

18-
import Pos.Binary.Class (Bi (..), genericDecode, genericEncode, serialize')
18+
import Pos.Binary.Class (Bi (..), genericDecode, genericEncode,
19+
serialize')
1920
import Pos.Core.Script ()
2021

2122

0 commit comments

Comments
 (0)