ouroboros-network-framework: renamed modules in testlib

IntersectMBO · Dec 19, 2024 · eb7d95c · eb7d95c
1 parent 37326ec
commit eb7d95c
Show file tree

Hide file tree

Showing 19 changed files with 46 additions and 48 deletions.
diff --git a/ouroboros-network-framework/CHANGELOG.md b/ouroboros-network-framework/CHANGELOG.md
@@ -16,6 +16,13 @@
   affects its API.
 * Added `connStateSupply` record field to
   `Ouroboros.Network.ConnectionManager.Core.Arguments`.
+* Renamed modules in `ouroboros-network:testlib`:
+  `Ouroboros.Network.Test.Orphans -> Test.Ouroboros.Network.Orphans`
+  `Ouroboros.Network.ConnectionManager.Test.Experiments -> Test.Ouroboros.Network.ConnectionManager.Experiments`
+  `Ouroboros.Network.ConnectionManager.Test.Timeouts -> Test.Ouroboros.Network.ConnectionManager.Timeouts`
+  `Ouroboros.Network.ConnectionManager.Test.Utils -> Test.Ouroboros.Network.ConnectionManager.Utils`
+  `Ouroboros.Network.InboundGovernor.Test.Utils -> Test.Ouroboros.Network.InboundGovernor.Utils`
+
 
 ### Non-breaking changes
 

diff --git a/ouroboros-network-framework/io-tests/Test/Ouroboros/Network/Driver.hs b/ouroboros-network-framework/io-tests/Test/Ouroboros/Network/Driver.hs
@@ -60,7 +60,7 @@ import Control.Monad.Class.MonadTimer.SI
 import Control.Monad.IOSim
 import Control.Tracer
 
-import Ouroboros.Network.Test.Orphans ()
+import Test.Ouroboros.Network.Orphans ()
 
 import Test.QuickCheck
 import Test.Tasty (TestTree, testGroup)

diff --git a/ouroboros-network-framework/io-tests/Test/Ouroboros/Network/RawBearer.hs b/ouroboros-network-framework/io-tests/Test/Ouroboros/Network/RawBearer.hs
@@ -8,8 +8,8 @@ module Test.Ouroboros.Network.RawBearer where
 
 import Ouroboros.Network.IOManager
 import Ouroboros.Network.RawBearer
-import Ouroboros.Network.RawBearer.Test.Utils
 import Ouroboros.Network.Snocket
+import Test.Ouroboros.Network.RawBearer.Utils
 
 import Control.Concurrent.Class.MonadMVar
 import Control.Monad.Class.MonadThrow (catchJust, finally)

diff --git a/ouroboros-network-framework/io-tests/Test/Ouroboros/Network/Server2/IO.hs b/ouroboros-network-framework/io-tests/Test/Ouroboros/Network/Server2/IO.hs
@@ -27,9 +27,9 @@ import Ouroboros.Network.IOManager
 import Ouroboros.Network.Snocket (socketSnocket)
 import Ouroboros.Network.Socket (configureSocket)
 
-import Ouroboros.Network.ConnectionManager.Test.Experiments
-import Ouroboros.Network.ConnectionManager.Test.Timeouts
-import Ouroboros.Network.Test.Orphans ()
+import Test.Ouroboros.Network.ConnectionManager.Experiments
+import Test.Ouroboros.Network.ConnectionManager.Timeouts
+import Test.Ouroboros.Network.Orphans ()
 
 tests :: TestTree
 tests =

diff --git a/ouroboros-network-framework/io-tests/Test/Ouroboros/Network/Socket.hs b/ouroboros-network-framework/io-tests/Test/Ouroboros/Network/Socket.hs
@@ -65,7 +65,7 @@ import Ouroboros.Network.Protocol.Handshake.Codec
 import Ouroboros.Network.Protocol.Handshake.Unversioned
 import Ouroboros.Network.Protocol.Handshake.Version
 
-import Ouroboros.Network.Test.Orphans ()
+import Test.Ouroboros.Network.Orphans ()
 
 import Test.QuickCheck
 import Test.Tasty (DependencyType (..), TestTree, after, testGroup)

diff --git a/ouroboros-network-framework/io-tests/Test/Ouroboros/Network/Subscription.hs b/ouroboros-network-framework/io-tests/Test/Ouroboros/Network/Subscription.hs
@@ -66,7 +66,7 @@ import Ouroboros.Network.Subscription.Subscriber
 import Ouroboros.Network.Subscription.Worker (LocalAddresses (..),
            WorkerParams (..))
 
-import Ouroboros.Network.Test.Orphans ()
+import Test.Ouroboros.Network.Orphans ()
 
 import Test.QuickCheck
 import Test.Tasty (TestTree, testGroup)

diff --git a/ouroboros-network-framework/ouroboros-network-framework.cabal b/ouroboros-network-framework/ouroboros-network-framework.cabal
@@ -125,12 +125,12 @@ library testlib
   visibility: public
   hs-source-dirs: testlib
   exposed-modules:
-    Ouroboros.Network.ConnectionManager.Test.Experiments
-    Ouroboros.Network.ConnectionManager.Test.Timeouts
-    Ouroboros.Network.ConnectionManager.Test.Utils
-    Ouroboros.Network.InboundGovernor.Test.Utils
-    Ouroboros.Network.RawBearer.Test.Utils
-    Ouroboros.Network.Test.Orphans
+    Test.Ouroboros.Network.ConnectionManager.Experiments
+    Test.Ouroboros.Network.ConnectionManager.Timeouts
+    Test.Ouroboros.Network.ConnectionManager.Utils
+    Test.Ouroboros.Network.InboundGovernor.Utils
+    Test.Ouroboros.Network.Orphans
+    Test.Ouroboros.Network.RawBearer.Utils
 
   other-modules:
   build-depends:

diff --git a/ouroboros-network-framework/sim-tests/Test/Ouroboros/Network/ConnectionManager.hs b/ouroboros-network-framework/sim-tests/Test/Ouroboros/Network/ConnectionManager.hs
@@ -61,14 +61,15 @@ import Test.Tasty.QuickCheck (testProperty)
 import Ouroboros.Network.ConnectionId (ConnectionId (..))
 import Ouroboros.Network.ConnectionManager.Core qualified as CM
 import Ouroboros.Network.ConnectionManager.State qualified as CM
-import Ouroboros.Network.ConnectionManager.Test.Utils (verifyAbstractTransition)
 import Ouroboros.Network.ConnectionManager.Types
 import Ouroboros.Network.MuxMode
 import Ouroboros.Network.NodeToNode.Version (DiffusionMode (..))
 import Ouroboros.Network.Server.RateLimiting
 import Ouroboros.Network.Snocket (Accept (..), Accepted (..),
            AddressFamily (TestFamily), Snocket (..), TestAddress (..))
 
+import Test.Ouroboros.Network.ConnectionManager.Utils (verifyAbstractTransition)
+
 import Ouroboros.Network.ConnectionManager.InformationChannel
            (newInformationChannel)
 import Ouroboros.Network.ConnectionManager.InformationChannel qualified as InfoChannel

diff --git a/ouroboros-network-framework/sim-tests/Test/Ouroboros/Network/Server2/Sim.hs b/ouroboros-network-framework/sim-tests/Test/Ouroboros/Network/Server2/Sim.hs
@@ -98,19 +98,18 @@ import Ouroboros.Network.Testing.Data.AbsBearerInfo hiding (delay)
 import Ouroboros.Network.Testing.Utils (WithName (..), WithTime (..),
            genDelayWithPrecision, nightlyTest, sayTracer, tracerWithTime)
 
-import Ouroboros.Network.Test.Orphans ()
-import Test.Simulation.Network.Snocket hiding (tests)
-
-import Ouroboros.Network.ConnectionManager.Test.Experiments
-import Ouroboros.Network.ConnectionManager.Test.Timeouts
-import Ouroboros.Network.ConnectionManager.Test.Utils
+import Test.Ouroboros.Network.ConnectionManager.Experiments
+import Test.Ouroboros.Network.ConnectionManager.Timeouts
+import Test.Ouroboros.Network.ConnectionManager.Utils
            (abstractStateIsFinalTransition, allValidTransitionsNames,
            validTransitionMap, verifyAbstractTransition,
            verifyAbstractTransitionOrder)
-import Ouroboros.Network.InboundGovernor.Test.Utils
+import Test.Ouroboros.Network.InboundGovernor.Utils
            (allValidRemoteTransitionsNames, remoteStrIsFinalTransition,
            validRemoteTransitionMap, verifyRemoteTransition,
            verifyRemoteTransitionOrder)
+import Test.Ouroboros.Network.Orphans ()
+import Test.Simulation.Network.Snocket hiding (tests)
 
 tests :: TestTree
 tests =

diff --git a/ouroboros-network-framework/sim-tests/Test/Ouroboros/Network/Socket.hs b/ouroboros-network-framework/sim-tests/Test/Ouroboros/Network/Socket.hs
@@ -67,7 +67,7 @@ import Ouroboros.Network.Protocol.Handshake.Codec
 import Ouroboros.Network.Protocol.Handshake.Unversioned
 import Ouroboros.Network.Protocol.Handshake.Version
 
-import Ouroboros.Network.Test.Orphans ()
+import Test.Ouroboros.Network.Orphans ()
 
 import Test.QuickCheck
 import Test.Tasty (DependencyType (..), TestTree, after, testGroup)

diff --git a/ouroboros-network-framework/sim-tests/Test/Ouroboros/Network/Subscription.hs b/ouroboros-network-framework/sim-tests/Test/Ouroboros/Network/Subscription.hs
@@ -66,7 +66,7 @@ import Ouroboros.Network.Subscription.Subscriber
 import Ouroboros.Network.Subscription.Worker (LocalAddresses (..),
            WorkerParams (..))
 
-import Ouroboros.Network.Test.Orphans ()
+import Test.Ouroboros.Network.Orphans ()
 
 import Test.QuickCheck
 import Test.Tasty (TestTree, testGroup)

diff --git a/ouroboros-network-framework/sim-tests/Test/Simulation/Network/Snocket.hs b/ouroboros-network-framework/sim-tests/Test/Simulation/Network/Snocket.hs
@@ -59,8 +59,8 @@ import Network.TypedProtocol.ReqResp.Client
 import Network.TypedProtocol.ReqResp.Server
 import Network.TypedProtocol.ReqResp.Type
 
-import Ouroboros.Network.Test.Orphans ()
 import Ouroboros.Network.Testing.Data.AbsBearerInfo
+import Test.Ouroboros.Network.Orphans ()
 
 import Test.QuickCheck hiding (Result (..))
 import Test.QuickCheck.Instances.ByteString ()

diff --git a/...ork/ConnectionManager/Test/Experiments.hs → .../Network/ConnectionManager/Experiments.hs b/...ork/ConnectionManager/Test/Experiments.hs → .../Network/ConnectionManager/Experiments.hs
@@ -21,7 +21,7 @@
 -- | This module contains experiments which can be executed either in `IO` or
 -- in `IOSim`.
 --
-module Ouroboros.Network.ConnectionManager.Test.Experiments
+module Test.Ouroboros.Network.ConnectionManager.Experiments
   ( ClientAndServerData (..)
   , unidirectionalExperiment
   , bidirectionalExperiment
@@ -99,12 +99,11 @@ import Ouroboros.Network.Snocket (Snocket)
 import Ouroboros.Network.Snocket qualified as Snocket
 import Ouroboros.Network.Testing.Utils (WithName (..))
 
-import Ouroboros.Network.Test.Orphans ()
--- import           Test.Simulation.Network.Snocket hiding (tests)
+import Test.Ouroboros.Network.ConnectionManager.Timeouts
+import Test.Ouroboros.Network.Orphans ()
 
 import Ouroboros.Network.ConnectionManager.InformationChannel
            (newInformationChannel)
-import Ouroboros.Network.ConnectionManager.Test.Timeouts
 
 
 --

diff --git a/...etwork/ConnectionManager/Test/Timeouts.hs → ...ros/Network/ConnectionManager/Timeouts.hs b/...etwork/ConnectionManager/Test/Timeouts.hs → ...ros/Network/ConnectionManager/Timeouts.hs
@@ -1,7 +1,7 @@
 {-# LANGUAGE LambdaCase     #-}
 {-# LANGUAGE NamedFieldPuns #-}
 
-module Ouroboros.Network.ConnectionManager.Test.Timeouts
+module Test.Ouroboros.Network.ConnectionManager.Timeouts
   ( verifyAllTimeouts
   , SimAddr
   , SimAddr_

diff --git a/...s/Network/ConnectionManager/Test/Utils.hs → ...oboros/Network/ConnectionManager/Utils.hs b/...s/Network/ConnectionManager/Test/Utils.hs → ...oboros/Network/ConnectionManager/Utils.hs
@@ -1,7 +1,7 @@
 {-# LANGUAGE NamedFieldPuns      #-}
 {-# LANGUAGE ScopedTypeVariables #-}
 
-module Ouroboros.Network.ConnectionManager.Test.Utils where
+module Test.Ouroboros.Network.ConnectionManager.Utils where
 
 import Prelude hiding (read)
 

diff --git a/...ros/Network/InboundGovernor/Test/Utils.hs → ...uroboros/Network/InboundGovernor/Utils.hs b/...ros/Network/InboundGovernor/Test/Utils.hs → ...uroboros/Network/InboundGovernor/Utils.hs
@@ -2,7 +2,8 @@
 {-# LANGUAGE NamedFieldPuns  #-}
 {-# LANGUAGE PatternSynonyms #-}
 {-# LANGUAGE ViewPatterns    #-}
-module Ouroboros.Network.InboundGovernor.Test.Utils where
+
+module Test.Ouroboros.Network.InboundGovernor.Utils where
 
 import Test.QuickCheck
 import Test.QuickCheck.Monoids

diff --git a/...testlib/Ouroboros/Network/Test/Orphans.hs → ...testlib/Test/Ouroboros/Network/Orphans.hs b/...testlib/Ouroboros/Network/Test/Orphans.hs → ...testlib/Test/Ouroboros/Network/Orphans.hs
@@ -1,5 +1,5 @@
 {-# OPTIONS_GHC -Wno-orphans     #-}
-module Ouroboros.Network.Test.Orphans () where
+module Test.Ouroboros.Network.Orphans () where
 
 import Network.TypedProtocol.PingPong.Type (PingPong)
 import Network.TypedProtocol.ReqResp.Type (ReqResp)

diff --git a/...Ouroboros/Network/RawBearer/Test/Utils.hs → ...Test/Ouroboros/Network/RawBearer/Utils.hs b/...Ouroboros/Network/RawBearer/Test/Utils.hs → ...Test/Ouroboros/Network/RawBearer/Utils.hs
@@ -4,7 +4,7 @@
 {-# LANGUAGE RankNTypes                 #-}
 {-# LANGUAGE ScopedTypeVariables        #-}
 
-module Ouroboros.Network.RawBearer.Test.Utils where
+module Test.Ouroboros.Network.RawBearer.Utils where
 
 import Ouroboros.Network.RawBearer
 import Ouroboros.Network.Snocket

diff --git a/ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/Testnet.hs b/ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/Testnet.hs
@@ -47,30 +47,18 @@ import Network.DNS.Types qualified as DNS
 
 import Ouroboros.Network.BlockFetch (PraosFetchMode (..),
            TraceFetchClientState (..))
+import Ouroboros.Network.ConsensusMode
 import Ouroboros.Network.ConnectionHandler (ConnectionHandlerTrace (..))
 import Ouroboros.Network.ConnectionId
 import Ouroboros.Network.ConnectionManager.Core qualified as CM
 import Ouroboros.Network.ConnectionManager.State qualified as CM
-import Ouroboros.Network.ConnectionManager.Test.Timeouts (TestProperty (..),
-           classifyActivityType, classifyEffectiveDataFlow,
-           classifyNegotiatedDataFlow, classifyPrunings, classifyTermination,
-           groupConns, mkProperty, ppTransition, verifyAllTimeouts)
-import Ouroboros.Network.ConnectionManager.Test.Utils
-           (abstractStateIsFinalTransition,
-           abstractStateIsFinalTransitionTVarTracing, connectionManagerTraceMap,
-           validTransitionMap, verifyAbstractTransition,
-           verifyAbstractTransitionOrder)
 import Ouroboros.Network.ConnectionManager.Types
-import Ouroboros.Network.ConsensusMode
 import Ouroboros.Network.ExitPolicy (RepromoteDelay (..))
-import Ouroboros.Network.InboundGovernor qualified as IG
-import Ouroboros.Network.InboundGovernor.Test.Utils (inboundGovernorTraceMap,
-           remoteStrIsFinalTransition, serverTraceMap, validRemoteTransitionMap,
-           verifyRemoteTransition, verifyRemoteTransitionOrder)
 import Ouroboros.Network.Mock.ConcreteBlock (BlockHeader)
 import Ouroboros.Network.NodeToNode (DiffusionMode (..))
 import Ouroboros.Network.PeerSelection.Bootstrap (UseBootstrapPeers (..),
            requiresBootstrapPeers)
+import Ouroboros.Network.InboundGovernor qualified as IG
 import Ouroboros.Network.PeerSelection.Governor hiding (PeerSelectionState (..))
 import Ouroboros.Network.PeerSelection.Governor qualified as Governor
 import Ouroboros.Network.PeerSelection.LedgerPeers
@@ -99,14 +87,17 @@ import Ouroboros.Network.Testing.Utils hiding (SmallDelay, debugTracer)
 
 import Simulation.Network.Snocket (BearerInfo (..))
 
+import Test.Ouroboros.Network.ConnectionManager.Timeouts
+import Test.Ouroboros.Network.ConnectionManager.Utils
+import Test.Ouroboros.Network.InboundGovernor.Utils
 import Test.Ouroboros.Network.LedgerPeers (LedgerPools (..))
 import Test.Ouroboros.Network.Testnet.Internal
 import Test.Ouroboros.Network.Testnet.Node (config_REPROMOTE_DELAY)
 import Test.Ouroboros.Network.Testnet.Node.Kernel
 import Test.QuickCheck
 import Test.QuickCheck.Monoids
 import Test.Tasty
-import Test.Tasty.QuickCheck (testProperty)
+import Test.Tasty.QuickCheck
 
 tests :: TestTree
 tests =