Fix pex reactor test

diff --git a/p2p/listener_test.go b/p2p/listener_test.go
index ee4853b..e7c2e6d 100644 (file)
--- a/p2p/listener_test.go
+++ b/p2p/listener_test.go
@@ -11,7 +11,7 @@ import (
 
 func TestListener(t *testing.T) {
        // Create a listener
-       l := NewDefaultListener("tcp", ":8001", true, log.TestingLogger())
+       l, _ := NewDefaultListener("tcp", ":8001", true, log.TestingLogger())
 
        // Dial the listener
        lAddr := l.ExternalAddress()

diff --git a/p2p/pex_reactor_test.go b/p2p/pex_reactor_test.go
index bd03e54..a02caa8 100644 (file)
--- a/p2p/pex_reactor_test.go
+++ b/p2p/pex_reactor_test.go
@@ -16,6 +16,10 @@ import (
        "github.com/tendermint/tmlibs/log"
 )
 
+var (
+       sw *Switch
+)
+
 func TestPEXReactorBasic(t *testing.T) {
        assert, require := assert.New(t), require.New(t)
 
@@ -25,7 +29,7 @@ func TestPEXReactorBasic(t *testing.T) {
        book := NewAddrBook(dir+"addrbook.json", true)
        book.SetLogger(log.TestingLogger())
 
-       r := NewPEXReactor(book)
+       r := NewPEXReactor(book, sw)
        r.SetLogger(log.TestingLogger())
 
        assert.NotNil(r)
@@ -41,7 +45,7 @@ func TestPEXReactorAddRemovePeer(t *testing.T) {
        book := NewAddrBook(dir+"addrbook.json", true)
        book.SetLogger(log.TestingLogger())
 
-       r := NewPEXReactor(book)
+       r := NewPEXReactor(book, sw)
        r.SetLogger(log.TestingLogger())
 
        size := book.Size()
@@ -79,7 +83,7 @@ func TestPEXReactorRunning(t *testing.T) {
                switches[i] = makeSwitch(config, i, "127.0.0.1", "123.123.123", func(i int, sw *Switch) *Switch {
                        sw.SetLogger(log.TestingLogger().With("switch", i))
 
-                       r := NewPEXReactor(book)
+                       r := NewPEXReactor(book, sw)
                        r.SetLogger(log.TestingLogger())
                        r.SetEnsurePeersPeriod(250 * time.Millisecond)
                        sw.AddReactor("pex", r)
@@ -91,7 +95,8 @@ func TestPEXReactorRunning(t *testing.T) {
        for _, s := range switches {
                addr, _ := NewNetAddressString(s.NodeInfo().ListenAddr)
                book.AddAddress(addr, addr)
-               s.AddListener(NewDefaultListener("tcp", s.NodeInfo().ListenAddr, true, log.TestingLogger()))
+               l, _ := NewDefaultListener("tcp", s.NodeInfo().ListenAddr, true, log.TestingLogger())
+               s.AddListener(l)
        }
 
        // start switches
@@ -125,7 +130,7 @@ func TestPEXReactorReceive(t *testing.T) {
        book := NewAddrBook(dir+"addrbook.json", true)
        book.SetLogger(log.TestingLogger())
 
-       r := NewPEXReactor(book)
+       r := NewPEXReactor(book, sw)
        r.SetLogger(log.TestingLogger())
 
        peer := createRandomPeer(false)
@@ -150,7 +155,7 @@ func TestPEXReactorAbuseFromPeer(t *testing.T) {
        book := NewAddrBook(dir+"addrbook.json", true)
        book.SetLogger(log.TestingLogger())
 
-       r := NewPEXReactor(book)
+       r := NewPEXReactor(book, sw)
        r.SetLogger(log.TestingLogger())
        r.SetMaxMsgCountByPeer(5)