From 029059947a9570e3b601686ae818c92d5f8f1b85 Mon Sep 17 00:00:00 2001
From: Seungbae Yu <72970043+dbadoy@users.noreply.github.com>
Date: Sat, 30 Jul 2022 01:23:30 +0900
Subject: [PATCH] all: use AbsTime.Add instead of conversion (#25417)

---
 common/mclock/simclock.go   | 4 ++--
 common/prque/lazyqueue.go   | 4 ++--
 les/distributor.go          | 2 +-
 les/flowcontrol/control.go  | 2 +-
 les/utils/timeutils_test.go | 2 +-
 les/vflux/server/balance.go | 8 ++++----
 6 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/common/mclock/simclock.go b/common/mclock/simclock.go
index 766ca0f873..f5ad3f8bc0 100644
--- a/common/mclock/simclock.go
+++ b/common/mclock/simclock.go
@@ -58,7 +58,7 @@ func (s *Simulated) Run(d time.Duration) {
 	s.mu.Lock()
 	s.init()
 
-	end := s.now + AbsTime(d)
+	end := s.now.Add(d)
 	var do []func()
 	for len(s.scheduled) > 0 && s.scheduled[0].at <= end {
 		ev := heap.Pop(&s.scheduled).(*simTimer)
@@ -134,7 +134,7 @@ func (s *Simulated) AfterFunc(d time.Duration, fn func()) Timer {
 func (s *Simulated) schedule(d time.Duration, fn func()) *simTimer {
 	s.init()
 
-	at := s.now + AbsTime(d)
+	at := s.now.Add(d)
 	ev := &simTimer{do: fn, at: at, s: s}
 	heap.Push(&s.scheduled, ev)
 	s.cond.Broadcast()
diff --git a/common/prque/lazyqueue.go b/common/prque/lazyqueue.go
index 2fd2300d73..6fdb6cc1b7 100644
--- a/common/prque/lazyqueue.go
+++ b/common/prque/lazyqueue.go
@@ -87,13 +87,13 @@ func (q *LazyQueue) Refresh() {
 
 // refresh re-evaluates items in the older queue and swaps the two queues
 func (q *LazyQueue) refresh(now mclock.AbsTime) {
-	q.maxUntil = now + mclock.AbsTime(q.period)
+	q.maxUntil = now.Add(q.period)
 	for q.queue[0].Len() != 0 {
 		q.Push(heap.Pop(q.queue[0]).(*item).value)
 	}
 	q.queue[0], q.queue[1] = q.queue[1], q.queue[0]
 	q.indexOffset = 1 - q.indexOffset
-	q.maxUntil += mclock.AbsTime(q.period)
+	q.maxUntil = q.maxUntil.Add(q.period)
 }
 
 // Push adds an item to the queue
diff --git a/les/distributor.go b/les/distributor.go
index 31150e4d73..a0319c67f7 100644
--- a/les/distributor.go
+++ b/les/distributor.go
@@ -256,7 +256,7 @@ func (d *requestDistributor) queue(r *distReq) chan distPeer {
 	if r.reqOrder == 0 {
 		d.lastReqOrder++
 		r.reqOrder = d.lastReqOrder
-		r.waitForPeers = d.clock.Now() + mclock.AbsTime(waitForPeers)
+		r.waitForPeers = d.clock.Now().Add(waitForPeers)
 	}
 	// Assign the timestamp when the request is queued no matter it's
 	// a new one or re-queued one.
diff --git a/les/flowcontrol/control.go b/les/flowcontrol/control.go
index 4f0de82318..76a241fa5a 100644
--- a/les/flowcontrol/control.go
+++ b/les/flowcontrol/control.go
@@ -182,7 +182,7 @@ func (node *ClientNode) UpdateParams(params ServerParams) {
 				return
 			}
 		}
-		node.updateSchedule = append(node.updateSchedule, scheduledUpdate{time: now + mclock.AbsTime(DecParamDelay), params: params})
+		node.updateSchedule = append(node.updateSchedule, scheduledUpdate{time: now.Add(DecParamDelay), params: params})
 	}
 }
 
diff --git a/les/utils/timeutils_test.go b/les/utils/timeutils_test.go
index 9f9e1c2dc9..b219d0439d 100644
--- a/les/utils/timeutils_test.go
+++ b/les/utils/timeutils_test.go
@@ -37,7 +37,7 @@ func TestUpdateTimer(t *testing.T) {
 	if updated := timer.Update(func(diff time.Duration) bool { return true }); !updated {
 		t.Fatalf("Doesn't update the clock when reaching the threshold")
 	}
-	if updated := timer.UpdateAt(sim.Now()+mclock.AbsTime(time.Second), func(diff time.Duration) bool { return true }); !updated {
+	if updated := timer.UpdateAt(sim.Now().Add(time.Second), func(diff time.Duration) bool { return true }); !updated {
 		t.Fatalf("Doesn't update the clock when reaching the threshold")
 	}
 	timer = NewUpdateTimer(sim, 0)
diff --git a/les/vflux/server/balance.go b/les/vflux/server/balance.go
index 727ce09a43..550c6d70ca 100644
--- a/les/vflux/server/balance.go
+++ b/les/vflux/server/balance.go
@@ -356,7 +356,7 @@ func (n *nodeBalance) estimatePriority(capacity uint64, addBalance int64, future
 		b = n.reducedBalance(b, now, future, capacity, avgReqCost)
 	}
 	if bias > 0 {
-		b = n.reducedBalance(b, now+mclock.AbsTime(future), bias, capacity, 0)
+		b = n.reducedBalance(b, now.Add(future), bias, capacity, 0)
 	}
 	pri := n.balanceToPriority(now, b, capacity)
 	// Ensure that biased estimates are always lower than actual priorities, even if
@@ -512,7 +512,7 @@ func (n *nodeBalance) scheduleCheck(now mclock.AbsTime) {
 			n.updateAfter(0)
 			return
 		}
-		if n.nextUpdate == 0 || n.nextUpdate > now+mclock.AbsTime(d) {
+		if n.nextUpdate == 0 || n.nextUpdate > now.Add(d) {
 			if d > time.Second {
 				// Note: if the scheduled update is not in the very near future then we
 				// schedule the update a bit earlier. This way we do need to update a few
@@ -520,7 +520,7 @@ func (n *nodeBalance) scheduleCheck(now mclock.AbsTime) {
 				// brings the expected firing time a little bit closer.
 				d = ((d - time.Second) * 7 / 8) + time.Second
 			}
-			n.nextUpdate = now + mclock.AbsTime(d)
+			n.nextUpdate = now.Add(d)
 			n.updateAfter(d)
 		}
 	} else {
@@ -629,7 +629,7 @@ func (n *nodeBalance) reducedBalance(b balance, start mclock.AbsTime, dt time.Du
 	// since the costs are applied continuously during the dt time period we calculate
 	// the expiration offset at the middle of the period
 	var (
-		at  = start + mclock.AbsTime(dt/2)
+		at  = start.Add(dt / 2)
 		dtf = float64(dt)
 	)
 	if !b.pos.IsZero() {