From 58e19dc15d83a311b253947a4490d916fa06a968 Mon Sep 17 00:00:00 2001 From: rjl493456442 Date: Thu, 31 Oct 2019 15:13:34 +0800 Subject: [PATCH] les: fix unit tests --- les/clientpool.go | 5 +---- les/clientpool_test.go | 3 ++- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/les/clientpool.go b/les/clientpool.go index 7013a8f8ed..75bc63ff97 100644 --- a/les/clientpool.go +++ b/les/clientpool.go @@ -169,10 +169,7 @@ func newClientPool(db ethdb.Database, freeClientCap uint64, clock mclock.Clock, // delete this entry. ndb.nbEvictCallBack = func(now mclock.AbsTime, b negBalance) bool { balance := math.Exp(float64(b.logValue-pool.logOffset(now)) / fixedPointMultiplier) - if balance <= 1 { - return true - } - return false + return balance <= 1 } go func() { for { diff --git a/les/clientpool_test.go b/les/clientpool_test.go index ab43226553..5b9494c2aa 100644 --- a/les/clientpool_test.go +++ b/les/clientpool_test.go @@ -308,7 +308,7 @@ func TestFreeClientKickedOut(t *testing.T) { for i := 0; i < 10; i++ { pool.connect(poolTestPeer(i), 1) - clock.Run(time.Millisecond) + clock.Run(100 * time.Millisecond) } if pool.connect(poolTestPeer(11), 1) { t.Fatalf("New free client should be rejected") @@ -498,6 +498,7 @@ func TestNodeDBExpiration(t *testing.T) { for _, c := range cases { ndb.setNB(c.ip, c.balance) } + time.Sleep(100 * time.Millisecond) // Ensure the db expirer is registered. clock.Run(time.Hour + time.Minute) select { case <-done: