ouroboros-network:api-tests - moved Test.Cardano.Network.Version

Author: coot

…ork/mock/Ouroboros/Network/Mock/Chain.hs …ests-lib/Ouroboros/Network/Mock/Chain.hsouroboros-network/mock/Ouroboros/Network/Mock/Chain.hs renamed to ouroboros-network/api/tests-lib/Ouroboros/Network/Mock/Chain.hs ouroboros-network/mock/Ouroboros/Network/Mock/Chain.hs renamed to ouroboros-network/api/tests-lib/Ouroboros/Network/Mock/Chain.hs

@@ -12,7 +12,7 @@
 
 -- | Arbitrary generators for chains, headers and blocks
 --
-module Test.ChainGenerators
+module Ouroboros.Network.Mock.ChainGenerators
   ( -- * Arbitrary chains generators
     -- These generators are used to test various scenarios that require
     -- a chain: e.g. appending a block to chain, arbitrary updates
@@ -25,6 +25,7 @@ module Test.ChainGenerators
   , TestChainAndRange (..)
   , TestChainAndPoints (..)
   , TestChainFork (..)
+  , TestChainRange (..)
     -- * Utility functions
   , genNonNegative
   , genSlotGap
@@ -48,7 +49,6 @@ import Ouroboros.Network.Mock.Chain qualified as Chain
 import Ouroboros.Network.Mock.ConcreteBlock
 import Ouroboros.Network.Point (WithOrigin (..), block, blockPointHash,
            blockPointSlot, fromWithOrigin, origin)
-import Ouroboros.Network.Protocol.BlockFetch.Type (ChainRange (..))
 
 import Data.List (scanl')
 import Test.Cardano.Slotting.Arbitrary ()
@@ -130,15 +130,17 @@ instance Arbitrary (Point Block) where
          . shrink
          .     (castPoint :: Point Block -> Point BlockHeader)
 
-instance Arbitrary (ChainRange (Point Block)) where
+data TestChainRange = TestChainRange (Point Block) (Point Block)
+
+instance Arbitrary TestChainRange where
   arbitrary = do
     low  <- arbitrary
     high <- arbitrary `suchThat` (\high -> pointSlot low <= pointSlot high)
-    return (ChainRange low high)
+    return (TestChainRange low high)
 
-  shrink (ChainRange low high) = [ ChainRange low' high'
-                                 | (low', high') <- shrink (low, high)
-                                 , pointSlot low <= pointSlot high ]
+  shrink (TestChainRange low high) = [ TestChainRange low' high'
+                                     | (low', high') <- shrink (low, high)
+                                     , pointSlot low <= pointSlot high ]
 
 instance Arbitrary BlockBody where
     arbitrary =

…tocols/tests-lib/Test/ChainGenerators.hs …uroboros/Network/Mock/ChainGenerators.hsouroboros-network/protocols/tests-lib/Test/ChainGenerators.hs renamed to ouroboros-network/api/tests-lib/Ouroboros/Network/Mock/ChainGenerators.hs ouroboros-network/protocols/tests-lib/Test/ChainGenerators.hs renamed to ouroboros-network/api/tests-lib/Ouroboros/Network/Mock/ChainGenerators.hs

@@ -3,8 +3,11 @@ module Main (main) where
 import Main.Utf8 (withUtf8)
 import Test.Tasty
 
+import Test.Cardano.Network.Version qualified as Version
 import Test.Cardano.Network.NodeToClient.Version qualified as NodeToClient.Version
 import Test.Cardano.Network.NodeToNode.Version qualified as NodeToNode.Version
+import Test.Ouroboros.Network.AnchoredFragment qualified as AnchoredFragment
+import Test.Ouroboros.Network.Chain qualified as Chain
 import Test.Ouroboros.Network.PeerSelection.RelayAccessPoint qualified as RelayAccessPoint
 
 main :: IO ()
@@ -13,7 +16,10 @@ main = withUtf8 $ defaultMain tests
 tests :: TestTree
 tests =
   testGroup "ouroboros-network-api"
-  [ NodeToClient.Version.tests
+  [ AnchoredFragment.tests
+  , Chain.tests
+  , Version.tests
+  , NodeToClient.Version.tests
   , NodeToNode.Version.tests
   , RelayAccessPoint.tests
   ]

…/Ouroboros/Network/Mock/ConcreteBlock.hs …/Ouroboros/Network/Mock/ConcreteBlock.hsouroboros-network/mock/Ouroboros/Network/Mock/ConcreteBlock.hs renamed to ouroboros-network/api/tests-lib/Ouroboros/Network/Mock/ConcreteBlock.hs ouroboros-network/mock/Ouroboros/Network/Mock/ConcreteBlock.hs renamed to ouroboros-network/api/tests-lib/Ouroboros/Network/Mock/ConcreteBlock.hs

@@ -4,9 +4,9 @@
 --
 module Test.Cardano.Network.Version (tests) where
 
-import Cardano.Network.NodeToClient (NodeToClientVersion (..),
+import Cardano.Network.NodeToClient.Version (NodeToClientVersion (..),
            nodeToClientVersionCodec)
-import Cardano.Network.NodeToNode (NodeToNodeVersion (..),
+import Cardano.Network.NodeToNode.Version (NodeToNodeVersion (..),
            nodeToNodeVersionCodec)
 import Ouroboros.Network.CodecCBORTerm
 
@@ -56,8 +56,8 @@ roundTripPropAll
        , Enum a
        , Bounded a
        , Show a
-       , Eq failure
        , Show failure
+       , Eq failure
        )
     => CodecCBORTerm failure a -> Assertion
 roundTripPropAll codec =
@@ -68,8 +68,6 @@ crossFailureProp
     :: forall failure a b.
        ( Show a
        , Show b
-       , Eq failure
-       , Show failure
        )
     => CodecCBORTerm failure a
     -> CodecCBORTerm failure b
@@ -85,8 +83,6 @@ crossFailurePropAll
     :: forall failure a b.
        ( Show a
        , Show b
-       , Eq failure
-       , Show failure
        )
     => CodecCBORTerm failure a
     -> CodecCBORTerm failure b

ouroboros-network/api/tests/Main.hs

@@ -10,7 +10,7 @@
 {-# OPTIONS_GHC -Wno-x-partial #-}
 #endif
 
-module Test.AnchoredFragment
+module Test.Ouroboros.Network.AnchoredFragment
   ( tests
   , TestBlockAnchoredFragment (..)
   ) where
@@ -29,10 +29,11 @@ import Ouroboros.Network.AnchoredFragment (AnchoredFragment,
 import Ouroboros.Network.AnchoredFragment qualified as AF
 import Ouroboros.Network.Block
 import Ouroboros.Network.Mock.Chain qualified as Chain
+import Ouroboros.Network.Mock.ChainGenerators (TestBlockChain (..),
+           TestChainAndRange (..), addSlotGap, genChainAnchor, genNonNegative,
+           genSlotGap)
 import Ouroboros.Network.Mock.ConcreteBlock
 import Ouroboros.Network.Point (WithOrigin (..), withOrigin)
-import Test.ChainGenerators (TestBlockChain (..), TestChainAndRange (..),
-           addSlotGap, genChainAnchor, genNonNegative, genSlotGap)
 
 
 --

…ests/lib/Test/Cardano/Network/Version.hs …pi/tests/Test/Cardano/Network/Version.hsouroboros-network/tests/lib/Test/Cardano/Network/Version.hs renamed to ouroboros-network/api/tests/Test/Cardano/Network/Version.hs ouroboros-network/tests/lib/Test/Cardano/Network/Version.hs renamed to ouroboros-network/api/tests/Test/Cardano/Network/Version.hs

@@ -6,7 +6,7 @@
 
 {-# OPTIONS_GHC -Wno-incomplete-uni-patterns #-}
 
-module Test.Chain (tests) where
+module Test.Ouroboros.Network.Chain (tests) where
 
 import Data.List qualified as L
 import Data.Maybe (listToMaybe)
@@ -18,8 +18,8 @@ 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.Mock.ChainGenerators hiding (tests)
 
-import Test.ChainGenerators hiding (tests)
 import Test.Ouroboros.Network.Serialise (prop_serialise)
 
 

…protocols/tests/Test/AnchoredFragment.hs …st/Ouroboros/Network/AnchoredFragment.hsouroboros-network/protocols/tests/Test/AnchoredFragment.hs renamed to ouroboros-network/api/tests/Test/Ouroboros/Network/AnchoredFragment.hs ouroboros-network/protocols/tests/Test/AnchoredFragment.hs renamed to ouroboros-network/api/tests/Test/Ouroboros/Network/AnchoredFragment.hs

@@ -125,14 +125,37 @@ library api
     text >=1.2 && <2.2,
     typed-protocols ^>=1.1,
 
+library api-tests-lib
+  import: ghc-options
+  hs-source-dirs: api/tests-lib
+  exposed-modules:
+    Ouroboros.Network.Mock.ConcreteBlock
+    Ouroboros.Network.Mock.Chain
+    Ouroboros.Network.Mock.ChainGenerators
+  build-depends:
+    QuickCheck,
+    base,
+    bytestring,
+    cardano-slotting:testlib ^>=0.2.0,
+    cborg,
+    hashable,
+    nothunks,
+    ouroboros-network:api,
+    quickcheck-instances,
+    serialise,
+    tasty,
+    tasty-quickcheck,
+    time,
+
 test-suite api-tests
   import: ghc-options
   type: exitcode-stdio-1.0
   main-is: Main.hs
   hs-source-dirs: api/tests
-  default-language: Haskell2010
-  default-extensions: ImportQualifiedPost
   other-modules:
+    Test.Ouroboros.Network.AnchoredFragment
+    Test.Ouroboros.Network.Chain
+    Test.Cardano.Network.Version
     Test.Cardano.Network.NodeToClient.Version
     Test.Cardano.Network.NodeToNode.Version
     Test.Ouroboros.Network.PeerSelection.RelayAccessPoint
@@ -145,8 +168,9 @@ test-suite api-tests
     cardano-binary,
     cborg,
     iproute,
-    ouroboros-network:api,
+    ouroboros-network:{api, api-tests-lib, tests-lib},
     tasty,
+    tasty-hunit,
     tasty-quickcheck,
     with-utf8,
 
@@ -833,7 +857,6 @@ library protocols-tests-lib
     Ouroboros.Network.Protocol.TxSubmission2.Direct
     Ouroboros.Network.Protocol.TxSubmission2.Examples
     Ouroboros.Network.Protocol.TxSubmission2.Test
-    Test.ChainGenerators
     Test.ChainProducerState
     Test.Data.CDDL
     Test.Data.PipeliningDepth
@@ -843,7 +866,6 @@ library protocols-tests-lib
     QuickCheck,
     base >=4.14 && <4.22,
     bytestring,
-    cardano-slotting:testlib ^>=0.2.0,
     cardano-strict-containers,
     cborg,
     containers,
@@ -853,7 +875,7 @@ library protocols-tests-lib
     io-sim,
     network,
     network-mux,
-    ouroboros-network:{api, framework, mock, protocols, tests-lib},
+    ouroboros-network:{api, api-tests-lib, framework, mock, protocols, tests-lib},
     pipes,
     quickcheck-instances,
     serialise,
@@ -867,17 +889,11 @@ test-suite protocols-tests
   type: exitcode-stdio-1.0
   hs-source-dirs: protocols/tests
   main-is: Main.hs
-  -- TODO: these two tests should be moved to `ouroboros-network:mock`
-  other-modules:
-    Test.AnchoredFragment
-    Test.Chain
 
   build-depends:
-    QuickCheck ^>=2.16,
     base >=4.14 && <4.22,
-    ouroboros-network:{api, mock, protocols-tests-lib, tests-lib},
+    ouroboros-network:{protocols-tests-lib},
     tasty,
-    tasty-quickcheck,
 
   ghc-options:
     -threaded
@@ -906,7 +922,7 @@ test-suite protocols-cddl
     filepath,
     mtl,
     network,
-    ouroboros-network:{api, framework, mock, protocols, protocols-tests-lib},
+    ouroboros-network:{api, api-tests-lib, framework, protocols, protocols-tests-lib},
     process-extras,
     quickcheck-instances,
     serialise,
@@ -916,6 +932,7 @@ test-suite protocols-cddl
     temporary,
     text,
     typed-protocols:{typed-protocols, stateful},
+    tasty-quickcheck,
 
   ghc-options:
     -threaded
@@ -955,20 +972,12 @@ library mock
   visibility: public
   hs-source-dirs: mock
   exposed-modules:
-    Ouroboros.Network.Mock.Chain
-    Ouroboros.Network.Mock.ConcreteBlock
     Ouroboros.Network.Mock.ProducerState
 
   build-depends:
     base >=4.14 && <4.22,
-    bytestring,
-    cborg,
     containers,
-    hashable,
-    nothunks,
-    ouroboros-network:api,
-    serialise,
-    time,
+    ouroboros-network:{api, api-tests-lib},
 
 -- Simulation Test Library
 library ouroboros-network-tests-lib
@@ -997,7 +1006,7 @@ library ouroboros-network-tests-lib
     network,
     network-mux,
     nothunks,
-    ouroboros-network:{ouroboros-network, api, cardano-diffusion, framework, framework-tests-lib, mock, orphan-instances, protocols, protocols-tests-lib, tests-lib},
+    ouroboros-network:{ouroboros-network, api, api-tests-lib, cardano-diffusion, framework, framework-tests-lib, mock, orphan-instances, protocols, protocols-tests-lib, tests-lib},
     pipes,
     pretty-simple,
     psqueues,
@@ -1015,7 +1024,6 @@ library ouroboros-network-tests-lib
     Ouroboros.Network.BlockFetch.Examples
     Ouroboros.Network.MockNode
     Test.Cardano.Network.OrphanInstances.Tests
-    Test.Cardano.Network.Version
     Test.Ouroboros.Network.BlockFetch
     Test.Ouroboros.Network.Diffusion.Node
     Test.Ouroboros.Network.Diffusion.Node.ChainDB
@@ -1092,7 +1100,7 @@ test-suite ouroboros-network-io-tests
     monoidal-synchronisation,
     network,
     network-mux,
-    ouroboros-network:{api, cardano-diffusion, framework, mock, protocols, protocols-tests-lib, tests-lib},
+    ouroboros-network:{api, api-tests-lib, cardano-diffusion, framework, mock, protocols, protocols-tests-lib, tests-lib},
     serialise,
     tasty,
     tasty-quickcheck,
@@ -1127,7 +1135,7 @@ executable demo-chain-sync
     io-classes:{si-timers, strict-stm},
     network-mux,
     optparse-applicative,
-    ouroboros-network:{ouroboros-network, api, cardano-diffusion, framework, mock, protocols},
+    ouroboros-network:{ouroboros-network, api, api-tests-lib, cardano-diffusion, framework, protocols},
     random,
     serialise,
     typed-protocols,

…os-network/protocols/tests/Test/Chain.hs …pi/tests/Test/Ouroboros/Network/Chain.hsouroboros-network/protocols/tests/Test/Chain.hs renamed to ouroboros-network/api/tests/Test/Ouroboros/Network/Chain.hs ouroboros-network/protocols/tests/Test/Chain.hs renamed to ouroboros-network/api/tests/Test/Ouroboros/Network/Chain.hs

@@ -59,7 +59,6 @@ import Ouroboros.Network.Block (Point, SlotNo, Tip, decodeTip, encodeTip,
            unwrapCBORinCBOR, wrapCBORinCBOR)
 import Ouroboros.Network.CodecCBORTerm
 import Ouroboros.Network.Magic
-import Ouroboros.Network.Mock.ConcreteBlock qualified as Concrete (Block)
 
 import Cardano.Network.NodeToClient.Version (NodeToClientVersion,
            NodeToClientVersionData (..), nodeToClientCodecCBORTerm)
@@ -113,7 +112,8 @@ import Ouroboros.Network.Protocol.PeerSharing.Codec (codecPeerSharing)
 import Ouroboros.Network.Protocol.PeerSharing.Test ()
 import Ouroboros.Network.Protocol.PeerSharing.Type qualified as PeerSharing
 
-import Test.ChainGenerators ()
+import Ouroboros.Network.Mock.ChainGenerators ()
+import Ouroboros.Network.Mock.ConcreteBlock qualified as Concrete (Block)
 import Test.Data.CDDL (Any (..))
 
 import Ouroboros.Network.PeerSelection.PeerSharing.Codec (decodeRemoteAddress,

ouroboros-network/ouroboros-network.cabal

@@ -35,6 +35,7 @@ import Ouroboros.Network.Block (Serialised (..), genesisPoint, unwrapCBORinCBOR,
 
 import Ouroboros.Network.Mock.Chain (Chain, Point)
 import Ouroboros.Network.Mock.Chain qualified as Chain
+import Ouroboros.Network.Mock.ChainGenerators (TestChainAndPoints (..))
 import Ouroboros.Network.Mock.ConcreteBlock (Block)
 
 import Ouroboros.Network.Protocol.BlockFetch.Client
@@ -45,7 +46,6 @@ import Ouroboros.Network.Protocol.BlockFetch.Server
 import Ouroboros.Network.Protocol.BlockFetch.Type
 import Test.Data.PipeliningDepth (PipeliningDepth (..))
 
-import Test.ChainGenerators (TestChainAndPoints (..))
 import Test.Ouroboros.Network.Protocol.Utils (prop_codec_cborM,
            prop_codec_valid_cbor_encoding, splits2, splits3)