Drop support for go 1.20

[btrtrc.git] / pexconn_test.go

diff --git a/pexconn_test.go b/pexconn_test.go
index 7bb61ecdaaccb6461ae384f367e5387486ff94af..f8b9c9e07ae162a7e384855fd96669976f4fa446 100644 (file)
--- 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.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.messageWriter.writeCond.Signaled()
+       <-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},
        }