X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=pexconn_test.go;h=f8b9c9e07ae162a7e384855fd96669976f4fa446;hb=HEAD;hp=a3ff1d02dbbe3b36ea772b18183f96a94abe2b82;hpb=47284cf426ce1e394ef7a55bf2519f18fea5368a;p=btrtrc.git

diff --git a/pexconn_test.go b/pexconn_test.go
index a3ff1d02..f8b9c9e0 100644
--- a/pexconn_test.go
+++ b/pexconn_test.go
@@ -12,19 +12,24 @@ import (
 )
 
 func TestPexConnState(t *testing.T) {
-	cl := Client{
-		config: TestingConfig(t),
-	}
+	var cl Client
+	cl.init(TestingConfig(t))
 	cl.initLogger()
 	torrent := cl.newTorrent(metainfo.Hash{}, nil)
 	addr := &net.TCPAddr{IP: net.IPv6loopback, Port: 4747}
-	c := cl.newConnection(nil, false, addr, addr.Network(), "")
+	c := cl.newConnection(nil, newConnectionOpts{
+		remoteAddr: addr,
+		network:    addr.Network(),
+	})
 	c.PeerExtensionIDs = make(map[pp.ExtensionName]pp.ExtensionNumber)
 	c.PeerExtensionIDs[pp.ExtensionNamePex] = pexExtendedId
-	c.writerCond.L.Lock()
+	c.messageWriter.mu.Lock()
 	c.setTorrent(torrent)
-	torrent.addPeerConn(c)
+	if err := torrent.addPeerConn(c); err != nil {
+		t.Log(err)
+	}
 
+	connWriteCond := c.messageWriter.writeCond.Signaled()
 	c.pex.Init(c)
 	require.True(t, c.pex.IsEnabled(), "should get enabled")
 	defer c.pex.Close()
@@ -36,7 +41,7 @@ func TestPexConnState(t *testing.T) {
 		out = m
 		return true
 	}
-	c.writerCond.Wait()
+	<-connWriteCond
 	c.pex.Share(testWriter)
 	require.True(t, writerCalled)
 	require.EqualValues(t, pp.Extended, out.Type)
@@ -48,7 +53,7 @@ func TestPexConnState(t *testing.T) {
 		Added:      krpc.CompactIPv4NodeAddrs(nil),
 		AddedFlags: []pp.PexPeerFlags{},
 		Added6: krpc.CompactIPv6NodeAddrs{
-			mustNodeAddr(addr),
+			krpcNodeAddrFromNetAddr(addr),
 		},
 		Added6Flags: []pp.PexPeerFlags{0},
 	}