Make eventually work with MonadicIO

cardano-foundation · Oct 1, 2020 · 0c9a952 · 0c9a952
1 parent 72de8fb
commit 0c9a952
Show file tree

Hide file tree

Showing 17 changed files with 103 additions and 110 deletions.
diff --git a/lib/core-integration/src/Test/Integration/Framework/DSL.hs b/lib/core-integration/src/Test/Integration/Framework/DSL.hs
@@ -581,7 +581,7 @@ waitAllTxsInLedger
     => Context t
     -> ApiWallet
     -> m ()
-waitAllTxsInLedger ctx w = liftIO $ eventually "waitAllTxsInLedger: all txs in ledger" $ do
+waitAllTxsInLedger ctx w = eventually "waitAllTxsInLedger: all txs in ledger" $ do
     let ep = Link.listTransactions @'Shelley w
     (_, txs) <- unsafeRequest @[ApiTransaction n] ctx ep Empty
     view (#status . #getApiT) <$> txs `shouldSatisfy` all (== InLedger)
@@ -593,7 +593,7 @@ waitForNextEpoch
 waitForNextEpoch ctx = do
     epoch <- getFromResponse (#nodeTip . #epochNumber) <$>
         request @ApiNetworkInformation ctx Link.getNetworkInfo Default Empty
-    liftIO $ eventually "waitForNextEpoch: goes to next epoch" $ do
+    eventually "waitForNextEpoch: goes to next epoch" $ do
         epoch' <- getFromResponse (#nodeTip . #epochNumber) <$>
             request @ApiNetworkInformation ctx Link.getNetworkInfo Default Empty
         unless (getApiT epoch' > getApiT epoch) $ fail "not yet"
@@ -664,7 +664,7 @@ a .<= b
 --
 -- It is like 'eventuallyUsingDelay', but with the default delay of 500 ms
 -- between retries.
-eventually :: String -> IO a -> IO a
+eventually :: MonadIO m => String -> IO a -> m a
 eventually = eventuallyUsingDelay (500 * ms)
   where
     ms = 1000
@@ -674,11 +674,12 @@ eventually = eventuallyUsingDelay (500 * ms)
 --
 -- It sleeps for a specified delay between retries.
 eventuallyUsingDelay
-    :: Int -- ^ Delay in microseconds
+    :: MonadIO m
+    => Int -- ^ Delay in microseconds
     -> String -- ^ Brief description of the IO action
     -> IO a
-    -> IO a
-eventuallyUsingDelay delay desc io = do
+    -> m a
+eventuallyUsingDelay delay desc io = liftIO $ do
     lastErrorRef <- newIORef Nothing
     -- NOTE
     -- This __90s__ is mostly justified by the parameters in the shelley
@@ -737,7 +738,7 @@ restoreWalletFromPubKey ctx pubKey name = snd <$> allocate create destroy
         r <- request @w ctx (Link.postWallet @style) Default payloadRestore
         expectResponseCode HTTP.status201 r
         let wid = getFromResponse id r
-        liftIO $ eventually "restoreWalletFromPubKey: wallet is 100% synced " $ do
+        eventually "restoreWalletFromPubKey: wallet is 100% synced " $ do
             rg <- request @w ctx (Link.getWallet @style wid) Default Empty
             expectField (typed @(ApiT SyncProgress) . #getApiT) (`shouldBe` Ready) rg
         return wid
@@ -929,7 +930,7 @@ rewardWallet ctx = do
     expectResponseCode HTTP.status201 r
     let w = getFromResponse id r
     waitForNextEpoch ctx
-    liftIO $ eventually "MIR wallet: wallet is 100% synced " $ do
+    eventually "MIR wallet: wallet is 100% synced " $ do
         rg <- request @ApiWallet ctx (Link.getWallet @'Shelley w) Default Empty
         verify rg
             [ expectField (#balance . #getApiT . #available . #getQuantity) (.> 0)

diff --git a/lib/core-integration/src/Test/Integration/Scenario/API/Byron/Addresses.hs b/lib/core-integration/src/Test/Integration/Scenario/API/Byron/Addresses.hs
@@ -37,8 +37,6 @@ import Cardano.Wallet.Primitive.Types
     ( AddressState (..) )
 import Control.Monad
     ( forM_ )
-import Control.Monad.IO.Class
-    ( liftIO )
 import Control.Monad.Trans.Resource
     ( ResourceT, runResourceT )
 import Data.Generics.Internal.VL.Lens
@@ -428,7 +426,7 @@ scenario_ADDRESS_IMPORT_05 addrNum fixture = it title $ \ctx -> runResourceT $ d
         [ expectResponseCode HTTP.status204
         ]
 
-    liftIO $ eventually "Addresses are imported" $ do
+    eventually "Addresses are imported" $ do
       r1 <- request @[ApiAddress n] ctx (Link.listAddresses @'Byron w) Default Empty
       verify r1
           [ expectListSize addrNum

diff --git a/lib/core-integration/src/Test/Integration/Scenario/API/Byron/HWWallets.hs b/lib/core-integration/src/Test/Integration/Scenario/API/Byron/HWWallets.hs
@@ -142,7 +142,7 @@ spec = describe "BYRON_HW_WALLETS" $ do
             (Link.createTransaction @'Byron wSrc) Default payload
         expectResponseCode HTTP.status202 rTrans
 
-        liftIO $ eventually "Wallet balance is as expected" $ do
+        eventually "Wallet balance is as expected" $ do
             rGet <- request @ApiByronWallet ctx
                 (Link.getWallet @'Byron wDest) Default Empty
             verify rGet
@@ -161,7 +161,7 @@ spec = describe "BYRON_HW_WALLETS" $ do
         let accXPub = pubKeyFromMnemonics mnemonics
         wDest' <- restoreWalletFromPubKey @ApiByronWallet @'Byron ctx accXPub restoredWalletName
 
-        liftIO $ eventually "Balance of restored wallet is as expected" $ do
+        eventually "Balance of restored wallet is as expected" $ do
             rGet <- request @ApiByronWallet ctx
                 (Link.getWallet @'Byron wDest') Default Empty
             verify rGet

diff --git a/lib/core-integration/src/Test/Integration/Scenario/API/Byron/Migrations.hs b/lib/core-integration/src/Test/Integration/Scenario/API/Byron/Migrations.hs
@@ -237,7 +237,7 @@ spec = describe "BYRON_MIGRATIONS" $ do
                 "style": "random"
                 } |]
         wOld <- unsafeResponse <$> postByronWallet ctx payloadRestore
-        originalBalance <- liftIO $ eventually "wallet balance greater than 0" $ do
+        originalBalance <- eventually "wallet balance greater than 0" $ do
             r <- request @ApiByronWallet ctx
                 (Link.getWallet @'Byron wOld)
                 Default
@@ -285,7 +285,7 @@ spec = describe "BYRON_MIGRATIONS" $ do
 
         -- Check that funds become available in the target wallet:
         let expectedBalance = originalBalance - expectedFee - leftovers
-        liftIO $ eventually "wallet balance = expectedBalance" $ do
+        eventually "wallet balance = expectedBalance" $ do
             request @ApiWallet ctx
                 (Link.getWallet @'Shelley wNew)
                 Default
@@ -377,7 +377,7 @@ spec = describe "BYRON_MIGRATIONS" $ do
                     "style": "random"
                     } |]
             sourceWallet <- unsafeResponse <$> postByronWallet ctx payloadRestore
-            liftIO $ eventually "wallet balance greater than 0" $ do
+            eventually "wallet balance greater than 0" $ do
                 request @ApiByronWallet ctx
                     (Link.getWallet @'Byron sourceWallet)
                     Default
@@ -517,7 +517,7 @@ spec = describe "BYRON_MIGRATIONS" $ do
 
             -- Check that funds become available in the target wallet:
             let expectedBalance = originalBalance - expectedFee - leftovers
-            liftIO $ eventually "Wallet has expectedBalance" $ do
+            eventually "Wallet has expectedBalance" $ do
                 r2 <- request @ApiWallet ctx
                     (Link.getWallet @'Shelley targetWallet) Default Empty
                 verify r2

diff --git a/lib/core-integration/src/Test/Integration/Scenario/API/Byron/Wallets.hs b/lib/core-integration/src/Test/Integration/Scenario/API/Byron/Wallets.hs
@@ -172,7 +172,7 @@ spec = describe "BYRON_WALLETS" $ do
                 liftIO $ verify r expectations
                 let w = getFromResponse id r
 
-                liftIO $ eventually "wallet is available and ready" $ do
+                eventually "wallet is available and ready" $ do
                     -- get
                     rg <- request @ApiByronWallet ctx
                         (Link.getWallet @'Byron w) Default Empty

diff --git a/lib/core-integration/src/Test/Integration/Scenario/API/Network.hs b/lib/core-integration/src/Test/Integration/Scenario/API/Network.hs
@@ -82,7 +82,7 @@ spec = describe "COMMON_NETWORK" $ do
             let getNetworkInfo = request @ApiNetworkInformation ctx
                     Link.getNetworkInfo Default Empty
             w <- emptyRandomWallet ctx
-            liftIO $ eventually "Wallet has the same tip as network/information" $ do
+            eventually "Wallet has the same tip as network/information" $ do
                 sync <- getNetworkInfo
                 expectField (#syncProgress . #getApiT) (`shouldBe` Ready) sync
 

diff --git a/lib/core-integration/src/Test/Integration/Scenario/API/Shelley/Addresses.hs b/lib/core-integration/src/Test/Integration/Scenario/API/Shelley/Addresses.hs
@@ -28,8 +28,6 @@ import Cardano.Wallet.Primitive.Types
     ( AddressState (..) )
 import Control.Monad
     ( forM_ )
-import Control.Monad.IO.Class
-    ( liftIO )
 import Control.Monad.Trans.Resource
     ( runResourceT )
 import Data.Generics.Internal.VL.Lens
@@ -199,7 +197,7 @@ spec = describe "SHELLEY_ADDRESSES" $ do
             expectResponseCode HTTP.status202 rTrans
 
         -- make sure all transactions are in ledger
-        liftIO $ eventually "Wallet balance = initPoolGap * minUTxOValue" $ do
+        eventually "Wallet balance = initPoolGap * minUTxOValue" $ do
             rb <- request @ApiWallet ctx
                 (Link.getWallet @'Shelley wDest) Default Empty
             expectField

diff --git a/lib/core-integration/src/Test/Integration/Scenario/API/Shelley/HWWallets.hs b/lib/core-integration/src/Test/Integration/Scenario/API/Shelley/HWWallets.hs
@@ -121,7 +121,7 @@ spec = describe "SHELLEY_HW_WALLETS" $ do
             (Link.createTransaction @'Shelley wSrc) Default payload
         expectResponseCode HTTP.status202 rTrans
 
-        liftIO $ eventually "Wallet balance is as expected" $ do
+        eventually "Wallet balance is as expected" $ do
             rGet <- request @ApiWallet ctx
                 (Link.getWallet @'Shelley wDest) Default Empty
             verify rGet
@@ -140,7 +140,7 @@ spec = describe "SHELLEY_HW_WALLETS" $ do
         let accXPub = pubKeyFromMnemonics mnemonics
         wDest' <- restoreWalletFromPubKey @ApiWallet @'Shelley ctx accXPub restoredWalletName
 
-        liftIO $ eventually "Balance of restored wallet is as expected" $ do
+        eventually "Balance of restored wallet is as expected" $ do
             rGet <- request @ApiWallet ctx
                 (Link.getWallet @'Shelley wDest') Default Empty
             verify rGet

diff --git a/lib/core-integration/src/Test/Integration/Scenario/API/Shelley/Migrations.hs b/lib/core-integration/src/Test/Integration/Scenario/API/Shelley/Migrations.hs
@@ -169,7 +169,7 @@ spec = describe "SHELLEY_MIGRATIONS" $ do
                 "passphrase": #{fixturePassphrase}
                 } |]
         wOld <- unsafeResponse <$> postWallet ctx payloadRestore
-        originalBalance <- liftIO $ eventually "wallet balance greater than 0" $ do
+        originalBalance <- eventually "wallet balance greater than 0" $ do
             r <- request @ApiWallet ctx
                 (Link.getWallet @'Shelley wOld)
                 Default
@@ -212,7 +212,7 @@ spec = describe "SHELLEY_MIGRATIONS" $ do
 
         -- Check that funds become available in the target wallet:
         let expectedBalance = originalBalance - expectedFee - leftovers
-        liftIO $ eventually "wallet balance = expectedBalance" $ do
+        eventually "wallet balance = expectedBalance" $ do
             request @ApiWallet ctx
                 (Link.getWallet @'Shelley wNew)
                 Default
@@ -270,7 +270,7 @@ spec = describe "SHELLEY_MIGRATIONS" $ do
                     "passphrase": #{fixturePassphrase}
                     } |]
             sourceWallet <- unsafeResponse <$> postWallet ctx payloadRestore
-            originalBalance <- liftIO $ eventually "wallet balance greater than 0" $ do
+            originalBalance <- eventually "wallet balance greater than 0" $ do
                 rg <- request @ApiWallet ctx
                     (Link.getWallet @'Shelley sourceWallet)
                     Default
@@ -305,7 +305,7 @@ spec = describe "SHELLEY_MIGRATIONS" $ do
 
             -- Check that funds become available in the target wallet:
             let expectedBalance = originalBalance - expectedFee
-            liftIO $ eventually "targetWallet balance = expectedBalance" $ do
+            eventually "targetWallet balance = expectedBalance" $ do
                 request @ApiWallet ctx
                     (Link.getWallet @'Shelley targetWallet)
                     Default
@@ -466,7 +466,7 @@ spec = describe "SHELLEY_MIGRATIONS" $ do
 
             -- Check that funds become available in the target wallet:
             let expectedBalance = originalBalance - expectedFee
-            liftIO $ eventually "Wallet has expectedBalance" $ do
+            eventually "Wallet has expectedBalance" $ do
                 r2 <- request @ApiWallet ctx
                     (Link.getWallet @'Shelley targetWallet) Default Empty
                 verify r2