From 3aeba50c38e74bc1091895db1cb57e7d93864270 Mon Sep 17 00:00:00 2001
From: obscuren <geffobscura@gmail.com>
Date: Wed, 24 Sep 2014 21:13:28 +0200
Subject: [PATCH] merge error

---
 ethereum.go | 1 +
 peer.go     | 8 +++-----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/ethereum.go b/ethereum.go
index 389b9d4e43..d04b08960f 100644
--- a/ethereum.go
+++ b/ethereum.go
@@ -386,6 +386,7 @@ func (s *Ethereum) ReapDeadPeerHandler() {
 // Start the ethereum
 func (s *Ethereum) Start(seed bool) {
 	s.reactor.Start()
+	s.blockPool.Start()
 	// Bind to addr and port
 	ln, err := net.Listen("tcp", ":"+s.Port)
 	if err != nil {
diff --git a/peer.go b/peer.go
index 06df5fab6c..ef346d3ac3 100644
--- a/peer.go
+++ b/peer.go
@@ -311,7 +311,7 @@ func (p *Peer) writeMessage(msg *ethwire.Msg) {
 func (p *Peer) HandleOutbound() {
 	// The ping timer. Makes sure that every 2 minutes a ping is send to the peer
 	pingTimer := time.NewTicker(pingPongTimer)
-	serviceTimer := time.NewTicker(5 * time.Minute)
+	serviceTimer := time.NewTicker(5 * time.Second)
 
 out:
 	for {
@@ -345,10 +345,8 @@ out:
 		// Service timer takes care of peer broadcasting, transaction
 		// posting or block posting
 		case <-serviceTimer.C:
-			if p.caps&CapPeerDiscTy > 0 {
-				msg := p.peersMessage()
-				p.ethereum.BroadcastMsg(msg)
-			}
+
+			//p.QueueMessage(ethwire.NewMessage(ethwire.MsgGetPeersTy, ""))
 
 		case <-p.quit:
 			// Break out of the for loop if a quit message is posted