From 1e44ed5fd3f3dd8fb49fad6ab21423c7eedb8de4 Mon Sep 17 00:00:00 2001
From: Mark Spanbroek <mark@spanbroek.net>
Date: Tue, 17 May 2022 16:51:29 +0200
Subject: [PATCH] [purchasing] Use Clock instead of getTime()

---
 dagger/contracts/interactions.nim |  2 +-
 dagger/purchasing.nim             | 12 ++++++++----
 tests/dagger/testpurchasing.nim   |  5 ++++-
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/dagger/contracts/interactions.nim b/dagger/contracts/interactions.nim
index 665b38b6..0b57a8bd 100644
--- a/dagger/contracts/interactions.nim
+++ b/dagger/contracts/interactions.nim
@@ -34,7 +34,7 @@ proc new*(_: type ContractInteractions,
   let proofs = OnChainProofs.new(contract)
   let clock = OnChainClock.new(signer.provider)
   some ContractInteractions(
-    purchasing: Purchasing.new(market),
+    purchasing: Purchasing.new(market, clock),
     sales: Sales.new(market),
     proving: Proving.new(proofs, clock),
     clock: clock
diff --git a/dagger/purchasing.nim b/dagger/purchasing.nim
index 85c065bb..cc351f26 100644
--- a/dagger/purchasing.nim
+++ b/dagger/purchasing.nim
@@ -1,10 +1,10 @@
-import std/times
 import std/tables
 import pkg/stint
 import pkg/chronos
 import pkg/questionable
 import pkg/nimcrypto
 import ./market
+import ./clock
 
 export questionable
 export market
@@ -12,6 +12,7 @@ export market
 type
   Purchasing* = ref object
     market: Market
+    clock: Clock
     purchases: Table[array[32, byte], Purchase]
     proofProbability*: UInt256
     requestExpiryInterval*: UInt256
@@ -19,6 +20,7 @@ type
   Purchase* = ref object
     future: Future[void]
     market: Market
+    clock: Clock
     offerExpiryMargin: UInt256
     request*: StorageRequest
     offers*: seq[StorageOffer]
@@ -31,9 +33,10 @@ const DefaultOfferExpiryMargin = (8 * 60).u256
 proc start(purchase: Purchase) {.gcsafe.}
 func id*(purchase: Purchase): array[32, byte]
 
-proc new*(_: type Purchasing, market: Market): Purchasing =
+proc new*(_: type Purchasing, market: Market, clock: Clock): Purchasing =
   Purchasing(
     market: market,
+    clock: clock,
     proofProbability: DefaultProofProbability,
     requestExpiryInterval: DefaultRequestExpiryInterval,
     offerExpiryMargin: DefaultOfferExpiryMargin
@@ -44,7 +47,7 @@ proc populate*(purchasing: Purchasing, request: StorageRequest): StorageRequest
   if result.ask.proofProbability == 0.u256:
     result.ask.proofProbability = purchasing.proofProbability
   if result.expiry == 0.u256:
-    result.expiry = (getTime().toUnix().u256 + purchasing.requestExpiryInterval)
+    result.expiry = (purchasing.clock.now().u256 + purchasing.requestExpiryInterval)
   if result.nonce == array[32, byte].default:
     doAssert randomBytes(result.nonce) == 32
 
@@ -53,6 +56,7 @@ proc purchase*(purchasing: Purchasing, request: StorageRequest): Purchase =
   let purchase = Purchase(
     request: request,
     market: purchasing.market,
+    clock: purchasing.clock,
     offerExpiryMargin: purchasing.offerExpiryMargin
   )
   purchase.start()
@@ -68,7 +72,7 @@ func getPurchase*(purchasing: Purchasing, id: array[32, byte]): ?Purchase =
 proc selectOffer(purchase: Purchase) {.async.} =
   var cheapest: ?StorageOffer
   for offer in purchase.offers:
-    without getTime().toUnix().u256 < offer.expiry - purchase.offerExpiryMargin:
+    without purchase.clock.now().u256 < offer.expiry - purchase.offerExpiryMargin:
       continue
     without current =? cheapest:
       cheapest = some offer
diff --git a/tests/dagger/testpurchasing.nim b/tests/dagger/testpurchasing.nim
index f9716563..772567db 100644
--- a/tests/dagger/testpurchasing.nim
+++ b/tests/dagger/testpurchasing.nim
@@ -4,17 +4,20 @@ import pkg/chronos
 import pkg/stint
 import pkg/dagger/purchasing
 import ./helpers/mockmarket
+import ./helpers/mockclock
 import ./examples
 
 suite "Purchasing":
 
   var purchasing: Purchasing
   var market: MockMarket
+  var clock: MockClock
   var request: StorageRequest
 
   setup:
     market = MockMarket.new()
-    purchasing = Purchasing.new(market)
+    clock = MockClock.new()
+    purchasing = Purchasing.new(market, clock)
     request = StorageRequest(
       ask: StorageAsk(
         duration: uint16.example.u256,