From 96272e19a6b7a3163ec53f45e04407e9d2ff8414 Mon Sep 17 00:00:00 2001
From: obscuren <geffobscura@gmail.com>
Date: Mon, 15 Dec 2014 12:34:06 +0100
Subject: removed filter manager from base

---
 eth/protocol.go | 43 ++++++++++++++++++++++---------------------
 1 file changed, 22 insertions(+), 21 deletions(-)

(limited to 'eth/protocol.go')

diff --git a/eth/protocol.go b/eth/protocol.go
index 3b5b49696..8cbf6d309 100644
--- a/eth/protocol.go
+++ b/eth/protocol.go
@@ -11,6 +11,25 @@ import (
 	"github.com/ethereum/go-ethereum/rlp"
 )
 
+const (
+	ProtocolVersion    = 49
+	NetworkId          = 0
+	ProtocolLength     = uint64(8)
+	ProtocolMaxMsgSize = 10 * 1024 * 1024
+)
+
+// eth protocol message codes
+const (
+	StatusMsg = iota
+	GetTxMsg  // unused
+	TxMsg
+	GetBlockHashesMsg
+	BlockHashesMsg
+	GetBlocksMsg
+	BlocksMsg
+	NewBlockMsg
+)
+
 // ethProtocol represents the ethereum wire protocol
 // instance is running on each peer
 type ethProtocol struct {
@@ -41,25 +60,6 @@ type blockPool interface {
 	RemovePeer(peerId string)
 }
 
-const (
-	ProtocolVersion    = 43
-	NetworkId          = 0
-	ProtocolLength     = uint64(8)
-	ProtocolMaxMsgSize = 10 * 1024 * 1024
-)
-
-// eth protocol message codes
-const (
-	StatusMsg = iota
-	GetTxMsg  // unused
-	TxMsg
-	GetBlockHashesMsg
-	BlockHashesMsg
-	GetBlocksMsg
-	BlocksMsg
-	NewBlockMsg
-)
-
 // message structs used for rlp decoding
 type newBlockMsgData struct {
 	Block *types.Block
@@ -279,9 +279,10 @@ func (self *ethProtocol) handleStatus() error {
 		return ProtocolError(ErrProtocolVersionMismatch, "%d (!= %d)", status.ProtocolVersion, ProtocolVersion)
 	}
 
-	self.peer.Infof("Peer is [eth] capable (%d/%d). TD = %v ~ %x", status.ProtocolVersion, status.NetworkId, status.CurrentBlock)
+	self.peer.Infof("Peer is [eth] capable (%d/%d). TD=%v H=%x\n", status.ProtocolVersion, status.NetworkId, status.TD, status.CurrentBlock[:4])
 
-	self.blockPool.AddPeer(status.TD, status.CurrentBlock, self.id, self.requestBlockHashes, self.requestBlocks, self.protoErrorDisconnect)
+	//self.blockPool.AddPeer(status.TD, status.CurrentBlock, self.id, self.requestBlockHashes, self.requestBlocks, self.protoErrorDisconnect)
+	self.peer.Infoln("AddPeer(IGNORED)")
 
 	return nil
 }
-- 
cgit