From 866d754de616602c22c220a352502bfef0fc3ea8 Mon Sep 17 00:00:00 2001
From: Eric <5089238+emizzle@users.noreply.github.com>
Date: Mon, 24 Mar 2025 13:28:12 +1100
Subject: [PATCH] safeEventually > eventuallySafe

---
 tests/helpers.nim                                      |  8 ++++----
 .../integration/30_minutes/testmarketplace.nim.ignore  | 10 +++++-----
 tests/integration/30_minutes/testproofs.nim.ignore     |  2 +-
 tests/integration/5_minutes/testsales.nim.ignore       |  2 +-
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/tests/helpers.nim b/tests/helpers.nim
index 4b556469..429a30a7 100644
--- a/tests/helpers.nim
+++ b/tests/helpers.nim
@@ -36,13 +36,13 @@ proc allFuturesThrowing*[T, E]( # https://github.com/nim-lang/Nim/issues/23432
 ): Future[void] =
   allFuturesThrowing(futs.mapIt(FutureBase(it)))
 
-template safeEventually*(expression: untyped, waitingTime = 250, timeout = 5000): bool =
-  proc safeEventually(): Future[bool] {.async.} =
+template eventuallySafe*(expression: untyped, timeout=5000, pollInterval=1000)): bool =
+  proc eventuallySafe(): Future[bool] {.async.} =
     let endTime = getTime() + initDuration(milliseconds = timeout)
     while not expression:
       if endTime < getTime():
         return false
-      await sleepAsync(waitingTime)
+      await sleepAsync(pollInterval)
     return true
 
-  await safeEventually()
+  await eventuallySafe()
diff --git a/tests/integration/30_minutes/testmarketplace.nim.ignore b/tests/integration/30_minutes/testmarketplace.nim.ignore
index 441626f0..15059664 100644
--- a/tests/integration/30_minutes/testmarketplace.nim.ignore
+++ b/tests/integration/30_minutes/testmarketplace.nim.ignore
@@ -6,7 +6,7 @@ import ../../contracts/deployment
 import ./../marketplacesuite
 import ../twonodes
 import ../nodeconfigs
-from ../../helpers import safeEventually
+from ../../helpers import eventuallySafe
 
 marketplacesuite(name = "Marketplace", stopOnRequestFail = true):
   let marketplaceConfig = NodeConfigs(
@@ -123,11 +123,11 @@ marketplacesuite(name = "Marketplace", stopOnRequestFail = true):
     # Checking that the hosting node received reward for at least the time between <expiry;end>
     let slotSize = slotSize(blocks, ecNodes, ecTolerance)
     let pricePerSlotPerSecond = minPricePerBytePerSecond * slotSize
-    check safeEventually (await token.balanceOf(hostAccount)) - startBalanceHost >=
+    check eventuallySafe (await token.balanceOf(hostAccount)) - startBalanceHost >=
       (duration - 5 * 60).u256 * pricePerSlotPerSecond * ecNodes.u256
 
     # Checking that client node receives some funds back that were not used for the host nodes
-    check safeEventually(
+    check eventuallySafe(
       (await token.balanceOf(clientAccount)) - clientBalanceBeforeFinished > 0,
       timeout = 10 * 1000, # give client a bit of time to withdraw its funds
     )
@@ -297,12 +297,12 @@ marketplacesuite(name = "Marketplace payouts", stopOnRequestFail = true):
     let slotSize = slotSize(blocks, ecNodes, ecTolerance)
     let pricePerSlotPerSecond = minPricePerBytePerSecond * slotSize
 
-    check safeEventually (
+    check eventuallySafe (
       let endBalanceProvider = (await token.balanceOf(provider.ethAccount))
       endBalanceProvider > startBalanceProvider and
         endBalanceProvider < startBalanceProvider + expiry.u256 * pricePerSlotPerSecond
     )
-    check safeEventually(
+    check eventuallySafe(
       (
         let endBalanceClient = (await token.balanceOf(client.ethAccount))
         let endBalanceProvider = (await token.balanceOf(provider.ethAccount))
diff --git a/tests/integration/30_minutes/testproofs.nim.ignore b/tests/integration/30_minutes/testproofs.nim.ignore
index 2a4c61fe..6092fd67 100644
--- a/tests/integration/30_minutes/testproofs.nim.ignore
+++ b/tests/integration/30_minutes/testproofs.nim.ignore
@@ -7,7 +7,7 @@ import ../../codex/helpers
 import ../../examples
 import ../marketplacesuite
 import ../nodeconfigs
-from ../../helpers import safeEventually
+from ../../helpers import eventuallySafe
 
 export logutils
 
diff --git a/tests/integration/5_minutes/testsales.nim.ignore b/tests/integration/5_minutes/testsales.nim.ignore
index 025546ce..57ae9667 100644
--- a/tests/integration/5_minutes/testsales.nim.ignore
+++ b/tests/integration/5_minutes/testsales.nim.ignore
@@ -8,7 +8,7 @@ import ../../contracts/time
 import ../codexconfig
 import ../codexclient
 import ../nodeconfigs
-from ../../helpers import safeEventually
+from ../../helpers import eventuallySafe
 import ../marketplacesuite
 
 proc findItem[T](items: seq[T], item: T): ?!T =