diff options
author | obscuren <geffobscura@gmail.com> | 2015-04-24 21:36:48 +0800 |
---|---|---|
committer | obscuren <geffobscura@gmail.com> | 2015-04-24 21:37:07 +0800 |
commit | bd9c76097d485b55ae808fee345d1d76801df1ea (patch) | |
tree | a6a641cc5c9af103f1a5eaa7d86d3ec1cfe6c345 | |
parent | 31f82eb3347454f64f3d41de3087109d09597806 (diff) | |
download | dexon-bd9c76097d485b55ae808fee345d1d76801df1ea.tar dexon-bd9c76097d485b55ae808fee345d1d76801df1ea.tar.gz dexon-bd9c76097d485b55ae808fee345d1d76801df1ea.tar.bz2 dexon-bd9c76097d485b55ae808fee345d1d76801df1ea.tar.lz dexon-bd9c76097d485b55ae808fee345d1d76801df1ea.tar.xz dexon-bd9c76097d485b55ae808fee345d1d76801df1ea.tar.zst dexon-bd9c76097d485b55ae808fee345d1d76801df1ea.zip |
eth/downloader: removed peer td management and best peer selection
-rw-r--r-- | eth/downloader/peer.go | 15 | ||||
-rw-r--r-- | eth/downloader/queue.go | 3 |
2 files changed, 2 insertions, 16 deletions
diff --git a/eth/downloader/peer.go b/eth/downloader/peer.go index bcb8ad43a..91977f592 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 adbc2a0d0..a21a44706 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() |