tx-sub: restructure tasty test groups

* Make all `TxLogic` appear under `AppV2` group.
* Renamed `AppV2.diffusion` test as `AppV2.txSubmission` similar to
  `AppV2.txSubmission`

This makes it easier to run all tx-submission v2 tests.

Author: coot

ouroboros-network/testlib/Test/Ouroboros/Network/TxSubmission.hs

@@ -8,7 +8,7 @@ import Test.Tasty (TestTree, testGroup)
 
 tests :: TestTree
 tests = testGroup "Ouroboros.Network.TxSubmission"
-  [ TxLogic.tests
-  , AppV1.tests
+  [ AppV1.tests
+  , TxLogic.tests
   , AppV2.tests
   ]

ouroboros-network/testlib/Test/Ouroboros/Network/TxSubmission/AppV2.hs

@@ -71,7 +71,7 @@ import Test.Tasty.QuickCheck (testProperty)
 
 tests :: TestTree
 tests = testGroup "AppV2"
-  [ testProperty "diffusion"     prop_txSubmission_diffusion
+  [ testProperty "txSubmission"  prop_txSubmission
   , testProperty "inflight"      prop_txSubmission_inflight
   , testProperty "SharedTxState" $ withMaxSize 25
                                  $ withMaxSuccess 25
@@ -305,8 +305,8 @@ filterValidTxs
 -- property test are the same as for tx submission v1. We need this to know we
 -- didn't regress.
 --
-prop_txSubmission_diffusion :: TxSubmissionState -> Property
-prop_txSubmission_diffusion st@(TxSubmissionState peers _) =
+prop_txSubmission :: TxSubmissionState -> Property
+prop_txSubmission st@(TxSubmissionState peers _) =
     let tr = runSimTrace (txSubmissionSimulation st)
         numPeersWithWronglySizedTx :: Int
         numPeersWithWronglySizedTx =

ouroboros-network/testlib/Test/Ouroboros/Network/TxSubmission/TxLogic.hs

@@ -61,48 +61,50 @@ import Text.Pretty.Simple
 
 
 tests :: TestTree
-tests = testGroup "TxLogic"
-  [ testGroup "State"
-    [ testGroup "Arbitrary"
-      [ testGroup "ArbSharedTxState"
-        [ testProperty "generator"              prop_SharedTxState_generator
-        , testProperty "shrinker"             $ withMaxSuccess 10
-                                                prop_SharedTxState_shrinker
-        , testProperty "nothunks"               prop_SharedTxState_nothunks
+tests = testGroup "AppV2"
+  [ testGroup "TxLogic"
+    [ testGroup "State"
+      [ testGroup "Arbitrary"
+        [ testGroup "ArbSharedTxState"
+          [ testProperty "generator"              prop_SharedTxState_generator
+          , testProperty "shrinker"             $ withMaxSuccess 10
+                                                  prop_SharedTxState_shrinker
+          , testProperty "nothunks"               prop_SharedTxState_nothunks
+          ]
+        , testGroup "ArbReceivedTxIds"
+          [ testProperty "generator"              prop_receivedTxIds_generator
+          ]
+        , testGroup "ArbCollectTxs"
+          [ testProperty "generator"              prop_collectTxs_generator
+          , testProperty "shrinker"             $ withMaxSuccess 10
+                                                  prop_collectTxs_shrinker
+          ]
         ]
-      , testGroup "ArbReceivedTxIds"
-        [ testProperty "generator"              prop_receivedTxIds_generator
+      , testProperty "acknowledgeTxIds"           prop_acknowledgeTxIds
+      , testProperty "receivedTxIdsImpl"          prop_receivedTxIdsImpl
+      , testProperty "collectTxsImpl"             prop_collectTxsImpl
+      , testProperty "splitAcknowledgedTxIds"     prop_splitAcknowledgedTxIds
+      , testGroup "NoThunks"
+        [ testProperty "receivedTxIdsImpl"        prop_receivedTxIdsImpl_nothunks
+        , testProperty "collectTxsImpl"           prop_collectTxsImpl_nothunks
         ]
-      , testGroup "ArbCollectTxs"
-        [ testProperty "generator"              prop_collectTxs_generator
-        , testProperty "shrinker"             $ withMaxSuccess 10
-                                                prop_collectTxs_shrinker
-        ]
-      ]
-    , testProperty "acknowledgeTxIds"           prop_acknowledgeTxIds
-    , testProperty "receivedTxIdsImpl"          prop_receivedTxIdsImpl
-    , testProperty "collectTxsImpl"             prop_collectTxsImpl
-    , testProperty "splitAcknowledgedTxIds"     prop_splitAcknowledgedTxIds
-    , testGroup "NoThunks"
-      [ testProperty "receivedTxIdsImpl"        prop_receivedTxIdsImpl_nothunks
-      , testProperty "collectTxsImpl"           prop_collectTxsImpl_nothunks
       ]
-    ]
-  , testGroup "Decisions"
-    [ testGroup "ArbDecisionContexts"
-      [ testProperty "generator"               prop_ArbDecisionContexts_generator
-      , testProperty "shrinker"              $ withMaxSuccess 33
-                                               prop_ArbDecisionContexts_shrinker
+    , testGroup "Decisions"
+      [ testGroup "ArbDecisionContexts"
+        [ testProperty "generator"               prop_ArbDecisionContexts_generator
+        , testProperty "shrinker"              $ withMaxSuccess 33
+                                                 prop_ArbDecisionContexts_shrinker
+        ]
+      , testProperty "shared state invariant"    prop_makeDecisions_sharedstate
+      , testProperty "inflight"                  prop_makeDecisions_inflight
+      , testProperty "policy"                    prop_makeDecisions_policy
+      , testProperty "acknowledged"              prop_makeDecisions_acknowledged
+      , testProperty "exhaustive"                prop_makeDecisions_exhaustive
       ]
-    , testProperty "shared state invariant"    prop_makeDecisions_sharedstate
-    , testProperty "inflight"                  prop_makeDecisions_inflight
-    , testProperty "policy"                    prop_makeDecisions_policy
-    , testProperty "acknowledged"              prop_makeDecisions_acknowledged
-    , testProperty "exhaustive"                prop_makeDecisions_exhaustive
-    ]
-  , testGroup "Registry"
-    [ testGroup "filterActivePeers"
-      [ testProperty "not limiting decisions"  prop_filterActivePeers_not_limitting_decisions
+    , testGroup "Registry"
+      [ testGroup "filterActivePeers"
+        [ testProperty "not limiting decisions"  prop_filterActivePeers_not_limitting_decisions
+        ]
       ]
     ]
   ]