Remove prop parameter

Author: ninioArtillero

ouroboros-consensus-diffusion/test/consensus-test/Test/Consensus/Genesis/Setup.hs

@@ -46,27 +46,30 @@ import           Text.Printf (printf)
 -- | Contains all necessary data to run a 'GenesisTest'.
 -- It is defined to reify the testing infrastructure for
 -- the conformance `testgen` executable.
-data ConformanceTest blk prop = ConformanceTest
+data ConformanceTest blk = ConformanceTest
   { ctGenerator       :: Gen (GenesisTestFull blk)
     -- ^ The test generator.
   , ctSchedulerConfig :: SchedulerConfig
     -- ^ Scheduler configuration parameters.
   , ctShrinker        :: (GenesisTestFull blk -> StateView blk -> [GenesisTestFull blk])
     -- ^ A shrinker with a
-  , ctProperty        :: GenesisTestFull blk -> StateView blk -> prop
+  , ctProperty        :: GenesisTestFull blk -> StateView blk -> Property
     -- ^ The property to test.
   --, ctDesiredPasses   :: Int
     -- ^ Sets the expected number of test runs to check the property.
   }
 
 mkConformanceTest ::
+  (Testable prop) =>
   -- Int ->
   Gen (GenesisTestFull blk) ->
   SchedulerConfig ->
   (GenesisTestFull blk -> StateView blk -> [GenesisTestFull blk]) ->
   (GenesisTestFull blk -> StateView blk -> prop) ->
-  ConformanceTest blk prop
-mkConformanceTest ctGenerator ctSchedulerConfig ctShrinker ctProperty = ConformanceTest {..}
+  ConformanceTest blk
+mkConformanceTest ctGenerator ctSchedulerConfig ctShrinker mkProperty =
+  let ctProperty = fmap property . mkProperty
+   in ConformanceTest {..}
 
 -- | Like 'runSimStrictShutdown' but fail when the main thread terminates if
 -- there are other threads still running or blocked. If one is trying to follow
@@ -112,10 +115,9 @@ runGenesisTest' schedulerConfig genesisTest makeProperty =
       runGenesisTest schedulerConfig genesisTest
 
 runConformanceTest :: forall blk prop.
-  ( Testable prop
-  , blk ~ TestBlock
+  ( blk ~ TestBlock
   ) =>
-  ConformanceTest blk prop -> Property
+  ConformanceTest blk -> Property
 runConformanceTest ConformanceTest {..} =
   forAllGenRunShrinkCheck ctGenerator runner shrinker' $ \genesisTest result ->
     let cls = classifiers genesisTest