eth/downloader: removed peer td management and best peer selection
This commit is contained in:
parent
31f82eb334
commit
bd9c76097d
@ -2,7 +2,6 @@ package downloader
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"errors"
|
"errors"
|
||||||
"math/big"
|
|
||||||
"sync"
|
"sync"
|
||||||
|
|
||||||
"github.com/ethereum/go-ethereum/common"
|
"github.com/ethereum/go-ethereum/common"
|
||||||
@ -51,16 +50,6 @@ func (p peers) getPeer(id string) *peer {
|
|||||||
return p[id]
|
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
|
// peer represents an active peer
|
||||||
type peer struct {
|
type peer struct {
|
||||||
state int // Peer state (working, idle)
|
state int // Peer state (working, idle)
|
||||||
@ -68,7 +57,6 @@ type peer struct {
|
|||||||
|
|
||||||
mu sync.RWMutex
|
mu sync.RWMutex
|
||||||
id string
|
id string
|
||||||
td *big.Int
|
|
||||||
recentHash common.Hash
|
recentHash common.Hash
|
||||||
|
|
||||||
ignored *set.Set
|
ignored *set.Set
|
||||||
@ -78,10 +66,9 @@ type peer struct {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// create a new peer
|
// 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{
|
return &peer{
|
||||||
id: id,
|
id: id,
|
||||||
td: td,
|
|
||||||
recentHash: hash,
|
recentHash: hash,
|
||||||
getHashes: getHashes,
|
getHashes: getHashes,
|
||||||
getBlocks: getBlocks,
|
getBlocks: getBlocks,
|
||||||
|
@ -2,7 +2,6 @@ package downloader
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"math"
|
"math"
|
||||||
"math/big"
|
|
||||||
"sync"
|
"sync"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
@ -93,7 +92,7 @@ func (c *queue) has(hash common.Hash) bool {
|
|||||||
return c.hashPool.Has(hash) || c.fetchPool.Has(hash)
|
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()
|
c.mu.Lock()
|
||||||
defer c.mu.Unlock()
|
defer c.mu.Unlock()
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user