"net"
"testing"
+ "github.com/anacrolix/dht/v2/krpc"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
- "github.com/anacrolix/dht/v2/krpc"
pp "github.com/anacrolix/torrent/peer_protocol"
)
require.EqualValues(t, targ, s)
}
-func mustNodeAddr(addr net.Addr) krpc.NodeAddr {
- ret, ok := nodeAddr(addr)
- if !ok {
- panic(addr)
+func krpcNodeAddrFromNetAddr(addr net.Addr) krpc.NodeAddr {
+ addrPort, err := addrPortFromPeerRemoteAddr(addr)
+ if err != nil {
+ panic(err)
}
- return ret
+ return krpcNodeAddrFromAddrPort(addrPort)
}
var testcases = []struct {
}(),
targ: pp.PexMsg{
Added: krpc.CompactIPv4NodeAddrs{
- mustNodeAddr(addrs[2]),
- mustNodeAddr(addrs[3]),
+ krpcNodeAddrFromNetAddr(addrs[2]),
+ krpcNodeAddrFromNetAddr(addrs[3]),
},
AddedFlags: []pp.PexPeerFlags{pp.PexOutgoingConn, 0},
Added6: krpc.CompactIPv6NodeAddrs{
- mustNodeAddr(addrs[0]),
- mustNodeAddr(addrs[1]),
+ krpcNodeAddrFromNetAddr(addrs[0]),
+ krpcNodeAddrFromNetAddr(addrs[1]),
},
Added6Flags: []pp.PexPeerFlags{0, pp.PexOutgoingConn},
},
}(),
targ: pp.PexMsg{
Dropped: krpc.CompactIPv4NodeAddrs{
- mustNodeAddr(addrs[2]),
+ krpcNodeAddrFromNetAddr(addrs[2]),
},
Dropped6: krpc.CompactIPv6NodeAddrs{
- mustNodeAddr(addrs[0]),
+ krpcNodeAddrFromNetAddr(addrs[0]),
},
},
},
}(),
targ: pp.PexMsg{
Added6: krpc.CompactIPv6NodeAddrs{
- mustNodeAddr(addrs[1]),
+ krpcNodeAddrFromNetAddr(addrs[1]),
},
Added6Flags: []pp.PexPeerFlags{0},
},
}(),
targ: pp.PexMsg{
Added: krpc.CompactIPv4NodeAddrs{
- mustNodeAddr(addrs[2]),
+ krpcNodeAddrFromNetAddr(addrs[2]),
},
AddedFlags: []pp.PexPeerFlags{0},
Added6: krpc.CompactIPv6NodeAddrs{
- mustNodeAddr(addrs[0]),
- mustNodeAddr(addrs[1]),
+ krpcNodeAddrFromNetAddr(addrs[0]),
+ krpcNodeAddrFromNetAddr(addrs[1]),
},
Added6Flags: []pp.PexPeerFlags{0, 0},
},
}(),
targ: pp.PexMsg{
Added6: krpc.CompactIPv6NodeAddrs{
- mustNodeAddr(addrs[1]),
+ krpcNodeAddrFromNetAddr(addrs[1]),
},
Added6Flags: []pp.PexPeerFlags{0},
},
}(),
targ: pp.PexMsg{
Added6: krpc.CompactIPv6NodeAddrs{
- mustNodeAddr(addrs[0]),
+ krpcNodeAddrFromNetAddr(addrs[0]),
},
Added6Flags: []pp.PexPeerFlags{0},
},
},
targ1: pp.PexMsg{
Added6: krpc.CompactIPv6NodeAddrs{
- mustNodeAddr(addrs[1]),
+ krpcNodeAddrFromNetAddr(addrs[1]),
},
Added6Flags: []pp.PexPeerFlags{0},
},