diff options
| author | Jeffrey Wilcke <jeffrey@ethereum.org> | 2015-05-12 03:11:27 +0800 |
|---|---|---|
| committer | Jeffrey Wilcke <jeffrey@ethereum.org> | 2015-05-12 03:11:27 +0800 |
| commit | 0bedf1c3760a1042171fdfde0f119acb683c43ec (patch) | |
| tree | 2251978416ad615ee8ca5e465a5bf9ed5b74efed /eth/downloader/downloader.go | |
| parent | 59bc5412327469fd13534ee22eaeda91d79286f4 (diff) | |
| parent | 48bd48876c02d1a08690b9604df09ef4bcf77838 (diff) | |
| download | go-tangerine-0bedf1c3760a1042171fdfde0f119acb683c43ec.tar go-tangerine-0bedf1c3760a1042171fdfde0f119acb683c43ec.tar.gz go-tangerine-0bedf1c3760a1042171fdfde0f119acb683c43ec.tar.bz2 go-tangerine-0bedf1c3760a1042171fdfde0f119acb683c43ec.tar.lz go-tangerine-0bedf1c3760a1042171fdfde0f119acb683c43ec.tar.xz go-tangerine-0bedf1c3760a1042171fdfde0f119acb683c43ec.tar.zst go-tangerine-0bedf1c3760a1042171fdfde0f119acb683c43ec.zip | |
Merge pull request #918 from obscuren/cpu_miner_fixes
cmd/geth, miner, backend, xeth: Fixed miner threads to be settable
Diffstat (limited to 'eth/downloader/downloader.go')
| -rw-r--r-- | eth/downloader/downloader.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/eth/downloader/downloader.go b/eth/downloader/downloader.go index 4c7ebe646..577152a21 100644 --- a/eth/downloader/downloader.go +++ b/eth/downloader/downloader.go @@ -28,7 +28,7 @@ var ( errUnknownPeer = errors.New("peer's unknown or unhealthy") errBadPeer = errors.New("action from bad peer ignored") errNoPeers = errors.New("no peers to keep download active") - errPendingQueue = errors.New("pending items in queue") + ErrPendingQueue = errors.New("pending items in queue") ErrTimeout = errors.New("timeout") errEmptyHashSet = errors.New("empty hash set by peer") errPeersUnavailable = errors.New("no peers available or all peers tried for block download process") @@ -129,7 +129,7 @@ func (d *Downloader) Synchronise(id string, hash common.Hash) error { // Abort if the queue still contains some leftover data if _, cached := d.queue.Size(); cached > 0 && d.queue.GetHeadBlock() != nil { - return errPendingQueue + return ErrPendingQueue } // Reset the queue and peer set to clean any internal leftover state d.queue.Reset() |