From 3964f868f5a61022ec61d620aff562434b3b76b5 Mon Sep 17 00:00:00 2001
From: Eric <5089238+emizzle@users.noreply.github.com>
Date: Wed, 25 Oct 2023 17:28:55 +1100
Subject: [PATCH] Remove cancelTransaction, add period cadence to testproofs

---
 codex/market.nim                   |  3 ---
 tests/codex/helpers/mockmarket.nim |  3 ---
 tests/integration/testproofs.nim   | 15 ++++++---------
 3 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/codex/market.nim b/codex/market.nim
index a4f38ddd..4c1ea467 100644
--- a/codex/market.nim
+++ b/codex/market.nim
@@ -77,9 +77,6 @@ method getActiveSlot*(
 
   raiseAssert("not implemented")
 
-method cancelTransaction(market: Market, nonce: UInt256) {.base, async.} =
-  raiseAssert("not implemented")
-
 method fillSlot*(market: Market,
                  requestId: RequestId,
                  slotIndex: UInt256,
diff --git a/tests/codex/helpers/mockmarket.nim b/tests/codex/helpers/mockmarket.nim
index 38d93a96..867a3ef5 100644
--- a/tests/codex/helpers/mockmarket.nim
+++ b/tests/codex/helpers/mockmarket.nim
@@ -205,9 +205,6 @@ proc emitRequestFailed*(market: MockMarket, requestId: RequestId) =
        subscription.requestId.isNone:
       subscription.callback(requestId)
 
-proc cancelTransaction(market: Market, nonce: UInt256) {.async.} =
-  discard
-
 proc fillSlot*(market: MockMarket,
                requestId: RequestId,
                slotIndex: UInt256,
diff --git a/tests/integration/testproofs.nim b/tests/integration/testproofs.nim
index 3b188322..029edd8b 100644
--- a/tests/integration/testproofs.nim
+++ b/tests/integration/testproofs.nim
@@ -344,11 +344,6 @@ multinodesuite "Simulate invalid proofs",
 
     return id
 
-  proc waitUntilPurchaseIsFinished(purchaseId: PurchaseId, duration: int) {.async.} =
-    let client = clients()[0].node.client
-    check eventually(client.purchaseStateIs(purchaseId, "finished"), duration * 1000)
-
-
   # TODO: these are very loose tests in that they are not testing EXACTLY how
   # proofs were marked as missed by the validator. These tests should be
   # tightened so that they are showing, as an integration test, that specific
@@ -362,13 +357,15 @@ multinodesuite "Simulate invalid proofs",
 
     let purchaseId = await requestStorage(duration=totalProofs.periods)
     check eventually clientRestClient.purchaseStateIs(purchaseId, "started")
-    # await waitUntilPurchaseIsFinished(purchaseId, duration=totalProofs.periods.int)
 
     let duration = (totalProofs.periods.int + 2) * 10 # 10 seconds per period
 
-    check eventually(
-      clientRestClient.purchaseStateIs(purchaseId, "finished"), duration * 1000
-    )
+    for _ in 0..<totalProofs.periods.int:
+      if clientRestClient.purchaseStateIs(purchaseId, "finished"):
+        break
+      else:
+        await advanceToNextPeriod()
+        await sleepAsync(1.seconds)
 
     check eventually (
       (await token.balanceOf(!provider1.address)) >