logos-storage/logos-storage-nim
1
0
Fork 0
mirror of https://github.com/logos-storage/logos-storage-nim.git synced 2026-01-14 03:18:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use subscription instead of eventuallyS checking

Browse Source
This commit is contained in:
Arnaud 2025-06-10 09:51:29 +02:00
parent cb03b1194a
commit e71e0ae4fc
No known key found for this signature in database
GPG Key ID: B8FBC178F10CA7AE
1 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
tests/integration/testvalidator.nim
View File

@ -119,14 +119,15 @@ marketplacesuite "Validation":
debug "validation suite", purchaseId = purchaseId.toHex, requestId = requestId
if not eventuallyS(
await client0.purchaseStateIs(purchaseId, "started"),
timeout = (expiry + 60).int,
step = 5,
):
debug "validation suite: timed out waiting for the purchase to start"
fail()
return
var requestStartedFut = Future[void].Raising([CancelledError]).init()
proc onRequestStarted(eventResult: ?!RequestFulfilled) {.raises: [].} =
requestStartedFut.complete()
let startedSubscription =
await marketplace.subscribe(RequestFulfilled, onRequestStarted)
await requestStartedFut.wait(timeout = chronos.seconds((10 * 60) + 10))
discard await ethProvider.send("evm_mine")
currentTime = await ethProvider.currentTime()
@ -138,6 +139,8 @@ marketplacesuite "Validation":
requestId, timeout = secondsTillRequestEnd + 60, step = 5
)
await startedSubscription.unsubscribe()
test "validator uses historical state to mark missing proofs",
NodeConfigs(
# Uncomment to start Hardhat automatically, typically so logs can be inspected locally
@ -189,14 +192,15 @@ marketplacesuite "Validation":
debug "validation suite", purchaseId = purchaseId.toHex, requestId = requestId
if not eventuallyS(
await client0.purchaseStateIs(purchaseId, "started"),
timeout = (expiry + 60).int,
step = 5,
):
debug "validation suite: timed out waiting for the purchase to start"
fail()
return
var requestStartedFut = Future[void].Raising([CancelledError]).init()
proc onRequestStarted(eventResult: ?!RequestFulfilled) {.raises: [].} =
requestStartedFut.complete()
let startedSubscription =
await marketplace.subscribe(RequestFulfilled, onRequestStarted)
await requestStartedFut.wait(timeout = chronos.seconds((10 * 60) + 10))
# extra block just to make sure we have one that separates us
# from the block containing the last (past) SlotFilled event
@ -226,3 +230,5 @@ marketplacesuite "Validation":
check await marketplace.waitForRequestToFail(
requestId, timeout = secondsTillRequestEnd + 60, step = 5
)
await startedSubscription.unsubscribe()