From c9b6bfb2a7c75e812f294d1cec7451f18c5a4eaf Mon Sep 17 00:00:00 2001 From: Eric <5089238+emizzle@users.noreply.github.com> Date: Thu, 9 Nov 2023 17:01:10 +1100 Subject: [PATCH] clean up --- codex/validation.nim | 10 +++++----- tests/integration/marketplacesuite.nim | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/codex/validation.nim b/codex/validation.nim index 168595ee..588b107d 100644 --- a/codex/validation.nim +++ b/codex/validation.nim @@ -36,11 +36,11 @@ proc new*( proc slots*(validation: Validation): seq[SlotId] = validation.slots.toSeq -proc getCurrentPeriod(validation: Validation): Future[UInt256] {.async.} = +proc getCurrentPeriod(validation: Validation): UInt256 = return validation.periodicity.periodOf(validation.clock.now().u256) proc waitUntilNextPeriod(validation: Validation) {.async.} = - let period = await validation.getCurrentPeriod() + let period = validation.getCurrentPeriod() let periodEnd = validation.periodicity.periodEnd(period) trace "Waiting until next period", currentPeriod = period await validation.clock.waitUntil(periodEnd.truncate(int64) + 1) @@ -68,14 +68,14 @@ proc markProofAsMissing(validation: Validation, slotId: SlotId, period: Period) {.async.} = logScope: - currentPeriod = await validation.getCurrentPeriod() + currentPeriod = validation.getCurrentPeriod() try: if await validation.market.canProofBeMarkedAsMissing(slotId, period): trace "Marking proof as missing", slotId = $slotId, periodProofMissed = period await validation.market.markProofAsMissing(slotId, period) else: - let inDowntime = await validation.market.inDowntime(slotId) + let inDowntime {.used.} = await validation.market.inDowntime(slotId) trace "Proof not missing", checkedPeriod = period, inDowntime except CancelledError: raise @@ -84,7 +84,7 @@ proc markProofAsMissing(validation: Validation, proc markProofsAsMissing(validation: Validation) {.async.} = for slotId in validation.slots: - let previousPeriod = (await validation.getCurrentPeriod()) - 1 + let previousPeriod = validation.getCurrentPeriod() - 1 await validation.markProofAsMissing(slotId, previousPeriod) proc run(validation: Validation) {.async.} = diff --git a/tests/integration/marketplacesuite.nim b/tests/integration/marketplacesuite.nim index 2c24c217..22423ced 100644 --- a/tests/integration/marketplacesuite.nim +++ b/tests/integration/marketplacesuite.nim @@ -103,4 +103,4 @@ template marketplacesuite*(name: string, startNodes: Nodes, body: untyped) = teardown: await continuousMineFut.cancelAndWait() - body \ No newline at end of file + body