diff --git a/eth/downloader/peer.go b/eth/downloader/peer.go index bcb8ad43ab..91977f5927 100644 --- a/eth/downloader/peer.go +++ b/eth/downloader/peer.go @@ -2,7 +2,6 @@ package downloader import ( "errors" - "math/big" "sync" "github.com/ethereum/go-ethereum/common" @@ -51,16 +50,6 @@ func (p peers) getPeer(id string) *peer { return p[id] } -func (p peers) bestPeer() *peer { - var peer *peer - for _, cp := range p { - if peer == nil || cp.td.Cmp(peer.td) > 0 { - peer = cp - } - } - return peer -} - // peer represents an active peer type peer struct { state int // Peer state (working, idle) @@ -68,7 +57,6 @@ type peer struct { mu sync.RWMutex id string - td *big.Int recentHash common.Hash ignored *set.Set @@ -78,10 +66,9 @@ type peer struct { } // create a new peer -func newPeer(id string, td *big.Int, hash common.Hash, getHashes hashFetcherFn, getBlocks blockFetcherFn) *peer { +func newPeer(id string, hash common.Hash, getHashes hashFetcherFn, getBlocks blockFetcherFn) *peer { return &peer{ id: id, - td: td, recentHash: hash, getHashes: getHashes, getBlocks: getBlocks, diff --git a/eth/downloader/queue.go b/eth/downloader/queue.go index adbc2a0d01..a21a447060 100644 --- a/eth/downloader/queue.go +++ b/eth/downloader/queue.go @@ -2,7 +2,6 @@ package downloader import ( "math" - "math/big" "sync" "time" @@ -93,7 +92,7 @@ func (c *queue) has(hash common.Hash) bool { return c.hashPool.Has(hash) || c.fetchPool.Has(hash) } -func (c *queue) addBlock(id string, block *types.Block, td *big.Int) { +func (c *queue) addBlock(id string, block *types.Block) { c.mu.Lock() defer c.mu.Unlock()