From 1d7bf3d39fbd6b1a53913bb309bc07500b220ded Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C3=A9ter=20Szil=C3=A1gyi?= <peterke@gmail.com>
Date: Wed, 3 Jun 2015 18:39:56 +0300
Subject: [PATCH] eth/downloader: fix merge compile error
---
eth/downloader/downloader.go | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/eth/downloader/downloader.go b/eth/downloader/downloader.go
index 4b837eed5..d113aa33f 100644
--- a/eth/downloader/downloader.go
+++ b/eth/downloader/downloader.go
@@ -551,7 +551,7 @@ func (d *Downloader) banBlocks(peerId string, head common.Hash) error {
if peer == nil {
return nil
}
- request := d.queue.Reserve(peer, MaxBlockFetch)
+ request := d.queue.Reserve(peer)
if request == nil {
return nil
}
--
GitLab