Remove MonadTest constraints from assertion functions

Author: Jimbo4350

cardano-testnet/src/Testnet/Property/Assert.hs

@@ -22,7 +22,6 @@ import           Prelude hiding (lines)
 
 import qualified Control.Concurrent as IO
 import           Control.Monad
-import           Control.Monad.Catch (MonadCatch)
 import           Control.Monad.Trans.Reader (ReaderT)
 import           Control.Monad.Trans.Resource (ResourceT)
 import           Data.Aeson (Value, (.:))
@@ -39,17 +38,16 @@ import qualified Data.Time.Clock as DTC
 import           Data.Type.Equality
 import           Data.Word (Word8)
 import           GHC.Stack as GHC
+import           RIO (throwString)
 
-import           Testnet.Process.Run
+import           Testnet.Process.RunIO
 import           Testnet.Start.Types
 
 import           Hedgehog (MonadTest)
 import qualified Hedgehog as H
 import           Hedgehog.Extras.Internal.Test.Integration (IntegrationState)
 import qualified Hedgehog.Extras.Stock.IO.File as IO
-import           Hedgehog.Extras.Test.Base (failMessage)
 import qualified Hedgehog.Extras.Test.Base as H
-import qualified Hedgehog.Extras.Test.File as H
 import           Hedgehog.Extras.Test.Process (ExecConfig)
 
 newlineBytes :: Word8
@@ -65,23 +63,23 @@ fileJsonGrep fp f = do
   return $ L.any f jsons
 
 assertByDeadlineIOCustom
-  :: (MonadTest m, MonadIO m, HasCallStack)
+  :: (MonadIO m, HasCallStack)
   => String -> DTC.UTCTime -> IO Bool -> m ()
 assertByDeadlineIOCustom str deadline f = withFrozenCallStack $ do
-  success <- H.evalIO f
+  success <- liftIOAnnotated f
   unless success $ do
-    currentTime <- H.evalIO DTC.getCurrentTime
+    currentTime <- liftIOAnnotated DTC.getCurrentTime
     if currentTime < deadline
       then do
-        H.evalIO $ IO.threadDelay 1_000_000
+        liftIOAnnotated $ IO.threadDelay 1_000_000
         assertByDeadlineIOCustom str deadline f
       else do
-        H.annotateShow currentTime
-        H.failMessage GHC.callStack $ "Condition not met by deadline: " <> str
+        throwString $ "Condition not met by deadline: " <> str
 
 -- | A sanity check that confirms that there are the expected number of SPOs in the ledger state
 assertExpectedSposInLedgerState
-  :: (MonadTest m, MonadCatch m, MonadIO m, HasCallStack)
+  :: HasCallStack
+  => MonadIO m
   => FilePath -- ^ Stake pools query output filepath
   -> NumPools
   -> ExecConfig
@@ -92,21 +90,21 @@ assertExpectedSposInLedgerState output (NumPools numExpectedPools) execConfig =
       , "--out-file", output
       ]
 
-  poolSet <- H.evalEither =<< H.evalIO (Aeson.eitherDecodeFileStrict' @(Set PoolId) output)
-
-  H.cat output
-
-  let numPoolsInLedgerState = Set.size poolSet
-  unless (numPoolsInLedgerState == numExpectedPools) $
-    failMessage GHC.callStack
-      $ unlines [ "Expected number of stake pools not found in ledger state"
-                , "Expected: ", show numExpectedPools
-                , "Actual: ", show numPoolsInLedgerState
-                ]
+  ePoolSet <-  liftIOAnnotated (Aeson.eitherDecodeFileStrict' @(Set PoolId) output)
+  case ePoolSet of
+    Left err -> 
+      throwString $ "Failed to decode stake pools from ledger state: " <> err
+    Right poolSet -> do
+      let numPoolsInLedgerState = Set.size poolSet
+      unless (numPoolsInLedgerState == numExpectedPools) $
+        throwString $ unlines 
+          [ "Expected number of stake pooFvls not found in ledger state"
+          , "Expected: ", show numExpectedPools
+          , "Actual: ", show numPoolsInLedgerState
+          ]
 
 assertChainExtended
   :: HasCallStack
-  => H.MonadTest m
   => MonadIO m
   => DTC.UTCTime
   -> NodeLoggingFormat