split things out a little bit

Author: MaximilianAlgehed

quickcheck-dynamic/src/Test/QuickCheck/StateModel/Variables.hs

@@ -39,7 +39,7 @@ import Test.QuickCheck (Gen, Smart (..), elements)
 
 -- | A symbolic variable for a value of type `a`
 newtype Var a = Var Int
-  deriving (Eq, Ord, Typeable, Data)
+  deriving (Eq, Ord, Data)
 
 -- | Create a fresh symbolic variable with given identifier. While 'Var's are
 -- usually created by action generators, this function can be used for example

quickcheck-dynamic/test/Spec/DynamicLogic/RegistryModel.hs

@@ -256,21 +256,25 @@ prop_parRegistryIOSim (IOSimActions as) = monadicIOSim_ prop
       pure ()
 
 prop_parRegistryIOSimPor :: IOSimActions -> Property
-prop_parRegistryIOSimPor (IOSimActions as) = forAllBlind prop' $ \ p -> exploreSimTrace id p $ \ _ tr ->
-    either (flip counterexample False . show) id $ traceResult False tr
+prop_parRegistryIOSimPor (IOSimActions as) =
+  monadicIOSimPOR_ prop
   where
-    prop' :: Gen (forall s. IOSim s Property)
-    prop' = do
-      Capture eval <- capture
-      pure (eval prop)
-
-    prop :: forall s. Gen (IOSim s Property)
-    prop = monadic' $ do
+    prop :: forall s. PropertyM (IOSim s) ()
+    prop = do
       reg <- lift setupRegistry
       lift exploreRaces
       runPropertyReaderT (runParActions $ as @s) reg
       pure ()
 
+monadicIOSimPOR_ :: Testable a => (forall s. PropertyM (IOSim s) a) -> Property
+monadicIOSimPOR_ prop = forAllBlind prop' $ \ p -> exploreSimTrace id p $ \ _ tr ->
+    either (flip counterexample False . show) id $ traceResult False tr
+  where
+    prop' :: Gen (forall s. IOSim s Property)
+    prop' = do
+      Capture eval <- capture
+      pure $ eval $ monadic' prop
+
 propDL :: DL (RegState IO) () -> Property
 propDL d = forAllDL d prop_Registry