ouroboros-network-testing: renamed modules

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

Hide file tree

Showing 33 changed files with 144 additions and 144 deletions.
diff --git a/ouroboros-network-framework/sim-tests/Test/Ouroboros/Network/RawBearer.hs b/ouroboros-network-framework/sim-tests/Test/Ouroboros/Network/RawBearer.hs
@@ -9,7 +9,6 @@ module Test.Ouroboros.Network.RawBearer where
 import Ouroboros.Network.IOManager
 import Ouroboros.Network.RawBearer
 import Ouroboros.Network.Snocket
-import Ouroboros.Network.Testing.Data.AbsBearerInfo
 
 import Control.Concurrent.Class.MonadMVar
 import Control.Exception (Exception)
@@ -34,6 +33,7 @@ import System.Directory (removeFile)
 import System.IO.Error (ioeGetErrorType, isDoesNotExistErrorType)
 import System.IO.Unsafe
 
+import Test.Ouroboros.Network.Data.AbsBearerInfo
 import Test.Simulation.Network.Snocket (toBearerInfo)
 import Test.Tasty
 import Test.Tasty.QuickCheck

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
@@ -94,21 +94,20 @@ import Ouroboros.Network.Snocket qualified as Snocket
 
 import Simulation.Network.Snocket
 
-import Ouroboros.Network.Testing.Data.AbsBearerInfo hiding (delay)
-import Ouroboros.Network.Testing.Utils (WithName (..), WithTime (..),
-           genDelayWithPrecision, nightlyTest, sayTracer, tracerWithTime)
-
 import Test.Ouroboros.Network.ConnectionManager.Experiments
 import Test.Ouroboros.Network.ConnectionManager.Timeouts
 import Test.Ouroboros.Network.ConnectionManager.Utils
            (abstractStateIsFinalTransition, allValidTransitionsNames,
            validTransitionMap, verifyAbstractTransition,
            verifyAbstractTransitionOrder)
+import Test.Ouroboros.Network.Data.AbsBearerInfo hiding (delay)
 import Test.Ouroboros.Network.InboundGovernor.Utils
            (allValidRemoteTransitionsNames, remoteStrIsFinalTransition,
            validRemoteTransitionMap, verifyRemoteTransition,
            verifyRemoteTransitionOrder)
 import Test.Ouroboros.Network.Orphans ()
+import Test.Ouroboros.Network.Utils (WithName (..), WithTime (..),
+           genDelayWithPrecision, nightlyTest, sayTracer, tracerWithTime)
 import Test.Simulation.Network.Snocket hiding (tests)
 
 tests :: TestTree

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,7 +59,7 @@ import Network.TypedProtocol.ReqResp.Client
 import Network.TypedProtocol.ReqResp.Server
 import Network.TypedProtocol.ReqResp.Type
 
-import Ouroboros.Network.Testing.Data.AbsBearerInfo
+import Test.Ouroboros.Network.Data.AbsBearerInfo
 import Test.Ouroboros.Network.Orphans ()
 
 import Test.QuickCheck hiding (Result (..))

diff --git a/ouroboros-network-framework/src/Ouroboros/Network/ConnectionManager/State.hs b/ouroboros-network-framework/src/Ouroboros/Network/ConnectionManager/State.hs
@@ -38,7 +38,7 @@ import Ouroboros.Network.ConnectionId
 import Ouroboros.Network.ConnectionManager.ConnMap as ConnMap
 import Ouroboros.Network.ConnectionManager.Types
 
-import Ouroboros.Network.Testing.Utils (WithName (..))
+import Test.Ouroboros.Network.Utils (WithName (..))
 
 -- | 'ConnectionManager' state: for each peer we keep a 'ConnectionState' in
 -- a mutable variable, which reduces congestion on the 'TMVar' which keeps

diff --git a/ouroboros-network-framework/src/Simulation/Network/Snocket.hs b/ouroboros-network-framework/src/Simulation/Network/Snocket.hs
@@ -84,7 +84,7 @@ import Ouroboros.Network.ConnectionManager.Types (AddressType (..))
 import Ouroboros.Network.RawBearer
 import Ouroboros.Network.Snocket
 
-import Ouroboros.Network.Testing.Data.Script (Script (..), stepScriptSTM)
+import Test.Ouroboros.Network.Data.Script (Script (..), stepScriptSTM)
 
 data Connection m addr = Connection
     { -- | Attenuated channels of a connection.

diff --git a/ouroboros-network-framework/testlib/Test/Ouroboros/Network/ConnectionManager/Experiments.hs b/ouroboros-network-framework/testlib/Test/Ouroboros/Network/ConnectionManager/Experiments.hs
@@ -97,10 +97,10 @@ import Ouroboros.Network.Server2 (RemoteTransitionTrace)
 import Ouroboros.Network.Server2 qualified as Server
 import Ouroboros.Network.Snocket (Snocket)
 import Ouroboros.Network.Snocket qualified as Snocket
-import Ouroboros.Network.Testing.Utils (WithName (..))
 
 import Test.Ouroboros.Network.ConnectionManager.Timeouts
 import Test.Ouroboros.Network.Orphans ()
+import Test.Ouroboros.Network.Utils (WithName (..))
 
 import Ouroboros.Network.ConnectionManager.InformationChannel
            (newInformationChannel)

diff --git a/ouroboros-network-protocols/test/Test/Chain.hs b/ouroboros-network-protocols/test/Test/Chain.hs
@@ -18,9 +18,9 @@ import Test.Tasty.QuickCheck (testProperty)
 import Ouroboros.Network.Block (blockPrevHash, pattern GenesisPoint, pointHash)
 import Ouroboros.Network.Mock.Chain (Chain (..))
 import Ouroboros.Network.Mock.Chain qualified as Chain
-import Ouroboros.Network.Testing.Serialise (prop_serialise)
 
 import Test.ChainGenerators hiding (tests)
+import Test.Ouroboros.Network.Serialise (prop_serialise)
 
 
 --

diff --git a/ouroboros-network-protocols/testlib/Test/Ouroboros/Network/Testing/Utils.hs b/ouroboros-network-protocols/testlib/Test/Ouroboros/Network/Testing/Utils.hs
@@ -2,6 +2,7 @@
 {-# LANGUAGE FlexibleContexts #-}
 {-# LANGUAGE NamedFieldPuns   #-}
 {-# LANGUAGE RankNTypes       #-}
+-- TODO rename to `Test.Ouroboros.Network.Protocols.Utils`
 module Test.Ouroboros.Network.Testing.Utils where
 
 import Codec.CBOR.FlatTerm qualified as CBOR

diff --git a/ouroboros-network-testing/CHANGELOG.md b/ouroboros-network-testing/CHANGELOG.md
@@ -4,6 +4,7 @@
 
 ### Breaking changes
 
+* Renamed modules from `Ouroboros.Network.Testing.*` to `Test.Ouroboros.Network.*`
 * Added `IOError` field to `ErrorInterval :: AbsAttenuation` constructor.
 
 ### Non-Breaking changes

diff --git a/ouroboros-network-testing/ouroboros-network-testing.cabal b/ouroboros-network-testing/ouroboros-network-testing.cabal
@@ -29,12 +29,12 @@ library
   -- At this experiment/prototype stage everything is exposed.
   -- This has to be tidied up once the design becomes clear.
   exposed-modules:
-    Ouroboros.Network.Testing.Data.AbsBearerInfo
-    Ouroboros.Network.Testing.Data.Script
-    Ouroboros.Network.Testing.Data.Signal
-    Ouroboros.Network.Testing.QuickCheck
-    Ouroboros.Network.Testing.Serialise
-    Ouroboros.Network.Testing.Utils
+    Test.Ouroboros.Network.Data.AbsBearerInfo
+    Test.Ouroboros.Network.Data.Script
+    Test.Ouroboros.Network.Data.Signal
+    Test.Ouroboros.Network.QuickCheck
+    Test.Ouroboros.Network.Serialise
+    Test.Ouroboros.Network.Utils
 
   default-language: Haskell2010
   default-extensions: ImportQualifiedPost
@@ -98,7 +98,7 @@ test-suite test
   type: exitcode-stdio-1.0
   main-is: Main.hs
   hs-source-dirs: test
-  other-modules: Test.Ouroboros.Network.Testing.Data.AbsBearerInfo
+  other-modules: Test.Ouroboros.Network.Data.AbsBearerInfo.Test
   build-depends:
     QuickCheck,
     base >=4.14 && <4.21,

diff --git a/...ros/Network/Testing/Data/AbsBearerInfo.hs → ...t/Ouroboros/Network/Data/AbsBearerInfo.hs b/...ros/Network/Testing/Data/AbsBearerInfo.hs → ...t/Ouroboros/Network/Data/AbsBearerInfo.hs
@@ -3,7 +3,7 @@
 {-# LANGUAGE NamedFieldPuns     #-}
 {-# LANGUAGE NumericUnderscores #-}
 
-module Ouroboros.Network.Testing.Data.AbsBearerInfo
+module Test.Ouroboros.Network.Data.AbsBearerInfo
   ( AbsBearerInfoScript (..)
   , canFail
   , NonFailingAbsBearerInfo (..)
@@ -24,22 +24,21 @@ module Ouroboros.Network.Testing.Data.AbsBearerInfo
   , AbsIOErrType (..)
   ) where
 
-import           Control.Monad.Class.MonadTime.SI (DiffTime, Time (..), addTime)
+import Control.Monad.Class.MonadTime.SI (DiffTime, Time (..), addTime)
 
-import qualified Data.List as List
-import qualified Data.List.NonEmpty as NonEmpty
-import           Data.Monoid (Any (..))
-import           GHC.IO.Exception (IOException (..), IOErrorType (..))
-import           Foreign.C.Error (Errno (..), eCONNABORTED)
+import Data.List qualified as List
+import Data.List.NonEmpty qualified as NonEmpty
+import Data.Monoid (Any (..))
+import Foreign.C.Error (Errno (..), eCONNABORTED)
+import GHC.IO.Exception (IOErrorType (..), IOException (..))
 
-import           Network.Mux.Bearer.AttenuatedChannel (Size,
-                     SuccessOrFailure (..))
-import           Network.Mux.Types (SDUSize (..))
+import Network.Mux.Bearer.AttenuatedChannel (Size, SuccessOrFailure (..))
+import Network.Mux.Types (SDUSize (..))
 
-import           Ouroboros.Network.Testing.Data.Script (Script (..))
-import           Ouroboros.Network.Testing.Utils (Delay (..))
+import Test.Ouroboros.Network.Data.Script (Script (..))
+import Test.Ouroboros.Network.Utils (Delay (..))
 
-import           Test.QuickCheck hiding (Result (..))
+import Test.QuickCheck hiding (Result (..))
 
 
 data AbsDelay = SmallDelay

diff --git a/.../Ouroboros/Network/Testing/Data/Script.hs → ...src/Test/Ouroboros/Network/Data/Script.hs b/.../Ouroboros/Network/Testing/Data/Script.hs → ...src/Test/Ouroboros/Network/Data/Script.hs
@@ -2,7 +2,7 @@
 {-# LANGUAGE DerivingVia       #-}
 {-# LANGUAGE TupleSections     #-}
 
-module Ouroboros.Network.Testing.Data.Script
+module Test.Ouroboros.Network.Data.Script
   ( -- * Test scripts
     Script (..)
   , NonEmpty (..)
@@ -31,23 +31,23 @@ module Ouroboros.Network.Testing.Data.Script
   , interpretPickScript
   ) where
 
-import           Data.Functor (($>))
-import           Data.List.NonEmpty (NonEmpty (..))
-import qualified Data.List.NonEmpty as NonEmpty
-import           Data.Set (Set)
-import qualified Data.Set as Set
-
-import           Control.Concurrent.Class.MonadSTM.Strict
-import           Control.Concurrent.Class.MonadSTM (TVar)
-import qualified Control.Concurrent.Class.MonadSTM as LazySTM
-import           Control.Monad.Class.MonadAsync
-import           Control.Monad.Class.MonadFork
-import           Control.Monad.Class.MonadTimer.SI
-import           Control.Tracer (Tracer, traceWith)
-
-import           Ouroboros.Network.Testing.Utils (ShrinkCarefully,
-                     prop_shrink_nonequal, shrinkVector)
-import           Test.QuickCheck
+import Data.Functor (($>))
+import Data.List.NonEmpty (NonEmpty (..))
+import Data.List.NonEmpty qualified as NonEmpty
+import Data.Set (Set)
+import Data.Set qualified as Set
+
+import Control.Concurrent.Class.MonadSTM (TVar)
+import Control.Concurrent.Class.MonadSTM qualified as LazySTM
+import Control.Concurrent.Class.MonadSTM.Strict
+import Control.Monad.Class.MonadAsync
+import Control.Monad.Class.MonadFork
+import Control.Monad.Class.MonadTimer.SI
+import Control.Tracer (Tracer, traceWith)
+
+import Test.Ouroboros.Network.Utils (ShrinkCarefully, prop_shrink_nonequal,
+           shrinkVector)
+import Test.QuickCheck
 
 --
 -- Test script abstraction

diff --git a/.../Ouroboros/Network/Testing/Data/Signal.hs → ...src/Test/Ouroboros/Network/Data/Signal.hs b/.../Ouroboros/Network/Testing/Data/Signal.hs → ...src/Test/Ouroboros/Network/Data/Signal.hs
@@ -1,9 +1,9 @@
 {-# LANGUAGE BangPatterns        #-}
-{-# LANGUAGE DeriveFunctor       #-}
 {-# LANGUAGE DeriveFoldable      #-}
+{-# LANGUAGE DeriveFunctor       #-}
 {-# LANGUAGE ScopedTypeVariables #-}
 
-module Ouroboros.Network.Testing.Data.Signal
+module Test.Ouroboros.Network.Data.Signal
   ( -- * Events
     Events
   , eventsFromList
@@ -47,23 +47,23 @@ module Ouroboros.Network.Testing.Data.Signal
   , keyedUntil
   ) where
 
-import           Prelude hiding (scanl, until)
+import Prelude hiding (scanl, until)
 
-import           Data.Bool (bool)
-import qualified Data.Foldable as Deque (toList)
-import           Data.List (groupBy)
-import           Data.Maybe (maybeToList)
-import           Data.OrdPSQ (OrdPSQ)
-import qualified Data.OrdPSQ as PSQ
-import           Data.Set (Set)
-import qualified Data.Set as Set
-import           Deque.Lazy (Deque)
-import qualified Deque.Lazy as Deque
+import Data.Bool (bool)
+import Data.Foldable qualified as Deque (toList)
+import Data.List (groupBy)
+import Data.Maybe (maybeToList)
+import Data.OrdPSQ (OrdPSQ)
+import Data.OrdPSQ qualified as PSQ
+import Data.Set (Set)
+import Data.Set qualified as Set
+import Deque.Lazy (Deque)
+import Deque.Lazy qualified as Deque
 
-import           Control.Monad.Class.MonadTime.SI (DiffTime, Time (..), addTime)
+import Control.Monad.Class.MonadTime.SI (DiffTime, Time (..), addTime)
 
 
-import           Test.QuickCheck
+import Test.QuickCheck
 
 --
 -- Time stamps and events

diff --git a/...c/Ouroboros/Network/Testing/QuickCheck.hs → .../src/Test/Ouroboros/Network/QuickCheck.hs b/...c/Ouroboros/Network/Testing/QuickCheck.hs → .../src/Test/Ouroboros/Network/QuickCheck.hs
@@ -1,15 +1,15 @@
 {-# LANGUAGE RankNTypes #-}
 
-module Ouroboros.Network.Testing.QuickCheck
+module Test.Ouroboros.Network.QuickCheck
   ( runSimGen
   , monadicSim
   ) where
 
-import           Test.QuickCheck
-import           Test.QuickCheck.Gen.Unsafe (Capture (..), capture)
-import           Test.QuickCheck.Monadic
+import Test.QuickCheck
+import Test.QuickCheck.Gen.Unsafe (Capture (..), capture)
+import Test.QuickCheck.Monadic
 
-import           Control.Monad.IOSim
+import Control.Monad.IOSim
 
 -- | 'IOSim' analogue of 'runSTGen'
 --

diff --git a/...rc/Ouroboros/Network/Testing/Serialise.hs → ...g/src/Test/Ouroboros/Network/Serialise.hs b/...rc/Ouroboros/Network/Testing/Serialise.hs → ...g/src/Test/Ouroboros/Network/Serialise.hs
@@ -1,16 +1,15 @@
 {-# LANGUAGE CPP #-}
-module Ouroboros.Network.Testing.Serialise
+module Test.Ouroboros.Network.Serialise
   ( -- * Class
     Serialise (..)
   , prop_serialise
   , prop_serialise_valid
   , prop_serialise_roundtrip
   ) where
 
-import           Codec.CBOR.FlatTerm
-import           Codec.Serialise
-import           Test.QuickCheck (Property, counterexample, property, (.&&.),
-                     (===))
+import Codec.CBOR.FlatTerm
+import Codec.Serialise
+import Test.QuickCheck (Property, counterexample, property, (.&&.), (===))
 
 -- Class properties
 --