From 9f491ef839b43f8538bfa96606f817306f280751 Mon Sep 17 00:00:00 2001 From: tycho garen Date: Thu, 16 Jun 2022 11:54:33 -0400 Subject: [PATCH] more comments --- internal/p2p/peermanager.go | 71 ++++++++++++++++++------------------- 1 file changed, 35 insertions(+), 36 deletions(-) diff --git a/internal/p2p/peermanager.go b/internal/p2p/peermanager.go index 71258ec2b..087d96402 100644 --- a/internal/p2p/peermanager.go +++ b/internal/p2p/peermanager.go @@ -1371,48 +1371,47 @@ func (s *peerStore) Ranked() []*peerInfo { } sort.Slice(s.ranked, func(i, j int) bool { return s.ranked[i].Score() > s.ranked[j].Score() - // TODO: reevaluate more wholistic sorting. - // nolint: govet + // TODO: reevaluate more wholistic sorting, perhaps as follows: - // sort inactive peers after active peers - if s.ranked[i].Inactive && !s.ranked[j].Inactive { - return false - } else if !s.ranked[i].Inactive && s.ranked[j].Inactive { - return true - } + // // sort inactive peers after active peers + // if s.ranked[i].Inactive && !s.ranked[j].Inactive { + // return false + // } else if !s.ranked[i].Inactive && s.ranked[j].Inactive { + // return true + // } - iLastDialed, iLastDialSuccess := s.ranked[i].LastDialed() - jLastDialed, jLastDialSuccess := s.ranked[j].LastDialed() + // iLastDialed, iLastDialSuccess := s.ranked[i].LastDialed() + // jLastDialed, jLastDialSuccess := s.ranked[j].LastDialed() - // sort peers who our most recent dialing attempt was - // successful ahead of peers with recent dialing - // failures - switch { - case iLastDialSuccess && jLastDialSuccess: - // if both peers were (are?) successfully - // connected, convey their score, but give the - // one we dialed successfully most recently a bonus + // // sort peers who our most recent dialing attempt was + // // successful ahead of peers with recent dialing + // // failures + // switch { + // case iLastDialSuccess && jLastDialSuccess: + // // if both peers were (are?) successfully + // // connected, convey their score, but give the + // // one we dialed successfully most recently a bonus - iScore := s.ranked[i].Score() - jScore := s.ranked[j].Score() - if jLastDialed.Before(iLastDialed) { - jScore++ - } else { - iScore++ - } + // iScore := s.ranked[i].Score() + // jScore := s.ranked[j].Score() + // if jLastDialed.Before(iLastDialed) { + // jScore++ + // } else { + // iScore++ + // } - return iScore > jScore - case iLastDialSuccess: - return true - case jLastDialSuccess: - return false - default: - // if both peers were not successful in their - // most recent dialing attempt, fall back to - // peer score. + // return iScore > jScore + // case iLastDialSuccess: + // return true + // case jLastDialSuccess: + // return false + // default: + // // if both peers were not successful in their + // // most recent dialing attempt, fall back to + // // peer score. - return s.ranked[i].Score() > s.ranked[j].Score() - } + // return s.ranked[i].Score() > s.ranked[j].Score() + // } }) return s.ranked }