From f978ce66c89abd15ffd39e83585b248811727bb6 Mon Sep 17 00:00:00 2001 From: Marcin Szamotulski Date: Mon, 4 Nov 2024 10:56:49 +0100 Subject: [PATCH] ouroboros-network-testing: renamed modules --- .../Test/Ouroboros/Network/RawBearer.hs | 2 +- .../Test/Ouroboros/Network/Server2/Sim.hs | 7 ++- .../Test/Simulation/Network/Snocket.hs | 2 +- .../Network/ConnectionManager/State.hs | 2 +- .../src/Simulation/Network/Snocket.hs | 2 +- .../Network/ConnectionManager/Experiments.hs | 2 +- .../test/Test/Chain.hs | 2 +- .../Test/Ouroboros/Network/Testing/Utils.hs | 1 + ouroboros-network-testing/CHANGELOG.md | 1 + .../ouroboros-network-testing.cabal | 14 +++--- .../Ouroboros/Network}/Data/AbsBearerInfo.hs | 25 +++++----- .../Ouroboros/Network}/Data/Script.hs | 36 +++++++------- .../Ouroboros/Network}/Data/Signal.hs | 30 ++++++------ .../Ouroboros/Network}/QuickCheck.hs | 10 ++-- .../Ouroboros/Network}/Serialise.hs | 9 ++-- .../Ouroboros/Network}/Utils.hs | 49 +++++++++---------- ouroboros-network-testing/test/Main.hs | 4 +- .../AbsBearerInfo/Test.hs} | 18 +++---- .../io-tests/Test/Ouroboros/Network/Socket.hs | 2 +- .../Test/Ouroboros/Network/BlockFetch.hs | 4 +- .../Test/Ouroboros/Network/LedgerPeers.hs | 3 +- .../Test/Ouroboros/Network/PeerSelection.hs | 10 ++-- .../Network/PeerSelection/Instances.hs | 3 +- .../Network/PeerSelection/LocalRootPeers.hs | 4 +- .../Network/PeerSelection/MockEnvironment.hs | 9 ++-- .../Network/PeerSelection/PeerGraph.hs | 8 +-- .../Network/PeerSelection/PeerMetric.hs | 2 +- .../Network/PeerSelection/PublicRootPeers.hs | 4 +- .../Network/PeerSelection/RootPeersDNS.hs | 2 +- .../Test/Ouroboros/Network/Testnet.hs | 12 ++--- .../Ouroboros/Network/Testnet/Internal.hs | 4 +- .../Test/Ouroboros/Network/Testnet/Node.hs | 3 +- .../Test/Ouroboros/Network/TxSubmission.hs | 2 +- 33 files changed, 144 insertions(+), 144 deletions(-) rename ouroboros-network-testing/src/{Ouroboros/Network/Testing => Test/Ouroboros/Network}/Data/AbsBearerInfo.hs (93%) rename ouroboros-network-testing/src/{Ouroboros/Network/Testing => Test/Ouroboros/Network}/Data/Script.hs (90%) rename ouroboros-network-testing/src/{Ouroboros/Network/Testing => Test/Ouroboros/Network}/Data/Signal.hs (96%) rename ouroboros-network-testing/src/{Ouroboros/Network/Testing => Test/Ouroboros/Network}/QuickCheck.hs (75%) rename ouroboros-network-testing/src/{Ouroboros/Network/Testing => Test/Ouroboros/Network}/Serialise.hs (80%) rename ouroboros-network-testing/src/{Ouroboros/Network/Testing => Test/Ouroboros/Network}/Utils.hs (87%) rename ouroboros-network-testing/test/Test/Ouroboros/Network/{Testing/Data/AbsBearerInfo.hs => Data/AbsBearerInfo/Test.hs} (65%) diff --git a/ouroboros-network-framework/sim-tests/Test/Ouroboros/Network/RawBearer.hs b/ouroboros-network-framework/sim-tests/Test/Ouroboros/Network/RawBearer.hs index 60e92f03aa7..87e1431e844 100644 --- 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 index 7928d336616..a0e2a206d04 100644 --- 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 index 70f37dc5ea5..5929de0771d 100644 --- 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 index 7025ceac537..cc6c804d038 100644 --- 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 index 3a802579268..2140d70e274 100644 --- 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 index e1811f1c0a2..a6a49ee14e6 100644 --- 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 index 3c8edede9e5..e1ee4baecdc 100644 --- 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 index c5e496a24fa..69500874e90 100644 --- 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 index 2a49ad8360c..f6956031b7f 100644 --- 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 index d0787693197..dffcc4c7197 100644 --- 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/ouroboros-network-testing/src/Ouroboros/Network/Testing/Data/AbsBearerInfo.hs b/ouroboros-network-testing/src/Test/Ouroboros/Network/Data/AbsBearerInfo.hs similarity index 93% rename from ouroboros-network-testing/src/Ouroboros/Network/Testing/Data/AbsBearerInfo.hs rename to ouroboros-network-testing/src/Test/Ouroboros/Network/Data/AbsBearerInfo.hs index c1b7f812563..6e59f438593 100644 --- a/ouroboros-network-testing/src/Ouroboros/Network/Testing/Data/AbsBearerInfo.hs +++ b/ouroboros-network-testing/src/Test/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/src/Ouroboros/Network/Testing/Data/Script.hs b/ouroboros-network-testing/src/Test/Ouroboros/Network/Data/Script.hs similarity index 90% rename from ouroboros-network-testing/src/Ouroboros/Network/Testing/Data/Script.hs rename to ouroboros-network-testing/src/Test/Ouroboros/Network/Data/Script.hs index f5a7b248734..2d72fd16dff 100644 --- a/ouroboros-network-testing/src/Ouroboros/Network/Testing/Data/Script.hs +++ b/ouroboros-network-testing/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/src/Ouroboros/Network/Testing/Data/Signal.hs b/ouroboros-network-testing/src/Test/Ouroboros/Network/Data/Signal.hs similarity index 96% rename from ouroboros-network-testing/src/Ouroboros/Network/Testing/Data/Signal.hs rename to ouroboros-network-testing/src/Test/Ouroboros/Network/Data/Signal.hs index 58803d6889a..396ed6ace0d 100644 --- a/ouroboros-network-testing/src/Ouroboros/Network/Testing/Data/Signal.hs +++ b/ouroboros-network-testing/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/ouroboros-network-testing/src/Ouroboros/Network/Testing/QuickCheck.hs b/ouroboros-network-testing/src/Test/Ouroboros/Network/QuickCheck.hs similarity index 75% rename from ouroboros-network-testing/src/Ouroboros/Network/Testing/QuickCheck.hs rename to ouroboros-network-testing/src/Test/Ouroboros/Network/QuickCheck.hs index 6e97b59ea2a..03f0363e8fc 100644 --- a/ouroboros-network-testing/src/Ouroboros/Network/Testing/QuickCheck.hs +++ b/ouroboros-network-testing/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/ouroboros-network-testing/src/Ouroboros/Network/Testing/Serialise.hs b/ouroboros-network-testing/src/Test/Ouroboros/Network/Serialise.hs similarity index 80% rename from ouroboros-network-testing/src/Ouroboros/Network/Testing/Serialise.hs rename to ouroboros-network-testing/src/Test/Ouroboros/Network/Serialise.hs index 4a62a1fdf7f..2710e271907 100644 --- a/ouroboros-network-testing/src/Ouroboros/Network/Testing/Serialise.hs +++ b/ouroboros-network-testing/src/Test/Ouroboros/Network/Serialise.hs @@ -1,5 +1,5 @@ {-# LANGUAGE CPP #-} -module Ouroboros.Network.Testing.Serialise +module Test.Ouroboros.Network.Serialise ( -- * Class Serialise (..) , prop_serialise @@ -7,10 +7,9 @@ module Ouroboros.Network.Testing.Serialise , 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 -- diff --git a/ouroboros-network-testing/src/Ouroboros/Network/Testing/Utils.hs b/ouroboros-network-testing/src/Test/Ouroboros/Network/Utils.hs similarity index 87% rename from ouroboros-network-testing/src/Ouroboros/Network/Testing/Utils.hs rename to ouroboros-network-testing/src/Test/Ouroboros/Network/Utils.hs index a5e8b049367..119b3def13e 100644 --- a/ouroboros-network-testing/src/Ouroboros/Network/Testing/Utils.hs +++ b/ouroboros-network-testing/src/Test/Ouroboros/Network/Utils.hs @@ -5,12 +5,12 @@ {-# LANGUAGE LambdaCase #-} {-# LANGUAGE ScopedTypeVariables #-} -module Ouroboros.Network.Testing.Utils +module Test.Ouroboros.Network.Utils ( -- * Arbitrary Delays Delay (..) , genDelayWithPrecision , SmallDelay (..) - -- * Set properties + -- * Set properties , isSubsetProperty , disjointSetsProperty -- * QuickCheck Utils @@ -19,7 +19,7 @@ module Ouroboros.Network.Testing.Utils , ShrinkCarefully (..) , prop_shrink_nonequal , prop_shrink_valid - -- * Tracing Utils + -- * Tracing Utils , WithName (..) , WithTime (..) , tracerWithName @@ -28,36 +28,35 @@ module Ouroboros.Network.Testing.Utils , swapTimeWithName , swapNameWithTime , splitWithNameTrace - -- * Tracers + -- * Tracers , debugTracer , sayTracer - -- * Tasty Utils + -- * Tasty Utils , nightlyTest , ignoreTest - -- * Auxiliary functions + -- * Auxiliary functions , renderRanges ) where -import Control.Monad.Class.MonadSay -import Control.Monad.Class.MonadTime.SI -import Control.Tracer (Contravariant (contramap), Tracer (..), - contramapM) +import Control.Monad.Class.MonadSay +import Control.Monad.Class.MonadTime.SI +import Control.Tracer (Contravariant (contramap), Tracer (..), contramapM) -import Data.Bitraversable (bimapAccumR) -import Data.List (delete) -import Data.List.Trace (Trace) -import qualified Data.List.Trace as Trace -import qualified Data.Map as Map -import Data.Maybe (fromJust, isJust) -import Data.Ratio -import Data.Set (Set) -import qualified Data.Set as Set -import Text.Pretty.Simple (pPrint) +import Data.Bitraversable (bimapAccumR) +import Data.List (delete) +import Data.List.Trace (Trace) +import Data.List.Trace qualified as Trace +import Data.Map qualified as Map +import Data.Maybe (fromJust, isJust) +import Data.Ratio +import Data.Set (Set) +import Data.Set qualified as Set +import Text.Pretty.Simple (pPrint) -import Test.QuickCheck -import Test.Tasty (TestTree) -import Test.Tasty.ExpectedFailure (ignoreTest) -import Debug.Trace (traceShowM) +import Debug.Trace (traceShowM) +import Test.QuickCheck +import Test.Tasty (TestTree) +import Test.Tasty.ExpectedFailure (ignoreTest) newtype Delay = Delay { getDelay :: DiffTime } @@ -142,7 +141,7 @@ renderRanges r n = show lower ++ " -- " ++ show upper lower = n - n `mod` r upper = lower + (r-1) --- +-- -- Set properties -- diff --git a/ouroboros-network-testing/test/Main.hs b/ouroboros-network-testing/test/Main.hs index a1579a66b54..e996f157763 100644 --- a/ouroboros-network-testing/test/Main.hs +++ b/ouroboros-network-testing/test/Main.hs @@ -1,8 +1,8 @@ module Main (main) where -import Test.Tasty +import Test.Tasty -import qualified Test.Ouroboros.Network.Testing.Data.AbsBearerInfo as AbsBearerInfo +import Test.Ouroboros.Network.Data.AbsBearerInfo.Test qualified as AbsBearerInfo main :: IO () main = defaultMain tests diff --git a/ouroboros-network-testing/test/Test/Ouroboros/Network/Testing/Data/AbsBearerInfo.hs b/ouroboros-network-testing/test/Test/Ouroboros/Network/Data/AbsBearerInfo/Test.hs similarity index 65% rename from ouroboros-network-testing/test/Test/Ouroboros/Network/Testing/Data/AbsBearerInfo.hs rename to ouroboros-network-testing/test/Test/Ouroboros/Network/Data/AbsBearerInfo/Test.hs index 3e1e5acf8f0..4b77ed3c84c 100644 --- a/ouroboros-network-testing/test/Test/Ouroboros/Network/Testing/Data/AbsBearerInfo.hs +++ b/ouroboros-network-testing/test/Test/Ouroboros/Network/Data/AbsBearerInfo/Test.hs @@ -1,15 +1,15 @@ -module Test.Ouroboros.Network.Testing.Data.AbsBearerInfo (tests) where +module Test.Ouroboros.Network.Data.AbsBearerInfo.Test (tests) where -import qualified Data.List.NonEmpty as NonEmpty +import Data.List.NonEmpty qualified as NonEmpty -import Ouroboros.Network.Testing.Data.AbsBearerInfo (AbsBearerInfo, - AbsBearerInfoScript (..), - NonFailingAbsBearerInfoScript (..), canFail) -import Ouroboros.Network.Testing.Data.Script (Script (Script)) +import Test.Ouroboros.Network.Data.AbsBearerInfo (AbsBearerInfo, + AbsBearerInfoScript (..), NonFailingAbsBearerInfoScript (..), + canFail) +import Test.Ouroboros.Network.Data.Script (Script (Script)) -import Test.QuickCheck (Arbitrary (..), Fixed (..)) -import Test.Tasty (TestTree, testGroup) -import Test.Tasty.QuickCheck (testProperty) +import Test.QuickCheck (Arbitrary (..), Fixed (..)) +import Test.Tasty (TestTree, testGroup) +import Test.Tasty.QuickCheck (testProperty) tests :: TestTree tests = diff --git a/ouroboros-network/io-tests/Test/Ouroboros/Network/Socket.hs b/ouroboros-network/io-tests/Test/Ouroboros/Network/Socket.hs index 922886f7b13..c48bd1a070d 100644 --- a/ouroboros-network/io-tests/Test/Ouroboros/Network/Socket.hs +++ b/ouroboros-network/io-tests/Test/Ouroboros/Network/Socket.hs @@ -46,10 +46,10 @@ import Ouroboros.Network.Protocol.Handshake.Codec (cborTermVersionDataCodec, noTimeLimitsHandshake) import Ouroboros.Network.Protocol.Handshake.Version (acceptableVersion, queryVersion) -import Ouroboros.Network.Testing.Serialise import Ouroboros.Network.Util.ShowProxy import Test.ChainGenerators (TestBlockChainAndUpdates (..)) +import Test.Ouroboros.Network.Serialise import Ouroboros.Network.PeerSelection.PeerSharing (PeerSharing (..)) import Test.QuickCheck diff --git a/ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/BlockFetch.hs b/ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/BlockFetch.hs index 3ee230f89fa..c0501633766 100644 --- a/ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/BlockFetch.hs +++ b/ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/BlockFetch.hs @@ -46,6 +46,7 @@ import Ouroboros.Network.Block import Ouroboros.Network.BlockFetch import Ouroboros.Network.BlockFetch.ClientRegistry import Ouroboros.Network.BlockFetch.ClientState +import Ouroboros.Network.BlockFetch.Decision.Trace (TraceDecisionEvent) import Ouroboros.Network.BlockFetch.DeltaQ import Ouroboros.Network.BlockFetch.Examples import Ouroboros.Network.Driver (TraceSendRecv) @@ -54,8 +55,7 @@ import Ouroboros.Network.Mock.ConcreteBlock import Ouroboros.Network.NodeToNode.Version (NodeToNodeVersion) import Ouroboros.Network.Protocol.BlockFetch.Type (BlockFetch) -import Ouroboros.Network.BlockFetch.Decision.Trace (TraceDecisionEvent) -import Ouroboros.Network.Testing.Utils +import Test.Ouroboros.Network.Utils -- diff --git a/ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/LedgerPeers.hs b/ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/LedgerPeers.hs index b82de8d36f8..15a1dfe2dec 100644 --- a/ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/LedgerPeers.hs +++ b/ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/LedgerPeers.hs @@ -44,7 +44,8 @@ import Ouroboros.Network.PeerSelection.LedgerPeers.Utils (recomputeRelativeStake) import Ouroboros.Network.PeerSelection.RelayAccessPoint import Ouroboros.Network.PeerSelection.RootPeersDNS -import Ouroboros.Network.Testing.Data.Script + +import Test.Ouroboros.Network.Data.Script import Test.Ouroboros.Network.PeerSelection.RootPeersDNS import Test.QuickCheck import Test.Tasty diff --git a/ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/PeerSelection.hs b/ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/PeerSelection.hs index caa4d881ab1..31a46e0a9bf 100644 --- a/ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/PeerSelection.hs +++ b/ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/PeerSelection.hs @@ -83,15 +83,15 @@ import Ouroboros.Network.PeerSelection.State.LocalRootPeers qualified as LocalRo import Ouroboros.Network.Point import Ouroboros.Network.Protocol.PeerSharing.Type (PeerSharingResult (..)) -import Ouroboros.Network.Testing.Data.Script -import Ouroboros.Network.Testing.Data.Signal (E (E), Events, Signal, TS (TS), +import Test.Ouroboros.Network.Data.Script +import Test.Ouroboros.Network.Data.Signal (E (E), Events, Signal, TS (TS), signalProperty) -import Ouroboros.Network.Testing.Data.Signal qualified as Signal -import Ouroboros.Network.Testing.Utils (disjointSetsProperty, isSubsetProperty, - nightlyTest) +import Test.Ouroboros.Network.Data.Signal qualified as Signal import Test.Ouroboros.Network.PeerSelection.Instances import Test.Ouroboros.Network.PeerSelection.MockEnvironment hiding (tests) import Test.Ouroboros.Network.PeerSelection.PeerGraph +import Test.Ouroboros.Network.Utils (disjointSetsProperty, isSubsetProperty, + nightlyTest) import Control.Monad.IOSim diff --git a/ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/PeerSelection/Instances.hs b/ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/PeerSelection/Instances.hs index 4aa2f959aaf..c3b5df581a2 100644 --- a/ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/PeerSelection/Instances.hs +++ b/ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/PeerSelection/Instances.hs @@ -37,7 +37,8 @@ import Ouroboros.Network.PeerSelection.RelayAccessPoint (DomainAccessPoint (..), RelayAccessPoint (..)) import Ouroboros.Network.PeerSelection.State.LocalRootPeers (LocalRootConfig (..)) -import Ouroboros.Network.Testing.Utils (ShrinkCarefully, prop_shrink_nonequal, + +import Test.Ouroboros.Network.Utils (ShrinkCarefully, prop_shrink_nonequal, prop_shrink_valid) import Test.QuickCheck diff --git a/ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/PeerSelection/LocalRootPeers.hs b/ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/PeerSelection/LocalRootPeers.hs index e9451b7d986..60f3406e87a 100644 --- a/ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/PeerSelection/LocalRootPeers.hs +++ b/ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/PeerSelection/LocalRootPeers.hs @@ -22,9 +22,9 @@ import Ouroboros.Network.PeerSelection.State.LocalRootPeers (HotValency (..), LocalRootConfig (..), LocalRootPeers (..), WarmValency (..)) import Ouroboros.Network.PeerSelection.State.LocalRootPeers qualified as LocalRootPeers -import Ouroboros.Network.Testing.Utils (ShrinkCarefully, prop_shrink_nonequal, - prop_shrink_valid, renderRanges) import Test.Ouroboros.Network.PeerSelection.Instances +import Test.Ouroboros.Network.Utils (ShrinkCarefully, prop_shrink_nonequal, + prop_shrink_valid, renderRanges) import Test.QuickCheck diff --git a/ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/PeerSelection/MockEnvironment.hs b/ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/PeerSelection/MockEnvironment.hs index 77525938f93..b383ed1ab9b 100644 --- a/ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/PeerSelection/MockEnvironment.hs +++ b/ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/PeerSelection/MockEnvironment.hs @@ -24,7 +24,7 @@ module Test.Ouroboros.Network.PeerSelection.MockEnvironment , selectPeerSelectionTraceEvents , selectPeerSelectionTraceEventsUntil , peerShareReachablePeers - , module Ouroboros.Network.Testing.Data.Script + , module Test.Ouroboros.Network.Data.Script , module Ouroboros.Network.PeerSelection.Types , tests , prop_shrink_nonequal_GovernorMockEnvironment @@ -66,19 +66,18 @@ import Ouroboros.Network.PeerSelection.Governor qualified as Governor import Ouroboros.Network.PeerSelection.State.LocalRootPeers qualified as LocalRootPeers import Ouroboros.Network.Point -import Ouroboros.Network.Testing.Data.Script (PickScript, Script (..), +import Test.Ouroboros.Network.Data.Script (PickScript, Script (..), ScriptDelay (..), TimedScript, arbitraryPickScript, arbitraryScriptOf, initScript, initScript', interpretPickScript, playTimedScript, prop_shrink_Script, shrinkScriptWith, singletonScript, singletonTimedScript, stepScript, stepScriptSTM, stepScriptSTM') -import Ouroboros.Network.Testing.Utils (ShrinkCarefully, arbitrarySubset, - nightlyTest, prop_shrink_nonequal, prop_shrink_valid) - import Test.Ouroboros.Network.PeerSelection.Instances import Test.Ouroboros.Network.PeerSelection.LocalRootPeers as LocalRootPeers hiding (tests) import Test.Ouroboros.Network.PeerSelection.PeerGraph +import Test.Ouroboros.Network.Utils (ShrinkCarefully, arbitrarySubset, + nightlyTest, prop_shrink_nonequal, prop_shrink_valid) import Ouroboros.Network.ConsensusMode import Ouroboros.Network.PeerSelection.Bootstrap (UseBootstrapPeers (..), diff --git a/ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/PeerSelection/PeerGraph.hs b/ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/PeerSelection/PeerGraph.hs index a3ed08c823f..efe385a0430 100644 --- a/ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/PeerSelection/PeerGraph.hs +++ b/ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/PeerSelection/PeerGraph.hs @@ -34,11 +34,11 @@ import Data.Tree qualified as Tree import Control.Monad.Class.MonadTime.SI -import Ouroboros.Network.Testing.Data.Script (Script (..), - ScriptDelay (NoDelay), TimedScript, arbitraryScriptOf) -import Ouroboros.Network.Testing.Utils (ShrinkCarefully (..), - prop_shrink_nonequal, prop_shrink_valid, renderRanges) +import Test.Ouroboros.Network.Data.Script (Script (..), ScriptDelay (NoDelay), + TimedScript, arbitraryScriptOf) import Test.Ouroboros.Network.PeerSelection.Instances +import Test.Ouroboros.Network.Utils (ShrinkCarefully (..), prop_shrink_nonequal, + prop_shrink_valid, renderRanges) import Ouroboros.Network.PeerSelection.PeerSharing (PeerSharing) import Test.QuickCheck diff --git a/ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/PeerSelection/PeerMetric.hs b/ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/PeerSelection/PeerMetric.hs index 78b77e781fe..9d2889e602b 100644 --- a/ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/PeerSelection/PeerMetric.hs +++ b/ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/PeerSelection/PeerMetric.hs @@ -43,7 +43,7 @@ import Control.Monad.IOSim import NoThunks.Class -import Ouroboros.Network.Testing.Data.Script +import Test.Ouroboros.Network.Data.Script import Test.QuickCheck import Test.QuickCheck.Monoids diff --git a/ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/PeerSelection/PublicRootPeers.hs b/ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/PeerSelection/PublicRootPeers.hs index 27b3e9e2d3e..b7c0716f080 100644 --- a/ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/PeerSelection/PublicRootPeers.hs +++ b/ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/PeerSelection/PublicRootPeers.hs @@ -13,9 +13,9 @@ import Data.Set qualified as Set import Ouroboros.Network.PeerSelection.PublicRootPeers (PublicRootPeers) import Ouroboros.Network.PeerSelection.PublicRootPeers qualified as PublicRootPeers -import Ouroboros.Network.Testing.Utils (ShrinkCarefully, prop_shrink_nonequal, - prop_shrink_valid) import Test.Ouroboros.Network.PeerSelection.Instances +import Test.Ouroboros.Network.Utils (ShrinkCarefully, prop_shrink_nonequal, + prop_shrink_valid) import Ouroboros.Network.PeerSelection.PeerAdvertise (PeerAdvertise) diff --git a/ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/PeerSelection/RootPeersDNS.hs b/ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/PeerSelection/RootPeersDNS.hs index 68b092bb625..ee2999fbde9 100644 --- a/ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/PeerSelection/RootPeersDNS.hs +++ b/ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/PeerSelection/RootPeersDNS.hs @@ -67,7 +67,7 @@ import Ouroboros.Network.PeerSelection.RootPeersDNS.LocalRootPeers import Ouroboros.Network.PeerSelection.RootPeersDNS.PublicRootPeers import Ouroboros.Network.PeerSelection.State.LocalRootPeers (HotValency (..), LocalRootConfig (..), WarmValency (..)) -import Ouroboros.Network.Testing.Data.Script (Script (Script), initScript', +import Test.Ouroboros.Network.Data.Script (Script (Script), initScript', scriptHead, singletonScript, stepScript') import Test.Ouroboros.Network.PeerSelection.Instances () import Test.QuickCheck diff --git a/ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/Testnet.hs b/ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/Testnet.hs index d7a031a5ef6..9aad3e425d6 100644 --- a/ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/Testnet.hs +++ b/ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/Testnet.hs @@ -47,12 +47,12 @@ 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.Types +import Ouroboros.Network.ConsensusMode import Ouroboros.Network.ExitPolicy (RepromoteDelay (..)) import Ouroboros.Network.Mock.ConcreteBlock (BlockHeader) import Ouroboros.Network.NodeToNode (DiffusionMode (..)) @@ -79,21 +79,21 @@ import Ouroboros.Network.PeerSelection.State.LocalRootPeers qualified as LocalRo import Ouroboros.Network.PeerSelection.Types import Ouroboros.Network.PeerSharing (PeerSharingResult (..)) import Ouroboros.Network.Server2 qualified as Server -import Ouroboros.Network.Testing.Data.AbsBearerInfo -import Ouroboros.Network.Testing.Data.Script -import Ouroboros.Network.Testing.Data.Signal -import Ouroboros.Network.Testing.Data.Signal qualified as Signal -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.Data.AbsBearerInfo +import Test.Ouroboros.Network.Data.Script +import Test.Ouroboros.Network.Data.Signal +import Test.Ouroboros.Network.Data.Signal qualified as Signal 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.Ouroboros.Network.Utils hiding (SmallDelay, debugTracer) import Test.QuickCheck import Test.QuickCheck.Monoids import Test.Tasty diff --git a/ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/Testnet/Internal.hs b/ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/Testnet/Internal.hs index 681b0b78477..0f5b9bc791c 100644 --- a/ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/Testnet/Internal.hs +++ b/ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/Testnet/Internal.hs @@ -106,11 +106,10 @@ import Ouroboros.Network.Snocket (Snocket, TestAddress (..)) import Ouroboros.Network.Block (BlockNo) import Ouroboros.Network.Mock.ConcreteBlock (Block (..), BlockHeader (..)) -import Ouroboros.Network.Testing.Data.Script -import Ouroboros.Network.Testing.Utils import Simulation.Network.Snocket (BearerInfo (..), FD, SnocketTrace, WithAddr (..), makeFDBearer, withSnocket) +import Test.Ouroboros.Network.Data.Script import Test.Ouroboros.Network.PeerSelection.Instances qualified as PeerSelection import Test.Ouroboros.Network.PeerSelection.RootPeersDNS (DNSLookupDelay (..), DNSTimeout (..)) @@ -120,6 +119,7 @@ import Test.Ouroboros.Network.Testnet.Node qualified as Node import Test.Ouroboros.Network.Testnet.Node.Kernel (BlockGeneratorArgs, NtCAddr, NtCVersion, NtCVersionData, NtNAddr, NtNAddr_ (IPAddr), NtNVersion, NtNVersionData, ntnAddrToRelayAccessPoint, randomBlockGenerationArgs) +import Test.Ouroboros.Network.Utils import Data.Bool (bool) import Data.Function (on) diff --git a/ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/Testnet/Node.hs b/ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/Testnet/Node.hs index a23c142e3f4..ba823f49749 100644 --- a/ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/Testnet/Node.hs +++ b/ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/Testnet/Node.hs @@ -90,7 +90,6 @@ import Ouroboros.Network.Server.RateLimiting (AcceptedConnectionsLimit (..)) import Ouroboros.Network.Snocket (MakeBearer, Snocket, TestAddress (..), invalidFileDescriptor) -import Ouroboros.Network.Testing.Data.Script (Script (..), stepScriptSTM') import Simulation.Network.Snocket (AddressType (..), FD) @@ -106,6 +105,8 @@ import Ouroboros.Network.PeerSelection.RelayAccessPoint (DomainAccessPoint, import Ouroboros.Network.PeerSelection.RootPeersDNS.DNSActions (DNSLookupType) import Ouroboros.Network.PeerSelection.State.LocalRootPeers (HotValency, LocalRootConfig, WarmValency) + +import Test.Ouroboros.Network.Data.Script (Script (..), stepScriptSTM') import Test.Ouroboros.Network.PeerSelection.RootPeersDNS (DNSLookupDelay, DNSTimeout, mockDNSActions) import Test.Ouroboros.Network.Testnet.Node.ChainDB (addBlock, getBlockPointSet) diff --git a/ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/TxSubmission.hs b/ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/TxSubmission.hs index 8c5f5995c36..e16dde5ee6e 100644 --- a/ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/TxSubmission.hs +++ b/ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/TxSubmission.hs @@ -57,7 +57,7 @@ import Ouroboros.Network.TxSubmission.Mempool.Reader import Ouroboros.Network.TxSubmission.Outbound import Ouroboros.Network.Util.ShowProxy -import Ouroboros.Network.Testing.Utils +import Test.Ouroboros.Network.Utils import Test.QuickCheck import Test.Tasty (TestTree, testGroup)