From a106d08f4256bab09b0d4c9c1854844d078157ef Mon Sep 17 00:00:00 2001 From: Armando Santos Date: Thu, 2 Mar 2023 14:58:08 +0000 Subject: [PATCH] Rename files --- .../src/Ouroboros/Consensus/Network/NodeToNode.hs | 2 +- .../src/Ouroboros/Consensus/Node.hs | 4 ++-- ouroboros-network-api/ouroboros-network-api.cabal | 4 ++-- .../src/Ouroboros/Network/NodeToNode/Version.hs | 2 +- .../{PeerAdvertise/Type.hs => PeerAdvertise.hs} | 2 +- .../PeerSelection/{PeerSharing/Type.hs => PeerSharing.hs} | 4 ++-- ouroboros-network-protocols/test-cddl/Main.hs | 2 +- .../testlib/Ouroboros/Network/Protocol/Handshake/Test.hs | 2 +- ouroboros-network/src/Ouroboros/Network/Diffusion/P2P.hs | 2 +- ouroboros-network/src/Ouroboros/Network/NodeToNode.hs | 4 ++-- .../src/Ouroboros/Network/PeerSelection/Governor.hs | 2 +- .../Ouroboros/Network/PeerSelection/Governor/KnownPeers.hs | 4 ++-- .../src/Ouroboros/Network/PeerSelection/Governor/Monitor.hs | 2 +- .../Ouroboros/Network/PeerSelection/Governor/RootPeers.hs | 2 +- .../src/Ouroboros/Network/PeerSelection/Governor/Types.hs | 4 ++-- .../src/Ouroboros/Network/PeerSelection/KnownPeers.hs | 4 ++-- .../src/Ouroboros/Network/PeerSelection/LocalRootPeers.hs | 2 +- .../src/Ouroboros/Network/PeerSelection/PeerStateActions.hs | 2 +- .../src/Ouroboros/Network/PeerSelection/RootPeersDNS.hs | 2 +- .../src/Ouroboros/Network/PeerSelection/Simple.hs | 4 ++-- .../test/Test/Ouroboros/Network/Diffusion/Node.hs | 4 ++-- .../Test/Ouroboros/Network/Diffusion/Node/MiniProtocols.hs | 2 +- .../Test/Ouroboros/Network/Diffusion/Node/NodeKernel.hs | 2 +- .../test/Test/Ouroboros/Network/NodeToNode/Version.hs | 2 +- .../test/Test/Ouroboros/Network/PeerSelection.hs | 4 ++-- .../test/Test/Ouroboros/Network/PeerSelection/Instances.hs | 4 ++-- .../test/Test/Ouroboros/Network/PeerSelection/Json.hs | 2 +- .../Test/Ouroboros/Network/PeerSelection/LocalRootPeers.hs | 2 +- .../Test/Ouroboros/Network/PeerSelection/MockEnvironment.hs | 4 ++-- .../test/Test/Ouroboros/Network/PeerSelection/PeerGraph.hs | 2 +- .../Test/Ouroboros/Network/PeerSelection/RootPeersDNS.hs | 2 +- ouroboros-network/test/Test/Ouroboros/Network/Testnet.hs | 4 ++-- .../test/Test/Ouroboros/Network/Testnet/Simulation/Node.hs | 6 +++--- ouroboros-network/test/Test/Socket.hs | 2 +- 34 files changed, 49 insertions(+), 49 deletions(-) rename ouroboros-network-api/src/Ouroboros/Network/PeerSelection/{PeerAdvertise/Type.hs => PeerAdvertise.hs} (88%) rename ouroboros-network-api/src/Ouroboros/Network/PeerSelection/{PeerSharing/Type.hs => PeerSharing.hs} (97%) diff --git a/ouroboros-consensus-diffusion/src/Ouroboros/Consensus/Network/NodeToNode.hs b/ouroboros-consensus-diffusion/src/Ouroboros/Consensus/Network/NodeToNode.hs index b3bdb44447a..f400b868c05 100644 --- a/ouroboros-consensus-diffusion/src/Ouroboros/Consensus/Network/NodeToNode.hs +++ b/ouroboros-consensus-diffusion/src/Ouroboros/Consensus/Network/NodeToNode.hs @@ -111,7 +111,7 @@ import Ouroboros.Consensus.Util.Orphans () import qualified Codec.CBOR.Decoding as CBOR import qualified Codec.CBOR.Encoding as CBOR import Control.Monad.Class.MonadMVar (MonadMVar) -import qualified Ouroboros.Network.PeerSelection.PeerSharing.Type as PSTypes +import qualified Ouroboros.Network.PeerSelection.PeerSharing as PSTypes import Ouroboros.Network.PeerSharing (PeerSharingController, bracketPeerSharingClient, peerSharingClient, peerSharingServer) diff --git a/ouroboros-consensus-diffusion/src/Ouroboros/Consensus/Node.hs b/ouroboros-consensus-diffusion/src/Ouroboros/Consensus/Node.hs index 9a79a247285..061e24d85c9 100644 --- a/ouroboros-consensus-diffusion/src/Ouroboros/Consensus/Node.hs +++ b/ouroboros-consensus-diffusion/src/Ouroboros/Consensus/Node.hs @@ -124,8 +124,8 @@ import System.FS.API (SomeHasFS (..)) import System.FS.API.Types import System.FS.IO (ioHasFS) import System.Random (StdGen, newStdGen, randomIO, randomRIO) -import Ouroboros.Network.PeerSelection.PeerSharing.Type (PeerSharing) -import Ouroboros.Network.PeerSelection.PeerSharing.Type (decodeRemoteAddress, encodeRemoteAddress) +import Ouroboros.Network.PeerSelection.PeerSharing (PeerSharing, + decodeRemoteAddress, encodeRemoteAddress) import Ouroboros.Network.Protocol.PeerSharing.Type (PeerSharingAmount) {------------------------------------------------------------------------------- diff --git a/ouroboros-network-api/ouroboros-network-api.cabal b/ouroboros-network-api/ouroboros-network-api.cabal index c6d2c9714e6..b0c279ddb7d 100644 --- a/ouroboros-network-api/ouroboros-network-api.cabal +++ b/ouroboros-network-api/ouroboros-network-api.cabal @@ -42,8 +42,8 @@ library Ouroboros.Network.PeerSelection.LedgerPeers.Type Ouroboros.Network.PeerSelection.PeerMetric.Type - Ouroboros.Network.PeerSelection.PeerAdvertise.Type - Ouroboros.Network.PeerSelection.PeerSharing.Type + Ouroboros.Network.PeerSelection.PeerAdvertise + Ouroboros.Network.PeerSelection.PeerSharing Ouroboros.Network.PeerSelection.RelayAccessPoint default-language: Haskell2010 build-depends: base >=4.14 && <4.17, diff --git a/ouroboros-network-api/src/Ouroboros/Network/NodeToNode/Version.hs b/ouroboros-network-api/src/Ouroboros/Network/NodeToNode/Version.hs index c56cb7e8335..420e6b65a8e 100644 --- a/ouroboros-network-api/src/Ouroboros/Network/NodeToNode/Version.hs +++ b/ouroboros-network-api/src/Ouroboros/Network/NodeToNode/Version.hs @@ -22,7 +22,7 @@ import Ouroboros.Network.CodecCBORTerm import Ouroboros.Network.Handshake.Acceptable (Accept (..), Acceptable (..)) import Ouroboros.Network.Magic -import Ouroboros.Network.PeerSelection.PeerSharing.Type +import Ouroboros.Network.PeerSelection.PeerSharing (PeerSharing (..)) diff --git a/ouroboros-network-api/src/Ouroboros/Network/PeerSelection/PeerAdvertise/Type.hs b/ouroboros-network-api/src/Ouroboros/Network/PeerSelection/PeerAdvertise.hs similarity index 88% rename from ouroboros-network-api/src/Ouroboros/Network/PeerSelection/PeerAdvertise/Type.hs rename to ouroboros-network-api/src/Ouroboros/Network/PeerSelection/PeerAdvertise.hs index 32242406828..fdad630db2f 100644 --- a/ouroboros-network-api/src/Ouroboros/Network/PeerSelection/PeerAdvertise/Type.hs +++ b/ouroboros-network-api/src/Ouroboros/Network/PeerSelection/PeerAdvertise.hs @@ -1,6 +1,6 @@ {-# LANGUAGE DeriveGeneric #-} -module Ouroboros.Network.PeerSelection.PeerAdvertise.Type (PeerAdvertise (..)) where +module Ouroboros.Network.PeerSelection.PeerAdvertise (PeerAdvertise (..)) where import Data.Aeson import Data.Bool (bool) diff --git a/ouroboros-network-api/src/Ouroboros/Network/PeerSelection/PeerSharing/Type.hs b/ouroboros-network-api/src/Ouroboros/Network/PeerSelection/PeerSharing.hs similarity index 97% rename from ouroboros-network-api/src/Ouroboros/Network/PeerSelection/PeerSharing/Type.hs rename to ouroboros-network-api/src/Ouroboros/Network/PeerSelection/PeerSharing.hs index 304c29e07f1..11f19f08ed7 100644 --- a/ouroboros-network-api/src/Ouroboros/Network/PeerSelection/PeerSharing/Type.hs +++ b/ouroboros-network-api/src/Ouroboros/Network/PeerSelection/PeerSharing.hs @@ -2,7 +2,7 @@ {-# OPTIONS_GHC -Wno-orphans #-} -module Ouroboros.Network.PeerSelection.PeerSharing.Type +module Ouroboros.Network.PeerSelection.PeerSharing ( PeerSharing (..) , combinePeerInformation , encodePortNumber @@ -18,7 +18,7 @@ import Data.Aeson.Types (FromJSON (..), ToJSON (..), Value (..), import qualified Data.Text as Text import GHC.Generics (Generic) import Network.Socket (PortNumber, SockAddr (..)) -import Ouroboros.Network.PeerSelection.PeerAdvertise.Type +import Ouroboros.Network.PeerSelection.PeerAdvertise (PeerAdvertise (..)) import Text.Read (readMaybe) diff --git a/ouroboros-network-protocols/test-cddl/Main.hs b/ouroboros-network-protocols/test-cddl/Main.hs index a78253b45fa..79218971460 100644 --- a/ouroboros-network-protocols/test-cddl/Main.hs +++ b/ouroboros-network-protocols/test-cddl/Main.hs @@ -104,7 +104,7 @@ import Ouroboros.Network.Protocol.TxSubmission2.Type (TxSubmission2) import qualified Ouroboros.Network.Protocol.TxSubmission2.Type as TxSubmission2 import Network.Socket (SockAddr (..)) -import Ouroboros.Network.PeerSelection.PeerSharing.Type +import Ouroboros.Network.PeerSelection.PeerSharing (PeerSharing (..), decodeRemoteAddress, encodeRemoteAddress) import Ouroboros.Network.Protocol.PeerSharing.Codec (codecPeerSharing) 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 e7e2127f32f..30849c4c936 100644 --- a/ouroboros-network-protocols/testlib/Ouroboros/Network/Protocol/Handshake/Test.hs +++ b/ouroboros-network-protocols/testlib/Ouroboros/Network/Protocol/Handshake/Test.hs @@ -70,7 +70,7 @@ import Ouroboros.Network.Magic import Ouroboros.Network.NodeToClient.Version import Ouroboros.Network.NodeToNode.Version -import Ouroboros.Network.PeerSelection.PeerSharing.Type +import Ouroboros.Network.PeerSelection.PeerSharing (PeerSharing (..)) import Test.QuickCheck import Test.Tasty (TestTree, testGroup) diff --git a/ouroboros-network/src/Ouroboros/Network/Diffusion/P2P.hs b/ouroboros-network/src/Ouroboros/Network/Diffusion/P2P.hs index d32a79e0c3c..9b27538dfe3 100644 --- a/ouroboros-network/src/Ouroboros/Network/Diffusion/P2P.hs +++ b/ouroboros-network/src/Ouroboros/Network/Diffusion/P2P.hs @@ -104,7 +104,7 @@ import Ouroboros.Network.PeerSelection.Governor.Types import Ouroboros.Network.PeerSelection.LedgerPeers (UseLedgerAfter (..), withLedgerPeers) import Ouroboros.Network.PeerSelection.PeerMetric (PeerMetrics) -import Ouroboros.Network.PeerSelection.PeerSharing.Type (PeerSharing) +import Ouroboros.Network.PeerSelection.PeerSharing (PeerSharing) import Ouroboros.Network.PeerSelection.PeerStateActions (PeerConnectionHandle, PeerSelectionActionsTrace (..), PeerStateActionsArguments (..), pchPeerSharing, diff --git a/ouroboros-network/src/Ouroboros/Network/NodeToNode.hs b/ouroboros-network/src/Ouroboros/Network/NodeToNode.hs index 10edfc0afc3..5f908f42cd7 100644 --- a/ouroboros-network/src/Ouroboros/Network/NodeToNode.hs +++ b/ouroboros-network/src/Ouroboros/Network/NodeToNode.hs @@ -129,9 +129,9 @@ import Ouroboros.Network.Mux import Ouroboros.Network.NodeToNode.Version import Ouroboros.Network.PeerSelection.Governor.Types (PeerSelectionTargets (..)) -import Ouroboros.Network.PeerSelection.PeerAdvertise.Type +import Ouroboros.Network.PeerSelection.PeerAdvertise (PeerAdvertise (..)) -import Ouroboros.Network.PeerSelection.PeerSharing.Type +import Ouroboros.Network.PeerSelection.PeerSharing (PeerSharing (..)) import Ouroboros.Network.PeerSelection.RootPeersDNS (DomainAccessPoint (..)) diff --git a/ouroboros-network/src/Ouroboros/Network/PeerSelection/Governor.hs b/ouroboros-network/src/Ouroboros/Network/PeerSelection/Governor.hs index 2a3e65e145a..111e5a4ffad 100644 --- a/ouroboros-network/src/Ouroboros/Network/PeerSelection/Governor.hs +++ b/ouroboros-network/src/Ouroboros/Network/PeerSelection/Governor.hs @@ -60,7 +60,7 @@ import qualified Ouroboros.Network.PeerSelection.Governor.RootPeers as RootPeers import Ouroboros.Network.PeerSelection.Governor.Types import qualified Ouroboros.Network.PeerSelection.KnownPeers as KnownPeers import Ouroboros.Network.PeerSelection.PeerMetric -import Ouroboros.Network.PeerSelection.PeerSharing.Type (PeerSharing) +import Ouroboros.Network.PeerSelection.PeerSharing (PeerSharing) {- $overview diff --git a/ouroboros-network/src/Ouroboros/Network/PeerSelection/Governor/KnownPeers.hs b/ouroboros-network/src/Ouroboros/Network/PeerSelection/Governor/KnownPeers.hs index 918c3b276d0..d9a435fc2de 100644 --- a/ouroboros-network/src/Ouroboros/Network/PeerSelection/Governor/KnownPeers.hs +++ b/ouroboros-network/src/Ouroboros/Network/PeerSelection/Governor/KnownPeers.hs @@ -25,9 +25,9 @@ import Ouroboros.Network.PeerSelection.KnownPeers (isKnownLedgerPeer) import qualified Ouroboros.Network.PeerSelection.KnownPeers as KnownPeers import Ouroboros.Network.PeerSelection.LedgerPeers (IsLedgerPeer (..)) import qualified Ouroboros.Network.PeerSelection.LocalRootPeers as LocalRootPeers -import Ouroboros.Network.PeerSelection.PeerAdvertise.Type +import Ouroboros.Network.PeerSelection.PeerAdvertise (PeerAdvertise (..)) -import Ouroboros.Network.PeerSelection.PeerSharing.Type +import Ouroboros.Network.PeerSelection.PeerSharing (PeerSharing (..)) import Ouroboros.Network.Protocol.PeerSharing.Type (PeerSharingAmount) diff --git a/ouroboros-network/src/Ouroboros/Network/PeerSelection/Governor/Monitor.hs b/ouroboros-network/src/Ouroboros/Network/PeerSelection/Governor/Monitor.hs index 57e40c6503b..db36d99cf62 100644 --- a/ouroboros-network/src/Ouroboros/Network/PeerSelection/Governor/Monitor.hs +++ b/ouroboros-network/src/Ouroboros/Network/PeerSelection/Governor/Monitor.hs @@ -38,7 +38,7 @@ import Ouroboros.Network.PeerSelection.Governor.Types hiding import qualified Ouroboros.Network.PeerSelection.KnownPeers as KnownPeers import Ouroboros.Network.PeerSelection.LedgerPeers (IsLedgerPeer (..)) import qualified Ouroboros.Network.PeerSelection.LocalRootPeers as LocalRootPeers -import Ouroboros.Network.PeerSelection.PeerSharing.Type +import Ouroboros.Network.PeerSelection.PeerSharing (PeerSharing (..)) import Ouroboros.Network.PeerSelection.Types diff --git a/ouroboros-network/src/Ouroboros/Network/PeerSelection/Governor/RootPeers.hs b/ouroboros-network/src/Ouroboros/Network/PeerSelection/Governor/RootPeers.hs index 8fbcef1822b..3206a466f8a 100644 --- a/ouroboros-network/src/Ouroboros/Network/PeerSelection/Governor/RootPeers.hs +++ b/ouroboros-network/src/Ouroboros/Network/PeerSelection/Governor/RootPeers.hs @@ -15,7 +15,7 @@ import Control.Monad.Class.MonadTime import Ouroboros.Network.PeerSelection.Governor.Types import qualified Ouroboros.Network.PeerSelection.KnownPeers as KnownPeers import qualified Ouroboros.Network.PeerSelection.LocalRootPeers as LocalRootPeers -import Ouroboros.Network.PeerSelection.PeerSharing.Type +import Ouroboros.Network.PeerSelection.PeerSharing (PeerSharing (..)) diff --git a/ouroboros-network/src/Ouroboros/Network/PeerSelection/Governor/Types.hs b/ouroboros-network/src/Ouroboros/Network/PeerSelection/Governor/Types.hs index 6e2d6bac509..eac28d1ff9b 100644 --- a/ouroboros-network/src/Ouroboros/Network/PeerSelection/Governor/Types.hs +++ b/ouroboros-network/src/Ouroboros/Network/PeerSelection/Governor/Types.hs @@ -69,9 +69,9 @@ import qualified Ouroboros.Network.PeerSelection.KnownPeers as KnownPeers import Ouroboros.Network.PeerSelection.LedgerPeers (IsLedgerPeer) import Ouroboros.Network.PeerSelection.LocalRootPeers (LocalRootPeers) import qualified Ouroboros.Network.PeerSelection.LocalRootPeers as LocalRootPeers -import Ouroboros.Network.PeerSelection.PeerAdvertise.Type +import Ouroboros.Network.PeerSelection.PeerAdvertise (PeerAdvertise) -import Ouroboros.Network.PeerSelection.PeerSharing.Type (PeerSharing) +import Ouroboros.Network.PeerSelection.PeerSharing (PeerSharing) import Ouroboros.Network.PeerSelection.Types (PeerSource (..), PeerStatus (PeerHot, PeerWarm)) import Ouroboros.Network.Protocol.PeerSharing.Type (PeerSharingAmount, diff --git a/ouroboros-network/src/Ouroboros/Network/PeerSelection/KnownPeers.hs b/ouroboros-network/src/Ouroboros/Network/PeerSelection/KnownPeers.hs index f6d81d352d1..caf0e11ba90 100644 --- a/ouroboros-network/src/Ouroboros/Network/PeerSelection/KnownPeers.hs +++ b/ouroboros-network/src/Ouroboros/Network/PeerSelection/KnownPeers.hs @@ -46,9 +46,9 @@ import Control.Exception (assert) import Control.Monad.Class.MonadTime import Ouroboros.Network.PeerSelection.LedgerPeers (IsLedgerPeer (..)) -import Ouroboros.Network.PeerSelection.PeerAdvertise.Type +import Ouroboros.Network.PeerSelection.PeerAdvertise (PeerAdvertise) -import Ouroboros.Network.PeerSelection.PeerSharing.Type +import Ouroboros.Network.PeerSelection.PeerSharing (PeerSharing (..), combinePeerInformation) diff --git a/ouroboros-network/src/Ouroboros/Network/PeerSelection/LocalRootPeers.hs b/ouroboros-network/src/Ouroboros/Network/PeerSelection/LocalRootPeers.hs index ed7a0b067c4..d230ee99ae7 100644 --- a/ouroboros-network/src/Ouroboros/Network/PeerSelection/LocalRootPeers.hs +++ b/ouroboros-network/src/Ouroboros/Network/PeerSelection/LocalRootPeers.hs @@ -29,7 +29,7 @@ import qualified Data.Map.Strict as Map import Data.Set (Set) import qualified Data.Set as Set -import Ouroboros.Network.PeerSelection.PeerAdvertise.Type +import Ouroboros.Network.PeerSelection.PeerAdvertise (PeerAdvertise) diff --git a/ouroboros-network/src/Ouroboros/Network/PeerSelection/PeerStateActions.hs b/ouroboros-network/src/Ouroboros/Network/PeerSelection/PeerStateActions.hs index 1a697ad8742..df1f8202880 100644 --- a/ouroboros-network/src/Ouroboros/Network/PeerSelection/PeerStateActions.hs +++ b/ouroboros-network/src/Ouroboros/Network/PeerSelection/PeerStateActions.hs @@ -60,7 +60,7 @@ import Ouroboros.Network.Protocol.Handshake (HandshakeException) import Ouroboros.Network.ConnectionHandler (Handle (..), HandleError (..), MuxConnectionManager) import Ouroboros.Network.ConnectionManager.Types -import Ouroboros.Network.PeerSelection.PeerSharing.Type (PeerSharing) +import Ouroboros.Network.PeerSelection.PeerSharing (PeerSharing) import Ouroboros.Network.PeerSelection.Types (PeerStatus (..)) -- $doc diff --git a/ouroboros-network/src/Ouroboros/Network/PeerSelection/RootPeersDNS.hs b/ouroboros-network/src/Ouroboros/Network/PeerSelection/RootPeersDNS.hs index ca5fba2129c..465cf306892 100644 --- a/ouroboros-network/src/Ouroboros/Network/PeerSelection/RootPeersDNS.hs +++ b/ouroboros-network/src/Ouroboros/Network/PeerSelection/RootPeersDNS.hs @@ -59,7 +59,7 @@ import qualified Data.IP as IP import qualified Network.DNS as DNS import qualified Network.Socket as Socket -import Ouroboros.Network.PeerSelection.PeerAdvertise.Type +import Ouroboros.Network.PeerSelection.PeerAdvertise (PeerAdvertise) import Ouroboros.Network.PeerSelection.RelayAccessPoint import Ouroboros.Network.PeerSelection.RootPeersDNS.DNSActions diff --git a/ouroboros-network/src/Ouroboros/Network/PeerSelection/Simple.hs b/ouroboros-network/src/Ouroboros/Network/PeerSelection/Simple.hs index 3e53c1c1459..2fb2937aeae 100644 --- a/ouroboros-network/src/Ouroboros/Network/PeerSelection/Simple.hs +++ b/ouroboros-network/src/Ouroboros/Network/PeerSelection/Simple.hs @@ -32,9 +32,9 @@ import qualified Network.Socket as Socket import Control.Monad.Class.MonadMVar (MonadMVar (..), takeMVar) import Ouroboros.Network.PeerSelection.Governor.Types import Ouroboros.Network.PeerSelection.LedgerPeers -import Ouroboros.Network.PeerSelection.PeerAdvertise.Type +import Ouroboros.Network.PeerSelection.PeerAdvertise (PeerAdvertise (..)) -import Ouroboros.Network.PeerSelection.PeerSharing.Type (PeerSharing) +import Ouroboros.Network.PeerSelection.PeerSharing (PeerSharing) import Ouroboros.Network.PeerSelection.RootPeersDNS import Ouroboros.Network.PeerSharing (PeerSharingController (..)) import Ouroboros.Network.Protocol.PeerSharing.Type diff --git a/ouroboros-network/test/Test/Ouroboros/Network/Diffusion/Node.hs b/ouroboros-network/test/Test/Ouroboros/Network/Diffusion/Node.hs index 7bbdc2e0cad..1a52d264050 100644 --- a/ouroboros-network/test/Test/Ouroboros/Network/Diffusion/Node.hs +++ b/ouroboros-network/test/Test/Ouroboros/Network/Diffusion/Node.hs @@ -102,9 +102,9 @@ import Ouroboros.Network.Testing.Data.Script (Script (..)) import Simulation.Network.Snocket (AddressType (..), FD) import Control.Monad.Class.MonadMVar (MonadMVar) -import Ouroboros.Network.PeerSelection.PeerAdvertise.Type +import Ouroboros.Network.PeerSelection.PeerAdvertise (PeerAdvertise (..)) -import Ouroboros.Network.PeerSelection.PeerSharing.Type +import Ouroboros.Network.PeerSelection.PeerSharing (PeerSharing (..)) import Ouroboros.Network.PeerSharing (PeerSharingRegistry (PeerSharingRegistry)) diff --git a/ouroboros-network/test/Test/Ouroboros/Network/Diffusion/Node/MiniProtocols.hs b/ouroboros-network/test/Test/Ouroboros/Network/Diffusion/Node/MiniProtocols.hs index f060e03a446..6cc9582504c 100644 --- a/ouroboros-network/test/Test/Ouroboros/Network/Diffusion/Node/MiniProtocols.hs +++ b/ouroboros-network/test/Test/Ouroboros/Network/Diffusion/Node/MiniProtocols.hs @@ -89,7 +89,7 @@ import Control.Monad.Class.MonadMVar (MonadMVar) import Ouroboros.Network.NodeToNode (blockFetchMiniProtocolNum, chainSyncMiniProtocolNum, keepAliveMiniProtocolNum, peerSharingMiniProtocolNum) -import qualified Ouroboros.Network.PeerSelection.PeerSharing.Type as PSTypes +import qualified Ouroboros.Network.PeerSelection.PeerSharing as PSTypes import Ouroboros.Network.PeerSharing (bracketPeerSharingClient, peerSharingClient, peerSharingServer) import Ouroboros.Network.Protocol.PeerSharing.Client diff --git a/ouroboros-network/test/Test/Ouroboros/Network/Diffusion/Node/NodeKernel.hs b/ouroboros-network/test/Test/Ouroboros/Network/Diffusion/Node/NodeKernel.hs index 415926d90f6..63d0e209837 100644 --- a/ouroboros-network/test/Test/Ouroboros/Network/Diffusion/Node/NodeKernel.hs +++ b/ouroboros-network/test/Test/Ouroboros/Network/Diffusion/Node/NodeKernel.hs @@ -76,7 +76,7 @@ import Test.Ouroboros.Network.Orphans () import qualified Codec.CBOR.Decoding as CBOR import qualified Codec.CBOR.Encoding as CBOR import Ouroboros.Network.NodeToNode () -import Ouroboros.Network.PeerSelection.PeerSharing.Type (PeerSharing) +import Ouroboros.Network.PeerSelection.PeerSharing (PeerSharing) import Ouroboros.Network.PeerSharing (PeerSharingRegistry (..), newPeerSharingRegistry) import Test.QuickCheck (Arbitrary (..), choose, chooseInt, frequency, diff --git a/ouroboros-network/test/Test/Ouroboros/Network/NodeToNode/Version.hs b/ouroboros-network/test/Test/Ouroboros/Network/NodeToNode/Version.hs index 0a0ddb486d6..2f70c94e0ba 100644 --- a/ouroboros-network/test/Test/Ouroboros/Network/NodeToNode/Version.hs +++ b/ouroboros-network/test/Test/Ouroboros/Network/NodeToNode/Version.hs @@ -7,7 +7,7 @@ import Ouroboros.Network.CodecCBORTerm import Ouroboros.Network.Magic import Ouroboros.Network.NodeToNode.Version -import Ouroboros.Network.PeerSelection.PeerSharing.Type +import Ouroboros.Network.PeerSelection.PeerSharing (PeerSharing (..)) import Test.QuickCheck import Test.Tasty (TestTree, testGroup) diff --git a/ouroboros-network/test/Test/Ouroboros/Network/PeerSelection.hs b/ouroboros-network/test/Test/Ouroboros/Network/PeerSelection.hs index fa0a4e5a935..a0d5d1ed20e 100644 --- a/ouroboros-network/test/Test/Ouroboros/Network/PeerSelection.hs +++ b/ouroboros-network/test/Test/Ouroboros/Network/PeerSelection.hs @@ -71,9 +71,9 @@ import Test.Ouroboros.Network.PeerSelection.PeerGraph import Control.Concurrent.Class.MonadSTM.Strict (newTVarIO) import Ouroboros.Network.PeerSelection.LedgerPeers (IsLedgerPeer (..)) -import Ouroboros.Network.PeerSelection.PeerAdvertise.Type +import Ouroboros.Network.PeerSelection.PeerAdvertise (PeerAdvertise (..)) -import Ouroboros.Network.PeerSelection.PeerSharing.Type +import Ouroboros.Network.PeerSelection.PeerSharing (PeerSharing (..)) import Ouroboros.Network.Protocol.PeerSharing.Type (PeerSharingResult (..)) diff --git a/ouroboros-network/test/Test/Ouroboros/Network/PeerSelection/Instances.hs b/ouroboros-network/test/Test/Ouroboros/Network/PeerSelection/Instances.hs index 23b0386ecd8..5c73589edf7 100644 --- a/ouroboros-network/test/Test/Ouroboros/Network/PeerSelection/Instances.hs +++ b/ouroboros-network/test/Test/Ouroboros/Network/PeerSelection/Instances.hs @@ -20,9 +20,9 @@ import Ouroboros.Network.PeerSelection.RootPeersDNS (DomainAccessPoint (..), RelayAccessPoint (..)) import qualified Data.IP as IP -import Ouroboros.Network.PeerSelection.PeerAdvertise.Type +import Ouroboros.Network.PeerSelection.PeerAdvertise (PeerAdvertise (..)) -import Ouroboros.Network.PeerSelection.PeerSharing.Type +import Ouroboros.Network.PeerSelection.PeerSharing (PeerSharing (..)) import Ouroboros.Network.Testing.Utils (prop_shrink_nonequal, prop_shrink_valid) diff --git a/ouroboros-network/test/Test/Ouroboros/Network/PeerSelection/Json.hs b/ouroboros-network/test/Test/Ouroboros/Network/PeerSelection/Json.hs index 2bfa6a2406b..96b42a8cba8 100644 --- a/ouroboros-network/test/Test/Ouroboros/Network/PeerSelection/Json.hs +++ b/ouroboros-network/test/Test/Ouroboros/Network/PeerSelection/Json.hs @@ -5,7 +5,7 @@ import Ouroboros.Network.PeerSelection.RootPeersDNS (DomainAccessPoint (..), RelayAccessPoint (..)) import Test.Ouroboros.Network.PeerSelection.Instances () -import Ouroboros.Network.PeerSelection.PeerAdvertise.Type +import Ouroboros.Network.PeerSelection.PeerAdvertise (PeerAdvertise) import Test.QuickCheck import Test.Tasty (TestTree, testGroup) diff --git a/ouroboros-network/test/Test/Ouroboros/Network/PeerSelection/LocalRootPeers.hs b/ouroboros-network/test/Test/Ouroboros/Network/PeerSelection/LocalRootPeers.hs index 866fe7aaefd..8b9b3c183fe 100644 --- a/ouroboros-network/test/Test/Ouroboros/Network/PeerSelection/LocalRootPeers.hs +++ b/ouroboros-network/test/Test/Ouroboros/Network/PeerSelection/LocalRootPeers.hs @@ -25,7 +25,7 @@ import Ouroboros.Network.Testing.Utils (prop_shrink_nonequal, import Test.Ouroboros.Network.PeerSelection.Instances -import Ouroboros.Network.PeerSelection.PeerAdvertise.Type +import Ouroboros.Network.PeerSelection.PeerAdvertise (PeerAdvertise) import Test.QuickCheck import Test.Tasty (TestTree, testGroup) diff --git a/ouroboros-network/test/Test/Ouroboros/Network/PeerSelection/MockEnvironment.hs b/ouroboros-network/test/Test/Ouroboros/Network/PeerSelection/MockEnvironment.hs index 4ffddefb67b..3a3c39174fd 100644 --- a/ouroboros-network/test/Test/Ouroboros/Network/PeerSelection/MockEnvironment.hs +++ b/ouroboros-network/test/Test/Ouroboros/Network/PeerSelection/MockEnvironment.hs @@ -72,9 +72,9 @@ import Test.Ouroboros.Network.PeerSelection.PeerGraph import Test.Ouroboros.Network.ShrinkCarefully import Ouroboros.Network.PeerSelection.LedgerPeers (IsLedgerPeer) -import Ouroboros.Network.PeerSelection.PeerAdvertise.Type +import Ouroboros.Network.PeerSelection.PeerAdvertise (PeerAdvertise) -import Ouroboros.Network.PeerSelection.PeerSharing.Type +import Ouroboros.Network.PeerSelection.PeerSharing (PeerSharing (..)) import Ouroboros.Network.PeerSelection.Types (PeerStatus (..)) import Ouroboros.Network.Protocol.PeerSharing.Type (PeerSharingAmount, diff --git a/ouroboros-network/test/Test/Ouroboros/Network/PeerSelection/PeerGraph.hs b/ouroboros-network/test/Test/Ouroboros/Network/PeerSelection/PeerGraph.hs index fcf76f625cd..30b5c89d495 100644 --- a/ouroboros-network/test/Test/Ouroboros/Network/PeerSelection/PeerGraph.hs +++ b/ouroboros-network/test/Test/Ouroboros/Network/PeerSelection/PeerGraph.hs @@ -41,7 +41,7 @@ import Ouroboros.Network.Testing.Utils (prop_shrink_nonequal, import Test.Ouroboros.Network.PeerSelection.Instances import Test.Ouroboros.Network.ShrinkCarefully -import Ouroboros.Network.PeerSelection.PeerSharing.Type (PeerSharing) +import Ouroboros.Network.PeerSelection.PeerSharing (PeerSharing) import Test.QuickCheck diff --git a/ouroboros-network/test/Test/Ouroboros/Network/PeerSelection/RootPeersDNS.hs b/ouroboros-network/test/Test/Ouroboros/Network/PeerSelection/RootPeersDNS.hs index f1252c8d279..d0d1d4bec45 100644 --- a/ouroboros-network/test/Test/Ouroboros/Network/PeerSelection/RootPeersDNS.hs +++ b/ouroboros-network/test/Test/Ouroboros/Network/PeerSelection/RootPeersDNS.hs @@ -49,7 +49,7 @@ import qualified Control.Monad.Class.MonadTimer as MonadTimer import Control.Monad.IOSim import Control.Tracer (Tracer (Tracer), contramap) -import Ouroboros.Network.PeerSelection.PeerAdvertise.Type +import Ouroboros.Network.PeerSelection.PeerAdvertise (PeerAdvertise (..)) import Ouroboros.Network.Testing.Data.Script (NonEmpty ((:|)), Script (Script), initScript', scriptHead, singletonScript, diff --git a/ouroboros-network/test/Test/Ouroboros/Network/Testnet.hs b/ouroboros-network/test/Test/Ouroboros/Network/Testnet.hs index 66ed7bafd70..36df0d5e73c 100644 --- a/ouroboros-network/test/Test/Ouroboros/Network/Testnet.hs +++ b/ouroboros-network/test/Test/Ouroboros/Network/Testnet.hs @@ -71,9 +71,9 @@ import Test.Tasty import Test.Tasty.QuickCheck (testProperty) import Ouroboros.Network.NodeToNode (DiffusionMode (..)) -import Ouroboros.Network.PeerSelection.PeerAdvertise.Type +import Ouroboros.Network.PeerSelection.PeerAdvertise (PeerAdvertise (..)) -import Ouroboros.Network.PeerSelection.PeerSharing.Type +import Ouroboros.Network.PeerSelection.PeerSharing (PeerSharing (..)) import TestLib.ConnectionManager (abstractStateIsFinalTransition, connectionManagerTraceMap, validTransitionMap, diff --git a/ouroboros-network/test/Test/Ouroboros/Network/Testnet/Simulation/Node.hs b/ouroboros-network/test/Test/Ouroboros/Network/Testnet/Simulation/Node.hs index c72db9e6426..f2d19707a5b 100644 --- a/ouroboros-network/test/Test/Ouroboros/Network/Testnet/Simulation/Node.hs +++ b/ouroboros-network/test/Test/Ouroboros/Network/Testnet/Simulation/Node.hs @@ -119,10 +119,10 @@ import Test.Ouroboros.Network.PeerSelection.RootPeersDNS (DNSLookupDelay (..), DNSTimeout (..)) import Test.QuickCheck -import Ouroboros.Network.PeerSelection.PeerAdvertise.Type - (PeerAdvertise (..)) -import Ouroboros.Network.PeerSelection.PeerSharing.Type (PeerSharing) import Control.Monad.Class.MonadMVar (MonadMVar) +import Ouroboros.Network.PeerSelection.PeerAdvertise + (PeerAdvertise (..)) +import Ouroboros.Network.PeerSelection.PeerSharing (PeerSharing) import Ouroboros.Network.Protocol.PeerSharing.Codec (byteLimitsPeerSharing, timeLimitsPeerSharing) diff --git a/ouroboros-network/test/Test/Socket.hs b/ouroboros-network/test/Test/Socket.hs index 7a602332dfd..08ad8041ff0 100644 --- a/ouroboros-network/test/Test/Socket.hs +++ b/ouroboros-network/test/Test/Socket.hs @@ -49,7 +49,7 @@ import Ouroboros.Network.Util.ShowProxy import Test.ChainGenerators (TestBlockChainAndUpdates (..)) -import Ouroboros.Network.PeerSelection.PeerSharing.Type +import Ouroboros.Network.PeerSelection.PeerSharing (PeerSharing (..)) import Test.QuickCheck import Test.Tasty (TestTree, testGroup)