[DEVOPS-1131] code style changes

cleverca22 · cleverca22 · commit d20b5c01c417 · 2018-11-29T23:10:36.000-04:00
diff --git a/cabal.project.freeze b/cabal.project.freeze
@@ -67,7 +67,6 @@ constraints: Cabal ==2.2.0.1,
              free ==5.0.2,
              generic-arbitrary ==0.1.0,
              generics-sop ==0.3.2.0,
-             ghc-paths ==0.1.0.9,
              graphviz ==2999.20.0.2,
              half ==0.3,
              hashable ==1.2.7.0,
@@ -99,7 +98,6 @@ constraints: Cabal ==2.2.0.1,
              mmorph ==1.1.2,
              monad-control ==1.0.2.3,
              mono-traversable ==1.0.9.0,
-             mtl ==2.2.2,
              mwc-random ==0.13.6.0,
              neat-interpolation ==0.3.2.2,
              network ==2.6.3.6,
@@ -149,7 +147,6 @@ constraints: Cabal ==2.2.0.1,
              sqlite-simple ==0.4.16.0,
              sqlite-simple-errors ==0.6.1.0,
              statistics ==0.14.0.2,
-             stm ==2.4.5.1,
              stm-chans ==3.0.0.4,
              streaming-commons ==0.2.1.0,
              strict ==0.3.2,
@@ -161,7 +158,6 @@ constraints: Cabal ==2.2.0.1,
              tagged ==0.8.5,
              tar ==0.5.1.0,
              temporary ==1.3,
-             text ==1.2.3.1,
              th-utilities ==0.2.0.1,
              these ==0.7.5,
              time-units ==1.0.0,
diff --git a/script-runner/AutomatedTestRunner.hs b/script-runner/AutomatedTestRunner.hs
@@ -1,12 +1,12 @@
-{-# LANGUAGE ApplicativeDo   #-}
-{-# LANGUAGE ConstraintKinds #-}
-{-# LANGUAGE DeriveGeneric   #-}
-{-# LANGUAGE FlexibleContexts #-}
-{-# LANGUAGE GeneralizedNewtypeDeriving   #-}
-{-# LANGUAGE OverloadedStrings #-}
-{-# LANGUAGE RankNTypes #-}
-{-# LANGUAGE TypeApplications #-}
-{-# LANGUAGE NamedFieldPuns #-}
+{-# LANGUAGE ApplicativeDo              #-}
+{-# LANGUAGE ConstraintKinds            #-}
+{-# LANGUAGE DeriveGeneric              #-}
+{-# LANGUAGE FlexibleContexts           #-}
+{-# LANGUAGE GeneralizedNewtypeDeriving #-}
+{-# LANGUAGE NamedFieldPuns             #-}
+{-# LANGUAGE OverloadedStrings          #-}
+{-# LANGUAGE RankNTypes                 #-}
+{-# LANGUAGE TypeApplications           #-}
 
 module AutomatedTestRunner (Example, getGenesisConfig, loadNKeys, doUpdate, onStartup, on, getScript, runScript, NodeType(..), startNode) where
 
@@ -19,49 +19,61 @@ import           Control.Concurrent.Async.Lifted.Safe
 import           Control.Exception (throw)
 import           Control.Lens (to)
 import           Control.Monad.STM (orElse)
-import           Data.Constraint (Dict(Dict))
-import           Data.Default (Default(def))
+import           Data.Constraint (Dict (Dict))
+import           Data.Default (Default (def))
+import qualified Data.HashMap.Strict as HM
 import           Data.Ix (range)
 import           Data.List ((!!))
-import           Data.Reflection (Given, given, give)
+import qualified Data.Map as Map
+import           Data.Reflection (Given, give, given)
+import qualified Data.Text as T
 import           Data.Version (showVersion)
-import           Options.Applicative (Parser, execParser, footerDoc, fullDesc, header, help, helper, info, infoOption, long, progDesc)
-import           Paths_cardano_sl (version)
-import           Pos.Client.KeyStorage (getSecretKeysPlain, addSecretKey)
-import           Pos.Crypto (emptyPassphrase, hash, hashHexF, withSafeSigners, noPassEncrypt)
-import           Pos.DB.BlockIndex (getTipHeader)
-import           Pos.Util.CompileInfo (CompileTimeInfo (ctiGitRevision), HasCompileInfo, compileInfo, withCompileInfo)
-import           Prelude (show)
-import           Text.PrettyPrint.ANSI.Leijen (Doc)
-import           Universum hiding (when, show, on, state)
-import qualified Pos.Client.CLI as CLI
-import           Pos.Launcher (HasConfigurations, NodeParams (npBehaviorConfig, npUserSecret, npNetworkConfig),
-                     NodeResources, WalletConfiguration,
-                     bracketNodeResources, loggerBracket,
-                     runNode, runRealMode, withConfigurations, InitModeContext)
-import           Formatting (int, sformat, (%), Format)
-import           Graphics.Vty (mkVty, defaultConfig, defAttr)
+import           Formatting (Format, int, sformat, (%))
+import           Graphics.Vty (defAttr, defaultConfig, mkVty)
 import           Ntp.Client (NtpConfiguration)
-import           PocMode (AuxxContext(AuxxContext, acRealModeContext), AuxxMode, realModeToAuxx)
+import           Options.Applicative (Parser, execParser, footerDoc, fullDesc,
+                     header, help, helper, info, infoOption, long, progDesc)
+import           Paths_cardano_sl (version)
+import           PocMode (AuxxContext (AuxxContext, acRealModeContext),
+                     AuxxMode, realModeToAuxx)
 import           Pos.Chain.Block (LastKnownHeaderTag)
-import           Pos.Chain.Genesis as Genesis (Config (configGeneratedSecrets, configProtocolMagic), configEpochSlots)
+import           Pos.Chain.Genesis as Genesis
+                     (Config (configGeneratedSecrets, configProtocolMagic),
+                     configEpochSlots)
 import           Pos.Chain.Txp (TxpConfiguration)
-import           Pos.Chain.Update (UpdateData, SystemTag, mkUpdateProposalWSign, BlockVersion, SoftwareVersion, BlockVersionModifier, updateConfiguration)
+import           Pos.Chain.Update (BlockVersion, BlockVersionModifier,
+                     SoftwareVersion, SystemTag, UpdateData,
+                     mkUpdateProposalWSign, updateConfiguration)
+import qualified Pos.Client.CLI as CLI
+import           Pos.Client.KeyStorage (addSecretKey, getSecretKeysPlain)
 import           Pos.Client.Update.Network (submitUpdateProposal)
-import           Pos.Core (LocalSlotIndex, SlotId (SlotId, siEpoch, siSlot), mkLocalSlotIndex, EpochIndex(EpochIndex), SlotCount, getEpochIndex, getSlotIndex, difficultyL, getChainDifficulty, getBlockCount, getEpochOrSlot)
+import           Pos.Core (EpochIndex (EpochIndex), LocalSlotIndex, SlotCount,
+                     SlotId (SlotId, siEpoch, siSlot), difficultyL,
+                     getBlockCount, getChainDifficulty, getEpochIndex,
+                     getEpochOrSlot, getSlotIndex, mkLocalSlotIndex)
+import           Pos.Crypto (emptyPassphrase, hash, hashHexF, noPassEncrypt,
+                     withSafeSigners)
+import           Pos.DB.BlockIndex (getTipHeader)
 import           Pos.DB.DB (initNodeDBs)
 import           Pos.DB.Txp (txpGlobalSettings)
 import           Pos.Infra.Diffusion.Types (Diffusion, hoistDiffusion)
-import           Pos.Infra.Network.Types (NetworkConfig (ncTopology, ncEnqueuePolicy, ncDequeuePolicy, ncFailurePolicy), Topology (TopologyAuxx), topologyDequeuePolicy, topologyEnqueuePolicy, topologyFailurePolicy, NodeId)
+import           Pos.Infra.Network.Types (NetworkConfig (ncDequeuePolicy, ncEnqueuePolicy, ncFailurePolicy, ncTopology),
+                     NodeId, Topology (TopologyAuxx), topologyDequeuePolicy,
+                     topologyEnqueuePolicy, topologyFailurePolicy)
 import           Pos.Infra.Shutdown (triggerShutdown)
-import           Pos.Infra.Slotting.Util (onNewSlot, defaultOnNewSlotParams)
-import           Pos.Util (logException, lensOf)
-import           Pos.Util.UserSecret (usVss, readUserSecret, usPrimKey, usKeys)
+import           Pos.Infra.Slotting.Util (defaultOnNewSlotParams, onNewSlot)
+import           Pos.Launcher (HasConfigurations, InitModeContext, NodeParams (npBehaviorConfig, npNetworkConfig, npUserSecret),
+                     NodeResources, WalletConfiguration, bracketNodeResources,
+                     loggerBracket, runNode, runRealMode, withConfigurations)
+import           Pos.Util (lensOf, logException)
+import           Pos.Util.CompileInfo (CompileTimeInfo (ctiGitRevision),
+                     HasCompileInfo, compileInfo, withCompileInfo)
+import           Pos.Util.UserSecret (readUserSecret, usKeys, usPrimKey, usVss)
 import           Pos.Util.Wlog (LoggerName)
-import           Pos.WorkMode (RealMode, EmptyMempoolExt)
-import qualified Data.HashMap.Strict as HM
-import qualified Data.Map as Map
-import qualified Data.Text as T
+import           Pos.WorkMode (EmptyMempoolExt, RealMode)
+import           Prelude (show)
+import           Text.PrettyPrint.ANSI.Leijen (Doc)
+import           Universum hiding (on, show, state, when)
 
 class TestScript a where
   getScript :: a -> Script
@@ -72,16 +84,16 @@ data ScriptRunnerOptions = ScriptRunnerOptions
   } deriving Show
 
 data ScriptBuilder = ScriptBuilder
-  { sbScript :: Script
-  , sbEpochSlots :: SlotCount
+  { sbScript        :: Script
+  , sbEpochSlots    :: SlotCount
   , sbGenesisConfig :: Config
   }
 data NodeType = Core { ntIdex :: Integer }
 
 instance Default Script where def = Script def def
 
 data Script = Script
-  { slotTriggers :: Map.Map SlotId SlotTrigger
+  { slotTriggers   :: Map.Map SlotId SlotTrigger
   , startupActions :: [ SlotTrigger ]
   } deriving (Show, Generic)
 
@@ -220,7 +232,7 @@ worker2 eventChan diffusion = do
     globalHeight = view (difficultyL . to getChainDifficulty) <$> mbHeader
     localHeight = view (difficultyL . to getChainDifficulty) localTip
     f (Just v) = Just $ getBlockCount v
-    f Nothing = Nothing
+    f Nothing  = Nothing
   liftIO $ do
     writeBChan eventChan $ CENodeInfo $ NodeInfo (getBlockCount localHeight) (getEpochOrSlot localTip) (f globalHeight)
     threadDelay 100000
@@ -234,7 +246,7 @@ worker1 genesisConfig script eventChan diffusion = do
       liftIO $ writeBChan eventChan $ CESlotStart $ SlotStart (getEpochIndex $ siEpoch slotid) (getSlotIndex $ siSlot slotid)
       case Map.lookup slotid (slotTriggers realScript) of
         Just (SlotTrigger act) -> runAction act
-        Nothing -> pure ()
+        Nothing                -> pure ()
       pure ()
     realScript = getScript script
     errhandler :: Show e => e -> AuxxMode ()
@@ -249,14 +261,14 @@ worker1 genesisConfig script eventChan diffusion = do
   realWorker `catch` errhandler @SomeException
 
 data TestScript a => InputParams a = InputParams
-  { ipEventChan :: BChan CustomEvent
-  , ipReplyChan :: BChan Reply
+  { ipEventChan    :: BChan CustomEvent
+  , ipReplyChan    :: BChan Reply
   , ipScriptGetter :: HasEpochSlots => IO a
   }
 data TestScript a => InputParams2 a = InputParams2
   { ip2EventChan :: BChan CustomEvent
   , ip2ReplyChan :: BChan Reply
-  , ip2Script :: a
+  , ip2Script    :: a
   }
 
 runScript :: TestScript a => (HasEpochSlots => IO a) -> IO ()
@@ -297,9 +309,7 @@ runUI = do
   pure (eventChan, replyChan, brick)
 
 getGenesisConfig :: Example Config
-getGenesisConfig = do
-  oldsb <- get
-  pure $ sbGenesisConfig oldsb
+getGenesisConfig = sbGenesisConfig <$> get
 
 data SlotCreationFailure = SlotCreationFailure { msg :: Text, slotsInEpoch :: SlotCount } deriving Show
 instance Exception SlotCreationFailure where
@@ -338,7 +348,6 @@ on (epoch, slot) action = do
       sbScript = script
     }
   put newsb
-  pure ()
 
 doUpdate :: HasConfigurations => Diffusion AuxxMode -> Config -> Int -> BlockVersion -> SoftwareVersion -> BlockVersionModifier -> AuxxMode ()
 doUpdate diffusion genesisConfig keyIndex blockVersion softwareVersion blockVersionModifier = do
diff --git a/script-runner/BlockParser.hs b/script-runner/BlockParser.hs
@@ -3,11 +3,11 @@
 
 module BlockParser (file1, file2, printBlock) where
 
-import           Universum hiding (when, openFile)
-import Codec.CBOR.Read (deserialiseFromBytes)
-import Pos.Binary.Class (decode)
-import Pos.Chain.Block (Block)
-import System.IO hiding (print)
+import           Codec.CBOR.Read (deserialiseFromBytes)
+import           Pos.Binary.Class (decode)
+import           Pos.Chain.Block (Block)
+import           System.IO hiding (print)
+import           Universum hiding (openFile, when)
 
 import qualified Data.ByteString.Lazy as LBS
 
diff --git a/script-runner/BrickUI.hs b/script-runner/BrickUI.hs
@@ -1,17 +1,17 @@
-{-# LANGUAGE NamedFieldPuns #-}
-{-# LANGUAGE OverloadedStrings #-}
+{-# LANGUAGE NamedFieldPuns    #-}
 {-# LANGUAGE NoImplicitPrelude #-}
+{-# LANGUAGE OverloadedStrings #-}
 
 module BrickUI (ui, handleEvent) where
 
 import           Brick hiding (on)
-import           Formatting
-import           Graphics.Vty (Event(EvKey), Key(KChar))
-import           Universum hiding (when, on, state)
+import qualified Brick.Widgets.Border as B
 import qualified Brick.Widgets.Border.Style as BS
 import qualified Brick.Widgets.Center as C
-import qualified Brick.Widgets.Border as B
-import BrickUITypes
+import           BrickUITypes
+import           Formatting
+import           Graphics.Vty (Event (EvKey), Key (KChar))
+import           Universum hiding (on, state, when)
 
 localHeight :: AppState -> Widget Name
 localHeight AppState{asLocalHeight} = str $ "Local Block Count: " <> show asLocalHeight
@@ -45,7 +45,7 @@ handleEvent :: AppState -> BrickEvent Name CustomEvent -> EventM n (Next AppStat
 handleEvent state (VtyEvent (EvKey key [])) = do
   case key of
     KChar 'q' -> halt state
-    _ -> continue $ state { asLastMsg = show key }
+    _         -> continue $ state { asLastMsg = show key }
 handleEvent state (AppEvent ae) = do
   case ae of
     CENodeInfo (NodeInfo{niLocalHeight,niGlobalHeight,niLocalEpochOrSlot}) -> do
diff --git a/script-runner/BrickUITypes.hs b/script-runner/BrickUITypes.hs
@@ -4,31 +4,33 @@ module BrickUITypes (AppState(..), Name, CustomEvent(..), Reply(..), SlotStart(.
 
 import           Brick.BChan
 import           Pos.Core (EpochOrSlot)
-import           Universum hiding (when, on, state)
+import           Universum hiding (on, state, when)
 
 data AppState = AppState
-  { asLocalHeight :: Word64
-  , asGlobalHeight :: Maybe Word64
-  , asLastMsg :: String
+  { asLocalHeight      :: Word64
+  , asGlobalHeight     :: Maybe Word64
+  , asLastMsg          :: String
   , asLocalEpochOrSlot :: Maybe EpochOrSlot
-  , asReplyChan :: BChan Reply
+  , asReplyChan        :: BChan Reply
   }
 
 data Reply = TriggerShutdown
 
 data SlotStart = SlotStart
   { ssEpoch :: Word64
-  , ssSlot :: Word16
+  , ssSlot  :: Word16
   } deriving Show
 
 data NodeInfo = NodeInfo
-  { niLocalHeight :: Word64
+  { niLocalHeight      :: Word64
   , niLocalEpochOrSlot :: EpochOrSlot
-  , niGlobalHeight :: Maybe Word64
+  , niGlobalHeight     :: Maybe Word64
   } deriving Show
 
-data CustomEvent = CESlotStart SlotStart
+data CustomEvent
+    = CESlotStart SlotStart
     | CENodeInfo NodeInfo
-    | QuitEvent deriving Show
+    | QuitEvent
+    deriving Show
 
 data Name = None deriving (Show, Ord, Eq)
diff --git a/script-runner/Poc.hs b/script-runner/Poc.hs
@@ -1,23 +1,27 @@
-{-# LANGUAGE FlexibleContexts #-}
-{-# LANGUAGE OverloadedStrings #-}
+{-# LANGUAGE FlexibleContexts  #-}
 {-# LANGUAGE NoImplicitPrelude #-}
-{-# LANGUAGE TypeApplications #-}
+{-# LANGUAGE OverloadedStrings #-}
+{-# LANGUAGE TypeApplications  #-}
 
 module Main (main) where
 
 import           AutomatedTestRunner
 import           BlockParser ()
 import           Data.Constraint (Dict (Dict))
 import           Data.Default (def)
-import           Formatting (int, sformat, (%), Format)
+import           Data.Ix (range)
+import           Formatting (Format, int, sformat, (%))
 import           PocMode
-import           Pos.Chain.Update (BlockVersion(BlockVersion), SoftwareVersion(SoftwareVersion), ApplicationName(ApplicationName), BlockVersionModifier(bvmMaxTxSize), BlockVersionData(bvdMaxTxSize, bvdMaxBlockSize))
+import           Pos.Chain.Update (ApplicationName (ApplicationName),
+                     BlockVersion (BlockVersion),
+                     BlockVersionData (bvdMaxBlockSize, bvdMaxTxSize),
+                     BlockVersionModifier (bvmMaxTxSize),
+                     SoftwareVersion (SoftwareVersion))
 import           Pos.DB.Class (gsAdoptedBVData)
 import           Pos.Infra.Diffusion.Types (Diffusion)
 import           Pos.Launcher (HasConfigurations)
 import           Serokell.Data.Memory.Units (Byte)
 import           Universum hiding (on)
-import           Data.Ix (range)
 
 printbvd :: Dict HasConfigurations -> Diffusion AuxxMode -> AuxxMode ()
 printbvd Dict _diffusion = do
diff --git a/script-runner/PocMode.hs b/script-runner/PocMode.hs
