From d2d1214e20aeae7d9c8d4d5d65ef03afc9252df8 Mon Sep 17 00:00:00 2001
From: Jae Kwon <jkwon.work@gmail.com>
Date: Mon, 30 Mar 2015 22:28:34 -0700
Subject: [PATCH] Do not start PEXReactor until the addrbook has started.
 Basically, start everything in node.Start().

---
 daemon/daemon.go | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/daemon/daemon.go b/daemon/daemon.go
index c2bb765f..d6984a02 100644
--- a/daemon/daemon.go
+++ b/daemon/daemon.go
@@ -71,14 +71,10 @@ func NewNode() *Node {
 
 	sw := p2p.NewSwitch()
 	sw.SetNetwork(config.App().GetString("Network"))
-	sw.AddReactor("PEX", pexReactor).Start(sw)
-	sw.AddReactor("MEMPOOL", mempoolReactor).Start(sw)
-	sw.AddReactor("BLOCKCHAIN", bcReactor).Start(sw)
-	if !config.App().GetBool("FastSync") {
-		sw.AddReactor("CONSENSUS", consensusReactor).Start(sw)
-	} else {
-		sw.AddReactor("CONSENSUS", consensusReactor)
-	}
+	sw.AddReactor("PEX", pexReactor)
+	sw.AddReactor("MEMPOOL", mempoolReactor)
+	sw.AddReactor("BLOCKCHAIN", bcReactor)
+	sw.AddReactor("CONSENSUS", consensusReactor)
 
 	return &Node{
 		sw:               sw,
@@ -99,7 +95,13 @@ func (n *Node) Start() {
 		go n.inboundConnectionRoutine(l)
 	}
 	n.book.Start()
-	//n.sw.StartReactors()
+	//n.sw.StartReactors()...
+	n.sw.Reactor("PEX").Start(n.sw)
+	n.sw.Reactor("MEMPOOL").Start(n.sw)
+	n.sw.Reactor("BLOCKCHAIN").Start(n.sw)
+	if !config.App().GetBool("FastSync") {
+		n.sw.Reactor("CONSENSUS").Start(n.sw)
+	}
 }
 
 func (n *Node) Stop() {