From 9abc55f3a05e3d285e081a7ba6018e2522bf784a Mon Sep 17 00:00:00 2001 From: tycho garen Date: Mon, 13 Jun 2022 08:56:27 -0400 Subject: [PATCH] fix scoring test --- internal/p2p/peermanager.go | 23 ++++++++++------------- internal/p2p/peermanager_scoring_test.go | 3 +++ 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/p2p/peermanager.go b/internal/p2p/peermanager.go index 113a1d1df..a1ad0222c 100644 --- a/internal/p2p/peermanager.go +++ b/internal/p2p/peermanager.go @@ -1348,22 +1348,19 @@ func (p *peerInfo) LastDialed() (time.Time, bool) { if addr.LastDialFailure.IsZero() { continue } - if last.Before(addr.LastDialSuccess) { - last = addr.LastDialSuccess - success = true + if last.After(addr.LastDialSuccess) { + continue } + success = true + last = addr.LastDialSuccess } - if addr.LastDialSuccess.After(addr.LastDialFailure) { - if last.Before(addr.LastDialSuccess) { - last = addr.LastDialSuccess - success = true - } + if addr.LastDialFailure.After(last) { + success = false + last = addr.LastDialFailure } - if addr.LastDialFailure.After(addr.LastDialSuccess) { - if last.Before(addr.LastDialFailure) { - last = addr.LastDialFailure - success = false - } + if addr.LastDialSuccess.After(last) || last.Equal(addr.LastDialSuccess) { + success = true + last = addr.LastDialSuccess } } diff --git a/internal/p2p/peermanager_scoring_test.go b/internal/p2p/peermanager_scoring_test.go index 9f64efbb3..7086985d1 100644 --- a/internal/p2p/peermanager_scoring_test.go +++ b/internal/p2p/peermanager_scoring_test.go @@ -217,6 +217,9 @@ func TestLastDialed(t *testing.T) { FailTime time.Time ExpectedSuccess bool }{ + { + Name: "Zero", + }, { Name: "Success", SuccessTime: base.Add(time.Hour),