From 3a8ce485e4a88ebe4cc7353af974945d5ffc665d Mon Sep 17 00:00:00 2001
From: Mark Spanbroek <mark@spanbroek.net>
Date: Tue, 17 May 2022 17:02:03 +0200
Subject: [PATCH] [sales] Use Clock instead of getTime()

---
 dagger/contracts/interactions.nim |  2 +-
 dagger/sales.nim                  | 14 ++++++++++----
 tests/dagger/testsales.nim        |  5 ++++-
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/dagger/contracts/interactions.nim b/dagger/contracts/interactions.nim
index 0b57a8bd..a8c06f8e 100644
--- a/dagger/contracts/interactions.nim
+++ b/dagger/contracts/interactions.nim
@@ -35,7 +35,7 @@ proc new*(_: type ContractInteractions,
   let clock = OnChainClock.new(signer.provider)
   some ContractInteractions(
     purchasing: Purchasing.new(market, clock),
-    sales: Sales.new(market),
+    sales: Sales.new(market, clock),
     proving: Proving.new(proofs, clock),
     clock: clock
   )
diff --git a/dagger/sales.nim b/dagger/sales.nim
index fba9a08f..c2610a18 100644
--- a/dagger/sales.nim
+++ b/dagger/sales.nim
@@ -1,4 +1,3 @@
-import std/times
 import std/sequtils
 import pkg/questionable
 import pkg/upraises
@@ -6,6 +5,7 @@ import pkg/stint
 import pkg/nimcrypto
 import pkg/chronicles
 import ./market
+import ./clock
 
 export stint
 
@@ -14,6 +14,7 @@ const DefaultOfferExpiryInterval = (10 * 60).u256
 type
   Sales* = ref object
     market: Market
+    clock: Clock
     subscription: ?Subscription
     available*: seq[Availability]
     offerExpiryInterval*: UInt256
@@ -34,8 +35,12 @@ type
     finished: bool
   OnSale = proc(offer: StorageOffer) {.gcsafe, upraises: [].}
 
-func new*(_: type Sales, market: Market): Sales =
-  Sales(market: market, offerExpiryInterval: DefaultOfferExpiryInterval)
+func new*(_: type Sales, market: Market, clock: Clock): Sales =
+  Sales(
+    market: market,
+    clock: clock,
+    offerExpiryInterval: DefaultOfferExpiryInterval
+  )
 
 proc init*(_: type Availability,
           size: UInt256,
@@ -62,10 +67,11 @@ func findAvailability(sales: Sales, ask: StorageAsk): ?Availability =
       return some availability
 
 proc createOffer(negotiation: Negotiation): StorageOffer =
+  let sales = negotiation.sales
   StorageOffer(
     requestId: negotiation.requestId,
     price: negotiation.ask.maxPrice,
-    expiry: getTime().toUnix().u256 + negotiation.sales.offerExpiryInterval
+    expiry: sales.clock.now().u256 + sales.offerExpiryInterval
   )
 
 proc sendOffer(negotiation: Negotiation) {.async.} =
diff --git a/tests/dagger/testsales.nim b/tests/dagger/testsales.nim
index 6220eeb7..d5a6f5ce 100644
--- a/tests/dagger/testsales.nim
+++ b/tests/dagger/testsales.nim
@@ -3,6 +3,7 @@ import pkg/asynctest
 import pkg/chronos
 import pkg/dagger/sales
 import ./helpers/mockmarket
+import ./helpers/mockclock
 import ./examples
 
 suite "Sales":
@@ -20,10 +21,12 @@ suite "Sales":
 
   var sales: Sales
   var market: MockMarket
+  var clock: MockClock
 
   setup:
     market = MockMarket.new()
-    sales = Sales.new(market)
+    clock = MockClock.new()
+    sales = Sales.new(market, clock)
     await sales.start()
 
   teardown: