stylish

IntersectMBO · Sep 18, 2023 · c7e9e85 · c7e9e85
1 parent 2c88c86
commit c7e9e85
Show file tree

Hide file tree

Showing 10 changed files with 19 additions and 15 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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