From c7e9e85755d481b7e70fbce3645f305a27bebed5 Mon Sep 17 00:00:00 2001 From: Armando Santos Date: Mon, 18 Sep 2023 14:30:02 +0100 Subject: [PATCH] stylish --- .../src/Ouroboros/Network/NodeToNode/Version.hs | 11 ++++++----- .../src/Ouroboros/Network/ConnectionManager/Core.hs | 2 +- .../Network/Protocol/Handshake/Unversioned.hs | 3 ++- .../Ouroboros/Network/Protocol/Handshake/Test.hs | 2 +- .../Ouroboros/Network/Diffusion/Node/NodeKernel.hs | 2 +- .../Network/PeerSelection/MockEnvironment.hs | 3 ++- .../Test/Ouroboros/Network/Testnet/Simulation/Node.hs | 2 +- .../Network/PeerSelection/PeerSelectionActions.hs | 2 +- .../Network/PeerSelection/PeerStateActions.hs | 2 +- .../Network/PeerSelection/State/KnownPeers.hs | 5 +++-- 10 files changed, 19 insertions(+), 15 deletions(-) diff --git a/ouroboros-network-api/src/Ouroboros/Network/NodeToNode/Version.hs b/ouroboros-network-api/src/Ouroboros/Network/NodeToNode/Version.hs index e409ca117d9..1e712eb05f7 100644 --- a/ouroboros-network-api/src/Ouroboros/Network/NodeToNode/Version.hs +++ b/ouroboros-network-api/src/Ouroboros/Network/NodeToNode/Version.hs @@ -23,7 +23,8 @@ import Ouroboros.Network.Handshake.Acceptable (Accept (..), Acceptable (..)) import Ouroboros.Network.Handshake.Queryable (Queryable (..)) import Ouroboros.Network.Magic -import Ouroboros.Network.PeerSelection.PeerSharing (PeerSharing (..), combinePeerSharing) +import Ouroboros.Network.PeerSelection.PeerSharing (PeerSharing (..), + combinePeerSharing) -- | Enumeration of node to node protocol versions. @@ -114,10 +115,10 @@ data DiffusionMode -- | Version data for NodeToNode protocol -- data NodeToNodeVersionData = NodeToNodeVersionData - { networkMagic :: !NetworkMagic - , diffusionMode :: !DiffusionMode - , peerSharing :: !PeerSharing - , query :: !Bool + { networkMagic :: !NetworkMagic + , diffusionMode :: !DiffusionMode + , peerSharing :: !PeerSharing + , query :: !Bool } deriving (Show, Typeable, Eq) -- 'Eq' instance is not provided, it is not what we need in version diff --git a/ouroboros-network-framework/src/Ouroboros/Network/ConnectionManager/Core.hs b/ouroboros-network-framework/src/Ouroboros/Network/ConnectionManager/Core.hs index f4b127628e1..718f123b562 100644 --- a/ouroboros-network-framework/src/Ouroboros/Network/ConnectionManager/Core.hs +++ b/ouroboros-network-framework/src/Ouroboros/Network/ConnectionManager/Core.hs @@ -63,10 +63,10 @@ import qualified Ouroboros.Network.ConnectionManager.Types as CM import Ouroboros.Network.InboundGovernor.Event (NewConnectionInfo (..)) import Ouroboros.Network.MuxMode +import Ouroboros.Network.PeerSelection.PeerSharing (PeerSharing) import Ouroboros.Network.Server.RateLimiting (AcceptedConnectionsLimit (..)) import Ouroboros.Network.Snocket -import Ouroboros.Network.PeerSelection.PeerSharing (PeerSharing) -- | Arguments for a 'ConnectionManager' which are independent of 'MuxMode'. diff --git a/ouroboros-network-framework/src/Ouroboros/Network/Protocol/Handshake/Unversioned.hs b/ouroboros-network-framework/src/Ouroboros/Network/Protocol/Handshake/Unversioned.hs index 8ff7b53d7a3..65e0552ddbb 100644 --- a/ouroboros-network-framework/src/Ouroboros/Network/Protocol/Handshake/Unversioned.hs +++ b/ouroboros-network-framework/src/Ouroboros/Network/Protocol/Handshake/Unversioned.hs @@ -26,7 +26,8 @@ import Network.TypedProtocol.Codec import Ouroboros.Network.CodecCBORTerm import Ouroboros.Network.ConnectionManager.Types (DataFlow (..)) -import Ouroboros.Network.PeerSelection.PeerSharing (PeerSharing (..), combinePeerSharing) +import Ouroboros.Network.PeerSelection.PeerSharing (PeerSharing (..), + combinePeerSharing) import Ouroboros.Network.Protocol.Handshake.Codec import Ouroboros.Network.Protocol.Handshake.Type import Ouroboros.Network.Protocol.Handshake.Version diff --git a/ouroboros-network-protocols/testlib/Ouroboros/Network/Protocol/Handshake/Test.hs b/ouroboros-network-protocols/testlib/Ouroboros/Network/Protocol/Handshake/Test.hs index 439e7dcecf4..8141e4b7e99 100644 --- a/ouroboros-network-protocols/testlib/Ouroboros/Network/Protocol/Handshake/Test.hs +++ b/ouroboros-network-protocols/testlib/Ouroboros/Network/Protocol/Handshake/Test.hs @@ -702,7 +702,7 @@ instance Arbitrary ArbitraryNodeToNodeVersionData where shrinkMode InitiatorAndResponderDiffusionMode = [InitiatorOnlyDiffusionMode] shrinkPeerSharing PeerSharingDisabled = [] - shrinkPeerSharing PeerSharingEnabled = [PeerSharingDisabled] + shrinkPeerSharing PeerSharingEnabled = [PeerSharingDisabled] newtype ArbitraryNodeToNodeVersions = ArbitraryNodeToNodeVersions diff --git a/ouroboros-network/sim-tests/Test/Ouroboros/Network/Diffusion/Node/NodeKernel.hs b/ouroboros-network/sim-tests/Test/Ouroboros/Network/Diffusion/Node/NodeKernel.hs index e31d22bda45..c8bfb6046c1 100644 --- a/ouroboros-network/sim-tests/Test/Ouroboros/Network/Diffusion/Node/NodeKernel.hs +++ b/ouroboros-network/sim-tests/Test/Ouroboros/Network/Diffusion/Node/NodeKernel.hs @@ -80,6 +80,7 @@ import qualified Codec.CBOR.Decoding as CBOR import qualified Codec.CBOR.Encoding as CBOR import Ouroboros.Network.Mock.Chain (Chain (..)) import Ouroboros.Network.NodeToNode () +import Ouroboros.Network.PeerSelection.PeerSharing (PeerSharing) import Ouroboros.Network.PeerSelection.RelayAccessPoint (RelayAccessPoint (..)) import Ouroboros.Network.PeerSharing (PeerSharingRegistry (..), @@ -88,7 +89,6 @@ import qualified Test.Ouroboros.Network.Diffusion.Node.ChainDB as ChainDB import Test.Ouroboros.Network.Diffusion.Node.ChainDB (ChainDB (..)) import Test.QuickCheck (Arbitrary (..), choose, chooseInt, frequency, oneof) -import Ouroboros.Network.PeerSelection.PeerSharing (PeerSharing) -- | Node-to-node address type. diff --git a/ouroboros-network/sim-tests/Test/Ouroboros/Network/PeerSelection/MockEnvironment.hs b/ouroboros-network/sim-tests/Test/Ouroboros/Network/PeerSelection/MockEnvironment.hs index 92f13e1d2c7..603148a16a6 100644 --- a/ouroboros-network/sim-tests/Test/Ouroboros/Network/PeerSelection/MockEnvironment.hs +++ b/ouroboros-network/sim-tests/Test/Ouroboros/Network/PeerSelection/MockEnvironment.hs @@ -74,13 +74,14 @@ import Test.Ouroboros.Network.ShrinkCarefully import Ouroboros.Network.PeerSelection.LedgerPeers (IsBigLedgerPeer, IsLedgerPeer) import Ouroboros.Network.PeerSelection.PeerAdvertise (PeerAdvertise) +import Ouroboros.Network.PeerSelection.PeerSharing (PeerSharing, + combinePeerSharing) import Ouroboros.Network.PeerSelection.Types (PeerStatus (..)) import Ouroboros.Network.Protocol.PeerSharing.Type (PeerSharingAmount, PeerSharingResult (..)) import Test.QuickCheck import Test.Tasty (TestTree, localOption, testGroup) import Test.Tasty.QuickCheck (QuickCheckMaxSize (..), testProperty) -import Ouroboros.Network.PeerSelection.PeerSharing (PeerSharing, combinePeerSharing) tests :: TestTree diff --git a/ouroboros-network/sim-tests/Test/Ouroboros/Network/Testnet/Simulation/Node.hs b/ouroboros-network/sim-tests/Test/Ouroboros/Network/Testnet/Simulation/Node.hs index c82f8a1f50b..7a61830450f 100644 --- a/ouroboros-network/sim-tests/Test/Ouroboros/Network/Testnet/Simulation/Node.hs +++ b/ouroboros-network/sim-tests/Test/Ouroboros/Network/Testnet/Simulation/Node.hs @@ -127,13 +127,13 @@ import Ouroboros.Network.BlockFetch (TraceFetchClientState, TraceLabelPeer (..)) import Ouroboros.Network.PeerSelection.PeerAdvertise (PeerAdvertise (..)) +import Ouroboros.Network.PeerSelection.PeerSharing (PeerSharing) import Ouroboros.Network.PeerSelection.State.LocalRootPeers (HotValency (..), WarmValency (..)) import Ouroboros.Network.Protocol.PeerSharing.Codec (byteLimitsPeerSharing, timeLimitsPeerSharing) import Test.Ouroboros.Network.PeerSelection.LocalRootPeers () import Test.QuickCheck -import Ouroboros.Network.PeerSelection.PeerSharing (PeerSharing) -- | Diffusion Simulator Arguments -- diff --git a/ouroboros-network/src/Ouroboros/Network/PeerSelection/PeerSelectionActions.hs b/ouroboros-network/src/Ouroboros/Network/PeerSelection/PeerSelectionActions.hs index 4dfc349808b..5a7262ac237 100644 --- a/ouroboros-network/src/Ouroboros/Network/PeerSelection/PeerSelectionActions.hs +++ b/ouroboros-network/src/Ouroboros/Network/PeerSelection/PeerSelectionActions.hs @@ -34,13 +34,13 @@ import Ouroboros.Network.PeerSelection.Governor.Types import Ouroboros.Network.PeerSelection.LedgerPeers import Ouroboros.Network.PeerSelection.PeerAdvertise (PeerAdvertise (..)) +import Ouroboros.Network.PeerSelection.PeerSharing (PeerSharing) import Ouroboros.Network.PeerSelection.RootPeersDNS import Ouroboros.Network.PeerSelection.State.LocalRootPeers (HotValency, WarmValency) import Ouroboros.Network.PeerSharing (PeerSharingController (..)) import Ouroboros.Network.Protocol.PeerSharing.Type (PeerSharingAmount (..)) -import Ouroboros.Network.PeerSelection.PeerSharing (PeerSharing) withPeerSelectionActions diff --git a/ouroboros-network/src/Ouroboros/Network/PeerSelection/PeerStateActions.hs b/ouroboros-network/src/Ouroboros/Network/PeerSelection/PeerStateActions.hs index dfc4d37ab73..aab6bdb5c5d 100644 --- a/ouroboros-network/src/Ouroboros/Network/PeerSelection/PeerStateActions.hs +++ b/ouroboros-network/src/Ouroboros/Network/PeerSelection/PeerStateActions.hs @@ -61,8 +61,8 @@ import Ouroboros.Network.Protocol.Handshake (HandshakeException) import Ouroboros.Network.ConnectionHandler (Handle (..), HandleError (..), MuxConnectionManager) import Ouroboros.Network.ConnectionManager.Types +import Ouroboros.Network.PeerSelection.PeerSharing (PeerSharing) import Ouroboros.Network.PeerSelection.Types (PeerStatus (..)) -import Ouroboros.Network.PeerSelection.PeerSharing (PeerSharing) -- $doc -- diff --git a/ouroboros-network/src/Ouroboros/Network/PeerSelection/State/KnownPeers.hs b/ouroboros-network/src/Ouroboros/Network/PeerSelection/State/KnownPeers.hs index 9d45712307e..a27251cf40d 100644 --- a/ouroboros-network/src/Ouroboros/Network/PeerSelection/State/KnownPeers.hs +++ b/ouroboros-network/src/Ouroboros/Network/PeerSelection/State/KnownPeers.hs @@ -48,7 +48,8 @@ import Data.Maybe (fromMaybe) import Ouroboros.Network.PeerSelection.LedgerPeers (IsLedgerPeer (..)) import Ouroboros.Network.PeerSelection.PeerAdvertise (PeerAdvertise (..)) -import Ouroboros.Network.PeerSelection.PeerSharing (PeerSharing (..), combinePeerSharing) +import Ouroboros.Network.PeerSelection.PeerSharing (PeerSharing (..), + combinePeerSharing) ------------------------------- @@ -383,7 +384,7 @@ setConnectTimes times canPeerShareRequest :: Ord peeraddr => peeraddr -> KnownPeers peeraddr -> Bool canPeerShareRequest pa KnownPeers { allPeers } = case Map.lookup pa allPeers of - Just (KnownPeerInfo _ _ PeerSharingEnabled _ _) -> True + Just (KnownPeerInfo _ _ PeerSharingEnabled _ _) -> True _ -> False -- Filter available for Peer Sharing peers according to their PeerSharing