Move testing utils module to ourboros-network-testing

This way it can be shared between 'ouroboros-netowrk-framework' and 'ouroboros-netowrk'.
IntersectMBO · Oct 19, 2020 · 9b36ceb · 9b36ceb
1 parent 275d60f
commit 9b36ceb
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 5 deletions.
diff --git a/ouroboros-network-testing/ouroboros-network-testing.cabal b/ouroboros-network-testing/ouroboros-network-testing.cabal
@@ -25,6 +25,7 @@ library
   exposed-modules:
                        Ouroboros.Network.Testing.Serialise
                        Ouroboros.Network.Testing.QuickCheck
+                       Ouroboros.Network.Testing.Utils
   default-language:    Haskell2010
   other-extensions:    BangPatterns,
                        DataKinds,
@@ -49,7 +50,9 @@ library
                        TypeFamilies,
                        TypeInType
   build-depends:       base              >=4.9 && <4.15,
+                       contra-tracer,
                        io-sim,
+                       io-sim-classes,
 
                        cborg             >=0.2.1 && <0.3,
                        serialise         >=0.2 && <0.3,

diff --git a/...work/test/Test/Ouroboros/Network/Utils.hs → ...ng/src/Ouroboros/Network/Testing/Utils.hs b/...work/test/Test/Ouroboros/Network/Utils.hs → ...ng/src/Ouroboros/Network/Testing/Utils.hs
@@ -1,6 +1,6 @@
 {-# LANGUAGE ScopedTypeVariables #-}
 
-module Test.Ouroboros.Network.Utils where
+module Ouroboros.Network.Testing.Utils where
 
 import           Control.Monad.Class.MonadTime
 import           Control.Monad.Class.MonadSay
@@ -35,3 +35,4 @@ debugTracer = Tracer traceShowM
 
 sayTracer :: ( Show a, MonadSay m) => Tracer m a
 sayTracer = Tracer (say . show)
+
diff --git a/ouroboros-network/ouroboros-network.cabal b/ouroboros-network/ouroboros-network.cabal
@@ -145,6 +145,7 @@ library
                        fingertree        >=0.1.4.2 && <0.2,
                        iproute,
                        mtl,
+                       nothunks,
                        network           >=3.1 && <3.2,
                        psqueues          >=0.2.3 && <0.3,
                        serialise         >=0.2 && <0.3,
@@ -249,7 +250,6 @@ test-suite test-network
                        Test.AnchoredFragment
                        Test.Chain
                        Test.ChainFragment
-                       Test.Ouroboros.Network.Utils
                        Test.Ouroboros.Network.BlockFetch
                        Test.Ouroboros.Network.KeepAlive
                        Test.Ouroboros.Network.MockNode
@@ -292,6 +292,7 @@ test-suite test-network
                        cardano-prelude,
                        cardano-slotting,
                        contra-tracer,
+                       nothunks,
 
                        io-sim,
                        io-sim-classes,
@@ -340,7 +341,6 @@ test-suite test-cddl
                        tasty-quickcheck,
 
                        cardano-binary,
-                       cardano-prelude,
                        cardano-slotting,
                        contra-tracer,
 
@@ -383,3 +383,5 @@ executable demo-chain-sync
   ghc-options:         -Wall
                        -threaded
                        -rtsopts
+
+
diff --git a/ouroboros-network/test/Test/Ouroboros/Network/BlockFetch.hs b/ouroboros-network/test/Test/Ouroboros/Network/BlockFetch.hs
@@ -45,7 +45,7 @@ import           Ouroboros.Network.Mux (ControlMessage (..), continueForever)
 import           Ouroboros.Network.Protocol.BlockFetch.Type (BlockFetch)
 import           Ouroboros.Network.Testing.ConcreteBlock
 
-import           Test.Ouroboros.Network.Utils
+import           Ouroboros.Network.Testing.Utils
 
 
 --

diff --git a/ouroboros-network/test/Test/Ouroboros/Network/TxSubmission.hs b/ouroboros-network/test/Test/Ouroboros/Network/TxSubmission.hs
@@ -50,7 +50,7 @@ import           Ouroboros.Network.TxSubmission.Inbound
 import           Ouroboros.Network.TxSubmission.Outbound
 import           Ouroboros.Network.NodeToNode (NodeToNodeVersion (..))
 
-import           Test.Ouroboros.Network.Utils
+import           Ouroboros.Network.Testing.Utils
 
 import           Test.Tasty (TestTree, testGroup)
 import           Test.Tasty.QuickCheck (testProperty)