From 224421086c97f86d38ac51e77642d4f4d175c7da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcin=20W=C3=B3jtowicz?= Date: Mon, 20 May 2024 18:15:14 +0200 Subject: [PATCH] Stylish haskell --- .../Test/Ouroboros/Network/Diffusion/Node.hs | 6 ++-- .../Test/Ouroboros/Network/PeerSelection.hs | 10 +++--- .../Network/PeerSelection/Instances.hs | 4 +-- .../Network/PeerSelection/MockEnvironment.hs | 19 +++++----- .../Test/Ouroboros/Network/Testnet.hs | 2 +- .../Network/Testnet/Simulation/Node.hs | 8 +++-- .../src/Ouroboros/Network/Diffusion/P2P.hs | 36 +++++++++---------- .../Ouroboros/Network/PeerSelection/Churn.hs | 2 +- .../Network/PeerSelection/Governor.hs | 18 +++++----- .../Network/PeerSelection/Governor/Types.hs | 8 ++--- .../PeerSelection/PeerSelectionActions.hs | 14 ++++---- 11 files changed, 63 insertions(+), 64 deletions(-) diff --git a/ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/Diffusion/Node.hs b/ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/Diffusion/Node.hs index 103f70fdd24..cc32bfd08b4 100644 --- a/ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/Diffusion/Node.hs +++ b/ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/Diffusion/Node.hs @@ -67,12 +67,13 @@ import Ouroboros.Network.Block (MaxSlotNo (..), maxSlotNoFromWithOrigin, pointSlot) import Ouroboros.Network.BlockFetch import Ouroboros.Network.ConnectionManager.Types (DataFlow (..)) +import Ouroboros.Network.ConsensusMode import Ouroboros.Network.Diffusion qualified as Diff import Ouroboros.Network.Diffusion.P2P qualified as Diff.P2P import Ouroboros.Network.ExitPolicy (RepromoteDelay (..)) import Ouroboros.Network.NodeToNode.Version (DiffusionMode (..)) -import Ouroboros.Network.PeerSelection.Governor (PeerSelectionTargets (..), - PublicPeerSelectionState (..), ConsensusModePeerTargets) +import Ouroboros.Network.PeerSelection.Governor (ConsensusModePeerTargets, + PeerSelectionTargets (..), PublicPeerSelectionState (..)) import Ouroboros.Network.PeerSelection.PeerMetric (PeerMetricsConfiguration (..), newPeerMetric) import Ouroboros.Network.Protocol.Handshake (HandshakeArguments (..)) @@ -112,7 +113,6 @@ import Test.Ouroboros.Network.Diffusion.Node.NodeKernel (NodeKernel (..), import Test.Ouroboros.Network.Diffusion.Node.NodeKernel qualified as Node import Test.Ouroboros.Network.PeerSelection.RootPeersDNS (DNSLookupDelay, DNSTimeout, mockDNSActions) -import Ouroboros.Network.ConsensusMode (ConsensusMode) data Interfaces m = Interfaces diff --git a/ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/PeerSelection.hs b/ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/PeerSelection.hs index 28858f2a8d7..47f5067c5ec 100644 --- a/ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/PeerSelection.hs +++ b/ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/PeerSelection.hs @@ -43,6 +43,7 @@ import Data.Foldable (traverse_) import Data.Function (on) import Data.IP qualified as IP import Data.List as List (foldl', groupBy, intercalate) +import Data.List.NonEmpty qualified as NonEmpty import Data.List.Trace qualified as Trace import Data.Map.Strict (Map) import Data.Map.Strict qualified as Map @@ -56,6 +57,7 @@ import System.Random (mkStdGen) import Network.DNS qualified as DNS (defaultResolvConf) import Network.Socket (SockAddr) +import Ouroboros.Network.ConsensusMode import Ouroboros.Network.ExitPolicy (RepromoteDelay (..)) import Ouroboros.Network.PeerSelection.Bootstrap (UseBootstrapPeers (..), requiresBootstrapPeers) @@ -96,8 +98,6 @@ import Test.QuickCheck.Monoids import Test.Tasty import Test.Tasty.QuickCheck import Text.Pretty.Simple -import Ouroboros.Network.ConsensusMode -import Data.List.NonEmpty qualified as NonEmpty -- Exactly as named. unfHydra :: Int @@ -765,8 +765,8 @@ envEventCredits (TraceEnvSetTargets PeerSelectionTargets { + 10 * (targetNumberOfKnownPeers + targetNumberOfEstablishedPeers + targetNumberOfActivePeers) - --- todo: add big ledger peer terms? + +-- todo: add big ledger peer terms? envEventCredits (TraceEnvGenesisLsjAndTargets (_, targets)) = 80 + 10 * (targetNumberOfKnownPeers @@ -3749,7 +3749,7 @@ _governorFindingPublicRoots targetNumberOfRootPeers readDomains readUseBootstrap debugStateVar, readUseLedgerPeers = return DontUseLedgerPeers } - + publicRootPeersProvider tracer (curry IP.toSockAddr) diff --git a/ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/PeerSelection/Instances.hs b/ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/PeerSelection/Instances.hs index 83db9531093..e2f83b90331 100644 --- a/ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/PeerSelection/Instances.hs +++ b/ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/PeerSelection/Instances.hs @@ -26,6 +26,7 @@ import Ouroboros.Network.PeerSelection.Governor import Data.Hashable import Data.IP qualified as IP +import Ouroboros.Network.ConsensusMode import Ouroboros.Network.PeerSelection.Bootstrap (UseBootstrapPeers (..)) import Ouroboros.Network.PeerSelection.LedgerPeers.Type (AfterSlot (..), UseLedgerPeers (..)) @@ -37,7 +38,6 @@ import Ouroboros.Network.PeerSelection.RelayAccessPoint (DomainAccessPoint (..), import Ouroboros.Network.Testing.Utils (ShrinkCarefully, prop_shrink_nonequal, prop_shrink_valid) import Test.QuickCheck -import Ouroboros.Network.ConsensusMode -- @@ -74,7 +74,7 @@ instance Arbitrary ConsensusMode where arbitrary = elements [PraosMode, GenesisMode] shrink GenesisMode = [PraosMode] shrink PraosMode = [] - + instance Arbitrary AfterSlot where arbitrary = oneof [ pure Always , After <$> arbitrary diff --git a/ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/PeerSelection/MockEnvironment.hs b/ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/PeerSelection/MockEnvironment.hs index d7844f8751b..9575f4bbb44 100644 --- a/ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/PeerSelection/MockEnvironment.hs +++ b/ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/PeerSelection/MockEnvironment.hs @@ -67,14 +67,11 @@ import Ouroboros.Network.PeerSelection.State.LocalRootPeers qualified as LocalRo import Ouroboros.Network.Testing.Data.Script (PickScript, Script (..), ScriptDelay (..), TimedScript, arbitraryPickScript, arbitraryScriptOf, initScript, initScript', interpretPickScript, - playTimedScript, prop_shrink_Script, singletonScript, - singletonTimedScript, stepScript, stepScriptSTM, stepScriptSTM', shrinkScriptWith) -import Ouroboros.Network.Testing.Utils - ( ShrinkCarefully, - arbitrarySubset, - prop_shrink_nonequal, - prop_shrink_valid, - nightlyTest ) + playTimedScript, prop_shrink_Script, shrinkScriptWith, + singletonScript, singletonTimedScript, stepScript, stepScriptSTM, + stepScriptSTM') +import Ouroboros.Network.Testing.Utils (ShrinkCarefully, arbitrarySubset, + nightlyTest, prop_shrink_nonequal, prop_shrink_valid) import Test.Ouroboros.Network.PeerSelection.Instances import Test.Ouroboros.Network.PeerSelection.LocalRootPeers as LocalRootPeers hiding @@ -1076,14 +1073,14 @@ instance Arbitrary GovernorMockEnvironment where (HotValency hotLocalRootsSize) = LocalRootPeers.hotTarget localRootPeers (WarmValency warmLocalRootsSize) = LocalRootPeers.warmTarget localRootPeers shrunkScript = shrink targetsWithDelay - checkTargets t = + checkTargets t = targetNumberOfKnownPeers t >= publicConfiguredRootSize + warmLocalRootsSize && targetNumberOfEstablishedPeers t >= warmLocalRootsSize && targetNumberOfEstablishedPeers t <= targetNumberOfKnownPeers t && targetNumberOfActivePeers t >= hotLocalRootsSize && targetNumberOfActivePeers t <= targetNumberOfEstablishedPeers t && targetNumberOfRootPeers t <= targetNumberOfKnownPeers t - - warmLocalRootsSize + - warmLocalRootsSize in [shrunk | shrunk@(shrunkTarget, _) <- shrunkScript, @@ -1096,7 +1093,7 @@ instance Arbitrary GovernorMockEnvironment where all checkTargets [deadlineTargets, syncTargets], genesisBigKnown >= 10 && genesisBigEst <= genesisBigKnown && genesisBigAct <= genesisBigEst, genesisBigEst * genesisBigAct /= 0] - + shrinkLocalRootPeers a = [ LocalRootPeers.fromGroups g | g <- shrink (LocalRootPeers.toGroups a) diff --git a/ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/Testnet.hs b/ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/Testnet.hs index 39a254a7042..d7a9debe633 100644 --- a/ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/Testnet.hs +++ b/ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/Testnet.hs @@ -2487,7 +2487,7 @@ prop_diffusion_target_active_local_above ioSimTrace traceNumber = $ evsList in classifySimulatedTime lastTime $ classifyNumberOfEvents (length evsList) - $ verify_target_active_above ev + $ verify_target_active_above ev ) <$> events diff --git a/ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/Testnet/Simulation/Node.hs b/ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/Testnet/Simulation/Node.hs index 10829307817..9ce912e6aeb 100644 --- a/ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/Testnet/Simulation/Node.hs +++ b/ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/Testnet/Simulation/Node.hs @@ -71,6 +71,7 @@ import Network.TypedProtocol.PingPong.Type qualified as PingPong import Ouroboros.Network.ConnectionHandler (ConnectionHandlerTrace) import Ouroboros.Network.ConnectionManager.Types (AbstractTransitionTrace, ConnectionManagerTrace) +import Ouroboros.Network.ConsensusMode import Ouroboros.Network.Diffusion.P2P qualified as Diff.P2P import Ouroboros.Network.Driver.Limits (ProtocolSizeLimits (..), ProtocolTimeLimits (..)) @@ -78,8 +79,9 @@ import Ouroboros.Network.InboundGovernor (InboundGovernorTrace, RemoteTransitionTrace) import Ouroboros.Network.Mux (MiniProtocolLimits (..)) import Ouroboros.Network.NodeToNode.Version (DiffusionMode (..)) -import Ouroboros.Network.PeerSelection.Governor (DebugPeerSelection (..), - PeerSelectionTargets (..), TracePeerSelection, ConsensusModePeerTargets (..)) +import Ouroboros.Network.PeerSelection.Governor (ConsensusModePeerTargets (..), + DebugPeerSelection (..), PeerSelectionTargets (..), + TracePeerSelection) import Ouroboros.Network.PeerSelection.Governor qualified as PeerSelection import Ouroboros.Network.PeerSelection.LedgerPeers (AfterSlot (..), LedgerPeersConsensusInterface (..), LedgerStateJudgement (..), @@ -430,7 +432,7 @@ genNodeArgs relays minConnected localRootPeers relay = flip suchThat hasUpstream fetchModeScript <- fmap (bool FetchModeBulkSync FetchModeDeadline) <$> arbitrary naConsensusMode <- arbitrary - bootstrapPeersDomain <- + bootstrapPeersDomain <- case naConsensusMode of GenesisMode -> pure . singletonScript $ DontUseBootstrapPeers PraosMode -> Script . NonEmpty.fromList <$> listOf1 arbitrary diff --git a/ouroboros-network/src/Ouroboros/Network/Diffusion/P2P.hs b/ouroboros-network/src/Ouroboros/Network/Diffusion/P2P.hs index 4dae00a3435..33b42b17a19 100644 --- a/ouroboros-network/src/Ouroboros/Network/Diffusion/P2P.hs +++ b/ouroboros-network/src/Ouroboros/Network/Diffusion/P2P.hs @@ -1,13 +1,13 @@ -{-# LANGUAGE CPP #-} -{-# LANGUAGE DataKinds #-} -{-# LANGUAGE FlexibleContexts #-} -{-# LANGUAGE GADTs #-} -{-# LANGUAGE KindSignatures #-} -{-# LANGUAGE NamedFieldPuns #-} -{-# LANGUAGE RankNTypes #-} -{-# LANGUAGE ScopedTypeVariables #-} -{-# LANGUAGE TypeOperators #-} +{-# LANGUAGE CPP #-} +{-# LANGUAGE DataKinds #-} {-# LANGUAGE DisambiguateRecordFields #-} +{-# LANGUAGE FlexibleContexts #-} +{-# LANGUAGE GADTs #-} +{-# LANGUAGE KindSignatures #-} +{-# LANGUAGE NamedFieldPuns #-} +{-# LANGUAGE RankNTypes #-} +{-# LANGUAGE ScopedTypeVariables #-} +{-# LANGUAGE TypeOperators #-} #if !defined(mingw32_HOST_OS) #define POSIX @@ -101,14 +101,14 @@ import Ouroboros.Network.NodeToNode (AcceptedConnectionsLimit (..), NodeToNodeVersionData (..), RemoteAddress) import Ouroboros.Network.NodeToNode qualified as NodeToNode import Ouroboros.Network.PeerSelection.Bootstrap (UseBootstrapPeers) -import Ouroboros.Network.PeerSelection.Churn ( PeerChurnArgs(..) ) +import Ouroboros.Network.PeerSelection.Churn (PeerChurnArgs (..)) import Ouroboros.Network.PeerSelection.Governor qualified as Governor import Ouroboros.Network.PeerSelection.Governor.Types - (ChurnMode (ChurnModeNormal), DebugPeerSelection (..), - PeerSelectionActions, PeerSelectionCounters, + (ChurnMode (ChurnModeNormal), ConsensusModePeerTargets (..), + DebugPeerSelection (..), PeerSelectionActions, PeerSelectionCounters, PeerSelectionInterfaces (..), PeerSelectionPolicy (..), PeerSelectionState, TracePeerSelection (..), - emptyPeerSelectionCounters, emptyPeerSelectionState, ConsensusModePeerTargets (..)) + emptyPeerSelectionCounters, emptyPeerSelectionState) #ifdef POSIX import Ouroboros.Network.PeerSelection.Governor.Types (makeDebugPeerSelectionState) @@ -248,17 +248,17 @@ nullTracers = data ArgumentsExtra m = ArgumentsExtra { -- | selection targets for the peer governor -- - daPeerTargets :: ConsensusModePeerTargets + daPeerTargets :: ConsensusModePeerTargets - , daReadLocalRootPeers :: STM m (LocalRootPeers.Config RelayAccessPoint) - , daReadPublicRootPeers :: STM m (Map RelayAccessPoint PeerAdvertise) + , daReadLocalRootPeers :: STM m (LocalRootPeers.Config RelayAccessPoint) + , daReadPublicRootPeers :: STM m (Map RelayAccessPoint PeerAdvertise) -- | When syncing up, ie. ledgerStateJudgement == TooOld, -- when this is True we will maintain connection with many big ledger peers -- to get a strong guarantee that when syncing up we will finish with a true -- ledger state. When false, we will fall back on the previous algorithms -- that leverage UseBootstrapPeers flag - , daConsensusMode :: ConsensusMode - , daReadUseBootstrapPeers :: STM m UseBootstrapPeers + , daConsensusMode :: ConsensusMode + , daReadUseBootstrapPeers :: STM m UseBootstrapPeers -- | Depending on configuration, node may provide us with -- a snapshot of big ledger peers taken at some slot on the chain. -- These peers may be selected by ledgerPeersThread when requested diff --git a/ouroboros-network/src/Ouroboros/Network/PeerSelection/Churn.hs b/ouroboros-network/src/Ouroboros/Network/PeerSelection/Churn.hs index 71d708a6c96..7fdc0089938 100644 --- a/ouroboros-network/src/Ouroboros/Network/PeerSelection/Churn.hs +++ b/ouroboros-network/src/Ouroboros/Network/PeerSelection/Churn.hs @@ -36,8 +36,8 @@ import Ouroboros.Network.Diffusion.Policies (churnEstablishConnectionTimeout, closeConnectionTimeout, deactivateTimeout) import Ouroboros.Network.PeerSelection.Bootstrap (UseBootstrapPeers (..)) import Ouroboros.Network.PeerSelection.Governor.Types hiding (targets) -import Ouroboros.Network.PeerSelection.PeerMetric import Ouroboros.Network.PeerSelection.LedgerPeers.Type +import Ouroboros.Network.PeerSelection.PeerMetric import Ouroboros.Network.PeerSelection.State.LocalRootPeers (HotValency (..)) -- | Tag indicating churning approach diff --git a/ouroboros-network/src/Ouroboros/Network/PeerSelection/Governor.hs b/ouroboros-network/src/Ouroboros/Network/PeerSelection/Governor.hs index 517d35903cf..62506cfdb0e 100644 --- a/ouroboros-network/src/Ouroboros/Network/PeerSelection/Governor.hs +++ b/ouroboros-network/src/Ouroboros/Network/PeerSelection/Governor.hs @@ -1,11 +1,11 @@ -{-# LANGUAGE BangPatterns #-} -{-# LANGUAGE CPP #-} -{-# LANGUAGE FlexibleContexts #-} -{-# LANGUAGE LambdaCase #-} -{-# LANGUAGE MultiWayIf #-} -{-# LANGUAGE NamedFieldPuns #-} -{-# LANGUAGE ScopedTypeVariables #-} +{-# LANGUAGE BangPatterns #-} +{-# LANGUAGE CPP #-} {-# LANGUAGE DuplicateRecordFields #-} +{-# LANGUAGE FlexibleContexts #-} +{-# LANGUAGE LambdaCase #-} +{-# LANGUAGE MultiWayIf #-} +{-# LANGUAGE NamedFieldPuns #-} +{-# LANGUAGE ScopedTypeVariables #-} #if __GLASGOW_HASKELL__ < 904 {-# OPTIONS_GHC -Wno-name-shadowing #-} @@ -72,8 +72,8 @@ import System.Random import Ouroboros.Network.ConsensusMode import Ouroboros.Network.PeerSelection.Bootstrap (UseBootstrapPeers (..)) -import Ouroboros.Network.PeerSelection.Churn (ChurnCounters (..), PeerChurnArgs (..), - peerChurnGovernor) +import Ouroboros.Network.PeerSelection.Churn (ChurnCounters (..), + PeerChurnArgs (..), peerChurnGovernor) import Ouroboros.Network.PeerSelection.Governor.ActivePeers qualified as ActivePeers import Ouroboros.Network.PeerSelection.Governor.BigLedgerPeers qualified as BigLedgerPeers import Ouroboros.Network.PeerSelection.Governor.EstablishedPeers qualified as EstablishedPeers diff --git a/ouroboros-network/src/Ouroboros/Network/PeerSelection/Governor/Types.hs b/ouroboros-network/src/Ouroboros/Network/PeerSelection/Governor/Types.hs index e0a26e8f7b2..b9a8fc49925 100644 --- a/ouroboros-network/src/Ouroboros/Network/PeerSelection/Governor/Types.hs +++ b/ouroboros-network/src/Ouroboros/Network/PeerSelection/Governor/Types.hs @@ -415,21 +415,21 @@ data PeerSelectionActions peeraddr peerconn m = PeerSelectionActions { data PeerSelectionInterfaces peeraddr peerconn m = PeerSelectionInterfaces { -- | PeerSelectionCounters are shared with churn through a `StrictTVar`. -- - countersVar :: StrictTVar m PeerSelectionCounters, + countersVar :: StrictTVar m PeerSelectionCounters, -- | PublicPeerSelectionState var. -- - publicStateVar :: StrictTVar m (PublicPeerSelectionState peeraddr), + publicStateVar :: StrictTVar m (PublicPeerSelectionState peeraddr), -- | PeerSelectionState shared for debugging purposes (to support SIGUSR1 -- debug event tracing) -- - debugStateVar :: StrictTVar m (PeerSelectionState peeraddr peerconn), + debugStateVar :: StrictTVar m (PeerSelectionState peeraddr peerconn), -- | `UseLedgerPeers` used by `peerSelectionGovernor` to support -- `HiddenRelayOrBP` -- - readUseLedgerPeers :: STM m UseLedgerPeers + readUseLedgerPeers :: STM m UseLedgerPeers } diff --git a/ouroboros-network/src/Ouroboros/Network/PeerSelection/PeerSelectionActions.hs b/ouroboros-network/src/Ouroboros/Network/PeerSelection/PeerSelectionActions.hs index bcb16131fb0..698e1dfc81d 100644 --- a/ouroboros-network/src/Ouroboros/Network/PeerSelection/PeerSelectionActions.hs +++ b/ouroboros-network/src/Ouroboros/Network/PeerSelection/PeerSelectionActions.hs @@ -1,11 +1,11 @@ -{-# LANGUAGE CPP #-} -{-# LANGUAGE FlexibleContexts #-} -{-# LANGUAGE LambdaCase #-} -{-# LANGUAGE NamedFieldPuns #-} -{-# LANGUAGE RankNTypes #-} -{-# LANGUAGE ScopedTypeVariables #-} -{-# LANGUAGE TupleSections #-} +{-# LANGUAGE CPP #-} {-# LANGUAGE DisambiguateRecordFields #-} +{-# LANGUAGE FlexibleContexts #-} +{-# LANGUAGE LambdaCase #-} +{-# LANGUAGE NamedFieldPuns #-} +{-# LANGUAGE RankNTypes #-} +{-# LANGUAGE ScopedTypeVariables #-} +{-# LANGUAGE TupleSections #-} module Ouroboros.Network.PeerSelection.PeerSelectionActions ( withPeerSelectionActions