From 064cf1609987bb0f6c59c1e790b7811d9a783fef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C3=A9ter=20Szil=C3=A1gyi?= Date: Mon, 11 May 2015 17:06:42 +0300 Subject: [PATCH] eth/downloader: use count instead of peers, clearer --- eth/downloader/downloader.go | 4 ++-- eth/downloader/peer.go | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/eth/downloader/downloader.go b/eth/downloader/downloader.go index 5e9931f59c..4c7ebe646d 100644 --- a/eth/downloader/downloader.go +++ b/eth/downloader/downloader.go @@ -363,7 +363,7 @@ out: } } // After removing bad peers make sure we actually have sufficient peer left to keep downloading - if d.peers.Peers() == 0 { + if d.peers.Len() == 0 { d.queue.Reset() return errNoPeers } @@ -400,7 +400,7 @@ out: if d.queue.InFlight() == 0 { d.queue.Reset() - return fmt.Errorf("%v peers available = %d. total peers = %d. hashes needed = %d", errPeersUnavailable, len(idlePeers), d.peers.Peers(), d.queue.Pending()) + return fmt.Errorf("%v peers available = %d. total peers = %d. hashes needed = %d", errPeersUnavailable, len(idlePeers), d.peers.Len(), d.queue.Pending()) } } else if d.queue.InFlight() == 0 { diff --git a/eth/downloader/peer.go b/eth/downloader/peer.go index 1ff2d5149b..4abae8d5e6 100644 --- a/eth/downloader/peer.go +++ b/eth/downloader/peer.go @@ -154,8 +154,8 @@ func (ps *peerSet) Peer(id string) *peer { return ps.peers[id] } -// Peers returns if the current number of peers in the set. -func (ps *peerSet) Peers() int { +// Len returns if the current number of peers in the set. +func (ps *peerSet) Len() int { ps.lock.RLock() defer ps.lock.RUnlock()