From 0277e52bd5f27e4f2148353be6d674871a6ba41e Mon Sep 17 00:00:00 2001
From: Anton Kaliaev <anton.kalyaev@gmail.com>
Date: Fri, 14 Apr 2017 23:59:22 +0400
Subject: [PATCH] fix merge

---
 addrbook.go         |  2 +-
 addrbook_test.go    |  7 ++-----
 pex_reactor.go      | 21 ++++++++++++---------
 pex_reactor_test.go |  8 +++++---
 4 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/addrbook.go b/addrbook.go
index 9dbbc2bf5..c33b97aa8 100644
--- a/addrbook.go
+++ b/addrbook.go
@@ -15,6 +15,7 @@ import (
 	"time"
 
 	. "github.com/tendermint/go-common"
+	crypto "github.com/tendermint/go-crypto"
 )
 
 const (
@@ -135,7 +136,6 @@ func (a *AddrBook) OnStop() {
 }
 
 func (a *AddrBook) Wait() {
-	a.wg.Wait()
 	a.saveToFile(a.filePath)
 }
 
diff --git a/addrbook_test.go b/addrbook_test.go
index 0f5ced5cf..16aea8ef9 100644
--- a/addrbook_test.go
+++ b/addrbook_test.go
@@ -9,9 +9,6 @@ import (
 	"github.com/stretchr/testify/assert"
 )
 
-	"github.com/stretchr/testify/assert"
-)
-
 func createTempFileName(prefix string) string {
 	f, err := ioutil.TempFile("", prefix)
 	if err != nil {
@@ -156,14 +153,14 @@ func TestAddrBookRemoveAddress(t *testing.T) {
 	fname := createTempFileName("addrbook_test")
 	book := NewAddrBook(fname, true)
 
-	addr := randIPv4Address()
+	addr := randIPv4Address(t)
 	book.AddAddress(addr, addr)
 	assert.Equal(t, 1, book.Size())
 
 	book.RemoveAddress(addr)
 	assert.Equal(t, 0, book.Size())
 
-	nonExistingAddr := randIPv4Address()
+	nonExistingAddr := randIPv4Address(t)
 	book.RemoveAddress(nonExistingAddr)
 	assert.Equal(t, 0, book.Size())
 }
diff --git a/pex_reactor.go b/pex_reactor.go
index 79a9200ff..a86bebe12 100644
--- a/pex_reactor.go
+++ b/pex_reactor.go
@@ -93,19 +93,17 @@ func (r *PEXReactor) GetChannels() []*ChannelDescriptor {
 // AddPeer implements Reactor by adding peer to the address book (if inbound)
 // or by requesting more addresses (if outbound).
 func (r *PEXReactor) AddPeer(p *Peer) {
-	netAddr, err := NewNetAddressString(p.ListenAddr)
-	if err != nil {
-		// this should never happen
-		log.Error("Error in AddPeer: invalid peer address", "addr", p.ListenAddr, "error", err)
-		return
-	}
-
 	if p.IsOutbound() { // For outbound peers, the address is already in the books
 		if r.book.NeedMoreAddrs() {
 			r.RequestPEX(p)
 		}
 	} else { // For inbound connections, the peer is its own source
-		addr := NewNetAddressString(p.ListenAddr)
+		addr, err := NewNetAddressString(p.ListenAddr)
+		if err != nil {
+			// this should never happen
+			log.Error("Error in AddPeer: invalid peer address", "addr", p.ListenAddr, "error", err)
+			return
+		}
 		r.book.AddAddress(addr, addr)
 	}
 }
@@ -117,7 +115,12 @@ func (r *PEXReactor) AddPeer(p *Peer) {
 // will remove him too. The peer will need to send first requests to others by
 // himself (he will have an addrbook or the seeds).
 func (r *PEXReactor) RemovePeer(p *Peer, reason interface{}) {
-	addr := NewNetAddressString(p.ListenAddr)
+	addr, err := NewNetAddressString(p.ListenAddr)
+	if err != nil {
+		// this should never happen
+		log.Error("Error in AddPeer: invalid peer address", "addr", p.ListenAddr, "error", err)
+		return
+	}
 	r.book.RemoveAddress(addr)
 }
 
diff --git a/pex_reactor_test.go b/pex_reactor_test.go
index 67d123bec..525efd3cb 100644
--- a/pex_reactor_test.go
+++ b/pex_reactor_test.go
@@ -72,7 +72,7 @@ func TestPEXReactorRunning(t *testing.T) {
 
 	// fill the address book and add listeners
 	for _, s := range switches {
-		addr := NewNetAddressString(s.NodeInfo().ListenAddr)
+		addr, _ := NewNetAddressString(s.NodeInfo().ListenAddr)
 		book.AddAddress(addr, addr)
 		s.AddListener(NewDefaultListener("tcp", s.NodeInfo().ListenAddr, true))
 	}
@@ -110,7 +110,8 @@ func TestPEXReactorReceive(t *testing.T) {
 	peer := createRandomPeer(false)
 
 	size := book.Size()
-	addrs := []*NetAddress{NewNetAddressString(peer.ListenAddr)}
+	netAddr, _ := NewNetAddressString(peer.ListenAddr)
+	addrs := []*NetAddress{netAddr}
 	msg := wire.BinaryBytes(struct{ PexMessage }{&pexAddrsMessage{Addrs: addrs}})
 	r.Receive(PexChannel, peer, msg)
 	assert.Equal(t, size+1, book.Size())
@@ -140,12 +141,13 @@ func TestPEXReactorAbuseFromPeer(t *testing.T) {
 
 func createRandomPeer(outbound bool) *Peer {
 	addr := cmn.Fmt("%v.%v.%v.%v:46656", rand.Int()%256, rand.Int()%256, rand.Int()%256, rand.Int()%256)
+	netAddr, _ := NewNetAddressString(addr)
 	return &Peer{
 		Key: cmn.RandStr(12),
 		NodeInfo: &NodeInfo{
 			ListenAddr: addr,
 		},
 		outbound: outbound,
-		mconn:    &MConnection{RemoteAddress: NewNetAddressString(addr)},
+		mconn:    &MConnection{RemoteAddress: netAddr},
 	}
 }