Merge pull request #5276 from IntersectMBO/geo2a/10.7-integration

Allow using `QuickCheck < 2.16`

Author: geo2a

cardano-diffusion/cardano-diffusion.cabal

@@ -47,9 +47,16 @@ common ghc-options
 -- in tests librararies redundant constraints are sometimes useful (e.g.
 -- by default truned off debug tracing might require extra constraints like
 -- `Show` or `MonadSay`).
+--
+-- TODO: '-Wno-redundant-constraints' remove when we support
+-- `quickcheck-monoids`. For now, it is needed to prevent
+-- false-positives that lead to build errors with `-Werror`.
+-- See https://gitlab.haskell.org/ghc/ghc/-/issues/24173 for details.
 common ghc-options-tests
   import: ghc-options
-  ghc-options: -Wno-redundant-constraints
+  ghc-options:
+    -Wno-redundant-constraints
+    -Wno-unused-packages
 
 library api
   import: ghc-options
@@ -430,10 +437,13 @@ test-suite protocols-bench
 
 library cardano-diffusion-tests-lib
   import: ghc-options-tests
+  mixins:
+    QuickCheck hiding (Test.QuickCheck.Monoids)
+
   visibility: public
   hs-source-dirs: tests/lib
   build-depends:
-    QuickCheck >=2.16,
+    QuickCheck,
     aeson,
     base >=4.14 && <4.23,
     bytestring,
@@ -453,6 +463,7 @@ library cardano-diffusion-tests-lib
     pipes,
     pretty-simple,
     psqueues,
+    quickcheck-monoids,
     random,
     serialise,
     tasty,

cardano-diffusion/changelog.d/20260114_093532_georgy.lukyanov_10_7_integration.md

@@ -0,0 +1,17 @@
+<!--
+A new scriv changelog fragment.
+
+Uncomment the section that is right (remove the HTML comment wrapper).
+For top level release notes, leave all the headers commented out.
+-->
+
+<!--
+### Breaking
+
+- A bullet item for the Breaking category.
+
+-->
+
+### Non-Breaking
+
+- Compatibility with both `QuickCheck` < 2.15 and >= 2.16

cardano-diffusion/tests/lib/Test/Cardano/Network/Diffusion/Testnet.hs

@@ -3,6 +3,7 @@
 {-# LANGUAGE NamedFieldPuns      #-}
 {-# LANGUAGE NumericUnderscores  #-}
 {-# LANGUAGE OverloadedStrings   #-}
+{-# LANGUAGE PackageImports      #-}
 {-# LANGUAGE RankNTypes          #-}
 {-# LANGUAGE ScopedTypeVariables #-}
 {-# LANGUAGE TypeApplications    #-}
@@ -107,6 +108,9 @@ import Test.Ouroboros.Network.TxSubmission.Types (Tx (..), TxId)
 import Test.Ouroboros.Network.Utils hiding (SmallDelay, debugTracer)
 
 import Test.QuickCheck
+#if !MIN_VERSION_QuickCheck(2,16,0)
+import "quickcheck-monoids" Test.QuickCheck.Monoids
+#endif
 import Test.Tasty
 import Test.Tasty.QuickCheck (testProperty)
 

cardano-diffusion/tests/lib/Test/Cardano/Network/PeerSelection.hs

@@ -89,6 +89,9 @@ import Cardano.Network.PeerSelection.Governor.Types qualified as Cardano.ExtraSi
 import Cardano.Network.PeerSelection.State.LocalRootPeers qualified as LocalRootPeers
 import Ouroboros.Network.BlockFetch (FetchMode (..), PraosFetchMode (..))
 import Test.QuickCheck
+#if !MIN_VERSION_QuickCheck(2,16,0)
+import "quickcheck-monoids" Test.QuickCheck.Monoids
+#endif
 import Test.Tasty
 import Test.Tasty.QuickCheck
 import Text.Pretty.Simple

ouroboros-network/changelog.d/20260114_093734_georgy.lukyanov_10_7_integration.md

@@ -0,0 +1,17 @@
+<!--
+A new scriv changelog fragment.
+
+Uncomment the section that is right (remove the HTML comment wrapper).
+For top level release notes, leave all the headers commented out.
+-->
+
+<!--
+### Breaking
+
+- A bullet item for the Breaking category.
+
+-->
+
+### Non-Breaking
+
+- Compatibility with both `QuickCheck` < 2.15 and >= 2.16

ouroboros-network/framework/sim-tests/Test/Ouroboros/Network/Server/Sim.hs

@@ -15,6 +15,9 @@
 {-# LANGUAGE StandaloneDeriving  #-}
 {-# LANGUAGE TypeApplications    #-}
 {-# LANGUAGE TypeOperators       #-}
+#if !MIN_VERSION_QuickCheck(2,16,0)
+{-# LANGUAGE PackageImports      #-}
+#endif
 
 -- for 'debugTracer'
 {-# OPTIONS_GHC -Wno-redundant-constraints #-}
@@ -64,6 +67,9 @@ import System.Random (StdGen, mkStdGen, split)
 import Text.Printf
 
 import Test.QuickCheck
+#if !MIN_VERSION_QuickCheck(2,16,0)
+import "quickcheck-monoids" Test.QuickCheck.Monoids
+#endif
 import Test.Tasty (TestTree, testGroup)
 import Test.Tasty.QuickCheck
 

ouroboros-network/framework/tests-lib/Test/Ouroboros/Network/ConnectionManager/Timeouts.hs

@@ -1,5 +1,8 @@
 {-# LANGUAGE LambdaCase     #-}
 {-# LANGUAGE NamedFieldPuns #-}
+{-# LANGUAGE PackageImports #-}
+
+{-# LANGUAGE CPP            #-}
 
 module Test.Ouroboros.Network.ConnectionManager.Timeouts
   ( verifyAllTimeouts
@@ -39,6 +42,9 @@ import Data.Monoid (Sum (Sum))
 import Text.Printf (printf)
 
 import Test.QuickCheck
+#if !MIN_VERSION_QuickCheck(2,16,0)
+import "quickcheck-monoids" Test.QuickCheck.Monoids
+#endif
 
 import Ouroboros.Network.ConnectionHandler (ConnectionHandlerTrace)
 import Ouroboros.Network.ConnectionManager.Core qualified as CM

ouroboros-network/framework/tests-lib/Test/Ouroboros/Network/ConnectionManager/Utils.hs

@@ -1,6 +1,9 @@
 {-# LANGUAGE NamedFieldPuns      #-}
+{-# LANGUAGE PackageImports      #-}
 {-# LANGUAGE ScopedTypeVariables #-}
 
+{-# LANGUAGE CPP                 #-}
+
 module Test.Ouroboros.Network.ConnectionManager.Utils where
 
 import Prelude hiding (read)
@@ -10,6 +13,9 @@ import Ouroboros.Network.ConnectionManager.Core as CM
 import Ouroboros.Network.ConnectionManager.Types
 
 import Test.QuickCheck
+#if !MIN_VERSION_QuickCheck(2,16,0)
+import "quickcheck-monoids" Test.QuickCheck.Monoids
+#endif
 
 
 verifyAbstractTransition :: AbstractTransition

ouroboros-network/framework/tests-lib/Test/Ouroboros/Network/InboundGovernor/Utils.hs

@@ -1,11 +1,17 @@
 {-# LANGUAGE LambdaCase      #-}
 {-# LANGUAGE NamedFieldPuns  #-}
+{-# LANGUAGE PackageImports  #-}
 {-# LANGUAGE PatternSynonyms #-}
 {-# LANGUAGE ViewPatterns    #-}
 
+{-# LANGUAGE CPP             #-}
+
 module Test.Ouroboros.Network.InboundGovernor.Utils where
 
 import Test.QuickCheck
+#if !MIN_VERSION_QuickCheck(2,16,0)
+import "quickcheck-monoids" Test.QuickCheck.Monoids
+#endif
 
 import Ouroboros.Network.ConnectionManager.Types
 import Ouroboros.Network.InboundGovernor (RemoteSt (..))

ouroboros-network/ouroboros-network.cabal

@@ -55,9 +55,16 @@ common ghc-options
 -- in tests librararies redundant constraints are sometimes useful (e.g.
 -- by default truned off debug tracing might require extra constraints like
 -- `Show` or `MonadSay`).
+--
+-- TODO: '-Wno-redundant-constraints' remove when we support
+-- `quickcheck-monoids`. For now, it is needed to prevent
+-- false-positives that lead to build errors with `-Werror`.
+-- See https://gitlab.haskell.org/ghc/ghc/-/issues/24173 for details.
 common ghc-options-tests
   import: ghc-options
-  ghc-options: -Wno-redundant-constraints
+  ghc-options:
+    -Wno-redundant-constraints
+    -Wno-unused-packages
 
 library api
   import: ghc-options
@@ -450,7 +457,7 @@ library tests-lib
     cpp-options: -DNIGHTLY
 
 test-suite tests-lib-tests
-  import: ghc-options
+  import: ghc-options-tests
   type: exitcode-stdio-1.0
   main-is: Main.hs
   hs-source-dirs: tests-lib/tests
@@ -467,7 +474,10 @@ test-suite tests-lib-tests
     -threaded
 
 library framework-tests-lib
-  import: ghc-options
+  import: ghc-options-tests
+  mixins:
+    QuickCheck hiding (Test.QuickCheck.Monoids)
+
   visibility: public
   hs-source-dirs: framework/tests-lib
   exposed-modules:
@@ -479,7 +489,7 @@ library framework-tests-lib
     Test.Ouroboros.Network.RawBearer.Utils
 
   build-depends:
-    QuickCheck >=2.16,
+    QuickCheck,
     base >=4.14 && <4.23,
     bytestring,
     cborg,
@@ -490,12 +500,16 @@ library framework-tests-lib
     io-sim,
     network-mux,
     ouroboros-network:{api, framework, tests-lib},
+    quickcheck-monoids,
     random,
     serialise,
     typed-protocols:{typed-protocols, examples},
 
 test-suite framework-sim-tests
-  import: ghc-options
+  import: ghc-options-tests
+  mixins:
+    QuickCheck hiding (Test.QuickCheck.Monoids)
+
   type: exitcode-stdio-1.0
   main-is: Main.hs
   hs-source-dirs: framework/sim-tests
@@ -507,7 +521,7 @@ test-suite framework-sim-tests
     Test.Simulation.Network.Snocket
 
   build-depends:
-    QuickCheck >=2.16,
+    QuickCheck,
     base >=4.14 && <4.23,
     bytestring,
     cborg,
@@ -521,6 +535,7 @@ test-suite framework-sim-tests
     pretty-simple,
     psqueues,
     quickcheck-instances,
+    quickcheck-monoids,
     quiet,
     random,
     serialise,
@@ -538,7 +553,7 @@ test-suite framework-sim-tests
     cpp-options: -DOUROBOROS_NETWORK_IPV6
 
 test-suite framework-io-tests
-  import: ghc-options
+  import: ghc-options-tests
   type: exitcode-stdio-1.0
   main-is: Main.hs
   hs-source-dirs: framework/io-tests
@@ -549,7 +564,7 @@ test-suite framework-io-tests
     Test.Ouroboros.Network.Socket
 
   build-depends:
-    QuickCheck >=2.16,
+    QuickCheck,
     base >=4.14 && <4.23,
     bytestring,
     contra-tracer,
@@ -574,7 +589,7 @@ test-suite framework-io-tests
     -threaded
 
 library orphan-instances
-  import: ghc-options
+  import: ghc-options-tests
   visibility: public
   hs-source-dirs: orphan-instances
   exposed-modules:
@@ -733,7 +748,7 @@ library protocols
     typed-protocols:{typed-protocols, cborg, stateful, stateful-cborg} ^>=1.1,
 
 library protocols-tests-lib
-  import: ghc-options
+  import: ghc-options-tests
   visibility: public
   hs-source-dirs: protocols/tests-lib
   exposed-modules:
@@ -817,10 +832,13 @@ test-suite protocols-tests
 -- Simulation Test Library
 library ouroboros-network-tests-lib
   import: ghc-options-tests
+  mixins:
+    QuickCheck hiding (Test.QuickCheck.Monoids)
+
   visibility: public
   hs-source-dirs: tests/lib
   build-depends:
-    QuickCheck >=2.16,
+    QuickCheck,
     aeson,
     array,
     base >=4.14 && <4.23,
@@ -843,6 +861,7 @@ library ouroboros-network-tests-lib
     nothunks,
     ouroboros-network:{ouroboros-network, api, api-tests-lib, framework, protocols, protocols-tests-lib, tests-lib},
     pretty-simple,
+    quickcheck-monoids,
     random,
     serialise,
     splitmix,
@@ -851,6 +870,7 @@ library ouroboros-network-tests-lib
     tasty-quickcheck,
     text,
     time >=1.9.1 && <1.16,
+    transformers-except,
     typed-protocols,
 
   exposed-modules:
@@ -913,7 +933,7 @@ test-suite ouroboros-network-io-tests
     Test.Ouroboros.Network.Socket
 
   build-depends:
-    QuickCheck >=2.16,
+    QuickCheck,
     base >=4.14 && <4.23,
     bytestring,
     cborg,