refactors a bit to get the tests back to work

codex-storage · Sep 27, 2024 · 9e9882b · 9e9882b
1 parent ab7b87e
commit 9e9882b
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 9 deletions.
diff --git a/codex/contracts/market.nim b/codex/contracts/market.nim
@@ -443,11 +443,9 @@ proc blockNumberForEpoch(epochTime: int64, provider: Provider): Future[UInt256]
   except ValueError as e:
     raise newException(EthersError, fmt"Conversion error: {e.msg}")
 
-method queryPastEvents*[T: MarketplaceEvent](
+method queryPastSlotFilledEvents*(
   market: OnChainMarket,
-  _: type T,
-  fromTime: int64): Future[seq[T]] {.async.} =
-
+  fromTime: int64): Future[seq[SlotFilled]] {.async.} =
   convertEthersError:
     let contract = market.contract
     let provider = contract.provider
@@ -456,6 +454,6 @@ method queryPastEvents*[T: MarketplaceEvent](
 
     let fromBlock = BlockTag.init(blockNumberForEpoch)
 
-    return await contract.queryFilter(T,
+    return await contract.queryFilter(SlotFilled,
                                       fromBlock,
                                       BlockTag.latest)
diff --git a/codex/market.nim b/codex/market.nim
@@ -225,8 +225,7 @@ method queryPastEvents*[T: MarketplaceEvent](
   blocksAgo: int): Future[seq[T]] {.base, async.} =
   raiseAssert("not implemented")
 
-method queryPastEvents*[T: MarketplaceEvent](
+method queryPastSlotFilledEvents*(
   market: Market,
-  _: type T,
-  fromTime: int64): Future[seq[T]] {.base, async.} =
+  fromTime: int64): Future[seq[SlotFilled]] {.base, async.} =
   raiseAssert("not implemented")
diff --git a/codex/validation.nim b/codex/validation.nim
@@ -129,7 +129,7 @@ proc epochForDurationBackFromNow(duration: times.Duration): int64 =
 
 proc restoreHistoricalState(validation: Validation) {.async} =
   let startTimeEpoch = epochForDurationBackFromNow(MaxStorageRequestDuration)
-  let slotFilledEvents = await validation.market.queryPastEvents(SlotFilled,
+  let slotFilledEvents = await validation.market.queryPastSlotFilledEvents(
     fromTime = startTimeEpoch)
   for event in slotFilledEvents:
     let slotId = slotId(event.requestId, event.slotIndex)

diff --git a/tests/codex/helpers/mockmarket.nim b/tests/codex/helpers/mockmarket.nim
@@ -436,6 +436,13 @@ method queryPastEvents*[T: MarketplaceEvent](
       SlotFilled(requestId: slot.requestId, slotIndex: slot.slotIndex)
     )
 
+method queryPastSlotFilledEvents*(
+    market: MockMarket,
+    fromTime: int64): Future[seq[SlotFilled]] {.async.} =
+  return market.filled.map(slot =>
+    SlotFilled(requestId: slot.requestId, slotIndex: slot.slotIndex)
+  )
+
 method unsubscribe*(subscription: RequestSubscription) {.async.} =
   subscription.market.subscriptions.onRequest.keepItIf(it != subscription)