From b2685aad2a43118f1e916c95fdcd6cb3d403978c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C3=A9ter=20Szil=C3=A1gyi?= <peterke@gmail.com>
Date: Thu, 30 Apr 2015 16:55:07 +0300
Subject: [PATCH] p2p: fix a merge issue, address Felix's review

---
 p2p/peer_error.go | 2 --
 p2p/server.go     | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/p2p/peer_error.go b/p2p/peer_error.go
index bab1696d59..a912f60644 100644
--- a/p2p/peer_error.go
+++ b/p2p/peer_error.go
@@ -73,7 +73,6 @@ const (
 	DiscSelf
 	DiscReadTimeout
 	DiscSubprotocolError
-	DiscThrottled
 )
 
 var discReasonToString = [...]string{
@@ -90,7 +89,6 @@ var discReasonToString = [...]string{
 	DiscSelf:                "Connected to self",
 	DiscReadTimeout:         "Read timeout",
 	DiscSubprotocolError:    "Subprotocol error",
-	DiscThrottled:           "Node throttled",
 }
 
 func (d DiscReason) String() string {
diff --git a/p2p/server.go b/p2p/server.go
index 68e5bfa275..9f2668be9a 100644
--- a/p2p/server.go
+++ b/p2p/server.go
@@ -616,7 +616,7 @@ func (srv *Server) checkPeer(id discover.NodeID) (bool, DiscReason) {
 	case id == srv.ntab.Self().ID:
 		return false, DiscSelf
 	case srv.throttle[id]:
-		return false, DiscThrottled
+		return false, DiscUselessPeer
 	default:
 		return true, 0
 	}