tx-submission: reorganised test modules

* Put `TxLogic` tests in a separate module, and common API in `Types`.
* Fixed tasty test hierarchy.
* Renamed `TxSubmissionV{1,2}` as `AppV{1,2}`

Author: coot

ouroboros-network/ouroboros-network.cabal

@@ -255,9 +255,10 @@ library sim-tests-lib
                        Test.Ouroboros.Network.Testnet
                        Test.Ouroboros.Network.Testnet.Simulation.Node
                        Test.Ouroboros.Network.TxSubmission
-                       Test.Ouroboros.Network.TxSubmission.Common
-                       Test.Ouroboros.Network.TxSubmission.TxSubmissionV1
-                       Test.Ouroboros.Network.TxSubmission.TxSubmissionV2
+                       Test.Ouroboros.Network.TxSubmission.Types
+                       Test.Ouroboros.Network.TxSubmission.TxLogic
+                       Test.Ouroboros.Network.TxSubmission.AppV1
+                       Test.Ouroboros.Network.TxSubmission.AppV2
                        Test.Ouroboros.Network.Version
 
   ghc-options:         -Wall

ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/Diffusion/Node.hs

@@ -119,7 +119,7 @@ import Test.Ouroboros.Network.Diffusion.Node.NodeKernel (NodeKernel (..),
 import Test.Ouroboros.Network.Diffusion.Node.NodeKernel qualified as Node
 import Test.Ouroboros.Network.PeerSelection.RootPeersDNS (DNSLookupDelay,
            DNSTimeout, mockDNSActions)
-import Test.Ouroboros.Network.TxSubmission.Common (Tx)
+import Test.Ouroboros.Network.TxSubmission.Types (Tx)
 
 
 data Interfaces m = Interfaces

ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/Diffusion/Node/MiniProtocols.hs

@@ -109,8 +109,8 @@ import Ouroboros.Network.TxSubmission.Inbound.Types (TraceTxLogic,
            TraceTxSubmissionInbound)
 import Ouroboros.Network.TxSubmission.Outbound (txSubmissionOutbound)
 import Test.Ouroboros.Network.Diffusion.Node.NodeKernel
-import Test.Ouroboros.Network.TxSubmission.Common (Mempool, Tx,
-           getMempoolReader, getMempoolWriter, txSubmissionCodec2)
+import Test.Ouroboros.Network.TxSubmission.Types (Mempool, Tx, getMempoolReader,
+           getMempoolWriter, txSubmissionCodec2)
 
 
 -- | Protocol codecs.

ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/Diffusion/Node/NodeKernel.hs

@@ -90,7 +90,7 @@ import Ouroboros.Network.TxSubmission.Inbound.Registry (SharedTxStateVar,
            TxChannels (..), TxChannelsVar, newSharedTxStateVar)
 import Test.Ouroboros.Network.Diffusion.Node.ChainDB (ChainDB (..))
 import Test.Ouroboros.Network.Diffusion.Node.ChainDB qualified as ChainDB
-import Test.Ouroboros.Network.TxSubmission.Common (Mempool, Tx, newMempool)
+import Test.Ouroboros.Network.TxSubmission.Types (Mempool, Tx, newMempool)
 import Test.QuickCheck (Arbitrary (..), choose, chooseInt, frequency, oneof)
 
 

ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/Testnet.hs

@@ -111,8 +111,8 @@ import Ouroboros.Network.TxSubmission.Inbound.State (inflightTxs)
 import Ouroboros.Network.TxSubmission.Inbound.Types (TraceTxLogic (..),
            TraceTxSubmissionInbound (..))
 import Ouroboros.Network.TxSubmission.Outbound (TxSubmissionProtocolError (..))
-import Test.Ouroboros.Network.TxSubmission.Common (ArbTxDecisionPolicy (..),
-           Tx (..))
+import Test.Ouroboros.Network.TxSubmission.TxLogic (ArbTxDecisionPolicy (..))
+import Test.Ouroboros.Network.TxSubmission.Types (Tx (..))
 
 tests :: TestTree
 tests =

ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/Testnet/Simulation/Node.hs

@@ -148,8 +148,8 @@ import Ouroboros.Network.TxSubmission.Inbound.Types (TraceTxLogic,
            TraceTxSubmissionInbound)
 import Test.Ouroboros.Network.LedgerPeers (LedgerPools (..), genLedgerPoolsFrom)
 import Test.Ouroboros.Network.PeerSelection.LocalRootPeers ()
-import Test.Ouroboros.Network.TxSubmission.Common (ArbTxDecisionPolicy (..),
-           Tx (..))
+import Test.Ouroboros.Network.TxSubmission.TxLogic (ArbTxDecisionPolicy (..))
+import Test.Ouroboros.Network.TxSubmission.Types (Tx (..))
 import Test.QuickCheck
 
 -- | Diffusion Simulator Arguments

ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/TxSubmission.hs

@@ -1,14 +1,14 @@
 module Test.Ouroboros.Network.TxSubmission (tests) where
 
-import Test.Ouroboros.Network.TxSubmission.Common qualified as Common
-import Test.Ouroboros.Network.TxSubmission.TxSubmissionV1 qualified as V1
-import Test.Ouroboros.Network.TxSubmission.TxSubmissionV2 qualified as V2
+import Test.Ouroboros.Network.TxSubmission.AppV1 qualified as AppV1
+import Test.Ouroboros.Network.TxSubmission.AppV2 qualified as AppV2
+import Test.Ouroboros.Network.TxSubmission.TxLogic qualified as TxLogic
 
 import Test.Tasty (TestTree, testGroup)
 
 tests :: TestTree
 tests = testGroup "Ouroboros.Network.TxSubmission"
-  [ Common.tests
-  , V1.tests
-  , V2.tests
+  [ TxLogic.tests
+  , AppV1.tests
+  , AppV2.tests
   ]

ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/TxSubmission/TxSubmissionV1.hs renamed to ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/TxSubmission/AppV1.hs

@@ -11,7 +11,7 @@
 
 {-# OPTIONS_GHC -Wno-orphans #-}
 
-module Test.Ouroboros.Network.TxSubmission.TxSubmissionV1 (tests) where
+module Test.Ouroboros.Network.TxSubmission.AppV1 (tests) where
 
 import Prelude hiding (seq)
 
@@ -48,16 +48,17 @@ import Ouroboros.Network.TxSubmission.Outbound
 import Ouroboros.Network.Util.ShowProxy
 
 import Ouroboros.Network.Testing.Utils
+import Test.Ouroboros.Network.TxSubmission.Types
 
 import Test.QuickCheck
 import Test.Tasty (TestTree, testGroup)
 import Test.Tasty.QuickCheck (testProperty)
 
-import Test.Ouroboros.Network.TxSubmission.Common hiding (tests)
+-- import Test.Ouroboros.Network.TxSubmission.Common hiding (tests)
 
 
 tests :: TestTree
-tests = testGroup "Ouroboros.Network.TxSubmission.TxSubmissionV1"
+tests = testGroup "AppV1"
   [ testProperty "txSubmission" prop_txSubmission
   ]
 

ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/TxSubmission/TxSubmissionV2.hs renamed to ouroboros-network/sim-tests-lib/Test/Ouroboros/Network/TxSubmission/AppV2.hs

@@ -12,7 +12,7 @@
 
 {-# OPTIONS_GHC -Wno-orphans #-}
 
-module Test.Ouroboros.Network.TxSubmission.TxSubmissionV2 (tests) where
+module Test.Ouroboros.Network.TxSubmission.AppV2 (tests) where
 
 import Prelude hiding (seq)
 
@@ -34,8 +34,8 @@ import Control.Tracer (Tracer (..), contramap)
 
 import Data.ByteString.Lazy (ByteString)
 import Data.ByteString.Lazy qualified as BSL
-import Data.Function (on)
 import Data.Foldable (traverse_)
+import Data.Function (on)
 import Data.List (nubBy)
 import Data.Map.Strict (Map)
 import Data.Map.Strict qualified as Map
@@ -59,15 +59,16 @@ import Ouroboros.Network.TxSubmission.Outbound
 import Ouroboros.Network.Util.ShowProxy
 
 import Ouroboros.Network.Testing.Utils hiding (debugTracer)
-import Test.Ouroboros.Network.TxSubmission.Common hiding (tests)
+import Test.Ouroboros.Network.TxSubmission.TxLogic hiding (tests)
+import Test.Ouroboros.Network.TxSubmission.Types
 
 import Test.QuickCheck
 import Test.Tasty (TestTree, testGroup)
 import Test.Tasty.QuickCheck (testProperty)
 
 
 tests :: TestTree
-tests = testGroup "Ouroboros.Network.TxSubmission.TxSubmissionV2"
+tests = testGroup "AppV2"
   [ testProperty "txSubmission" prop_txSubmission
   , testProperty "txSubmission inflight" prop_txSubmission_inflight
   ]