Remove custom QuickCheck elements (#1439)

See the commit description.

"no changelog" label as this only affects tests.

Author: amesgen

ouroboros-consensus-diffusion/src/unstable-diffusion-testlib/Test/ThreadNet/Util/NodeToNodeVersion.hs

@@ -7,8 +7,7 @@ module Test.ThreadNet.Util.NodeToNodeVersion (
 import qualified Data.Map.Strict as Map
 import           Data.Proxy (Proxy (..))
 import           Ouroboros.Consensus.Node.NetworkProtocolVersion
-import           Test.QuickCheck (Gen)
-import           Test.Util.QuickCheck
+import           Test.QuickCheck
 
 genVersion ::
      SupportedNetworkProtocolVersion blk

ouroboros-consensus-diffusion/src/unstable-mock-testlib/Test/ThreadNet/TxGen/Mock.hs

@@ -11,9 +11,8 @@ import qualified Data.Map.Strict as Map
 import qualified Data.Set as Set
 import           Ouroboros.Consensus.Block
 import           Ouroboros.Consensus.Mock.Ledger
-import           Test.QuickCheck hiding (elements)
+import           Test.QuickCheck
 import           Test.ThreadNet.TxGen
-import           Test.Util.QuickCheck
 
 {-------------------------------------------------------------------------------
   TxGen SimpleBlock

ouroboros-consensus-diffusion/test/consensus-test/Test/Consensus/PointSchedule/Tests.hs

@@ -22,7 +22,7 @@ import           Ouroboros.Network.Block (blockHash)
 import           System.Random.Stateful (runSTGen_)
 import           Test.Consensus.PointSchedule.SinglePeer
 import           Test.Consensus.PointSchedule.SinglePeer.Indices
-import qualified Test.QuickCheck as QC hiding (elements)
+import qualified Test.QuickCheck as QC
 import           Test.QuickCheck
 import           Test.QuickCheck.Random
 import           Test.Tasty

ouroboros-consensus-protocol/test/protocol-test/Test/Consensus/Protocol/Praos/SelectView.hs

@@ -24,8 +24,7 @@ import           Test.Ouroboros.Consensus.Protocol
 import           Test.QuickCheck.Gen (Gen (..))
 import           Test.QuickCheck.Random (mkQCGen)
 import           Test.Tasty
-import           Test.Tasty.QuickCheck hiding (elements)
-import           Test.Util.QuickCheck
+import           Test.Tasty.QuickCheck
 import           Test.Util.TestEnv
 
 tests :: TestTree

ouroboros-consensus/ouroboros-consensus.cabal

@@ -386,7 +386,7 @@ library unstable-consensus-testlib
     Test.Util.WithEq
 
   build-depends:
-    QuickCheck,
+    QuickCheck >=2.15,
     base,
     base16-bytestring,
     binary,

ouroboros-consensus/src/unstable-consensus-testlib/Test/Util/QuickCheck.hs

@@ -20,7 +20,6 @@ module Test.Util.QuickCheck (
     -- * Comparing maps
   , isSubmapOfBy
     -- * Improved variants
-  , elements
   , (=:=)
     -- * SOP
   , cshrinkNP
@@ -39,11 +38,9 @@ import qualified Data.Map.Strict as Map
 import           Data.Proxy
 import           Data.SOP.Constraint
 import           Data.SOP.Strict
-import           GHC.Stack (HasCallStack)
 import           Ouroboros.Consensus.Util (repeatedly)
 import           Ouroboros.Consensus.Util.Condense (Condense, condense)
-import qualified Test.QuickCheck as QC
-import           Test.QuickCheck hiding (elements)
+import           Test.QuickCheck
 
 {-------------------------------------------------------------------------------
   Generic QuickCheck utilities
@@ -168,14 +165,6 @@ isSubmapOfBy p l r = conjoin [
   Improved variants
 -------------------------------------------------------------------------------}
 
--- | Generates one of the given values. The input list must be non-empty.
---
--- NOTE unlike the standard @elements@, this variant has a 'HasCallStack'
--- constraint, which makes debugging the 'error' much easier.
-elements :: HasCallStack => [a] -> Gen a
-elements [] = error "Test.Util.QuickCheck.elements used with empty list"
-elements xs = QC.elements xs
-
 -- | Like '===', but uses 'Condense' instead of 'Show' when it fails.
 infix 4 =:=
 (=:=) :: (Eq a, Condense a) => a -> a -> Property

ouroboros-consensus/test/consensus-test/Test/Consensus/HardFork/Forecast.hs

@@ -47,9 +47,9 @@ import qualified Ouroboros.Consensus.HardFork.History as History
 import           Ouroboros.Consensus.HardFork.History.Util
 import           Ouroboros.Consensus.Util (Some (..), repeatedly, splits)
 import           Test.Consensus.HardFork.Infra
-import           Test.QuickCheck hiding (elements)
+import           Test.QuickCheck
 import           Test.Tasty
-import           Test.Tasty.QuickCheck hiding (elements)
+import           Test.Tasty.QuickCheck
 import           Test.Util.QuickCheck
 
 tests :: TestTree

ouroboros-consensus/test/consensus-test/Test/Consensus/HardFork/Infra.hs

@@ -35,7 +35,7 @@ import           Data.Word
 import           Ouroboros.Consensus.Block
 import           Ouroboros.Consensus.BlockchainTime
 import qualified Ouroboros.Consensus.HardFork.History as HF
-import           Test.QuickCheck hiding (elements)
+import           Test.QuickCheck
 
 {-------------------------------------------------------------------------------
   Generate hard fork shape

ouroboros-consensus/test/consensus-test/Test/Consensus/Mempool.hs

@@ -70,11 +70,10 @@ import           Ouroboros.Consensus.Util (repeatedly, repeatedlyM,
 import           Ouroboros.Consensus.Util.Condense (condense)
 import           Ouroboros.Consensus.Util.IOLike
 import           Test.Crypto.Hash ()
-import           Test.QuickCheck hiding (elements)
+import           Test.QuickCheck
 import           Test.Tasty (TestTree, testGroup)
 import           Test.Tasty.QuickCheck (testProperty)
 import           Test.Util.Orphans.IOLike ()
-import           Test.Util.QuickCheck (elements)
 
 tests :: TestTree
 tests = testGroup "Mempool"

ouroboros-consensus/test/infra-test/Test/Ouroboros/Consensus/ChainGenerator/Tests/Adversarial.hs

@@ -36,7 +36,7 @@ import qualified Test.Ouroboros.Consensus.ChainGenerator.Slot as S
 import           Test.Ouroboros.Consensus.ChainGenerator.Slot (E (SlotE))
 import qualified Test.Ouroboros.Consensus.ChainGenerator.Some as Some
 import qualified Test.Ouroboros.Consensus.ChainGenerator.Tests.Honest as H
-import qualified Test.QuickCheck as QC hiding (elements)
+import qualified Test.QuickCheck as QC
 import           Test.QuickCheck.Extras (unsafeMapSuchThatJust)
 import           Test.QuickCheck.Random (QCGen)
 import qualified Test.Tasty as TT