From 7533d49ba0004fed476c45e367c70bbe9811274a Mon Sep 17 00:00:00 2001 From: Rupert Horlick Date: Tue, 26 Jun 2018 12:24:12 -0700 Subject: [PATCH 1/3] [CDEC-383] Add stylish-haskell to nix and CI --- .buildkite/pipeline.yml | 5 ++ .stylish-haskell.yaml | 4 +- pkgs/default.nix | 69 ++++++++++++++++++++++++++ scripts/check-stylish.sh | 19 +++++++ scripts/haskell/shell-with-stylish.nix | 4 ++ scripts/haskell/stylish-last-10.sh | 5 ++ stack.yaml | 6 +++ 7 files changed, 110 insertions(+), 2 deletions(-) create mode 100755 scripts/check-stylish.sh create mode 100644 scripts/haskell/shell-with-stylish.nix create mode 100755 scripts/haskell/stylish-last-10.sh diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml index b128c39aa81..2942875d04b 100644 --- a/.buildkite/pipeline.yml +++ b/.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: diff --git a/.stylish-haskell.yaml b/.stylish-haskell.yaml index 3be07cdfd7d..3952c949c86 100644 --- a/.stylish-haskell.yaml +++ b/.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: # @@ -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: 100 +columns: 80 # By default, line endings are converted according to the OS. You can override # preferred format here. diff --git a/pkgs/default.nix b/pkgs/default.nix index 2f1bfbfb25b..d7353a8e71a 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -75842,6 +75842,75 @@ homepage = "http://github.com/ekmett/structs/"; description = "Strict GC'd imperative object-oriented programming with cheap pointers"; license = stdenv.lib.licenses.bsd3; +}) {}; +"stylish-haskell" = callPackage +({ + mkDerivation +, aeson +, base +, bytestring +, containers +, directory +, fetchgit +, file-embed +, filepath +, haskell-src-exts +, mtl +, optparse-applicative +, semigroups +, stdenv +, strict +, syb +, yaml +}: +mkDerivation { + +pname = "stylish-haskell"; +version = "0.9.2.0"; +src = fetchgit { + +url = "https://github.com/input-output-hk/stylish-haskell.git"; +sha256 = "0d6ylb07gxv050fpzc6siwxj8c7j1pkcry5zyzimv0xwn1wf6rfy"; +rev = "ecfd3b307d8d13a6d12aff03055f25a39a17e182"; + +}; +isLibrary = true; +isExecutable = true; +libraryHaskellDepends = [ +aeson +base +bytestring +containers +directory +file-embed +filepath +haskell-src-exts +mtl +semigroups +syb +yaml +]; +executableHaskellDepends = [ +aeson +base +bytestring +containers +directory +file-embed +filepath +haskell-src-exts +mtl +optparse-applicative +strict +syb +yaml +]; +doHaddock = false; +doCheck = false; +homepage = "https://github.com/jaspervdj/stylish-haskell"; +description = "Haskell code prettifier"; +license = stdenv.lib.licenses.bsd3; + }) {}; "sum-type-boilerplate" = callPackage ({ diff --git a/scripts/check-stylish.sh b/scripts/check-stylish.sh new file mode 100755 index 00000000000..686cb1d35db --- /dev/null +++ b/scripts/check-stylish.sh @@ -0,0 +1,19 @@ +#!/usr/bin/env bash + +# check and warn if commits don't conform to stylish-haskell + +set -xe + +fail_stylish_check() { + git diff --text > /tmp/stylish.patch + buildkite-agent artifact upload /tmp/stylish.patch --job "$BUILDKITE_JOB_ID" + echo "ERROR: you need to (run ./scripts/haskell/stylish-last-10.sh or apply the patch in the buildkite artifact) and commit the changes" >&2 + exit 1 +} + +# Get relative path to script directory +haskellScriptDir=$(dirname -- "$(readlink -f -- "${BASH_SOURCE[0]}")")/haskell/ + +source "${haskellScriptDir}stylish-last-10.sh" + +git diff --text --exit-code || fail_stylish_check diff --git a/scripts/haskell/shell-with-stylish.nix b/scripts/haskell/shell-with-stylish.nix new file mode 100644 index 00000000000..cc2625e0229 --- /dev/null +++ b/scripts/haskell/shell-with-stylish.nix @@ -0,0 +1,4 @@ +let + cardanoPkgs = import ../../. {}; + pkgs = import ((import ../../lib.nix).fetchNixPkgs) { }; +in pkgs.runCommand "name" { buildInputs = [ cardanoPkgs.stylish-haskell ]; } "" diff --git a/scripts/haskell/stylish-last-10.sh b/scripts/haskell/stylish-last-10.sh new file mode 100755 index 00000000000..9672e7c5b30 --- /dev/null +++ b/scripts/haskell/stylish-last-10.sh @@ -0,0 +1,5 @@ +nix-shell ${haskellScriptDir}shell-with-stylish.nix --run "\ + git diff --diff-filter=AMR --name-only -r HEAD~10 |\ + grep '.hs$' |\ + xargs -I '{}' realpath --relative-to=. $(git rev-parse --show-toplevel)/'{}' |\ + xargs -L 1 stylish-haskell -i" diff --git a/stack.yaml b/stack.yaml index fc1f30d8c8f..3e5de2fa459 100644 --- a/stack.yaml +++ b/stack.yaml @@ -141,6 +141,12 @@ packages: commit: e4e879abca99d0d56015765859fb37af59a81dbb extra-dep: true +# Add custom stylish-haskell while waiting for PR upstream: https://github.com/jaspervdj/stylish-haskell/pull/214 +- location: + git: https://github.com/input-output-hk/stylish-haskell.git + commit: ecfd3b307d8d13a6d12aff03055f25a39a17e182 + extra-dep: true + nix: shell-file: shell.nix From 6a59cc69152e286ef12934ecf6a6a4163e3552e7 Mon Sep 17 00:00:00 2001 From: Rupert Horlick Date: Tue, 26 Jun 2018 14:18:18 -0700 Subject: [PATCH 2/3] [CDEC-383] Appease new stylish-haskell CI check --- .stylish-haskell.yaml | 2 +- acid-state-exts/Setup.hs | 2 +- .../src/Serokell/AcidState/ExtendedState.hs | 17 +++-- .../src/Serokell/AcidState/Instances.hs | 15 ++--- .../src/Serokell/AcidState/Util.hs | 13 ++-- block/src/Pos/Block/BHelpers.hs | 8 +-- block/src/Pos/Block/Logic/Integrity.hs | 10 +-- block/src/Pos/Block/Slog/Logic.hs | 6 +- block/src/Pos/DB/Block.hs | 6 +- block/src/Pos/DB/Block/Load.hs | 6 +- block/test/Test/Pos/Block/Arbitrary.hs | 4 +- .../test/Test/Pos/Block/Arbitrary/Message.hs | 2 +- core/src/Pos/Aeson/Core.hs | 11 ++-- core/src/Pos/Aeson/Genesis.hs | 13 ++-- core/src/Pos/Core/Block/Constructors.hs | 11 ++-- core/src/Pos/Core/Block/Genesis/Instances.hs | 5 +- core/src/Pos/Core/Block/Genesis/Types.hs | 5 +- core/src/Pos/Core/Block/Main/Instances.hs | 16 ++--- core/src/Pos/Core/Block/Main/Types.hs | 5 +- core/src/Pos/Core/Block/Union/Instances.hs | 5 +- core/src/Pos/Core/Block/Union/Types.hs | 7 +- core/src/Pos/Core/Common/Address.hs | 6 +- core/src/Pos/Core/Common/TxFeePolicy.hs | 4 +- core/src/Pos/Core/Genesis/Canonical.hs | 16 ++--- core/src/Pos/Core/Genesis/Generate.hs | 13 ++-- core/src/Pos/Core/Slotting/LocalSlotIndex.hs | 2 +- core/src/Pos/Core/Slotting/SlotId.hs | 2 +- core/src/Pos/Core/Ssc/Commitment.hs | 2 +- core/src/Pos/Core/Ssc/VssCertificate.hs | 2 +- core/src/Pos/Core/Ssc/VssCertificatesMap.hs | 2 +- core/src/Pos/Core/Txp/Tx.hs | 7 +- core/src/Pos/Core/Txp/TxWitness.hs | 9 ++- core/src/Pos/Core/Update/Proposal.hs | 6 +- core/src/Pos/Core/Update/Types.hs | 9 ++- core/src/Pos/Core/Update/Vote.hs | 3 +- core/src/Pos/Merkle.hs | 2 +- core/test/Test/Pos/Core/Arbitrary.hs | 27 ++++---- core/test/Test/Pos/Core/Bi.hs | 63 ++++++++---------- core/test/Test/Pos/Core/CborSpec.hs | 3 +- core/test/Test/Pos/Core/Gen.hs | 66 +++++++++---------- crypto/test/Test/Pos/Crypto/Bi.hs | 18 +++-- crypto/test/Test/Pos/Crypto/Gen.hs | 15 ++--- db/Pos/DB/Class.hs | 2 +- infra/Pos/Infra/Binary/Slotting.hs | 7 +- .../Bench/Pos/Diffusion/BlockDownload.hs | 18 +++-- lib/src/Pos/AllSecrets.hs | 3 +- lib/src/Pos/Binary/Communication.hs | 21 +++--- lib/src/Pos/Client/CLI/Options.hs | 5 +- lib/src/Pos/Client/CLI/Util.hs | 4 +- lib/src/Pos/Diffusion/Full/Txp.hs | 20 +++--- lib/test/Test/Pos/Cbor/CborSpec.hs | 4 +- lib/test/Test/Pos/Update/PollSpec.hs | 4 +- lrc/src/Pos/Lrc/DB/Leaders.hs | 2 +- lrc/src/Pos/Lrc/DB/Richmen.hs | 4 +- ssc/Pos/Ssc/Base.hs | 10 +-- ssc/Pos/Ssc/Functions.hs | 5 +- tools/src/dbgen/Lib.hs | 8 +-- txp/src/Pos/Script.hs | 4 +- txp/src/Pos/Script/Examples.hs | 2 +- txp/src/Pos/Txp/Base.hs | 8 +-- txp/src/Pos/Txp/Toil/Utxo/Functions.hs | 11 ++-- txp/src/Pos/Txp/Toil/Utxo/Util.hs | 2 +- txp/test/Test/Pos/Txp/Arbitrary.hs | 3 +- update/src/Pos/Binary/Update/Poll.hs | 4 +- update/src/Pos/Update/Configuration.hs | 2 +- update/src/Pos/Update/DB.hs | 19 +++--- update/src/Pos/Update/Download.hs | 2 +- update/src/Pos/Update/Logic/Global.hs | 14 ++-- update/src/Pos/Update/Logic/Local.hs | 11 ++-- update/src/Pos/Update/MemState.hs | 2 +- update/src/Pos/Update/MemState/Functions.hs | 3 +- update/src/Pos/Update/Network.hs | 2 +- update/src/Pos/Update/Poll.hs | 4 +- update/src/Pos/Update/Poll/Class.hs | 5 +- update/src/Pos/Update/Poll/Failure.hs | 4 +- update/src/Pos/Update/Poll/Logic/Apply.hs | 22 +++---- update/src/Pos/Update/Poll/Logic/Base.hs | 26 ++++---- update/src/Pos/Update/Poll/Logic/Normalize.hs | 8 +-- update/src/Pos/Update/Poll/Logic/Rollback.hs | 2 +- update/src/Pos/Update/Poll/Logic/Softfork.hs | 9 ++- update/src/Pos/Update/Poll/Logic/Version.hs | 2 +- update/src/Pos/Update/Poll/Modifier.hs | 2 +- update/src/Pos/Update/Poll/PollState.hs | 7 +- update/src/Pos/Update/Poll/Pure.hs | 6 +- update/src/Pos/Update/Poll/RollTrans.hs | 5 +- update/src/Pos/Update/Poll/Trans.hs | 7 +- update/src/Pos/Update/Poll/Types.hs | 3 +- update/src/Pos/Update/Worker.hs | 5 +- update/test/Setup.hs | 2 +- update/test/Test/Pos/Update/Arbitrary/Core.hs | 14 ++-- update/test/Test/Pos/Update/Arbitrary/Poll.hs | 13 ++-- .../Cardano/Wallet/Web/Endpoint/NewWallet.hs | 5 +- wallet-new/server/Main.hs | 13 ++-- wallet-new/src/Cardano/Wallet/API/V1/Types.hs | 4 +- wallet-new/src/Cardano/Wallet/Kernel.hs | 10 ++- .../src/Cardano/Wallet/Kernel/DB/AcidState.hs | 2 +- .../src/Cardano/Wallet/Kernel/Submission.hs | 2 +- .../src/Cardano/Wallet/Server/Plugins.hs | 7 +- wallet-new/src/Cardano/Wallet/WalletLayer.hs | 2 +- .../src/Cardano/Wallet/WalletLayer/Kernel.hs | 1 - .../src/Cardano/Wallet/WalletLayer/Legacy.hs | 8 +-- .../src/Cardano/Wallet/WalletLayer/Types.hs | 2 +- wallet-new/test/unit/Test/Spec/Submission.hs | 6 +- wallet/src/Pos/Wallet/Aeson/ClientTypes.hs | 16 ++--- wallet/src/Pos/Wallet/Web/Account.hs | 8 +-- .../src/Pos/Wallet/Web/ClientTypes/Types.hs | 4 +- wallet/src/Pos/Wallet/Web/Methods/Redeem.hs | 5 +- wallet/src/Pos/Wallet/Web/Methods/Restore.hs | 14 ++-- wallet/src/Pos/Wallet/Web/State/Storage.hs | 12 ++-- .../Wallet/Web/Swagger/Instances/Schema.hs | 9 ++- wallet/test/Test/Pos/Util/MnemonicSpec.hs | 4 +- 111 files changed, 425 insertions(+), 507 deletions(-) diff --git a/.stylish-haskell.yaml b/.stylish-haskell.yaml index 3952c949c86..d6fad7faf6b 100644 --- a/.stylish-haskell.yaml +++ b/.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. diff --git a/acid-state-exts/Setup.hs b/acid-state-exts/Setup.hs index 9a994af677b..44671092b28 100644 --- a/acid-state-exts/Setup.hs +++ b/acid-state-exts/Setup.hs @@ -1,2 +1,2 @@ -import Distribution.Simple +import Distribution.Simple main = defaultMain diff --git a/acid-state-exts/src/Serokell/AcidState/ExtendedState.hs b/acid-state-exts/src/Serokell/AcidState/ExtendedState.hs index 3f319492ef9..5e1f523dc53 100644 --- a/acid-state-exts/src/Serokell/AcidState/ExtendedState.hs +++ b/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) diff --git a/acid-state-exts/src/Serokell/AcidState/Instances.hs b/acid-state-exts/src/Serokell/AcidState/Instances.hs index 04177d0de66..ae51e7035bf 100644 --- a/acid-state-exts/src/Serokell/AcidState/Instances.hs +++ b/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 diff --git a/acid-state-exts/src/Serokell/AcidState/Util.hs b/acid-state-exts/src/Serokell/AcidState/Util.hs index 79499bbb785..95ec55d31d8 100644 --- a/acid-state-exts/src/Serokell/AcidState/Util.hs +++ b/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 diff --git a/block/src/Pos/Block/BHelpers.hs b/block/src/Pos/Block/BHelpers.hs index 0d529d99bc7..f8a30175b31 100644 --- a/block/src/Pos/Block/BHelpers.hs +++ b/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)) diff --git a/block/src/Pos/Block/Logic/Integrity.hs b/block/src/Pos/Block/Logic/Integrity.hs index a9e69e80d0d..4bcc3dd85e2 100644 --- a/block/src/Pos/Block/Logic/Integrity.hs +++ b/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) diff --git a/block/src/Pos/Block/Slog/Logic.hs b/block/src/Pos/Block/Slog/Logic.hs index 7c734855cb3..00ee2bce841 100644 --- a/block/src/Pos/Block/Slog/Logic.hs +++ b/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)) diff --git a/block/src/Pos/DB/Block.hs b/block/src/Pos/DB/Block.hs index 4075845cbfa..d136f9371ec 100644 --- a/block/src/Pos/DB/Block.hs +++ b/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 diff --git a/block/src/Pos/DB/Block/Load.hs b/block/src/Pos/DB/Block/Load.hs index a57d2863506..37f488d482d 100644 --- a/block/src/Pos/DB/Block/Load.hs +++ b/block/src/Pos/DB/Block/Load.hs @@ -20,9 +20,10 @@ 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) @@ -30,7 +31,6 @@ 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 = diff --git a/block/test/Test/Pos/Block/Arbitrary.hs b/block/test/Test/Pos/Block/Arbitrary.hs index de9d26fc1d3..d5f0920b3cf 100644 --- a/block/test/Test/Pos/Block/Arbitrary.hs +++ b/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) diff --git a/block/test/Test/Pos/Block/Arbitrary/Message.hs b/block/test/Test/Pos/Block/Arbitrary/Message.hs index 6c9ccaac07a..d66f88cbb0b 100644 --- a/block/test/Test/Pos/Block/Arbitrary/Message.hs +++ b/block/test/Test/Pos/Block/Arbitrary/Message.hs @@ -1,4 +1,4 @@ -{-# LANGUAGE FlexibleContexts #-} +{-# LANGUAGE FlexibleContexts #-} {-# LANGUAGE UndecidableInstances #-} {-# OPTIONS_GHC -fno-warn-orphans #-} diff --git a/core/src/Pos/Aeson/Core.hs b/core/src/Pos/Aeson/Core.hs index fa5dbb09ebf..23cd5594f3f 100644 --- a/core/src/Pos/Aeson/Core.hs +++ b/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) diff --git a/core/src/Pos/Aeson/Genesis.hs b/core/src/Pos/Aeson/Genesis.hs index 3ead1050253..53e6770ef06 100644 --- a/core/src/Pos/Aeson/Genesis.hs +++ b/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) diff --git a/core/src/Pos/Core/Block/Constructors.hs b/core/src/Pos/Core/Block/Constructors.hs index 0da2ebc8c51..9436ced2f56 100644 --- a/core/src/Pos/Core/Block/Constructors.hs +++ b/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) ---------------------------------------------------------------------------- diff --git a/core/src/Pos/Core/Block/Genesis/Instances.hs b/core/src/Pos/Core/Block/Genesis/Instances.hs index 4860f3a1f24..94fb75c35fd 100644 --- a/core/src/Pos/Core/Block/Genesis/Instances.hs +++ b/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) diff --git a/core/src/Pos/Core/Block/Genesis/Types.hs b/core/src/Pos/Core/Block/Genesis/Types.hs index 988b380ac21..0b379fd47e5 100644 --- a/core/src/Pos/Core/Block/Genesis/Types.hs +++ b/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) diff --git a/core/src/Pos/Core/Block/Main/Instances.hs b/core/src/Pos/Core/Block/Main/Instances.hs index 4879c9764e3..0e4ea850390 100644 --- a/core/src/Pos/Core/Block/Main/Instances.hs +++ b/core/src/Pos/Core/Block/Main/Instances.hs @@ -14,19 +14,17 @@ import Serokell.Util (Color (Magenta), colorize, listJson) import Pos.Core.Block.Blockchain (GenericBlock (..), GenericBlockHeader (..)) import Pos.Core.Block.Main.Lens (mainBlockBlockVersion, mainBlockDifficulty, - mainBlockSlot, mainBlockSoftwareVersion, - mainHeaderBlockVersion, mainHeaderDifficulty, - mainHeaderLeaderKey, mainHeaderSlot, - mainHeaderSoftwareVersion, mbTxs, mcdDifficulty, - mehBlockVersion, mehSoftwareVersion) + mainBlockSlot, mainBlockSoftwareVersion, mainHeaderBlockVersion, + mainHeaderDifficulty, mainHeaderLeaderKey, mainHeaderSlot, + mainHeaderSoftwareVersion, mbTxs, mcdDifficulty, mehBlockVersion, + mehSoftwareVersion) import Pos.Core.Block.Main.Types (MainBody (..), MainExtraHeaderData (..)) import Pos.Core.Block.Union.Types (BlockHeader (..), HasHeaderHash (..), HeaderHash, - IsHeader, IsMainHeader (..), MainBlock, - MainBlockHeader, MainConsensusData (..), - blockHeaderHash) + IsHeader, IsMainHeader (..), MainBlock, MainBlockHeader, + MainConsensusData (..), blockHeaderHash) import Pos.Core.Common (HasDifficulty (..)) import Pos.Core.Slotting (EpochOrSlot (..), HasEpochIndex (..), HasEpochOrSlot (..), - slotIdF) + slotIdF) import Pos.Core.Update (HasBlockVersion (..), HasSoftwareVersion (..)) import Pos.Crypto (hashHexF) diff --git a/core/src/Pos/Core/Block/Main/Types.hs b/core/src/Pos/Core/Block/Main/Types.hs index 4fb4d765a1b..ccafca97787 100644 --- a/core/src/Pos/Core/Block/Main/Types.hs +++ b/core/src/Pos/Core/Block/Main/Types.hs @@ -16,9 +16,8 @@ import qualified Data.Text.Buildable as Buildable import Fmt (genericF) import Formatting (bprint, build, builder, (%)) -import Pos.Binary.Class (Bi (..), Cons (..), Field (..), - deriveSimpleBi, encodeListLen, - enforceSize) +import Pos.Binary.Class (Bi (..), Cons (..), Field (..), deriveSimpleBi, encodeListLen, + enforceSize) import Pos.Core.Delegation (DlgPayload) import Pos.Core.Ssc (SscPayload, SscProof) import Pos.Core.Txp (TxPayload, TxProof) diff --git a/core/src/Pos/Core/Block/Union/Instances.hs b/core/src/Pos/Core/Block/Union/Instances.hs index d059b688b75..de7f81d21b2 100644 --- a/core/src/Pos/Core/Block/Union/Instances.hs +++ b/core/src/Pos/Core/Block/Union/Instances.hs @@ -20,9 +20,8 @@ import Pos.Core.Block.Blockchain (GenericBlock (..)) import Pos.Core.Block.Genesis () import Pos.Core.Block.Main () import Pos.Core.Block.Union.Types (Block, BlockHeader (..), HasHeaderHash (..), - HasPrevBlock (..), IsGenesisHeader, IsHeader, - IsMainHeader (..), blockHeaderHash, - choosingBlockHeader) + HasPrevBlock (..), IsGenesisHeader, IsHeader, IsMainHeader (..), + blockHeaderHash, choosingBlockHeader) import Pos.Core.Common (HasDifficulty (..)) import Pos.Core.Slotting (EpochOrSlot (..), HasEpochIndex (..), HasEpochOrSlot (..)) import Pos.Util.Some (Some) diff --git a/core/src/Pos/Core/Block/Union/Types.hs b/core/src/Pos/Core/Block/Union/Types.hs index b79890ca881..3edd999c74d 100644 --- a/core/src/Pos/Core/Block/Union/Types.hs +++ b/core/src/Pos/Core/Block/Union/Types.hs @@ -51,10 +51,9 @@ import qualified Data.Text.Buildable as Buildable import Formatting (Format, bprint, build, (%)) import Universum -import Pos.Binary.Class (Bi (..), decodeListLenCanonicalOf, - encodeListLen, enforceSize) +import Pos.Binary.Class (Bi (..), decodeListLenCanonicalOf, encodeListLen, enforceSize) import Pos.Core.Block.Blockchain (Blockchain (..), GenericBlock (..), - GenericBlockHeader (..), gbHeader, gbhPrevBlock) + GenericBlockHeader (..), gbHeader, gbhPrevBlock) import Pos.Core.Block.Genesis.Types import Pos.Core.Block.Main.Types import Pos.Core.Common (ChainDifficulty, HasDifficulty (..)) @@ -244,7 +243,7 @@ instance ) => NFData BlockHeader where rnf (BlockHeaderGenesis header) = rnf header - rnf (BlockHeaderMain header) = rnf header + rnf (BlockHeaderMain header) = rnf header choosingBlockHeader :: Functor f => LensLike' f GenesisBlockHeader r diff --git a/core/src/Pos/Core/Common/Address.hs b/core/src/Pos/Core/Common/Address.hs index 26c326b5046..246c3f92d3d 100644 --- a/core/src/Pos/Core/Common/Address.hs +++ b/core/src/Pos/Core/Common/Address.hs @@ -70,11 +70,9 @@ import Pos.Core.Common.Coin () import Pos.Core.Constants (accountGenesisIndex, wAddressGenesisIndex) import Pos.Crypto.Hashing (hashHexF) import Pos.Crypto.HD (HDAddressPayload, HDPassphrase, ShouldCheckPassphrase (..), - deriveHDPassphrase, deriveHDPublicKey, deriveHDSecretKey, - packHDAddressAttr) + deriveHDPassphrase, deriveHDPublicKey, deriveHDSecretKey, packHDAddressAttr) import Pos.Crypto.Signing (EncryptedSecretKey, PassPhrase, PublicKey, RedeemPublicKey, - SecretKey, deterministicKeyGen, emptyPassphrase, encToPublic, - noPassEncrypt) + SecretKey, deterministicKeyGen, emptyPassphrase, encToPublic, noPassEncrypt) import Pos.Data.Attributes (Attributes (..), attrData, mkAttributes) import Pos.Core.Common.AddrAttributes diff --git a/core/src/Pos/Core/Common/TxFeePolicy.hs b/core/src/Pos/Core/Common/TxFeePolicy.hs index 9cc8dc8912d..29d95041501 100644 --- a/core/src/Pos/Core/Common/TxFeePolicy.hs +++ b/core/src/Pos/Core/Common/TxFeePolicy.hs @@ -10,8 +10,8 @@ import qualified Data.Text.Buildable as Buildable import Formatting (bprint, build, shown, (%)) import Pos.Binary.Class (Bi (..), decodeKnownCborDataItem, decodeUnknownCborDataItem, - encodeKnownCborDataItem, encodeUnknownCborDataItem, - encodeListLen, enforceSize) + encodeKnownCborDataItem, encodeListLen, encodeUnknownCborDataItem, + enforceSize) import Pos.Core.Common.TxSizeLinear -- | Transaction fee policy represents a formula to compute the minimal allowed diff --git a/core/src/Pos/Core/Genesis/Canonical.hs b/core/src/Pos/Core/Genesis/Canonical.hs index 3129a8f906a..5049d48513e 100644 --- a/core/src/Pos/Core/Genesis/Canonical.hs +++ b/core/src/Pos/Core/Genesis/Canonical.hs @@ -24,23 +24,23 @@ import Serokell.Util.Base64 (base64F) import qualified Serokell.Util.Base64 as B64 import Serokell.Util.Text (readDecimal, readUnsignedDecimal) import Text.JSON.Canonical (FromJSON (..), FromObjectKey (..), Int54, JSValue (..), - ReportSchemaErrors (expected), ToJSON (..), ToObjectKey (..), - expectedButGotValue, fromJSField, fromJSObject, mkObject) + ReportSchemaErrors (expected), ToJSON (..), ToObjectKey (..), + expectedButGotValue, fromJSField, fromJSObject, mkObject) import Pos.Binary.Class (AsBinary (..)) import Pos.Core.Common (Address, Coeff (..), Coin (..), CoinPortion (..), SharedSeed (..), - StakeholderId, TxFeePolicy (..), TxSizeLinear (..), addressF, - decodeTextAddress, getCoinPortion, unsafeGetCoin) + StakeholderId, TxFeePolicy (..), TxSizeLinear (..), addressF, + decodeTextAddress, getCoinPortion, unsafeGetCoin) import Pos.Core.Delegation (HeavyDlgIndex (..), ProxySKHeavy) import Pos.Core.ProtocolConstants (VssMaxTTL (..), VssMinTTL (..)) import Pos.Core.Slotting (EpochIndex (..), Timestamp (..)) import Pos.Core.Ssc (VssCertificate (..), VssCertificatesMap (..), - validateVssCertificatesMap) + validateVssCertificatesMap) import Pos.Core.Update (BlockVersionData (..), SoftforkRule (..)) import Pos.Crypto (ProxyCert, ProxySecretKey (..), PublicKey, RedeemPublicKey, Signature, - decodeAbstractHash, fromAvvmPk, fullProxyCertHexF, fullPublicKeyF, - fullSignatureHexF, hashHexF, parseFullProxyCert, parseFullPublicKey, - parseFullSignature, redeemPkB64UrlF) + decodeAbstractHash, fromAvvmPk, fullProxyCertHexF, fullPublicKeyF, + fullSignatureHexF, hashHexF, parseFullProxyCert, parseFullPublicKey, + parseFullSignature, redeemPkB64UrlF) import Pos.Crypto.Configuration (ProtocolMagic (..)) import Pos.Core.Genesis.AvvmBalances (GenesisAvvmBalances (..)) diff --git a/core/src/Pos/Core/Genesis/Generate.hs b/core/src/Pos/Core/Genesis/Generate.hs index 06072c4be5e..fd746e59ffb 100644 --- a/core/src/Pos/Core/Genesis/Generate.hs +++ b/core/src/Pos/Core/Genesis/Generate.hs @@ -25,22 +25,21 @@ import Serokell.Util.Verify (VerificationRes (..), formatAllErrors, ve import Pos.Binary.Class (asBinary, serialize') import Pos.Core.Common (Address, Coin, IsBootstrapEraAddr (..), StakeholderId, - addressHash, applyCoinPortionDown, coinToInteger, - deriveFirstHDAddress, makePubKeyAddressBoot, mkCoin, sumCoins, - unsafeIntegerToCoin) + addressHash, applyCoinPortionDown, coinToInteger, deriveFirstHDAddress, + makePubKeyAddressBoot, mkCoin, sumCoins, unsafeIntegerToCoin) import Pos.Core.Configuration.Protocol (HasProtocolConstants, vssMaxTTL, vssMinTTL) import Pos.Core.Delegation (HeavyDlgIndex (..), ProxySKHeavy) import Pos.Core.Ssc (VssCertificate, mkVssCertificate, mkVssCertificatesMap) import Pos.Crypto (EncryptedSecretKey, ProtocolMagic, RedeemPublicKey, SecretKey, - VssKeyPair, createPsk, deterministic, emptyPassphrase, encToSecret, - keyGen, noPassEncrypt, randomNumberInRange, redeemDeterministicKeyGen, - safeKeyGen, toPublic, toVssPublicKey, vssKeyGen) + VssKeyPair, createPsk, deterministic, emptyPassphrase, encToSecret, keyGen, + noPassEncrypt, randomNumberInRange, redeemDeterministicKeyGen, safeKeyGen, + toPublic, toVssPublicKey, vssKeyGen) import Pos.Util.Util (leftToPanic) import Pos.Core.Genesis.AvvmBalances (GenesisAvvmBalances (..)) import Pos.Core.Genesis.Delegation (GenesisDelegation (..), mkGenesisDelegation) import Pos.Core.Genesis.Initializer (FakeAvvmOptions (..), GenesisInitializer (..), - TestnetBalanceOptions (..)) + TestnetBalanceOptions (..)) import Pos.Core.Genesis.NonAvvmBalances (GenesisNonAvvmBalances (..)) import Pos.Core.Genesis.VssCertificatesMap (GenesisVssCertificatesMap (..)) import Pos.Core.Genesis.WStakeholders (GenesisWStakeholders (..)) diff --git a/core/src/Pos/Core/Slotting/LocalSlotIndex.hs b/core/src/Pos/Core/Slotting/LocalSlotIndex.hs index 424ad001645..8c62981aabc 100644 --- a/core/src/Pos/Core/Slotting/LocalSlotIndex.hs +++ b/core/src/Pos/Core/Slotting/LocalSlotIndex.hs @@ -22,7 +22,7 @@ import System.Random (Random (..)) import Pos.Binary.Class (Bi (..)) import Pos.Core.Configuration.Protocol (HasProtocolConstants, epochSlots, - protocolConstants) + protocolConstants) import Pos.Core.ProtocolConstants (ProtocolConstants, pcEpochSlots) import Pos.Util.Util (leftToPanic) diff --git a/core/src/Pos/Core/Slotting/SlotId.hs b/core/src/Pos/Core/Slotting/SlotId.hs index aad5bef4662..7b1fdf5d810 100644 --- a/core/src/Pos/Core/Slotting/SlotId.hs +++ b/core/src/Pos/Core/Slotting/SlotId.hs @@ -24,7 +24,7 @@ import Formatting (Format, bprint, build, ords, (%)) import Pos.Binary.Class (Cons (..), Field (..), deriveSimpleBi) import Pos.Core.Configuration.Protocol (HasProtocolConstants, epochSlots, - slotSecurityParam) + slotSecurityParam) import Pos.Util.Util (leftToPanic) import Pos.Core.Slotting.EpochIndex diff --git a/core/src/Pos/Core/Ssc/Commitment.hs b/core/src/Pos/Core/Ssc/Commitment.hs index e48e31a7d49..37ab8d20f43 100644 --- a/core/src/Pos/Core/Ssc/Commitment.hs +++ b/core/src/Pos/Core/Ssc/Commitment.hs @@ -13,7 +13,7 @@ import qualified Data.HashMap.Strict as HM import Pos.Core.Slotting (EpochIndex) import Pos.Binary.Class (AsBinary, Bi (..), encodeListLen, enforceSize, fromBinary, - serialize') + serialize') import Pos.Crypto (EncShare, PublicKey, SecretProof, Signature, VssPublicKey) import Pos.Util.Util (cborError) diff --git a/core/src/Pos/Core/Ssc/VssCertificate.hs b/core/src/Pos/Core/Ssc/VssCertificate.hs index b319f695dda..802532538a9 100644 --- a/core/src/Pos/Core/Ssc/VssCertificate.hs +++ b/core/src/Pos/Core/Ssc/VssCertificate.hs @@ -25,7 +25,7 @@ import Pos.Core.Common (StakeholderId, addressHash) import Pos.Binary.Class (AsBinary, Bi (..), encodeListLen, enforceSize) import Pos.Core.Slotting (EpochIndex) import Pos.Crypto (ProtocolMagic, PublicKey, SecretKey, SignTag (SignVssCert), Signature, - VssPublicKey, checkSig, sign, toPublic) + VssPublicKey, checkSig, sign, toPublic) -- | VssCertificate allows VssPublicKey to participate in MPC. Each -- stakeholder should create a Vss keypair, sign VSS public key with signing diff --git a/core/src/Pos/Core/Ssc/VssCertificatesMap.hs b/core/src/Pos/Core/Ssc/VssCertificatesMap.hs index e316835c43e..a13b06c39fe 100644 --- a/core/src/Pos/Core/Ssc/VssCertificatesMap.hs +++ b/core/src/Pos/Core/Ssc/VssCertificatesMap.hs @@ -30,7 +30,7 @@ import Pos.Core.Common (StakeholderId) import Pos.Crypto (ProtocolMagic) import Pos.Core.Ssc.VssCertificate (VssCertificate (..), checkVssCertificate, getCertId, - toCertPair) + toCertPair) import Pos.Util.Util (cborError) -- | VssCertificatesMap contains all valid certificates collected diff --git a/core/src/Pos/Core/Txp/Tx.hs b/core/src/Pos/Core/Txp/Tx.hs index 5aeca7c2360..bbabbcf14bd 100644 --- a/core/src/Pos/Core/Txp/Tx.hs +++ b/core/src/Pos/Core/Txp/Tx.hs @@ -27,10 +27,9 @@ import Serokell.Util.Base16 (base16F) import Serokell.Util.Text (listJson) import Serokell.Util.Verify (VerificationRes (..), verResSingleF, verifyGeneric) -import Pos.Binary.Class (Bi (..), Cons (..), Field (..), - encodeListLen, encodeKnownCborDataItem, enforceSize, - encodeUnknownCborDataItem, decodeKnownCborDataItem, - decodeUnknownCborDataItem, deriveSimpleBi) +import Pos.Binary.Class (Bi (..), Cons (..), Field (..), decodeKnownCborDataItem, + decodeUnknownCborDataItem, deriveSimpleBi, encodeKnownCborDataItem, + encodeListLen, encodeUnknownCborDataItem, enforceSize) import Pos.Core.Common (Address (..), Coin (..), checkCoin, coinF) import Pos.Crypto (Hash, hash, shortHashF) import Pos.Data.Attributes (Attributes, areAttributesKnown) diff --git a/core/src/Pos/Core/Txp/TxWitness.hs b/core/src/Pos/Core/Txp/TxWitness.hs index ad54a543576..6cd559fd56d 100644 --- a/core/src/Pos/Core/Txp/TxWitness.hs +++ b/core/src/Pos/Core/Txp/TxWitness.hs @@ -12,13 +12,12 @@ import qualified Data.Text.Buildable as Buildable import Formatting (bprint, build, (%)) import Serokell.Util.Base16 (base16F) -import Pos.Binary.Class (Bi (..), encodeListLen, encodeKnownCborDataItem, - encodeUnknownCborDataItem, decodeKnownCborDataItem, - decodeUnknownCborDataItem, decodeListLenCanonical, - matchSize) +import Pos.Binary.Class (Bi (..), decodeKnownCborDataItem, decodeListLenCanonical, + decodeUnknownCborDataItem, encodeKnownCborDataItem, encodeListLen, + encodeUnknownCborDataItem, matchSize) import Pos.Core.Common (Script, addressHash) import Pos.Crypto (Hash, PublicKey, RedeemPublicKey, RedeemSignature, Signature, hash, - shortHashF) + shortHashF) import Pos.Core.Txp.Tx (Tx) diff --git a/core/src/Pos/Core/Update/Proposal.hs b/core/src/Pos/Core/Update/Proposal.hs index 1d92dbfd707..5bd23f5d6a3 100644 --- a/core/src/Pos/Core/Update/Proposal.hs +++ b/core/src/Pos/Core/Update/Proposal.hs @@ -18,10 +18,10 @@ import Data.Text.Lazy.Builder (Builder) import Formatting (bprint, build, builder, (%)) import Serokell.Util.Text (listJson) -import Pos.Binary.Class (Bi (..), Cons (..), Field (..), deriveSimpleBi, - encodeListLen, enforceSize) +import Pos.Binary.Class (Bi (..), Cons (..), Field (..), deriveSimpleBi, encodeListLen, + enforceSize) import Pos.Crypto (Hash, ProtocolMagic, PublicKey, SafeSigner, SignTag (SignUSProposal), - Signature, checkSig, hash, safeSign, safeToPublic) + Signature, checkSig, hash, safeSign, safeToPublic) import Pos.Data.Attributes (Attributes, areAttributesKnown) import Pos.Core.Update.BlockVersion diff --git a/core/src/Pos/Core/Update/Types.hs b/core/src/Pos/Core/Update/Types.hs index 98d8ab37f94..7c7e6293493 100644 --- a/core/src/Pos/Core/Update/Types.hs +++ b/core/src/Pos/Core/Update/Types.hs @@ -61,14 +61,13 @@ import qualified Prelude import Serokell.Data.Memory.Units (Byte, memory) import Serokell.Util.Text (listJson) -import Pos.Binary.Class (Bi (..), Cons (..), Field (..), Raw, - encodeListLen, enforceSize, - deriveSimpleBi) +import Pos.Binary.Class (Bi (..), Cons (..), Field (..), Raw, deriveSimpleBi, + encodeListLen, enforceSize) import Pos.Core.Common (CoinPortion, ScriptVersion, TxFeePolicy, addressHash) import Pos.Core.Slotting.Types (EpochIndex, FlatSlotId) import Pos.Crypto (Hash, ProtocolMagic, PublicKey, SafeSigner, SecretKey, - SignTag (SignUSVote), Signature, hash, safeSign, safeToPublic, - shortHashF, sign, toPublic) + SignTag (SignUSVote), Signature, hash, safeSign, safeToPublic, shortHashF, + sign, toPublic) import Pos.Data.Attributes (Attributes, areAttributesKnown) import Pos.Util.Orphans () diff --git a/core/src/Pos/Core/Update/Vote.hs b/core/src/Pos/Core/Update/Vote.hs index 5be5e400ec9..662586d7366 100644 --- a/core/src/Pos/Core/Update/Vote.hs +++ b/core/src/Pos/Core/Update/Vote.hs @@ -18,8 +18,7 @@ import Serokell.Util.Text (listJson) import Pos.Binary.Class (Bi (..), encodeListLen, enforceSize) import Pos.Core.Common (addressHash) import Pos.Crypto (ProtocolMagic, PublicKey, SafeSigner, SecretKey, SignTag (SignUSVote), - Signature, checkSig, safeSign, safeToPublic, shortHashF, sign, - toPublic) + Signature, checkSig, safeSign, safeToPublic, shortHashF, sign, toPublic) import Pos.Core.Update.Proposal diff --git a/core/src/Pos/Merkle.hs b/core/src/Pos/Merkle.hs index 3d583afa610..8d6348919e1 100644 --- a/core/src/Pos/Merkle.hs +++ b/core/src/Pos/Merkle.hs @@ -24,9 +24,9 @@ import Universum import Data.Bits (Bits (..)) import Data.ByteArray (ByteArrayAccess, convert) -import qualified Data.ByteString.Lazy as LBS import Data.ByteString.Builder (Builder, byteString) import qualified Data.ByteString.Builder.Extra as Builder +import qualified Data.ByteString.Lazy as LBS import Data.Coerce (coerce) import qualified Data.Foldable as Foldable import qualified Data.Text.Buildable as Buildable diff --git a/core/test/Test/Pos/Core/Arbitrary.hs b/core/test/Test/Pos/Core/Arbitrary.hs index bcc17a52d03..0e68c8cb313 100644 --- a/core/test/Test/Pos/Core/Arbitrary.hs +++ b/core/test/Test/Pos/Core/Arbitrary.hs @@ -31,27 +31,26 @@ import qualified Data.Map as M import Data.Time.Units (Second, TimeUnit (..), convertUnit) import System.Random (Random) import Test.QuickCheck (Arbitrary (..), Gen, choose, oneof, scale, shrinkIntegral, sized, - suchThat) + suchThat) import Test.QuickCheck.Arbitrary.Generic (genericArbitrary, genericShrink) import Test.QuickCheck.Instances () import Pos.Binary.Class (Bi) import Pos.Core (AddrAttributes (..), AddrSpendingData (..), AddrStakeDistribution (..), - AddrType (..), Address (..), Address' (..), ApplicationName (..), - BlockCount (..), BlockVersion (..), BlockVersionData (..), - ChainDifficulty (..), Coeff (..), Coin (..), CoinPortion (..), - EpochIndex (..), EpochOrSlot (..), LocalSlotIndex (..), Script (..), - SharedSeed (..), SlotCount (..), SlotId (..), SoftforkRule (..), - SoftwareVersion (..), StakeholderId, TimeDiff (..), Timestamp (..), - TxFeePolicy (..), TxSizeLinear (..), VssCertificate, - applicationNameMaxLength, coinPortionDenominator, coinToInteger, divCoin, - localSlotIndexMaxBound, localSlotIndexMinBound, makeAddress, maxCoinVal, - mkCoin, mkLocalSlotIndex, mkMultiKeyDistr, mkVssCertificate, - mkVssCertificatesMapLossy, unsafeCoinPortionFromDouble, unsafeGetCoin, - unsafeSubCoin) + AddrType (..), Address (..), Address' (..), ApplicationName (..), + BlockCount (..), BlockVersion (..), BlockVersionData (..), + ChainDifficulty (..), Coeff (..), Coin (..), CoinPortion (..), + EpochIndex (..), EpochOrSlot (..), LocalSlotIndex (..), Script (..), + SharedSeed (..), SlotCount (..), SlotId (..), SoftforkRule (..), + SoftwareVersion (..), StakeholderId, TimeDiff (..), Timestamp (..), + TxFeePolicy (..), TxSizeLinear (..), VssCertificate, applicationNameMaxLength, + coinPortionDenominator, coinToInteger, divCoin, localSlotIndexMaxBound, + localSlotIndexMinBound, makeAddress, maxCoinVal, mkCoin, mkLocalSlotIndex, + mkMultiKeyDistr, mkVssCertificate, mkVssCertificatesMapLossy, + unsafeCoinPortionFromDouble, unsafeGetCoin, unsafeSubCoin) import Pos.Core.Configuration (HasGenesisBlockVersionData, HasProtocolConstants, - epochSlots, protocolConstants) + epochSlots, protocolConstants) import Pos.Core.Constants (sharedSeedLength) import Pos.Core.Delegation (HeavyDlgIndex (..), LightDlgIndices (..)) import qualified Pos.Core.Genesis as G diff --git a/core/test/Test/Pos/Core/Bi.hs b/core/test/Test/Pos/Core/Bi.hs index 1534eface1b..adcf3d2aff8 100644 --- a/core/test/Test/Pos/Core/Bi.hs +++ b/core/test/Test/Pos/Core/Bi.hs @@ -22,55 +22,50 @@ import qualified Hedgehog as H import Pos.Binary.Class (Raw (..), asBinary) import Pos.Core.Block (BlockHeader (..), BlockHeaderAttributes, BlockSignature (..), - GenesisBlockHeader, GenesisBody (..), GenesisConsensusData (..), - GenesisProof (..), HeaderHash, MainBlockHeader, MainBody (..), - MainConsensusData (..), MainExtraBodyData (..), - MainExtraHeaderData (..), MainProof (..), MainToSign (..), - mkGenesisHeader, mkMainHeaderExplicit) + GenesisBlockHeader, GenesisBody (..), GenesisConsensusData (..), + GenesisProof (..), HeaderHash, MainBlockHeader, MainBody (..), + MainConsensusData (..), MainExtraBodyData (..), MainExtraHeaderData (..), + MainProof (..), MainToSign (..), mkGenesisHeader, mkMainHeaderExplicit) import Pos.Core.Common (AddrAttributes (..), AddrSpendingData (..), - AddrStakeDistribution (..), AddrType (..), BlockCount (..), - ChainDifficulty (..), Coeff (..), Coin (..), CoinPortion (..), - IsBootstrapEraAddr (..), Script (..), ScriptVersion, - SharedSeed (..), SlotLeaders, StakeholderId, StakesList, - TxFeePolicy (..), TxSizeLinear (..), addressHash, makeAddress, - makePubKeyAddress) + AddrStakeDistribution (..), AddrType (..), BlockCount (..), + ChainDifficulty (..), Coeff (..), Coin (..), CoinPortion (..), + IsBootstrapEraAddr (..), Script (..), ScriptVersion, SharedSeed (..), + SlotLeaders, StakeholderId, StakesList, TxFeePolicy (..), TxSizeLinear (..), + addressHash, makeAddress, makePubKeyAddress) import Pos.Core.Configuration (GenesisHash (..)) import Pos.Core.Delegation (DlgPayload (..), HeavyDlgIndex (..), LightDlgIndices (..), - ProxySKBlockInfo, ProxySKHeavy) + ProxySKBlockInfo, ProxySKHeavy) import Pos.Core.ProtocolConstants (ProtocolConstants (..)) import Pos.Core.Slotting (EpochIndex (..), EpochOrSlot (..), FlatSlotId, - LocalSlotIndex (..), SlotCount (..), SlotId (..), TimeDiff (..), - Timestamp (..)) + LocalSlotIndex (..), SlotCount (..), SlotId (..), TimeDiff (..), + Timestamp (..)) import Pos.Core.Ssc (Commitment, CommitmentSignature, CommitmentsMap, InnerSharesMap, - Opening, OpeningsMap, SharesDistribution, SignedCommitment, - SscPayload (..), SscProof (..), VssCertificate (..), - VssCertificate (..), VssCertificatesHash, VssCertificatesMap (..), - mkCommitmentsMap, mkVssCertificate, mkVssCertificatesMap, - randCommitmentAndOpening) + Opening, OpeningsMap, SharesDistribution, SignedCommitment, SscPayload (..), + SscProof (..), VssCertificate (..), VssCertificatesHash, + VssCertificatesMap (..), mkCommitmentsMap, mkVssCertificate, + mkVssCertificatesMap, randCommitmentAndOpening) import Pos.Core.Txp (Tx (..), TxAux (..), TxId, TxIn (..), TxInWitness (..), TxOut (..), - TxOutAux (..), TxPayload (..), TxProof (..), TxSig, TxSigData (..), - TxWitness, mkTxPayload) + TxOutAux (..), TxPayload (..), TxProof (..), TxSig, TxSigData (..), TxWitness, + mkTxPayload) import Pos.Core.Update (ApplicationName (..), BlockVersion (..), BlockVersionData (..), - BlockVersionModifier (..), SoftforkRule (..), - SoftwareVersion (..), SystemTag (..), UpAttributes, UpId, - UpdateData (..), UpdatePayload (..), UpdateProof, UpdateProposal, - UpdateProposalToSign (..), UpdateVote (..), VoteId, - mkUpdateProof, mkUpdateProposalWSign, mkUpdateVoteSafe) + BlockVersionModifier (..), SoftforkRule (..), SoftwareVersion (..), + SystemTag (..), UpAttributes, UpId, UpdateData (..), UpdatePayload (..), + UpdateProof, UpdateProposal, UpdateProposalToSign (..), UpdateVote (..), + VoteId, mkUpdateProof, mkUpdateProposalWSign, mkUpdateVoteSafe) import Pos.Crypto (AbstractHash (..), EncShare (..), HDAddressPayload (..), Hash, - ProtocolMagic (..), PublicKey (..), RedeemPublicKey, RedeemSignature, - SafeSigner (..), Secret (..), SecretKey (..), SecretProof (..), - SignTag (..), VssKeyPair, VssPublicKey (..), abstractHash, createPsk, - decryptShare, deterministic, deterministicVssKeyGen, hash, proxySign, - redeemDeterministicKeyGen, redeemSign, safeCreatePsk, sign, toPublic, - toVssPublicKey) + ProtocolMagic (..), PublicKey (..), RedeemPublicKey, RedeemSignature, + SafeSigner (..), Secret (..), SecretKey (..), SecretProof (..), SignTag (..), + VssKeyPair, VssPublicKey (..), abstractHash, createPsk, decryptShare, + deterministic, deterministicVssKeyGen, hash, proxySign, + redeemDeterministicKeyGen, redeemSign, safeCreatePsk, sign, toPublic, + toVssPublicKey) import Pos.Data.Attributes (Attributes, mkAttributes) import Pos.Merkle (mkMerkleTree, mtRoot) import Serokell.Data.Memory.Units (Byte) import Test.Pos.Binary.Helpers.GoldenRoundTrip (discoverGolden, discoverRoundTrip, eachOf, - goldenTestBi, roundTripsBiBuildable, - roundTripsBiShow) + goldenTestBi, roundTripsBiBuildable, roundTripsBiShow) import Test.Pos.Core.Gen import Test.Pos.Crypto.Bi (getBytes) import Test.Pos.Crypto.Gen (genProtocolMagic) diff --git a/core/test/Test/Pos/Core/CborSpec.hs b/core/test/Test/Pos/Core/CborSpec.hs index cc0d43d7eed..c8e2cba21ad 100644 --- a/core/test/Test/Pos/Core/CborSpec.hs +++ b/core/test/Test/Pos/Core/CborSpec.hs @@ -16,7 +16,8 @@ import Test.Hspec (Spec, describe) import Test.QuickCheck (Arbitrary (..)) import Test.QuickCheck.Arbitrary.Generic (genericArbitrary, genericShrink) -import Pos.Binary.Class (Bi (..), Cons (..), Field (..), deriveSimpleBi, serialize, unsafeDeserialize) +import Pos.Binary.Class (Bi (..), Cons (..), Field (..), deriveSimpleBi, serialize, + unsafeDeserialize) import Pos.Core import Pos.Core.Common (ScriptVersion) diff --git a/core/test/Test/Pos/Core/Gen.hs b/core/test/Test/Pos/Core/Gen.hs index f4d1d02bdf2..e9c65e3fdf3 100644 --- a/core/test/Test/Pos/Core/Gen.hs +++ b/core/test/Test/Pos/Core/Gen.hs @@ -158,57 +158,53 @@ import qualified Hedgehog.Gen as Gen import qualified Hedgehog.Range as Range import Pos.Binary.Class (Bi, Raw (..), asBinary) import Pos.Core.Block (BlockBodyAttributes, BlockHeader (..), BlockHeaderAttributes, - BlockSignature (..), GenesisBlockHeader, GenesisBody (..), - GenesisConsensusData (..), GenesisExtraHeaderData (..), - GenesisProof (..), HeaderHash, MainBlockHeader, MainBody (..), - MainConsensusData (..), MainExtraBodyData (..), - MainExtraHeaderData (..), MainProof (..), MainToSign (..), - mkGenericHeader, mkMainHeaderExplicit) + BlockSignature (..), GenesisBlockHeader, GenesisBody (..), + GenesisConsensusData (..), GenesisExtraHeaderData (..), GenesisProof (..), + HeaderHash, MainBlockHeader, MainBody (..), MainConsensusData (..), + MainExtraBodyData (..), MainExtraHeaderData (..), MainProof (..), + MainToSign (..), mkGenericHeader, mkMainHeaderExplicit) import Pos.Core.Common (AddrAttributes (..), AddrSpendingData (..), - AddrStakeDistribution (..), AddrType (..), Address (..), - BlockCount (..), ChainDifficulty (..), Coeff (..), Coin (..), - CoinPortion (..), Script (..), ScriptVersion, SharedSeed (..), - SlotLeaders, StakeholderId, StakesList, StakesMap, - TxFeePolicy (..), TxSizeLinear (..), coinPortionDenominator, - makeAddress, maxCoinVal, mkMultiKeyDistr) + AddrStakeDistribution (..), AddrType (..), Address (..), BlockCount (..), + ChainDifficulty (..), Coeff (..), Coin (..), CoinPortion (..), Script (..), + ScriptVersion, SharedSeed (..), SlotLeaders, StakeholderId, StakesList, + StakesMap, TxFeePolicy (..), TxSizeLinear (..), coinPortionDenominator, + makeAddress, maxCoinVal, mkMultiKeyDistr) import Pos.Core.Configuration (CoreConfiguration (..), GenesisConfiguration (..), - GenesisHash (..)) + GenesisHash (..)) import Pos.Core.Delegation (DlgPayload (..), HeavyDlgIndex (..), LightDlgIndices (..), - ProxySKBlockInfo, ProxySKHeavy) + ProxySKBlockInfo, ProxySKHeavy) import Pos.Core.Genesis (FakeAvvmOptions (..), GenesisAvvmBalances (..), - GenesisDelegation (..), GenesisInitializer (..), - GenesisProtocolConstants (..), GenesisSpec (..), - TestnetBalanceOptions (..), mkGenesisSpec) + GenesisDelegation (..), GenesisInitializer (..), + GenesisProtocolConstants (..), GenesisSpec (..), TestnetBalanceOptions (..), + mkGenesisSpec) import Pos.Core.ProtocolConstants (ProtocolConstants (..), VssMaxTTL (..), VssMinTTL (..)) import Pos.Core.Slotting (EpochIndex (..), EpochOrSlot (..), FlatSlotId, - LocalSlotIndex (..), SlotCount (..), SlotId (..), TimeDiff (..), - Timestamp (..), localSlotIndexMaxBound, localSlotIndexMinBound) + LocalSlotIndex (..), SlotCount (..), SlotId (..), TimeDiff (..), + Timestamp (..), localSlotIndexMaxBound, localSlotIndexMinBound) import Pos.Core.Ssc (Commitment, CommitmentSignature, CommitmentsMap, InnerSharesMap, - Opening, OpeningsMap, SharesDistribution, SharesMap, - SignedCommitment, SscPayload (..), SscProof, VssCertificate (..), - VssCertificatesHash, VssCertificatesMap (..), mkCommitmentsMap, - mkSscProof, mkVssCertificate, mkVssCertificatesMap, - randCommitmentAndOpening) + Opening, OpeningsMap, SharesDistribution, SharesMap, SignedCommitment, + SscPayload (..), SscProof, VssCertificate (..), VssCertificatesHash, + VssCertificatesMap (..), mkCommitmentsMap, mkSscProof, mkVssCertificate, + mkVssCertificatesMap, randCommitmentAndOpening) import Pos.Core.Txp (Tx (..), TxAttributes, TxAux (..), TxId, TxIn (..), TxInWitness (..), - TxOut (..), TxOutAux (..), TxPayload (..), TxProof (..), TxSig, - TxSigData (..), TxWitness, mkTxPayload) + TxOut (..), TxOutAux (..), TxPayload (..), TxProof (..), TxSig, + TxSigData (..), TxWitness, mkTxPayload) import Pos.Core.Update (ApplicationName (..), BlockVersion (..), BlockVersionData (..), - BlockVersionModifier (..), SoftforkRule (..), - SoftwareVersion (..), SystemTag (..), UpAttributes, UpId, - UpdateData (..), UpdatePayload (..), UpdateProof, - UpdateProposal (..), UpdateProposalToSign (..), UpdateProposals, - UpdateVote (..), VoteId, mkUpdateVote) + BlockVersionModifier (..), SoftforkRule (..), SoftwareVersion (..), + SystemTag (..), UpAttributes, UpId, UpdateData (..), UpdatePayload (..), + UpdateProof, UpdateProposal (..), UpdateProposalToSign (..), UpdateProposals, + UpdateVote (..), VoteId, mkUpdateVote) import Pos.Crypto (Hash, ProtocolMagic, decodeHash, deterministic, hash, safeCreatePsk, - sign) + sign) import Pos.Data.Attributes (Attributes (..), mkAttributes) import Pos.Merkle (MerkleRoot (..), MerkleTree (..), mkMerkleTree, mtRoot) import Pos.Util.Util (leftToPanic) import Serokell.Data.Memory.Units (Byte) import Test.Pos.Crypto.Gen (genAbstractHash, genDecShare, genHDAddressPayload, - genProtocolMagic, genProxySignature, genPublicKey, - genRedeemPublicKey, genRedeemSignature, genSafeSigner, - genSecretKey, genSignTag, genSignature, genVssPublicKey) + genProtocolMagic, genProxySignature, genPublicKey, genRedeemPublicKey, + genRedeemSignature, genSafeSigner, genSecretKey, genSignTag, genSignature, + genVssPublicKey) ---------------------------------------------------------------------------- diff --git a/crypto/test/Test/Pos/Crypto/Bi.hs b/crypto/test/Test/Pos/Crypto/Bi.hs index a8f3a333d18..2a35cc666fc 100644 --- a/crypto/test/Test/Pos/Crypto/Bi.hs +++ b/crypto/test/Test/Pos/Crypto/Bi.hs @@ -21,18 +21,16 @@ import Hedgehog (Gen, Property) import qualified Hedgehog as H import Pos.Crypto (AbstractHash, EncShare, PassPhrase, ProtocolMagic (..), ProxyCert, - ProxySecretKey, PublicKey (..), RedeemSignature, - SafeSigner (FakeSigner), Secret, SecretKey (..), SecretProof, - SignTag (SignForTestingOnly), Signature, VssKeyPair, WithHash, - decryptShare, deriveHDPassphrase, deterministic, - deterministicVssKeyGen, genSharedSecret, hash, mkSigned, noPassEncrypt, - packHDAddressAttr, proxySign, redeemDeterministicKeyGen, redeemSign, - safeCreateProxyCert, safeCreatePsk, sign, toPublic, toVssPublicKey) + ProxySecretKey, PublicKey (..), RedeemSignature, SafeSigner (FakeSigner), + Secret, SecretKey (..), SecretProof, SignTag (SignForTestingOnly), Signature, + VssKeyPair, WithHash, decryptShare, deriveHDPassphrase, deterministic, + deterministicVssKeyGen, genSharedSecret, hash, mkSigned, noPassEncrypt, + packHDAddressAttr, proxySign, redeemDeterministicKeyGen, redeemSign, + safeCreateProxyCert, safeCreatePsk, sign, toPublic, toVssPublicKey) import Test.Pos.Binary.Helpers.GoldenRoundTrip (discoverGolden, discoverRoundTrip, eachOf, - goldenTestBi, roundTripsAesonBuildable, - roundTripsAesonShow, - roundTripsBiBuildable, roundTripsBiShow) + goldenTestBi, roundTripsAesonBuildable, roundTripsAesonShow, + roundTripsBiBuildable, roundTripsBiShow) import Test.Pos.Crypto.Gen -------------------------------------------------------------------------------- diff --git a/crypto/test/Test/Pos/Crypto/Gen.hs b/crypto/test/Test/Pos/Crypto/Gen.hs index 0bbffeba2f0..cee3597ce5a 100644 --- a/crypto/test/Test/Pos/Crypto/Gen.hs +++ b/crypto/test/Test/Pos/Crypto/Gen.hs @@ -66,19 +66,18 @@ import Pos.Binary.Class (Bi) import Pos.Crypto (PassPhrase) import Pos.Crypto.Configuration (ProtocolMagic (..)) import Pos.Crypto.Hashing (AbstractHash (..), HashAlgorithm, WithHash, abstractHash, - withHash) + withHash) import Pos.Crypto.HD (HDAddressPayload (..), HDPassphrase (..)) import Pos.Crypto.Random (deterministic) import Pos.Crypto.SecretSharing (DecShare, EncShare, Secret, SecretProof, VssKeyPair, - VssPublicKey, decryptShare, deterministicVssKeyGen, - genSharedSecret, toVssPublicKey) + VssPublicKey, decryptShare, deterministicVssKeyGen, genSharedSecret, + toVssPublicKey) import Pos.Crypto.Signing (EncryptedSecretKey, ProxyCert, ProxySecretKey, ProxySignature, - PublicKey, SafeSigner (..), SecretKey, SignTag (..), Signature, - Signed, createPsk, deterministicKeyGen, mkSigned, - noPassEncrypt, proxySign, safeCreateProxyCert, safeCreatePsk, - sign, signEncoded, toPublic) + PublicKey, SafeSigner (..), SecretKey, SignTag (..), Signature, Signed, + createPsk, deterministicKeyGen, mkSigned, noPassEncrypt, proxySign, + safeCreateProxyCert, safeCreatePsk, sign, signEncoded, toPublic) import Pos.Crypto.Signing.Redeem (RedeemPublicKey, RedeemSecretKey, RedeemSignature, - redeemDeterministicKeyGen, redeemSign) + redeemDeterministicKeyGen, redeemSign) ---------------------------------------------------------------------------- -- Protocol Magic Generator diff --git a/db/Pos/DB/Class.hs b/db/Pos/DB/Class.hs index b11b2f36550..639d38f101b 100644 --- a/db/Pos/DB/Class.hs +++ b/db/Pos/DB/Class.hs @@ -59,7 +59,7 @@ import Serokell.Data.Memory.Units (Byte) import Pos.Binary.Class (Bi, decodeFull') import Pos.Core (Block, BlockHeader, BlockVersionData (..), EpochIndex, HasConfiguration, - HeaderHash, isBootstrapEra) + HeaderHash, isBootstrapEra) import Pos.DB.Error (DBError (DBMalformed)) import Pos.Util.Util (eitherToThrow) diff --git a/infra/Pos/Infra/Binary/Slotting.hs b/infra/Pos/Infra/Binary/Slotting.hs index 9ae38156298..49e7ac8966c 100644 --- a/infra/Pos/Infra/Binary/Slotting.hs +++ b/infra/Pos/Infra/Binary/Slotting.hs @@ -12,11 +12,8 @@ import Data.Time.Units (Millisecond) import Pos.Binary.Class (Bi (..), Cons (..), Field (..), deriveSimpleBi) import Pos.Core.Slotting (TimeDiff) -import Pos.Infra.Slotting.Types (EpochSlottingData (..), - SlottingData, - createSlottingDataUnsafe, - getSlottingDataMap, - isValidSlottingDataMap) +import Pos.Infra.Slotting.Types (EpochSlottingData (..), SlottingData, + createSlottingDataUnsafe, getSlottingDataMap, isValidSlottingDataMap) import Pos.Util.Util (cborError) deriveSimpleBi ''EpochSlottingData [ diff --git a/lib/bench/Bench/Pos/Diffusion/BlockDownload.hs b/lib/bench/Bench/Pos/Diffusion/BlockDownload.hs index e9b3bc66ebb..4cad23e6c4b 100644 --- a/lib/bench/Bench/Pos/Diffusion/BlockDownload.hs +++ b/lib/bench/Bench/Pos/Diffusion/BlockDownload.hs @@ -6,9 +6,9 @@ -- Currently only the batched block requests are wired up. The streaming -- definition is not yet available. {-# OPTIONS_GHC -fno-warn-orphans #-} +{-# LANGUAGE BangPatterns #-} +{-# LANGUAGE OverloadedStrings #-} {-# LANGUAGE ScopedTypeVariables #-} -{-# LANGUAGE OverloadedStrings #-} -{-# LANGUAGE BangPatterns #-} module Bench.Pos.Diffusion.BlockDownload where @@ -35,26 +35,24 @@ import qualified Node import Pipes (each) import Pos.Binary (serialize, serialize') -import Pos.Core (BlockVersion (..), Block, HeaderHash, BlockHeader) +import Pos.Core (Block, BlockHeader, BlockVersion (..), HeaderHash) import qualified Pos.Core as Core (getBlockHeader) import Pos.Core.ProtocolConstants (ProtocolConstants (..)) import Pos.Crypto (ProtocolMagic (..)) import Pos.Crypto.Hashing (Hash, unsafeMkAbstractHash) -import Pos.DB.Class (SerializedBlock, Serialized (..)) -import Pos.Diffusion.Full (FullDiffusionConfiguration (..), - FullDiffusionInternals (..), - RunFullDiffusionInternals (..), - diffusionLayerFullExposeInternals) +import Pos.DB.Class (Serialized (..), SerializedBlock) +import Pos.Diffusion.Full (FullDiffusionConfiguration (..), FullDiffusionInternals (..), + RunFullDiffusionInternals (..), diffusionLayerFullExposeInternals) import qualified Pos.Infra.Diffusion.Transport.TCP as Diffusion (bracketTransportTCP) import Pos.Infra.Diffusion.Types as Diffusion (Diffusion (..), StreamEntry (..)) import qualified Pos.Infra.Network.Policy as Policy import Pos.Infra.Network.Types (Bucket (..)) import Pos.Infra.Reporting.Health.Types (HealthStatus (..)) -import Pos.Logic.Types as Logic (Logic (..)) import Pos.Logic.Pure (pureLogic) +import Pos.Logic.Types as Logic (Logic (..)) import Pos.Core.Chrono (NewestFirst (..), OldestFirst (..)) -import Pos.Util.Trace (wlogTrace, noTrace) +import Pos.Util.Trace (noTrace, wlogTrace) import Test.Pos.Block.Arbitrary.Generate (generateMainBlock) -- TODO diff --git a/lib/src/Pos/AllSecrets.hs b/lib/src/Pos/AllSecrets.hs index ab515f8ef6b..80cb048735f 100644 --- a/lib/src/Pos/AllSecrets.hs +++ b/lib/src/Pos/AllSecrets.hs @@ -24,8 +24,7 @@ import Formatting (bprint, int, (%)) import Serokell.Util (listJson, mapJson) import Pos.Core (AddrSpendingData (..), Address, IsBootstrapEraAddr (..), StakeholderId, - addressHash, checkAddrSpendingData, makePubKeyAddress, - makePubKeyAddressBoot) + addressHash, checkAddrSpendingData, makePubKeyAddress, makePubKeyAddressBoot) import Pos.Crypto (PublicKey, SecretKey, toPublic) -- | This map effectively provides inverse of 'hash' and diff --git a/lib/src/Pos/Binary/Communication.hs b/lib/src/Pos/Binary/Communication.hs index 54d25153cf1..ca669e6106f 100644 --- a/lib/src/Pos/Binary/Communication.hs +++ b/lib/src/Pos/Binary/Communication.hs @@ -16,21 +16,16 @@ import qualified Data.ByteString.Lazy as LBS import Data.Word (Word32) import Pos.Binary.Class (Bi (..), Cons (..), Field (..), decodeKnownCborDataItem, - decodeUnknownCborDataItem, deriveSimpleBi, - encodeKnownCborDataItem, encodeListLen, - encodeUnknownCborDataItem, enforceSize, - serialize, serialize') + decodeUnknownCborDataItem, deriveSimpleBi, encodeKnownCborDataItem, + encodeListLen, encodeUnknownCborDataItem, enforceSize, serialize, serialize') import Pos.Block.BHelpers () -import Pos.Block.Network (MsgBlock (..), MsgSerializedBlock (..), MsgGetBlocks (..), MsgGetHeaders (..), - MsgHeaders (..), MsgStream (..), MsgStreamStart (..), - MsgStreamUpdate (..), MsgStreamBlock (..)) +import Pos.Block.Network (MsgBlock (..), MsgGetBlocks (..), MsgGetHeaders (..), + MsgHeaders (..), MsgSerializedBlock (..), MsgStream (..), MsgStreamBlock (..), + MsgStreamStart (..), MsgStreamUpdate (..)) import Pos.Core (BlockVersion, HeaderHash) import Pos.DB.Class (Serialized (..)) -import Pos.Infra.Communication.Types.Protocol (HandlerSpec (..), - HandlerSpecs, - MsgSubscribe (..), - MsgSubscribe1 (..), - VerInfo (..)) +import Pos.Infra.Communication.Types.Protocol (HandlerSpec (..), HandlerSpecs, + MsgSubscribe (..), MsgSubscribe1 (..), VerInfo (..)) import Pos.Util.Util (cborError) -- TODO: move into each component @@ -80,7 +75,7 @@ instance Bi MsgBlock where -- serialize (MsgBlock b) = serializeMsgSerializedBlock (MsgSerializedBlock $ serialize b) -- ``` serializeMsgSerializedBlock :: MsgSerializedBlock -> BS.ByteString -serializeMsgSerializedBlock (MsgSerializedBlock b) = "\x82\x0" <> unSerialized b +serializeMsgSerializedBlock (MsgSerializedBlock b) = "\x82\x0" <> unSerialized b serializeMsgSerializedBlock (MsgNoSerializedBlock t) = serialize' (MsgNoBlock t) -- Serialize `MsgSerializedBlock` with the property diff --git a/lib/src/Pos/Client/CLI/Options.hs b/lib/src/Pos/Client/CLI/Options.hs index eaf00c0d89a..b6a8f61d806 100644 --- a/lib/src/Pos/Client/CLI/Options.hs +++ b/lib/src/Pos/Client/CLI/Options.hs @@ -29,10 +29,9 @@ import Pos.Util.OptParse (fromParsec) import Pos.Communication (NodeId) import Pos.Core (Timestamp (..)) +import Pos.Infra.Util.TimeWarp (NetworkAddress, addrParser, addrParserNoWildcard, + addressToNodeId) import Pos.Launcher.Configuration (ConfigurationOptions (..)) -import Pos.Infra.Util.TimeWarp (NetworkAddress, addrParser, - addrParserNoWildcard, - addressToNodeId) data CommonArgs = CommonArgs { logConfig :: !(Maybe FilePath) diff --git a/lib/src/Pos/Client/CLI/Util.hs b/lib/src/Pos/Client/CLI/Util.hs index fbb62c0e610..d6d93a37c5b 100644 --- a/lib/src/Pos/Client/CLI/Util.hs +++ b/lib/src/Pos/Client/CLI/Util.hs @@ -19,7 +19,7 @@ import qualified Data.Yaml as Yaml import Formatting (sformat, shown, (%)) import Mockable (CurrentTime, Mockable, currentTime) import System.Wlog (LoggerConfig (..), WithLogger, logInfo, parseLoggerConfig, - productionB) + productionB) import Text.Parsec (parserFail, try) import qualified Text.Parsec.Char as P import qualified Text.Parsec.Text as P @@ -30,7 +30,7 @@ import Pos.Client.CLI.Options (configurationOptions) import Pos.Configuration (nodeConfiguration) import Pos.Core (StakeholderId, Timestamp (..)) import Pos.Core.Configuration (HasConfiguration, canonicalGenesisJson, coreConfiguration, - genesisData, prettyGenesisJson) + genesisData, prettyGenesisJson) import Pos.Core.Genesis (gdStartTime) import Pos.Crypto (decodeAbstractHash) import Pos.Delegation.Configuration (dlgConfiguration) diff --git a/lib/src/Pos/Diffusion/Full/Txp.hs b/lib/src/Pos/Diffusion/Full/Txp.hs index ddd90a0a5a9..57fb43230d6 100644 --- a/lib/src/Pos/Diffusion/Full/Txp.hs +++ b/lib/src/Pos/Diffusion/Full/Txp.hs @@ -7,30 +7,26 @@ module Pos.Diffusion.Full.Txp , txOutSpecs ) where -import Universum import Data.Tagged (Tagged) import qualified Network.Broadcast.OutboundQueue as OQ +import Universum import Pos.Binary.Communication () import Pos.Binary.Txp () -import Pos.Communication.Message () import Pos.Communication.Limits (mlTxMsgContents) +import Pos.Communication.Message () import Pos.Core.Txp (TxAux (..), TxId) import Pos.Crypto (hash) -import Pos.Infra.Communication.Protocol (EnqueueMsg, MsgType (..), - Origin (..), NodeId, - MkListeners, OutSpecs) -import Pos.Infra.Communication.Relay (invReqDataFlowTK, resOk, - InvReqDataParams (..), - invReqMsgType, Relay (..), - relayListeners, - MempoolParams (..), - relayPropagateOut) +import Pos.Infra.Communication.Protocol (EnqueueMsg, MkListeners, MsgType (..), NodeId, + Origin (..), OutSpecs) +import Pos.Infra.Communication.Relay (InvReqDataParams (..), MempoolParams (..), + Relay (..), invReqDataFlowTK, invReqMsgType, relayListeners, + relayPropagateOut, resOk) import Pos.Infra.Network.Types (Bucket) import Pos.Logic.Types (Logic (..)) import qualified Pos.Logic.Types as KV (KeyVal (..)) import Pos.Txp.Network.Types (TxMsgContents (..)) -import Pos.Util.Trace (Trace, Severity) +import Pos.Util.Trace (Severity, Trace) -- | Send Tx to given addresses. -- Returns 'True' if any peer accepted and applied this transaction. diff --git a/lib/test/Test/Pos/Cbor/CborSpec.hs b/lib/test/Test/Pos/Cbor/CborSpec.hs index 193f1aa3f78..5da75954a24 100644 --- a/lib/test/Test/Pos/Cbor/CborSpec.hs +++ b/lib/test/Test/Pos/Cbor/CborSpec.hs @@ -28,16 +28,16 @@ import Pos.Binary.Communication () import Pos.Binary.Ssc () import qualified Pos.Block.Network as BT import qualified Pos.Block.Types as BT -import Pos.Core (ProxySKHeavy, StakeholderId, VssCertificate) import qualified Pos.Communication as C import Pos.Communication.Limits (mlOpening, mlUpdateVote, mlVssCertificate) +import Pos.Core (ProxySKHeavy, StakeholderId, VssCertificate) import qualified Pos.Core.Block as BT import qualified Pos.Core.Ssc as Ssc import Pos.Crypto.Signing (EncryptedSecretKey) import Pos.Delegation (DlgPayload, DlgUndo) import Pos.Infra.Binary () import Pos.Infra.Communication.Limits.Instances (mlDataMsg, mlInvMsg, mlMempoolMsg, - mlReqMsg) + mlReqMsg) import qualified Pos.Infra.Communication.Relay as R import Pos.Infra.Communication.Types.Relay (DataMsg (..)) import qualified Pos.Infra.DHT.Model as DHT diff --git a/lib/test/Test/Pos/Update/PollSpec.hs b/lib/test/Test/Pos/Update/PollSpec.hs index d2b2e35583d..c6e6ba2b310 100644 --- a/lib/test/Test/Pos/Update/PollSpec.hs +++ b/lib/test/Test/Pos/Update/PollSpec.hs @@ -11,11 +11,11 @@ import qualified Data.HashSet as HS import Test.Hspec (Spec, describe) import Test.Hspec.QuickCheck (modifyMaxSuccess, prop) import Test.QuickCheck (Arbitrary (..), Gen, Property, conjoin, forAll, listOf, suchThat, - (===)) + (===)) import Test.QuickCheck.Arbitrary.Generic (genericArbitrary, genericShrink) import Pos.Core (ApplicationName, BlockVersion (..), BlockVersionData (..), - HasConfiguration, SoftwareVersion (..), StakeholderId, addressHash) + HasConfiguration, SoftwareVersion (..), StakeholderId, addressHash) import Pos.Core.Update (UpId, UpdateProposal (..)) import Pos.Crypto (hash) import Pos.Infra.Slotting.Types (SlottingData) diff --git a/lrc/src/Pos/Lrc/DB/Leaders.hs b/lrc/src/Pos/Lrc/DB/Leaders.hs index 4b5bc7af22a..c339fe442cd 100644 --- a/lrc/src/Pos/Lrc/DB/Leaders.hs +++ b/lrc/src/Pos/Lrc/DB/Leaders.hs @@ -20,7 +20,7 @@ import Universum import Pos.Binary.Class (serialize') import Pos.Core (EpochIndex, HasProtocolConstants, SlotCount, SlotId (SlotId), - SlotLeaders, StakeholderId, flattenSlotId, unsafeMkLocalSlotIndex) + SlotLeaders, StakeholderId, flattenSlotId, unsafeMkLocalSlotIndex) import Pos.DB.Class (MonadDB, MonadDBRead) import Pos.Lrc.DB.Common (dbHasKey, getBi, putBatch, putBatchBi, putBi, toRocksOps) import Pos.Lrc.Genesis (genesisLeaders) diff --git a/lrc/src/Pos/Lrc/DB/Richmen.hs b/lrc/src/Pos/Lrc/DB/Richmen.hs index 147f7ad3023..81f5892078e 100644 --- a/lrc/src/Pos/Lrc/DB/Richmen.hs +++ b/lrc/src/Pos/Lrc/DB/Richmen.hs @@ -28,8 +28,8 @@ import qualified Data.HashSet as HS import Pos.Binary.Class (Bi) import Pos.Core (Coin, CoinPortion, ProxySKHeavy, StakeholderId, addressHash, - applyCoinPortionUp, gdHeavyDelegation, genesisData, sumCoins, - unGenesisDelegation, unsafeIntegerToCoin) + applyCoinPortionUp, gdHeavyDelegation, genesisData, sumCoins, + unGenesisDelegation, unsafeIntegerToCoin) import Pos.Crypto (pskDelegatePk) import Pos.DB.Class (MonadDB) import Pos.Lrc.Consumer.Delegation (tryGetDlgRichmen) diff --git a/ssc/Pos/Ssc/Base.hs b/ssc/Pos/Ssc/Base.hs index 2bcca4309b8..6602709c993 100644 --- a/ssc/Pos/Ssc/Base.hs +++ b/ssc/Pos/Ssc/Base.hs @@ -49,16 +49,16 @@ import Serokell.Util (VerificationRes, verifyGeneric) import Pos.Binary.Class (biSize, fromBinary) import Pos.Core (EpochIndex (..), LocalSlotIndex, SharedSeed (..), SlotCount, SlotId (..), - StakeholderId, addressHash, unsafeMkLocalSlotIndexExplicit) + StakeholderId, addressHash, unsafeMkLocalSlotIndexExplicit) import Pos.Core.Configuration (HasProtocolConstants, protocolConstants, vssMaxTTL, - vssMinTTL) + vssMinTTL) import Pos.Core.Limits (stripHashMap) import Pos.Core.ProtocolConstants (ProtocolConstants (..), pcSlotSecurityParam) import Pos.Core.Ssc (Commitment (..), CommitmentsMap (getCommitmentsMap), Opening (..), - SignedCommitment, SscPayload (..), VssCertificate (vcExpiryEpoch), - VssCertificatesMap (..), mkCommitmentsMapUnsafe) + SignedCommitment, SscPayload (..), VssCertificate (vcExpiryEpoch), + VssCertificatesMap (..), mkCommitmentsMapUnsafe) import Pos.Crypto (ProtocolMagic, Secret, SecretKey, SignTag (SignCommitment), Threshold, - checkSig, getDhSecret, secretToDhSecret, sign, toPublic, verifySecret) + checkSig, getDhSecret, secretToDhSecret, sign, toPublic, verifySecret) -- | Convert Secret to SharedSeed. secretToSharedSeed :: Secret -> SharedSeed diff --git a/ssc/Pos/Ssc/Functions.hs b/ssc/Pos/Ssc/Functions.hs index 48671eff806..d0903e25c54 100644 --- a/ssc/Pos/Ssc/Functions.hs +++ b/ssc/Pos/Ssc/Functions.hs @@ -22,13 +22,12 @@ import qualified Data.HashMap.Strict as HM import Serokell.Util.Verify (isVerSuccess) import Pos.Core (EpochIndex (..), HasGenesisData, HasProtocolConstants, IsMainHeader, - SlotId (..), StakeholderId, VssCertificatesMap, genesisVssCerts, - headerSlotL) + SlotId (..), StakeholderId, VssCertificatesMap, genesisVssCerts, headerSlotL) import Pos.Core.Slotting (crucialSlot) import Pos.Core.Ssc (CommitmentsMap (getCommitmentsMap), SscPayload (..)) import Pos.Crypto (ProtocolMagic) import Pos.Ssc.Base (checkCertTTL, isCommitmentId, isOpeningId, isSharesId, - verifySignedCommitment, vssThreshold) + verifySignedCommitment, vssThreshold) import Pos.Ssc.Error (SscVerifyError (..)) import Pos.Ssc.Toss.Base (verifyEntriesGuardM) import Pos.Ssc.Types (SscGlobalState (..)) diff --git a/tools/src/dbgen/Lib.hs b/tools/src/dbgen/Lib.hs index ada2e56473e..6a7d43cd108 100644 --- a/tools/src/dbgen/Lib.hs +++ b/tools/src/dbgen/Lib.hs @@ -32,16 +32,14 @@ import Pos.Util.Servant (decodeCType) import Pos.Util.Util (lensOf) import Pos.Wallet.Web.Account (GenSeed (..)) import Pos.Wallet.Web.ClientTypes (AccountId (..), CAccount (..), CAccountInit (..), - CAccountMeta (..), CAddress (..), CBackupPhrase (..), - CId (..), CWallet (..), CWalletAssurance (..), - CWalletInit (..), CWalletMeta (..), Wal) + CAccountMeta (..), CAddress (..), CBackupPhrase (..), CId (..), CWallet (..), + CWalletAssurance (..), CWalletInit (..), CWalletMeta (..), Wal) import Pos.Wallet.Web.ClientTypes.Instances () import Pos.Wallet.Web.Methods.Logic (getAccounts, newAccountIncludeUnready, newAddress) import Pos.Wallet.Web.Methods.Restore (newWallet) import Pos.Wallet.Web.Mode (WalletWebMode) import Pos.Wallet.Web.State.State (askWalletDB, getWalletSnapshot, getWalletUtxo, - insertIntoHistoryCache, setWalletUtxo, - updateWalletBalancesAndUtxo) + insertIntoHistoryCache, setWalletUtxo, updateWalletBalancesAndUtxo) import Test.QuickCheck (Gen, arbitrary, choose, frequency, generate, vectorOf) import Text.Printf (printf) diff --git a/txp/src/Pos/Script.hs b/txp/src/Pos/Script.hs index 422b9c4d9cd..ca4047eecdd 100644 --- a/txp/src/Pos/Script.hs +++ b/txp/src/Pos/Script.hs @@ -19,9 +19,9 @@ module Pos.Script import Universum hiding (lift) import Control.Exception (ArithException (..), ArrayException (..), ErrorCall (..), - PatternMatchFail (..)) + PatternMatchFail (..)) import Control.Exception.Safe (Handler (..), SomeException (..), catches, - displayException) + displayException) import Control.Lens (_Left) import Control.Monad.Error.Class (throwError) import qualified Data.ByteArray as BA diff --git a/txp/src/Pos/Script/Examples.hs b/txp/src/Pos/Script/Examples.hs index ca12e4eaa1b..e727e128cbb 100644 --- a/txp/src/Pos/Script/Examples.hs +++ b/txp/src/Pos/Script/Examples.hs @@ -37,7 +37,7 @@ import Universum import Pos.Core (StakeholderId, TxSigData) import Pos.Crypto (SafeSigner, SignTag (SignTx), deterministicKeyGen, fullPublicKeyHexF, - fullSignatureHexF, hashHexF, safeSign, safeToPublic, signRaw, signTag) + fullSignatureHexF, hashHexF, safeSign, safeToPublic, signRaw, signTag) import Pos.Crypto.Configuration (ProtocolMagic) import Pos.Script (Script, parseRedeemer, parseValidator) diff --git a/txp/src/Pos/Txp/Base.hs b/txp/src/Pos/Txp/Base.hs index f7779415d2c..b77a5349610 100644 --- a/txp/src/Pos/Txp/Base.hs +++ b/txp/src/Pos/Txp/Base.hs @@ -18,10 +18,10 @@ import Data.List (zipWith) import qualified Data.Map.Strict as M import Pos.Core (AddrStakeDistribution (..), Address (..), Coin, CoinPortion, - GenesisData (..), HasGenesisData, StakeholderId, StakesList, - aaStakeDistribution, addrAttributesUnwrapped, applyCoinPortionDown, - coinToInteger, genesisData, mkCoin, sumCoins, unsafeAddCoin, - unsafeGetCoin, unsafeIntegerToCoin) + GenesisData (..), HasGenesisData, StakeholderId, StakesList, + aaStakeDistribution, addrAttributesUnwrapped, applyCoinPortionDown, + coinToInteger, genesisData, mkCoin, sumCoins, unsafeAddCoin, unsafeGetCoin, + unsafeIntegerToCoin) import Pos.Core.Genesis (GenesisWStakeholders (..)) import Pos.Core.Txp (TxAux (..), TxOut (..), TxOutAux (..), TxPayload (..), mkTxPayload) import Pos.Crypto (hash) diff --git a/txp/src/Pos/Txp/Toil/Utxo/Functions.hs b/txp/src/Pos/Txp/Toil/Utxo/Functions.hs index 1c580d40bc8..bc4d9f52b9a 100644 --- a/txp/src/Pos/Txp/Toil/Utxo/Functions.hs +++ b/txp/src/Pos/Txp/Toil/Utxo/Functions.hs @@ -19,18 +19,17 @@ import Formatting (int, sformat, (%)) import Serokell.Util (allDistinct, enumerate) import Pos.Core (AddrType (..), Address (..), integerToCoin, isRedeemAddress, - isUnknownAddressType, sumCoins) + isUnknownAddressType, sumCoins) import Pos.Core.Common (checkPubKeyAddress, checkRedeemAddress, checkScriptAddress) import Pos.Core.Txp (Tx (..), TxAttributes, TxAux (..), TxIn (..), TxInWitness (..), - TxOut (..), TxOutAux (..), TxSigData (..), TxUndo, TxWitness, - isTxInUnknown) + TxOut (..), TxOutAux (..), TxSigData (..), TxUndo, TxWitness, isTxInUnknown) import Pos.Crypto (SignTag (SignRedeemTx, SignTx), WithHash (..), checkSig, hash, - redeemCheckSig) + redeemCheckSig) import Pos.Crypto.Configuration (ProtocolMagic) import Pos.Data.Attributes (Attributes (attrRemain), areAttributesKnown) import Pos.Script (Script (..), isKnownScriptVersion, txScriptCheck) import Pos.Txp.Toil.Failure (ToilVerFailure (..), TxOutVerFailure (..), - WitnessVerFailure (..)) + WitnessVerFailure (..)) import Pos.Txp.Toil.Monad (UtxoM, utxoDel, utxoGet, utxoPut) import Pos.Txp.Toil.Types (TxFee (..)) import Pos.Util (liftEither) @@ -133,7 +132,7 @@ verifyTxUtxo protocolMagic ctx@VTxContext {..} lockedAssets ta@(TxAux UnsafeTx { -> ExceptT ToilVerFailure UtxoM (NonEmpty (TxIn, TxOutAux)) filterAssetLocked xs = case NE.filter notAssetLockedSrcAddr xs of - [] -> throwError ToilEmptyAfterFilter + [] -> throwError ToilEmptyAfterFilter (y:ys) -> pure (y :| ys) -- Return `True` iff none of the source addresses are in the lockedAssets set. diff --git a/txp/src/Pos/Txp/Toil/Utxo/Util.hs b/txp/src/Pos/Txp/Toil/Utxo/Util.hs index dcc4961b7e8..6fffe6304fe 100644 --- a/txp/src/Pos/Txp/Toil/Utxo/Util.hs +++ b/txp/src/Pos/Txp/Toil/Utxo/Util.hs @@ -16,7 +16,7 @@ import qualified Data.HashSet as HS import qualified Data.Map.Strict as M import Pos.Core (Address, Coin, HasGenesisData, StakesMap, sumCoins, unsafeAddCoin, - unsafeIntegerToCoin) + unsafeIntegerToCoin) import Pos.Core.Txp (TxOut (txOutValue), TxOutAux (..), _TxOut) import Pos.Txp.Base (addrBelongsTo, addrBelongsToSet, txOutStake) import Pos.Txp.Toil.Types (Utxo) diff --git a/txp/test/Test/Pos/Txp/Arbitrary.hs b/txp/test/Test/Pos/Txp/Arbitrary.hs index b5a52b8fa7d..9d8e8033164 100644 --- a/txp/test/Test/Pos/Txp/Arbitrary.hs +++ b/txp/test/Test/Pos/Txp/Arbitrary.hs @@ -31,8 +31,7 @@ import Test.QuickCheck.Arbitrary.Generic (genericArbitrary, genericShr import Pos.Binary.Class (Raw) import Pos.Core.Common (Coin, IsBootstrapEraAddr (..), makePubKeyAddress) import Pos.Core.Txp (Tx (..), TxAux (..), TxIn (..), TxInWitness (..), TxOut (..), - TxOutAux (..), TxPayload (..), TxProof (..), TxSigData (..), - mkTxPayload) + TxOutAux (..), TxPayload (..), TxProof (..), TxSigData (..), mkTxPayload) import Pos.Crypto (Hash, ProtocolMagic, SecretKey, SignTag (SignTx), hash, sign, toPublic) import Pos.Data.Attributes (mkAttributes) import Pos.Merkle (MerkleNode (..), MerkleRoot (..)) diff --git a/update/src/Pos/Binary/Update/Poll.hs b/update/src/Pos/Binary/Update/Poll.hs index 0da8a254d78..961ba164331 100644 --- a/update/src/Pos/Binary/Update/Poll.hs +++ b/update/src/Pos/Binary/Update/Poll.hs @@ -7,9 +7,9 @@ module Pos.Binary.Update.Poll import Universum import Pos.Binary.Class (Bi (..), Cons (..), Field (..), decodeListLenCanonical, - deriveSimpleBi, encodeListLen) + deriveSimpleBi, encodeListLen) import Pos.Core (ApplicationName, BlockVersion, ChainDifficulty, Coin, EpochIndex, - HeaderHash, NumSoftwareVersion, SlotId, SoftwareVersion, StakeholderId) + HeaderHash, NumSoftwareVersion, SlotId, SoftwareVersion, StakeholderId) import qualified Pos.Core.Update as U import Pos.Infra.Binary () import Pos.Infra.Slotting.Types (SlottingData) diff --git a/update/src/Pos/Update/Configuration.hs b/update/src/Pos/Update/Configuration.hs index 3f0c4be0d2e..9a4f37abb90 100644 --- a/update/src/Pos/Update/Configuration.hs +++ b/update/src/Pos/Update/Configuration.hs @@ -1,4 +1,4 @@ -{-# LANGUAGE Rank2Types #-} +{-# LANGUAGE Rank2Types #-} -- | Propagation of runtime configuration. diff --git a/update/src/Pos/Update/DB.hs b/update/src/Pos/Update/DB.hs index dd846550316..7e1dae973af 100644 --- a/update/src/Pos/Update/DB.hs +++ b/update/src/Pos/Update/DB.hs @@ -50,26 +50,25 @@ import UnliftIO (MonadUnliftIO) import Pos.Binary.Class (serialize') import Pos.Binary.Update () -import Pos.Core (ApplicationName, BlockVersion, ChainDifficulty, NumSoftwareVersion, - SlotId, SoftwareVersion (..), StakeholderId, TimeDiff (..), epochSlots, - HasCoreConfiguration) +import Pos.Core (ApplicationName, BlockVersion, ChainDifficulty, HasCoreConfiguration, + NumSoftwareVersion, SlotId, SoftwareVersion (..), StakeholderId, + TimeDiff (..), epochSlots) import Pos.Core.Configuration (genesisBlockVersionData) import Pos.Core.Update (BlockVersionData (..), UpId, UpdateProposal (..)) import Pos.Crypto (hash) import Pos.DB (DBIteratorClass (..), DBTag (..), IterType, MonadDB, MonadDBRead (..), - RocksBatchOp (..), dbSerializeValue, encodeWithKeyPrefix) + RocksBatchOp (..), dbSerializeValue, encodeWithKeyPrefix) import Pos.DB.Error (DBError (DBMalformed)) import Pos.DB.GState.Common (gsGetBi, writeBatchGState) import Pos.Infra.Binary () -import Pos.Infra.Slotting.Types (EpochSlottingData (..), - SlottingData, - createInitSlottingData) +import Pos.Infra.Slotting.Types (EpochSlottingData (..), SlottingData, + createInitSlottingData) import Pos.Update.Configuration (HasUpdateConfiguration, ourAppName, ourSystemTag) import Pos.Update.Constants (genesisBlockVersion, genesisSoftwareVersions) import Pos.Update.Poll.Types (BlockVersionState (..), ConfirmedProposalState (..), - DecidedProposalState (dpsDifficulty), ProposalState (..), - UndecidedProposalState (upsSlot), bvsIsConfirmed, - cpsSoftwareVersion, psProposal) + DecidedProposalState (dpsDifficulty), ProposalState (..), + UndecidedProposalState (upsSlot), bvsIsConfirmed, cpsSoftwareVersion, + psProposal) import Pos.Util.Util (maybeThrow) ---------------------------------------------------------------------------- diff --git a/update/src/Pos/Update/Download.hs b/update/src/Pos/Update/Download.hs index 416da56bec5..4c1d72c0313 100644 --- a/update/src/Pos/Update/Download.hs +++ b/update/src/Pos/Update/Download.hs @@ -19,7 +19,7 @@ import Formatting (build, sformat, stext, (%)) import Network.HTTP.Client (Manager, newManager) import Network.HTTP.Client.TLS (tlsManagerSettings) import Network.HTTP.Simple (getResponseBody, getResponseStatus, getResponseStatusCode, - httpLBS, parseRequest, setRequestManager) + httpLBS, parseRequest, setRequestManager) import qualified Serokell.Util.Base16 as B16 import Serokell.Util.Text (listJsonIndent, mapJson) import System.Directory (doesFileExist) diff --git a/update/src/Pos/Update/Logic/Global.hs b/update/src/Pos/Update/Logic/Global.hs index cc45c241e04..ea50024f84e 100644 --- a/update/src/Pos/Update/Logic/Global.hs +++ b/update/src/Pos/Update/Logic/Global.hs @@ -17,9 +17,9 @@ import System.Wlog (WithLogger, modifyLoggerName) import UnliftIO (MonadUnliftIO) import Pos.Core (ApplicationName, BlockVersion, ComponentBlock (..), HasCoreConfiguration, - HasProtocolConstants, NumSoftwareVersion, ProtocolMagic, - SoftwareVersion (..), StakeholderId, addressHash, blockVersionL, - epochIndexL, headerHashG, headerLeaderKeyL, headerSlotL) + HasProtocolConstants, NumSoftwareVersion, ProtocolMagic, SoftwareVersion (..), + StakeholderId, addressHash, blockVersionL, epochIndexL, headerHashG, + headerLeaderKeyL, headerSlotL) import Pos.Core.Chrono (NE, NewestFirst, OldestFirst) import Pos.Core.Update (BlockVersionData, UpId, UpdatePayload) import qualified Pos.DB.BatchOp as DB @@ -32,10 +32,10 @@ import Pos.Lrc.Context (HasLrcContext) import Pos.Update.Configuration (HasUpdateConfiguration, lastKnownBlockVersion) import Pos.Update.DB (UpdateOp (..)) import Pos.Update.Poll (BlockVersionState, ConfirmedProposalState, DBPoll, MonadPoll, - PollModifier (..), PollT, PollVerFailure, ProposalState, USUndo, - canCreateBlockBV, execPollT, execRollT, getAdoptedBV, - processGenesisBlock, recordBlockIssuance, reportUnexpectedError, - rollbackUS, runDBPoll, runPollT, verifyAndApplyUSPayload) + PollModifier (..), PollT, PollVerFailure, ProposalState, USUndo, + canCreateBlockBV, execPollT, execRollT, getAdoptedBV, processGenesisBlock, + recordBlockIssuance, reportUnexpectedError, rollbackUS, runDBPoll, runPollT, + verifyAndApplyUSPayload) import Pos.Util.AssertMode (inAssertMode) import qualified Pos.Util.Modifier as MM diff --git a/update/src/Pos/Update/Logic/Local.hs b/update/src/Pos/Update/Logic/Local.hs index cf66bb39d18..cea508c21b8 100644 --- a/update/src/Pos/Update/Logic/Local.hs +++ b/update/src/Pos/Update/Logic/Local.hs @@ -34,7 +34,7 @@ import UnliftIO (MonadUnliftIO) import Pos.Binary.Class (biSize) import Pos.Core (BlockVersionData (bvdMaxBlockSize), HeaderHash, ProtocolMagic, - SlotId (..), slotIdF) + SlotId (..), slotIdF) import Pos.Core.Update (UpId, UpdatePayload (..), UpdateProposal, UpdateVote (..)) import Pos.Crypto (PublicKey, shortHashF) import Pos.DB.Class (MonadDBRead) @@ -46,12 +46,11 @@ import Pos.Update.Configuration (HasUpdateConfiguration) import Pos.Update.Context (UpdateContext (..)) import qualified Pos.Update.DB as DB import Pos.Update.MemState (LocalVotes, MemPool (..), MemState (..), MemVar (mvState), - UpdateProposals, addToMemPool, withUSLock) + UpdateProposals, addToMemPool, withUSLock) import Pos.Update.Poll (MonadPoll (deactivateProposal), MonadPollRead (getProposal), - PollModifier, PollVerFailure (..), evalPollT, execPollT, - filterProposalsByThd, getAdoptedBV, modifyPollModifier, - normalizePoll, refreshPoll, reportUnexpectedError, runDBPoll, - runPollT, verifyAndApplyUSPayload) + PollModifier, PollVerFailure (..), evalPollT, execPollT, filterProposalsByThd, + getAdoptedBV, modifyPollModifier, normalizePoll, refreshPoll, + reportUnexpectedError, runDBPoll, runPollT, verifyAndApplyUSPayload) import Pos.Update.Poll.Types (canCombineVotes, psVotes) import Pos.Util.Util (HasLens (..), HasLens') diff --git a/update/src/Pos/Update/MemState.hs b/update/src/Pos/Update/MemState.hs index d89af7430d6..0db9f780508 100644 --- a/update/src/Pos/Update/MemState.hs +++ b/update/src/Pos/Update/MemState.hs @@ -6,4 +6,4 @@ module Pos.Update.MemState ) where import Pos.Update.MemState.Functions -import Pos.Update.MemState.Types \ No newline at end of file +import Pos.Update.MemState.Types diff --git a/update/src/Pos/Update/MemState/Functions.hs b/update/src/Pos/Update/MemState/Functions.hs index 6d2e436da6a..efc6a7233ec 100644 --- a/update/src/Pos/Update/MemState/Functions.hs +++ b/update/src/Pos/Update/MemState/Functions.hs @@ -14,8 +14,7 @@ import Pos.Binary.Update () import Pos.Core.Configuration () import Pos.Core.Update (UpdatePayload (..), UpdateVote (..)) import Pos.Crypto (PublicKey, hash) -import Pos.Infra.StateLock (Priority (..), StateLock, - withStateLockNoMetrics) +import Pos.Infra.StateLock (Priority (..), StateLock, withStateLockNoMetrics) import Pos.Update.MemState.Types (MemPool (..)) import Pos.Update.Poll (LocalVotes) import Pos.Util.Util (HasLens') diff --git a/update/src/Pos/Update/Network.hs b/update/src/Pos/Update/Network.hs index 4a114ec9e54..02912ae684e 100644 --- a/update/src/Pos/Update/Network.hs +++ b/update/src/Pos/Update/Network.hs @@ -4,4 +4,4 @@ module Pos.Update.Network ( module Pos.Update.Network.Listeners ) where -import Pos.Update.Network.Listeners \ No newline at end of file +import Pos.Update.Network.Listeners diff --git a/update/src/Pos/Update/Poll.hs b/update/src/Pos/Update/Poll.hs index 2a79c53d74f..32e98f5e873 100644 --- a/update/src/Pos/Update/Poll.hs +++ b/update/src/Pos/Update/Poll.hs @@ -13,13 +13,13 @@ module Pos.Update.Poll , module Pos.Update.Poll.Logic ) where -import Pos.Update.Poll.DBPoll import Pos.Update.Poll.Class +import Pos.Update.Poll.DBPoll import Pos.Update.Poll.Failure +import Pos.Update.Poll.Logic import Pos.Update.Poll.Modifier import Pos.Update.Poll.PollState import Pos.Update.Poll.Pure import Pos.Update.Poll.RollTrans import Pos.Update.Poll.Trans import Pos.Update.Poll.Types -import Pos.Update.Poll.Logic \ No newline at end of file diff --git a/update/src/Pos/Update/Poll/Class.hs b/update/src/Pos/Update/Poll/Class.hs index 02312b9bdc6..906f9c19ed7 100644 --- a/update/src/Pos/Update/Poll/Class.hs +++ b/update/src/Pos/Update/Poll/Class.hs @@ -13,12 +13,11 @@ import Control.Monad.Trans (MonadTrans) import System.Wlog (WithLogger) import Pos.Core (ApplicationName, BlockVersion, BlockVersionData, ChainDifficulty, Coin, - EpochIndex, NumSoftwareVersion, SlotId, - SoftwareVersion, StakeholderId) + EpochIndex, NumSoftwareVersion, SlotId, SoftwareVersion, StakeholderId) import Pos.Core.Update (UpId) import Pos.Infra.Slotting.Types (SlottingData) import Pos.Update.Poll.Types (BlockVersionState, ConfirmedProposalState, - DecidedProposalState, ProposalState, UndecidedProposalState) + DecidedProposalState, ProposalState, UndecidedProposalState) ---------------------------------------------------------------------------- -- Read-only diff --git a/update/src/Pos/Update/Poll/Failure.hs b/update/src/Pos/Update/Poll/Failure.hs index 270e195d030..5a8f091bbf0 100644 --- a/update/src/Pos/Update/Poll/Failure.hs +++ b/update/src/Pos/Update/Poll/Failure.hs @@ -5,14 +5,14 @@ module Pos.Update.Poll.Failure , reportUnexpectedError ) where -import Universum hiding (last, id) +import Universum hiding (id, last) import qualified Data.Text.Buildable import Formatting (bprint, build, int, sformat, stext, (%)) import Serokell.Data.Memory.Units (Byte, memory) import Pos.Core (ApplicationName, BlockVersion, BlockVersionData, Coin, EpochIndex, - HeaderHash, NumSoftwareVersion, ScriptVersion, StakeholderId, coinF) + HeaderHash, NumSoftwareVersion, ScriptVersion, StakeholderId, coinF) import Pos.Core.Update (BlockVersionModifier, UpAttributes, UpId) import Pos.Crypto (shortHashF) import Pos.Infra.Reporting (MonadReporting, reportError) diff --git a/update/src/Pos/Update/Poll/Logic/Apply.hs b/update/src/Pos/Update/Poll/Logic/Apply.hs index 3dca8bf37be..1a85da0af05 100644 --- a/update/src/Pos/Update/Poll/Logic/Apply.hs +++ b/update/src/Pos/Update/Poll/Logic/Apply.hs @@ -17,26 +17,26 @@ import System.Wlog (logDebug, logInfo, logNotice) import Pos.Binary.Class (biSize) import Pos.Core (ChainDifficulty (..), Coin, EpochIndex, HasProtocolConstants, HeaderHash, - IsMainHeader (..), ProtocolMagic, SlotId (siEpoch), SoftwareVersion (..), - addressHash, applyCoinPortionUp, blockVersionL, coinToInteger, - difficultyL, epochIndexL, flattenSlotId, headerHashG, headerSlotL, - sumCoins, unflattenSlotId, unsafeIntegerToCoin) + IsMainHeader (..), ProtocolMagic, SlotId (siEpoch), SoftwareVersion (..), + addressHash, applyCoinPortionUp, blockVersionL, coinToInteger, difficultyL, + epochIndexL, flattenSlotId, headerHashG, headerSlotL, sumCoins, + unflattenSlotId, unsafeIntegerToCoin) import Pos.Core.Configuration (blkSecurityParam) import Pos.Core.Update (BlockVersion, BlockVersionData (..), UpId, UpdatePayload (..), - UpdateProposal (..), UpdateVote (..), bvdUpdateProposalThd, - checkUpdatePayload) + UpdateProposal (..), UpdateVote (..), bvdUpdateProposalThd, + checkUpdatePayload) import Pos.Crypto (hash, shortHashF) import Pos.Data.Attributes (areAttributesKnown) import Pos.Update.Poll.Class (MonadPoll (..), MonadPollRead (..)) import Pos.Update.Poll.Failure (PollVerFailure (..)) import Pos.Update.Poll.Logic.Base (canBeAdoptedBV, canCreateBlockBV, confirmBlockVersion, - isDecided, mkTotNegative, mkTotPositive, mkTotSum, - putNewProposal, voteToUProposalState) + isDecided, mkTotNegative, mkTotPositive, mkTotSum, putNewProposal, + voteToUProposalState) import Pos.Update.Poll.Logic.Version (verifyAndApplyProposalBVS, verifyBlockVersion, - verifySoftwareVersion) + verifySoftwareVersion) import Pos.Update.Poll.Types (ConfirmedProposalState (..), DecidedProposalState (..), - DpsExtra (..), ProposalState (..), - UndecidedProposalState (..), UpsExtra (..), psProposal) + DpsExtra (..), ProposalState (..), UndecidedProposalState (..), UpsExtra (..), + psProposal) import Pos.Util.Some (Some (..)) type ApplyMode m = diff --git a/update/src/Pos/Update/Poll/Logic/Base.hs b/update/src/Pos/Update/Poll/Logic/Base.hs index fac0f15042e..c1ff0198746 100644 --- a/update/src/Pos/Update/Poll/Logic/Base.hs +++ b/update/src/Pos/Update/Poll/Logic/Base.hs @@ -39,25 +39,23 @@ import Formatting (build, int, sformat, (%)) import System.Wlog (WithLogger, logDebug, logNotice) import Pos.Binary.Update () -import Pos.Core (BlockVersion (..), Coin, EpochIndex, HeaderHash, HasProtocolConstants, - IsMainHeader (..), SlotId, SoftforkRule (..), TimeDiff (..), addressHash, - applyCoinPortionUp, coinPortionDenominator, coinToInteger, difficultyL, - epochSlots, getCoinPortion, headerHashG, isBootstrapEra, CoinPortion (..), - sumCoins, unsafeAddCoin, unsafeIntegerToCoin, unsafeSubCoin) +import Pos.Core (BlockVersion (..), Coin, CoinPortion (..), EpochIndex, + HasProtocolConstants, HeaderHash, IsMainHeader (..), SlotId, + SoftforkRule (..), TimeDiff (..), addressHash, applyCoinPortionUp, + coinPortionDenominator, coinToInteger, difficultyL, epochSlots, + getCoinPortion, headerHashG, isBootstrapEra, sumCoins, unsafeAddCoin, + unsafeIntegerToCoin, unsafeSubCoin) import Pos.Core.Update (BlockVersionData (..), BlockVersionModifier (..), UpId, - UpdateProposal (..), UpdateVote (..)) + UpdateProposal (..), UpdateVote (..)) import Pos.Crypto (PublicKey, hash, shortHashF) -import Pos.Infra.Slotting.Types (EpochSlottingData (..), - SlottingData, addEpochSlottingData, - getCurrentEpochIndex, - getNextEpochSlottingData) +import Pos.Infra.Slotting.Types (EpochSlottingData (..), SlottingData, + addEpochSlottingData, getCurrentEpochIndex, getNextEpochSlottingData) import Pos.Update.Poll.Class (MonadPoll (..), MonadPollRead (..)) import Pos.Update.Poll.Failure (PollVerFailure (..)) import Pos.Update.Poll.Types (BlockVersionState (..), ConfirmedProposalState (..), - DecidedProposalState (..), DpsExtra (..), - ProposalState (..), UndecidedProposalState (..), - UpsExtra (..), bvsIsConfirmed, combineVotes, - cpsBlockVersion, isPositiveVote, newVoteState) + DecidedProposalState (..), DpsExtra (..), ProposalState (..), + UndecidedProposalState (..), UpsExtra (..), bvsIsConfirmed, combineVotes, + cpsBlockVersion, isPositiveVote, newVoteState) diff --git a/update/src/Pos/Update/Poll/Logic/Normalize.hs b/update/src/Pos/Update/Poll/Logic/Normalize.hs index a4ab5e262bf..3d9659bd052 100644 --- a/update/src/Pos/Update/Poll/Logic/Normalize.hs +++ b/update/src/Pos/Update/Poll/Logic/Normalize.hs @@ -16,16 +16,16 @@ import qualified Data.HashSet as HS import Formatting (build, sformat, (%)) import System.Wlog (logWarning) -import Pos.Core (Coin, EpochIndex, SlotId (siEpoch), addressHash, - applyCoinPortionUp, mkCoin, unsafeAddCoin) +import Pos.Core (Coin, EpochIndex, SlotId (siEpoch), addressHash, applyCoinPortionUp, + mkCoin, unsafeAddCoin) import Pos.Core.Update (UpId, UpdateProposal, UpdateProposals, UpdateVote (..), - bvdUpdateProposalThd) + bvdUpdateProposalThd) import Pos.Crypto (PublicKey, hash) import Pos.Update.Poll.Class (MonadPoll (..), MonadPollRead (..)) import Pos.Update.Poll.Failure (PollVerFailure (..)) import Pos.Update.Poll.Logic.Apply (verifyAndApplyProposal, verifyAndApplyVoteDo) import Pos.Update.Poll.Types (DecidedProposalState (..), LocalVotes, ProposalState (..), - UndecidedProposalState (..)) + UndecidedProposalState (..)) import Pos.Util.Util (getKeys, sortWithMDesc) -- | Normalize given proposals and votes with respect to current Poll diff --git a/update/src/Pos/Update/Poll/Logic/Rollback.hs b/update/src/Pos/Update/Poll/Logic/Rollback.hs index 5014773ceff..f38c71faec7 100644 --- a/update/src/Pos/Update/Poll/Logic/Rollback.hs +++ b/update/src/Pos/Update/Poll/Logic/Rollback.hs @@ -12,7 +12,7 @@ import Pos.Core (ApplicationName, BlockVersion, NumSoftwareVersion, So import Pos.Core.Update (UpId) import Pos.Update.Poll.Class (MonadPoll (..)) import Pos.Update.Poll.Types (BlockVersionState, ConfirmedProposalState, PrevValue (..), - ProposalState (..), USUndo (..)) + ProposalState (..), USUndo (..)) -- | Rollback application of UpdatePayload in MonadPoll using payload -- itself and undo data. diff --git a/update/src/Pos/Update/Poll/Logic/Softfork.hs b/update/src/Pos/Update/Poll/Logic/Softfork.hs index 50347a898f1..049517a7a12 100644 --- a/update/src/Pos/Update/Poll/Logic/Softfork.hs +++ b/update/src/Pos/Update/Poll/Logic/Softfork.hs @@ -17,15 +17,14 @@ import Formatting (build, sformat, (%)) import Serokell.Util.Text (listJson) import System.Wlog (logInfo) -import Pos.Core (BlockVersion, Coin, EpochIndex, HeaderHash, - SlotId (..), SoftforkRule (..), StakeholderId, crucialSlot, sumCoins, - unsafeIntegerToCoin, HasProtocolConstants) +import Pos.Core (BlockVersion, Coin, EpochIndex, HasProtocolConstants, HeaderHash, + SlotId (..), SoftforkRule (..), StakeholderId, crucialSlot, sumCoins, + unsafeIntegerToCoin) import Pos.Core.Update (BlockVersionData (..)) import Pos.Update.Poll.Class (MonadPoll (..), MonadPollRead (..)) import Pos.Update.Poll.Failure (PollVerFailure (..)) import Pos.Update.Poll.Logic.Base (ConfirmedEpoch, CurEpoch, adoptBlockVersion, - calcSoftforkThreshold, canBeAdoptedBV, - updateSlottingData) + calcSoftforkThreshold, canBeAdoptedBV, updateSlottingData) import Pos.Update.Poll.Types (BlockVersionState (..)) import Pos.Util.AssertMode (inAssertMode) diff --git a/update/src/Pos/Update/Poll/Logic/Version.hs b/update/src/Pos/Update/Poll/Logic/Version.hs index a152c817b00..7dabf8ad9ab 100644 --- a/update/src/Pos/Update/Poll/Logic/Version.hs +++ b/update/src/Pos/Update/Poll/Logic/Version.hs @@ -17,7 +17,7 @@ import Universum import Pos.Core (EpochIndex, SoftwareVersion (..)) import Pos.Core.Update (BlockVersionData (..), BlockVersionModifier (..), UpId, - UpdateProposal (..)) + UpdateProposal (..)) import Pos.Update.Poll.Class (MonadPoll (..), MonadPollRead (..)) import Pos.Update.Poll.Failure (PollVerFailure (..)) import Pos.Update.Poll.Logic.Base (canBeProposedBV, verifyNextBVMod) diff --git a/update/src/Pos/Update/Poll/Modifier.hs b/update/src/Pos/Update/Poll/Modifier.hs index 9579d1f29b0..fcdcf9b7939 100644 --- a/update/src/Pos/Update/Poll/Modifier.hs +++ b/update/src/Pos/Update/Poll/Modifier.hs @@ -23,7 +23,7 @@ import Data.Semigroup (Semigroup) import Pos.Core.Common (StakeholderId) import Pos.Core.Update (ApplicationName, BlockVersion, BlockVersionData, - NumSoftwareVersion, SoftwareVersion, UpId) + NumSoftwareVersion, SoftwareVersion, UpId) import Pos.Infra.Slotting.Types (SlottingData) import Pos.Update.Poll.Types (BlockVersionState, ConfirmedProposalState, ProposalState) import Pos.Util.Modifier (MapModifier) diff --git a/update/src/Pos/Update/Poll/PollState.hs b/update/src/Pos/Update/Poll/PollState.hs index 97cc7f5edbb..f16e74ac2cf 100644 --- a/update/src/Pos/Update/Poll/PollState.hs +++ b/update/src/Pos/Update/Poll/PollState.hs @@ -31,14 +31,13 @@ import qualified Data.HashSet as HS import Pos.Core.Common (StakeholderId) import Pos.Core.Slotting (EpochIndex) import Pos.Core.Update (ApplicationName, BlockVersion, BlockVersionData, - NumSoftwareVersion, SoftwareVersion (..), UpId, - UpdateProposal (..)) + NumSoftwareVersion, SoftwareVersion (..), UpId, UpdateProposal (..)) +import Pos.Infra.Slotting.Types (SlottingData) import Pos.Lrc.DB.Issuers (IssuersStakes) import Pos.Lrc.Types (FullRichmenData) -import Pos.Infra.Slotting.Types (SlottingData) import Pos.Update.Poll.Modifier (PollModifier (..)) import Pos.Update.Poll.Types (BlockVersionState, ConfirmedProposalState, ProposalState, - psProposal) + psProposal) import Pos.Util.Modifier (foldlMapModWKey', modifyHashMap) data PollState = PollState diff --git a/update/src/Pos/Update/Poll/Pure.hs b/update/src/Pos/Update/Poll/Pure.hs index 64e8d4584db..367c2d3b1db 100644 --- a/update/src/Pos/Update/Poll/Pure.hs +++ b/update/src/Pos/Update/Poll/Pure.hs @@ -13,7 +13,7 @@ import Control.Lens (at, mapped, to, uses, (%=), (.=)) import qualified Data.HashMap.Strict as HM import qualified Data.HashSet as HS import System.Wlog (CanLog, HasLoggerName (..), LogEvent, NamedPureLogger, logDebug, - logWarning, runNamedPureLog) + logWarning, runNamedPureLog) import Pos.Core (SoftwareVersion (..)) import Pos.Core.Update (UpdateProposal (..)) @@ -22,8 +22,8 @@ import Pos.Update.BlockVersion (applyBVM) import Pos.Update.Poll.Class (MonadPoll (..), MonadPollRead (..)) import qualified Pos.Update.Poll.PollState as Poll import Pos.Update.Poll.Types (BlockVersionState (..), DecidedProposalState (..), - UndecidedProposalState (..), cpsSoftwareVersion, - propStateToEither, psProposal) + UndecidedProposalState (..), cpsSoftwareVersion, propStateToEither, + psProposal) newtype PurePoll a = PurePoll { getPurePoll :: StateT Poll.PollState (NamedPureLogger Identity) a diff --git a/update/src/Pos/Update/Poll/RollTrans.hs b/update/src/Pos/Update/Poll/RollTrans.hs index f457cc2c96e..9f0d319335d 100644 --- a/update/src/Pos/Update/Poll/RollTrans.hs +++ b/update/src/Pos/Update/Poll/RollTrans.hs @@ -24,9 +24,8 @@ import Pos.Core.Update (SoftwareVersion (..)) import Pos.Crypto (hash) import Pos.Update.Poll.Class (MonadPoll (..), MonadPollRead (..)) import Pos.Update.Poll.Types (PrevValue, USUndo (..), cpsSoftwareVersion, maybeToPrev, - psProposal, unChangedBVL, unChangedConfPropsL, - unChangedPropsL, unChangedSVL, unLastAdoptedBVL, - unPrevProposersL, unSlottingDataL) + psProposal, unChangedBVL, unChangedConfPropsL, unChangedPropsL, unChangedSVL, + unLastAdoptedBVL, unPrevProposersL, unSlottingDataL) import Pos.Util.Util (ether) type RollT m = Ether.LazyStateT' USUndo m diff --git a/update/src/Pos/Update/Poll/Trans.hs b/update/src/Pos/Update/Poll/Trans.hs index 144efc2328d..aaedf212431 100644 --- a/update/src/Pos/Update/Poll/Trans.hs +++ b/update/src/Pos/Update/Poll/Trans.hs @@ -26,11 +26,10 @@ import Pos.Crypto (hash) import Pos.Update.BlockVersion (applyBVM) import Pos.Update.Poll.Class (MonadPoll (..), MonadPollRead (..)) import Pos.Update.Poll.Modifier (PollModifier (..), pmActivePropsL, pmAdoptedBVFullL, - pmBVsL, pmConfirmedL, pmConfirmedPropsL, - pmEpochProposersL, pmSlottingDataL) + pmBVsL, pmConfirmedL, pmConfirmedPropsL, pmEpochProposersL, pmSlottingDataL) import Pos.Update.Poll.Types (BlockVersionState (..), DecidedProposalState (..), - ProposalState (..), UndecidedProposalState (..), - bvsIsConfirmed, cpsSoftwareVersion, psProposal) + ProposalState (..), UndecidedProposalState (..), bvsIsConfirmed, + cpsSoftwareVersion, psProposal) import qualified Pos.Util.Modifier as MM import Pos.Util.Util (ether) diff --git a/update/src/Pos/Update/Poll/Types.hs b/update/src/Pos/Update/Poll/Types.hs index d39acba9c77..dd09cc7c82c 100644 --- a/update/src/Pos/Update/Poll/Types.hs +++ b/update/src/Pos/Update/Poll/Types.hs @@ -56,8 +56,7 @@ import Serokell.Data.Memory.Units (Byte) import Pos.Core (ChainDifficulty, Coin, HeaderHash, ScriptVersion, StakeholderId, mkCoin) import Pos.Core.Slotting (EpochIndex, SlotId) import Pos.Core.Update (ApplicationName, BlockVersion, BlockVersionModifier (..), - NumSoftwareVersion, SoftwareVersion, UpId, UpdateProposal (..), - UpdateVote) + NumSoftwareVersion, SoftwareVersion, UpId, UpdateProposal (..), UpdateVote) import Pos.Crypto (PublicKey) import Pos.Infra.Slotting.Types (SlottingData) diff --git a/update/src/Pos/Update/Worker.hs b/update/src/Pos/Update/Worker.hs index 88794e990e2..acb84ffcc38 100644 --- a/update/src/Pos/Update/Worker.hs +++ b/update/src/Pos/Update/Worker.hs @@ -17,9 +17,8 @@ import Pos.Core.Update (UpdateProposal (..)) import Pos.Infra.Diffusion.Types (Diffusion) import Pos.Infra.Recovery.Info (recoveryCommGuard) import Pos.Infra.Shutdown (triggerShutdown) -import Pos.Infra.Slotting.Util (ActionTerminationPolicy (..), - OnNewSlotParams (..), - defaultOnNewSlotParams, onNewSlot) +import Pos.Infra.Slotting.Util (ActionTerminationPolicy (..), OnNewSlotParams (..), + defaultOnNewSlotParams, onNewSlot) import Pos.Update.Configuration (curSoftwareVersion) import Pos.Update.Context (UpdateContext (..)) import Pos.Update.DB (getConfirmedProposals) diff --git a/update/test/Setup.hs b/update/test/Setup.hs index 9a994af677b..44671092b28 100644 --- a/update/test/Setup.hs +++ b/update/test/Setup.hs @@ -1,2 +1,2 @@ -import Distribution.Simple +import Distribution.Simple main = defaultMain diff --git a/update/test/Test/Pos/Update/Arbitrary/Core.hs b/update/test/Test/Pos/Update/Arbitrary/Core.hs index c1904c29ae1..f3aee5ec9d0 100644 --- a/update/test/Test/Pos/Update/Arbitrary/Core.hs +++ b/update/test/Test/Pos/Update/Arbitrary/Core.hs @@ -14,18 +14,14 @@ module Test.Pos.Update.Arbitrary.Core import Universum import qualified Data.HashMap.Strict as HM -import Test.QuickCheck (Arbitrary (..), Gen, frequency, listOf, - listOf1, oneof) -import Test.QuickCheck.Arbitrary.Generic (genericArbitrary, - genericShrink) +import Test.QuickCheck (Arbitrary (..), Gen, frequency, listOf, listOf1, oneof) +import Test.QuickCheck.Arbitrary.Generic (genericArbitrary, genericShrink) import Pos.Arbitrary.Slotting () import Pos.Binary.Update () -import Pos.Core.Update (BlockVersionModifier, SystemTag (..), - UpdateData (..), UpdatePayload (..), - UpdateProposal, UpdateProposalToSign (..), - UpdateVote (..), mkUpdateProposalWSign, - mkUpdateVote) +import Pos.Core.Update (BlockVersionModifier, SystemTag (..), UpdateData (..), + UpdatePayload (..), UpdateProposal, UpdateProposalToSign (..), + UpdateVote (..), mkUpdateProposalWSign, mkUpdateVote) import Pos.Crypto (ProtocolMagic, fakeSigner) import Pos.Data.Attributes (mkAttributes) import Pos.Update.Poll.Types (VoteState (..)) diff --git a/update/test/Test/Pos/Update/Arbitrary/Poll.hs b/update/test/Test/Pos/Update/Arbitrary/Poll.hs index 1cf3091252f..d0f8c282bec 100644 --- a/update/test/Test/Pos/Update/Arbitrary/Poll.hs +++ b/update/test/Test/Pos/Update/Arbitrary/Poll.hs @@ -1,6 +1,6 @@ -{-# LANGUAGE FlexibleContexts #-} -{-# LANGUAGE NoImplicitPrelude #-} -{-# LANGUAGE TemplateHaskell #-} +{-# LANGUAGE FlexibleContexts #-} +{-# LANGUAGE NoImplicitPrelude #-} +{-# LANGUAGE TemplateHaskell #-} {-# LANGUAGE UndecidableInstances #-} {-# OPTIONS_GHC -fno-warn-orphans #-} @@ -21,13 +21,12 @@ import Pos.Core.Configuration (HasProtocolConstants) import Pos.Update.Poll.Modifier (PollModifier (..)) import Pos.Update.Poll.PollState (PollState (..), psActivePropsIdx) import Pos.Update.Poll.Types (BlockVersionState (..), ConfirmedProposalState (..), - DecidedProposalState (..), DpsExtra (..), PrevValue, - ProposalState (..), USUndo, UndecidedProposalState (..), - UpsExtra (..)) + DecidedProposalState (..), DpsExtra (..), PrevValue, ProposalState (..), + USUndo, UndecidedProposalState (..), UpsExtra (..)) import Test.Pos.Core.Arbitrary () -import Test.Pos.Util.Modifier () import Test.Pos.Update.Arbitrary.Core () +import Test.Pos.Util.Modifier () instance Arbitrary UpsExtra where arbitrary = genericArbitrary diff --git a/wallet-new/bench/Client/Cardano/Wallet/Web/Endpoint/NewWallet.hs b/wallet-new/bench/Client/Cardano/Wallet/Web/Endpoint/NewWallet.hs index a4c7c3af653..be8f01e411b 100644 --- a/wallet-new/bench/Client/Cardano/Wallet/Web/Endpoint/NewWallet.hs +++ b/wallet-new/bench/Client/Cardano/Wallet/Web/Endpoint/NewWallet.hs @@ -11,14 +11,13 @@ import Universum import Data.Time.Clock (getCurrentTime) import Bench.Cardano.Wallet.Types (BenchEndpoint (..), CompleteConfig (..), Response, - ResponseReport (..)) + ResponseReport (..)) import Client.Cardano.Wallet.Web.Analyze (analyzeResponseIfNeeded, checkResponse) import Client.Cardano.Wallet.Web.Api (newWallet) import Client.Cardano.Wallet.Web.Run (runEndpointClient) import Pos.Util.Mnemonic (Mnemonic, entropyToMnemonic, genEntropy) import Pos.Wallet.Web.ClientTypes (CBackupPhrase (..), CWallet (..), - CWalletAssurance (..), CWalletInit (..), - CWalletMeta (..)) + CWalletAssurance (..), CWalletInit (..), CWalletMeta (..)) -- | Run 'NewWallet' client. As a result we will get a newly created wallet. newWalletIO :: CompleteConfig -> IO () diff --git a/wallet-new/server/Main.hs b/wallet-new/server/Main.hs index 3e93d4d4de2..f6b3d179803 100644 --- a/wallet-new/server/Main.hs +++ b/wallet-new/server/Main.hs @@ -19,17 +19,17 @@ import Pos.DB.DB (initNodeDBs) import Pos.Infra.Diffusion.Types (Diffusion) import Pos.Infra.Ntp.Configuration (NtpConfiguration, ntpClientSettings) import Pos.Launcher (NodeParams (..), NodeResources (..), bpLoggingParams, - bracketNodeResources, loggerBracket, lpDefaultName, runNode, - withConfigurations) + bracketNodeResources, loggerBracket, lpDefaultName, runNode, + withConfigurations) import Pos.Launcher.Configuration (AssetLockPath (..), ConfigurationOptions, - HasConfigurations) + HasConfigurations) import Pos.Ssc.Types (SscParams) import Pos.Txp (txpGlobalSettings) import Pos.Util (logException) import Pos.Util.CompileInfo (HasCompileInfo, retrieveCompileTimeInfo, withCompileInfo) import Pos.Util.UserSecret (usVss) import Pos.Wallet.Web (bracketWalletWS, bracketWalletWebDB, getSKById, getWalletAddresses, - runWRealMode) + runWRealMode) import Pos.Wallet.Web.Mode (WalletWebMode) import Pos.Wallet.Web.State (askWalletDB, askWalletSnapshot, flushWalletStorage) import Pos.Wallet.Web.Tracking.Decrypt (eskToWalletDecrCredentials) @@ -40,9 +40,8 @@ import qualified Cardano.Wallet.Kernel.Mode as Kernel.Mode import Cardano.Wallet.Kernel (PassiveWallet) import Cardano.Wallet.Server.CLI (ChooseWalletBackend (..), NewWalletBackendParams (..), - WalletBackendParams (..), WalletStartupOptions (..), - getWalletNodeOptions, walletDbPath, walletFlushDb, - walletRebuildDb) + WalletBackendParams (..), WalletStartupOptions (..), getWalletNodeOptions, + walletDbPath, walletFlushDb, walletRebuildDb) import qualified Cardano.Wallet.Server.Plugins as Plugins import Cardano.Wallet.WalletLayer (PassiveWalletLayer, bracketKernelPassiveWallet) diff --git a/wallet-new/src/Cardano/Wallet/API/V1/Types.hs b/wallet-new/src/Cardano/Wallet/API/V1/Types.hs index b7bf5bcb38f..2a436309348 100644 --- a/wallet-new/src/Cardano/Wallet/API/V1/Types.hs +++ b/wallet-new/src/Cardano/Wallet/API/V1/Types.hs @@ -127,8 +127,8 @@ import qualified Pos.Core as Core import Pos.Crypto (decodeHash, hashHexF) import qualified Pos.Crypto.Signing as Core import Pos.Infra.Diffusion.Subscription.Status (SubscriptionStatus (..)) -import Pos.Infra.Util.LogSafe (BuildableSafeGen (..), SecureLog (..), buildSafe, buildSafeList, - buildSafeMaybe, deriveSafeBuildable, plainOrSecureF) +import Pos.Infra.Util.LogSafe (BuildableSafeGen (..), SecureLog (..), buildSafe, + buildSafeList, buildSafeMaybe, deriveSafeBuildable, plainOrSecureF) import qualified Pos.Wallet.Web.State.Storage as OldStorage import Test.Pos.Core.Arbitrary () diff --git a/wallet-new/src/Cardano/Wallet/Kernel.hs b/wallet-new/src/Cardano/Wallet/Kernel.hs index 4be72d8df0a..0da6921213c 100644 --- a/wallet-new/src/Cardano/Wallet/Kernel.hs +++ b/wallet-new/src/Cardano/Wallet/Kernel.hs @@ -44,13 +44,12 @@ import Data.Acid.Memory (openMemoryState) import Cardano.Wallet.Kernel.Diffusion (WalletDiffusion (..)) import Cardano.Wallet.Kernel.PrefilterTx (PrefilteredBlock (..), prefilterBlock, - prefilterUtxo) + prefilterUtxo) import Cardano.Wallet.Kernel.Types (WalletESKs, WalletId (..)) import Cardano.Wallet.Kernel.DB.AcidState (ApplyBlock (..), CancelPending (..), - CreateHdWallet (..), DB, NewPending (..), - NewPendingError, Snapshot (..), dbHdWallets, - defDB) + CreateHdWallet (..), DB, NewPending (..), NewPendingError, Snapshot (..), + dbHdWallets, defDB) import Cardano.Wallet.Kernel.DB.BlockMeta (BlockMeta (..)) import Cardano.Wallet.Kernel.DB.HdWallet import qualified Cardano.Wallet.Kernel.DB.HdWallet as HD @@ -61,8 +60,7 @@ import Cardano.Wallet.Kernel.DB.Resolved (ResolvedBlock) import Cardano.Wallet.Kernel.DB.Spec (singletonPending) import qualified Cardano.Wallet.Kernel.DB.Spec.Read as Spec import Cardano.Wallet.Kernel.Submission (Cancelled, WalletSubmission, addPending, - defaultResubmitFunction, exponentialBackoff, - newWalletSubmission, tick) + defaultResubmitFunction, exponentialBackoff, newWalletSubmission, tick) import Cardano.Wallet.Kernel.Submission.Worker (tickSubmissionLayer) import Pos.Core (AddressHash, Coin, Timestamp (..), TxAux (..)) diff --git a/wallet-new/src/Cardano/Wallet/Kernel/DB/AcidState.hs b/wallet-new/src/Cardano/Wallet/Kernel/DB/AcidState.hs index 86b78c268a6..257969fcc2b 100644 --- a/wallet-new/src/Cardano/Wallet/Kernel/DB/AcidState.hs +++ b/wallet-new/src/Cardano/Wallet/Kernel/DB/AcidState.hs @@ -44,7 +44,7 @@ import Pos.Core.Chrono (OldestFirst (..)) import Pos.Txp (Utxo) import Cardano.Wallet.Kernel.PrefilterTx (AddrWithId, PrefilteredBlock (..), - PrefilteredUtxo) + PrefilteredUtxo) import Cardano.Wallet.Kernel.DB.BlockMeta import Cardano.Wallet.Kernel.DB.HdWallet diff --git a/wallet-new/src/Cardano/Wallet/Kernel/Submission.hs b/wallet-new/src/Cardano/Wallet/Kernel/Submission.hs index 75276148541..4176a70e848 100644 --- a/wallet-new/src/Cardano/Wallet/Kernel/Submission.hs +++ b/wallet-new/src/Cardano/Wallet/Kernel/Submission.hs @@ -70,7 +70,7 @@ import Test.QuickCheck import Cardano.Wallet.Kernel.DB.HdWallet (HdAccountId) import Cardano.Wallet.Kernel.DB.InDb (fromDb) import Cardano.Wallet.Kernel.DB.Spec (Pending (..), emptyPending, pendingTransactions, - removePending, unionPending) + removePending, unionPending) import qualified Pos.Core as Core -- | Wallet Submission Layer diff --git a/wallet-new/src/Cardano/Wallet/Server/Plugins.hs b/wallet-new/src/Cardano/Wallet/Server/Plugins.hs index c076fedf430..e66f5e2ade7 100644 --- a/wallet-new/src/Cardano/Wallet/Server/Plugins.hs +++ b/wallet-new/src/Cardano/Wallet/Server/Plugins.hs @@ -27,10 +27,9 @@ import qualified Cardano.Wallet.Kernel.Mode as Kernel import qualified Cardano.Wallet.LegacyServer as LegacyServer import qualified Cardano.Wallet.Server as Server import Cardano.Wallet.Server.CLI (NewWalletBackendParams (..), RunMode, - WalletBackendParams (..), isDebugMode, - walletAcidInterval, walletDbOptions) + WalletBackendParams (..), isDebugMode, walletAcidInterval, walletDbOptions) import Cardano.Wallet.WalletLayer (ActiveWalletLayer, PassiveWalletLayer, - bracketKernelActiveWallet) + bracketKernelActiveWallet) import qualified Pos.Wallet.Web.Error.Types as V0 import Control.Exception (fromException) @@ -41,7 +40,7 @@ import Network.HTTP.Types.Status (badRequest400) import Network.Wai (Application, Middleware, Response, responseLBS) import Network.Wai.Handler.Warp (defaultSettings, setOnExceptionResponse) import Network.Wai.Middleware.Cors (cors, corsMethods, corsRequestHeaders, - simpleCorsResourcePolicy, simpleMethods) + simpleCorsResourcePolicy, simpleMethods) import Ntp.Client (NtpStatus) import Pos.Infra.Diffusion.Types (Diffusion (..)) import Pos.Wallet.Web (cleanupAcidStatePeriodically) diff --git a/wallet-new/src/Cardano/Wallet/WalletLayer.hs b/wallet-new/src/Cardano/Wallet/WalletLayer.hs index 1439e382413..3a604a77ca4 100644 --- a/wallet-new/src/Cardano/Wallet/WalletLayer.hs +++ b/wallet-new/src/Cardano/Wallet/WalletLayer.hs @@ -24,7 +24,7 @@ import qualified Cardano.Wallet.WalletLayer.Kernel as Kernel import qualified Cardano.Wallet.WalletLayer.Legacy as Legacy import qualified Cardano.Wallet.WalletLayer.QuickCheck as QuickCheck import Cardano.Wallet.WalletLayer.Types (ActiveWalletLayer (..), PassiveWalletLayer (..), - applyBlocks, rollbackBlocks) + applyBlocks, rollbackBlocks) ------------------------------------------------------------ -- Kernel diff --git a/wallet-new/src/Cardano/Wallet/WalletLayer/Kernel.hs b/wallet-new/src/Cardano/Wallet/WalletLayer/Kernel.hs index 667960e1868..9cdbc2e0684 100644 --- a/wallet-new/src/Cardano/Wallet/WalletLayer/Kernel.hs +++ b/wallet-new/src/Cardano/Wallet/WalletLayer/Kernel.hs @@ -27,7 +27,6 @@ import Pos.Util.Mnemonic (Mnemonic, mnemonicToSeed) import qualified Cardano.Wallet.Kernel.Actions as Actions import qualified Data.Map.Strict as Map import Pos.Crypto.Signing -import Pos.Util.BackupPhrase -- | Initialize the passive wallet. -- The passive wallet cannot send new transactions. diff --git a/wallet-new/src/Cardano/Wallet/WalletLayer/Legacy.hs b/wallet-new/src/Cardano/Wallet/WalletLayer/Legacy.hs index 70036a49a94..fb194ea2479 100644 --- a/wallet-new/src/Cardano/Wallet/WalletLayer/Legacy.hs +++ b/wallet-new/src/Cardano/Wallet/WalletLayer/Legacy.hs @@ -19,8 +19,8 @@ import Cardano.Wallet.WalletLayer.Types (ActiveWalletLayer (..), Passi import Cardano.Wallet.API.V1.Migration (migrate) import Cardano.Wallet.API.V1.Migration.Types () import Cardano.Wallet.API.V1.Types (Account, AccountIndex, AccountUpdate, Address, - NewAccount (..), NewWallet (..), V1 (..), Wallet, - WalletId, WalletOperation (..), WalletUpdate) + NewAccount (..), NewWallet (..), V1 (..), Wallet, WalletId, + WalletOperation (..), WalletUpdate) import Cardano.Wallet.Kernel.Diffusion (WalletDiffusion (..)) import Pos.Client.KeyStorage (MonadKeys) @@ -30,13 +30,13 @@ import Pos.Crypto (PassPhrase) import Pos.Util (HasLens', maybeThrow) import Pos.Wallet.Web.Account (GenSeed (..)) import Pos.Wallet.Web.ClientTypes.Types (CBackupPhrase (..), CWallet (..), - CWalletInit (..), CWalletMeta (..)) + CWalletInit (..), CWalletMeta (..)) import qualified Pos.Wallet.Web.Error.Types as V0 import Pos.Wallet.Web.Methods.Logic (MonadWalletLogicRead) import qualified Pos.Wallet.Web.Methods.Logic as V0 import Pos.Wallet.Web.Methods.Restore (newWallet, restoreWalletFromSeed) import Pos.Wallet.Web.State.State (WalletDbReader, askWalletDB, askWalletSnapshot, - getWalletAddresses, setWalletMeta) + getWalletAddresses, setWalletMeta) import Pos.Wallet.Web.State.Storage (getWalletInfo) import Pos.Wallet.Web.Tracking.Types (SyncQueue) diff --git a/wallet-new/src/Cardano/Wallet/WalletLayer/Types.hs b/wallet-new/src/Cardano/Wallet/WalletLayer/Types.hs index a4ddd1e4728..f1a887f10fc 100644 --- a/wallet-new/src/Cardano/Wallet/WalletLayer/Types.hs +++ b/wallet-new/src/Cardano/Wallet/WalletLayer/Types.hs @@ -24,7 +24,7 @@ import Universum import Control.Lens (makeLenses) import Cardano.Wallet.API.V1.Types (Account, AccountIndex, AccountUpdate, Address, - NewAccount, NewWallet, Wallet, WalletId, WalletUpdate) + NewAccount, NewWallet, Wallet, WalletId, WalletUpdate) import Pos.Block.Types (Blund) import Pos.Core.Chrono (NE, NewestFirst (..), OldestFirst (..)) diff --git a/wallet-new/test/unit/Test/Spec/Submission.hs b/wallet-new/test/unit/Test/Spec/Submission.hs index 5cd66704887..7eefc6055c8 100644 --- a/wallet-new/test/unit/Test/Spec/Submission.hs +++ b/wallet-new/test/unit/Test/Spec/Submission.hs @@ -8,10 +8,10 @@ module Test.Spec.Submission ( import Universum hiding (elems) import Cardano.Wallet.Kernel.DB.HdWallet (HdAccountId (..), HdAccountIx (..), - HdRootId (..)) + HdRootId (..)) import Cardano.Wallet.Kernel.DB.InDb (InDb (..), fromDb) import Cardano.Wallet.Kernel.DB.Spec (Pending (..), emptyPending, pendingTransactions, - removePending) + removePending) import Cardano.Wallet.Kernel.Submission import Control.Lens (at, non, to) import qualified Data.ByteString as BS @@ -32,7 +32,7 @@ import Serokell.Util.Text (listJsonIndent) import qualified Test.Pos.Txp.Arbitrary as Core import Test.QuickCheck (Gen, Property, arbitrary, choose, conjoin, forAll, listOf, - shuffle, vectorOf, (===)) + shuffle, vectorOf, (===)) import Test.QuickCheck.Property (counterexample) import Util (disjoint) import Util.Buildable (ShowThroughBuild (..)) diff --git a/wallet/src/Pos/Wallet/Aeson/ClientTypes.hs b/wallet/src/Pos/Wallet/Aeson/ClientTypes.hs index 80366fa4041..b58b00bfb24 100644 --- a/wallet/src/Pos/Wallet/Aeson/ClientTypes.hs +++ b/wallet/src/Pos/Wallet/Aeson/ClientTypes.hs @@ -7,24 +7,22 @@ module Pos.Wallet.Aeson.ClientTypes import Universum import Data.Aeson (FromJSON (..), ToJSON (..), Value (..), genericParseJSON, - genericToJSON, object, withArray, withObject, (.:), (.=)) + genericToJSON, object, withArray, withObject, (.:), (.=)) import Data.Aeson.TH (defaultOptions, deriveJSON, deriveToJSON) import Data.Aeson.Types (Parser, typeMismatch) import Data.Version (showVersion) import Servant.API.ContentTypes (NoContent (..)) import Crypto.Encoding.BIP39 (EntropySize, MnemonicWords, ValidChecksumSize, - ValidEntropySize, ValidMnemonicSentence) + ValidEntropySize, ValidMnemonicSentence) import Pos.Client.Txp.Util (InputSelectionPolicy (..)) import Pos.Util.Util (aesonError) import Pos.Wallet.Web.ClientTypes (Addr, ApiVersion (..), CAccount, CAccountId, - CAccountInit, CAccountMeta, CAddress, CBackupPhrase, - CCoin, CFilePath (..), CHash, CId, CInitialized, - CPaperVendWalletRedeem, CProfile, CPtxCondition, - CTExMeta, CTx, CTxId, CTxMeta, CUpdateInfo, - CWAddressMeta, CWallet, CWalletAssurance, CWalletInit, - CWalletMeta, CWalletRedeem, ClientInfo (..), - NewBatchPayment (..), SyncProgress, Wal) + CAccountInit, CAccountMeta, CAddress, CBackupPhrase, CCoin, CFilePath (..), + CHash, CId, CInitialized, CPaperVendWalletRedeem, CProfile, CPtxCondition, + CTExMeta, CTx, CTxId, CTxMeta, CUpdateInfo, CWAddressMeta, CWallet, + CWalletAssurance, CWalletInit, CWalletMeta, CWalletRedeem, ClientInfo (..), + NewBatchPayment (..), SyncProgress, Wal) import Pos.Wallet.Web.Error (WalletError) import Pos.Wallet.Web.Sockets.Types (NotifyEvent) diff --git a/wallet/src/Pos/Wallet/Web/Account.hs b/wallet/src/Pos/Wallet/Web/Account.hs index 8fb9b5871cc..0422dcee1f7 100644 --- a/wallet/src/Pos/Wallet/Web/Account.hs +++ b/wallet/src/Pos/Wallet/Web/Account.hs @@ -26,17 +26,17 @@ import System.Random (randomRIO) import System.Wlog (WithLogger) import Pos.Client.KeyStorage (AllUserSecrets (..), MonadKeys, MonadKeysRead, addSecretKey, - getSecretKeys, getSecretKeysPlain) + getSecretKeys, getSecretKeysPlain) import Pos.Core (Address (..), IsBootstrapEraAddr (..), deriveLvl2KeyPair) import Pos.Crypto (EncryptedSecretKey, PassPhrase, ShouldCheckPassphrase (..), - firstHardened, safeDeterministicKeyGen) + firstHardened, safeDeterministicKeyGen) import Pos.Util (eitherToThrow) import Pos.Util.Mnemonic (Mnemonic, mnemonicToSeed) import Pos.Wallet.Web.ClientTypes (AccountId (..), CId, Wal, encToCId) import Pos.Wallet.Web.Error (WalletError (..)) import Pos.Wallet.Web.State (AddressLookupMode (Ever), HasWAddressMeta (..), - WAddressMeta (..), WalletSnapshot, doesWAddressExist, - getAccountMeta, wamAccount) + WAddressMeta (..), WalletSnapshot, doesWAddressExist, getAccountMeta, + wamAccount) type AccountMode ctx m = ( MonadThrow m diff --git a/wallet/src/Pos/Wallet/Web/ClientTypes/Types.hs b/wallet/src/Pos/Wallet/Web/ClientTypes/Types.hs index 7f958693669..c8e2fbf810e 100644 --- a/wallet/src/Pos/Wallet/Web/ClientTypes/Types.hs +++ b/wallet/src/Pos/Wallet/Web/ClientTypes/Types.hs @@ -78,9 +78,9 @@ import Data.Version (Version) import Formatting (bprint, build, builder, later, shown, (%)) import Pos.Client.Txp.Util (InputSelectionPolicy) import Pos.Core (BlockVersion, ChainDifficulty, Coin, ScriptVersion, SoftwareVersion, - unsafeGetCoin) + unsafeGetCoin) import Pos.Infra.Util.LogSafe (BuildableSafeGen (..), SecureLog (..), buildUnsecure, - deriveSafeBuildable, secretOnlyF, secureListF) + deriveSafeBuildable, secretOnlyF, secureListF) import Pos.Util.Mnemonic (Mnemonic) import Pos.Util.Servant (HasTruncateLogPolicy, WithTruncatedLog (..)) import Serokell.Util (listJsonIndent, mapBuilder) diff --git a/wallet/src/Pos/Wallet/Web/Methods/Redeem.hs b/wallet/src/Pos/Wallet/Web/Methods/Redeem.hs index dd5070bdb07..6c711b1f4c6 100644 --- a/wallet/src/Pos/Wallet/Web/Methods/Redeem.hs +++ b/wallet/src/Pos/Wallet/Web/Methods/Redeem.hs @@ -20,11 +20,10 @@ import Pos.Util (maybeThrow) import Pos.Util.Mnemonic (mnemonicToAesKey) import Pos.Wallet.Web.Account (GenSeed (..)) import Pos.Wallet.Web.ClientTypes (AccountId (..), CAccountId (..), CAddress (..), - CBackupPhrase (..), CPaperVendWalletRedeem (..), - CTx (..), CWalletRedeem (..)) + CBackupPhrase (..), CPaperVendWalletRedeem (..), CTx (..), CWalletRedeem (..)) import Pos.Wallet.Web.Error (WalletError (..)) import Pos.Wallet.Web.Methods.History (addHistoryTxMeta, constructCTx, - getCurChainDifficulty) + getCurChainDifficulty) import qualified Pos.Wallet.Web.Methods.Logic as L import Pos.Wallet.Web.Methods.Txp (MonadWalletTxFull, rewrapTxError, submitAndSaveNewPtx) import Pos.Wallet.Web.Pending (mkPendingTx) diff --git a/wallet/src/Pos/Wallet/Web/Methods/Restore.hs b/wallet/src/Pos/Wallet/Web/Methods/Restore.hs index 90bd1d8aeab..1743715a8b6 100644 --- a/wallet/src/Pos/Wallet/Web/Methods/Restore.hs +++ b/wallet/src/Pos/Wallet/Web/Methods/Restore.hs @@ -30,20 +30,20 @@ import Pos.Crypto (EncryptedSecretKey, PassPhrase, emptyPassphrase, fi import Pos.Infra.StateLock (Priority (..), withStateLockNoMetrics) import Pos.Util (HasLens (..), maybeThrow) import Pos.Util.UserSecret (UserSecretDecodingError (..), WalletUserSecret (..), - mkGenesisWalletUserSecret, readUserSecret, usWallet, - wusAccounts, wusWalletName) + mkGenesisWalletUserSecret, readUserSecret, usWallet, wusAccounts, + wusWalletName) import Pos.Wallet.Web.Account (GenSeed (..), genSaveRootKey, genUniqueAccountId) import Pos.Wallet.Web.Backup (AccountMetaBackup (..), WalletBackup (..), - WalletMetaBackup (..)) + WalletMetaBackup (..)) import Pos.Wallet.Web.ClientTypes (AccountId (..), CAccountInit (..), CAccountMeta (..), - CBackupPhrase (..), CFilePath (..), CId, CWallet (..), - CWalletInit (..), CWalletMeta (..), Wal, encToCId) + CBackupPhrase (..), CFilePath (..), CId, CWallet (..), CWalletInit (..), + CWalletMeta (..), Wal, encToCId) import Pos.Wallet.Web.Error (WalletError (..), rewrapToWalletError) import qualified Pos.Wallet.Web.Methods.Logic as L import Pos.Wallet.Web.State as WS import Pos.Wallet.Web.State (AddressLookupMode (Ever), askWalletDB, askWalletSnapshot, - createAccount, getAccountWAddresses, getWalletMeta, - removeHistoryCache, setWalletSyncTip) + createAccount, getAccountWAddresses, getWalletMeta, removeHistoryCache, + setWalletSyncTip) import Pos.Wallet.Web.Tracking.Decrypt (eskToWalletDecrCredentials) import qualified Pos.Wallet.Web.Tracking.Restore as Restore import Pos.Wallet.Web.Tracking.Types (SyncQueue) diff --git a/wallet/src/Pos/Wallet/Web/State/Storage.hs b/wallet/src/Pos/Wallet/Web/State/Storage.hs index 610e2c01ad8..57135eea199 100644 --- a/wallet/src/Pos/Wallet/Web/State/Storage.hs +++ b/wallet/src/Pos/Wallet/Web/State/Storage.hs @@ -110,7 +110,7 @@ import qualified Data.Acid as Acid import Control.Arrow ((***)) import Control.Lens (at, has, ix, lens, makeClassy, makeLenses, non', to, toListOf, - traversed, (%=), (+=), (.=), (<<.=), (?=), _Empty, _Just, _head) + traversed, (%=), (+=), (.=), (<<.=), (?=), _Empty, _Just, _head) import Control.Monad.State.Class (get, put) import Data.Default (Default, def) import qualified Data.HashMap.Strict as HM @@ -122,19 +122,17 @@ import Formatting ((%)) import qualified Formatting as F import Pos.Client.Txp.History (TxHistoryEntry, txHistoryListToMap) import Pos.Core (Address, BlockCount (..), ChainDifficulty (..), HeaderHash, - ProtocolConstants (..), SlotId, Timestamp, VssMaxTTL (..), - VssMinTTL (..)) + ProtocolConstants (..), SlotId, Timestamp, VssMaxTTL (..), VssMinTTL (..)) import Pos.Core.Txp (TxAux, TxId) import Pos.SafeCopy () import Pos.Txp (AddrCoinMap, Utxo, UtxoModifier, applyUtxoModToAddrCoinMap, - utxoToAddressCoinMap) + utxoToAddressCoinMap) import qualified Pos.Util.Modifier as MM import qualified Pos.Wallet.Web.ClientTypes as WebTypes import Pos.Wallet.Web.Pending.Types (PendingTx (..), PtxCondition, PtxSubmitTiming (..), - ptxCond, ptxSubmitTiming, _PtxCreating) + ptxCond, ptxSubmitTiming, _PtxCreating) import Pos.Wallet.Web.Pending.Util (cancelApplyingPtx, incPtxSubmitTimingPure, - mkPtxSubmitTiming, ptxMarkAcknowledgedPure, - resetFailedPtx) + mkPtxSubmitTiming, ptxMarkAcknowledgedPure, resetFailedPtx) import Serokell.Util (zoom') -- | Type alias for indices which are used to maintain order diff --git a/wallet/src/Pos/Wallet/Web/Swagger/Instances/Schema.hs b/wallet/src/Pos/Wallet/Web/Swagger/Instances/Schema.hs index 0607d4bc888..d8616283747 100644 --- a/wallet/src/Pos/Wallet/Web/Swagger/Instances/Schema.hs +++ b/wallet/src/Pos/Wallet/Web/Swagger/Instances/Schema.hs @@ -11,10 +11,9 @@ import Universum import Control.Lens (ix, mapped, (?~)) import Data.Aeson (toJSON) import Data.Swagger (NamedSchema (..), SwaggerType (..), ToParamSchema (..), - ToSchema (..), declareNamedSchema, declareSchema, declareSchemaRef, - defaultSchemaOptions, description, example, format, - genericDeclareNamedSchema, name, properties, required, sketchSchema, - type_) + ToSchema (..), declareNamedSchema, declareSchema, declareSchemaRef, + defaultSchemaOptions, description, example, format, genericDeclareNamedSchema, + name, properties, required, sketchSchema, type_) import Data.Swagger.Internal.Schema (named) import qualified Data.Swagger.Lens as Swagger import Data.Typeable (Typeable, typeRep) @@ -23,7 +22,7 @@ import Servant.Multipart (FileData (..)) import Pos.Client.Txp.Util (InputSelectionPolicy (..)) import Pos.Core (ApplicationName, BlockCount (..), BlockVersion, ChainDifficulty, Coin, - SlotCount (..), SoftwareVersion, mkCoin) + SlotCount (..), SoftwareVersion, mkCoin) import Pos.Util.Mnemonic (Mnemonic) import qualified Pos.Wallet.Web.ClientTypes as CT diff --git a/wallet/test/Test/Pos/Util/MnemonicSpec.hs b/wallet/test/Test/Pos/Util/MnemonicSpec.hs index c4a8099ac4e..22c37cbb359 100644 --- a/wallet/test/Test/Pos/Util/MnemonicSpec.hs +++ b/wallet/test/Test/Pos/Util/MnemonicSpec.hs @@ -13,8 +13,8 @@ import Test.QuickCheck ((===)) import Crypto.Encoding.BIP39 (toEntropy) import Pos.Crypto (AesKey (..)) import Pos.Util.Mnemonic (Entropy, EntropySize, Mnemonic, MnemonicErr (..), - entropyToMnemonic, mkEntropy, mkMnemonic, mnemonicToAesKey, - mnemonicToEntropy, mnemonicToSeed) + entropyToMnemonic, mkEntropy, mkMnemonic, mnemonicToAesKey, mnemonicToEntropy, + mnemonicToSeed) import Pos.Wallet.Aeson.ClientTypes () import Pos.Wallet.Web.ClientTypes.Types (CBackupPhrase (..)) From 508e3c070c415adfbdbbaa361fa19fa38b07848e Mon Sep 17 00:00:00 2001 From: Rupert Horlick Date: Tue, 26 Jun 2018 16:54:47 -0700 Subject: [PATCH 3/3] [CDEC-383] Update hindent and editorconfig to 100 width --- .editorconfig | 2 +- .hindent.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.editorconfig b/.editorconfig index 3762e9ed18f..0b5f945987c 100644 --- a/.editorconfig +++ b/.editorconfig @@ -14,4 +14,4 @@ indent_size = 8 [*.hs] indent_size = 4 -max_line_length = 80 +max_line_length = 100 diff --git a/.hindent.yaml b/.hindent.yaml index d28d8339779..25fcc5f2ae2 100644 --- a/.hindent.yaml +++ b/.hindent.yaml @@ -1,3 +1,3 @@ indent-size: 4 -line-length: 80 +line-length: 100 force-trailing-newline: true