forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-18 01:43:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

p2p/enode: fix test

Browse source
This commit is contained in:
Felix Lange 2024-12-12 18:15:32 +01:00
parent 42cb347ed7
commit 83f5e0c5f7
2 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
p2p/enode/node.go
View file

@ -81,6 +81,8 @@ func newNodeWithID(r *enr.Record, id ID) *Node {
n.setIP4(ip4) n.setIP4(ip4)
case valid6: case valid6:
n.setIP6(ip6) n.setIP6(ip6)
default:
n.setIPv4Ports()
} }
return n return n
} }
@ -107,6 +109,10 @@ func localityScore(ip netip.Addr) int {
func (n *Node) setIP4(ip netip.Addr) { func (n *Node) setIP4(ip netip.Addr) {
n.ip = ip n.ip = ip
n.setIPv4Ports()
}
func (n *Node) setIPv4Ports() {
n.Load((*enr.UDP)(&n.udp)) n.Load((*enr.UDP)(&n.udp))
n.Load((*enr.TCP)(&n.tcp)) n.Load((*enr.TCP)(&n.tcp))
} }

9
p2p/enode/node_test.go
View file

@ -91,6 +91,7 @@ func TestNodeEndpoints(t *testing.T) {
r.Set(enr.UDP(9000)) r.Set(enr.UDP(9000))
return SignNull(&r, id) return SignNull(&r, id)
}(), }(),
wantUDP: 9000,
}, },
{ {
name: "tcp-only", name: "tcp-only",
@ -99,6 +100,7 @@ func TestNodeEndpoints(t *testing.T) {
r.Set(enr.TCP(9000)) r.Set(enr.TCP(9000))
return SignNull(&r, id) return SignNull(&r, id)
}(), }(),
wantTCP: 9000,
}, },
{ {
name: "quic-only", name: "quic-only",
@ -273,10 +275,9 @@ func TestNodeEndpoints(t *testing.T) {
name: "dns-only", name: "dns-only",
node: func() *Node { node: func() *Node {
var r enr.Record var r enr.Record
n := SignNull(&r, id) r.Set(enr.UDP(30303))
n.hostname = "example.com" r.Set(enr.TCP(30303))
n.tcp = 30303 n := SignNull(&r, id).WithHostname("example.com")
n.udp = 30303
return n return n
}(), }(),
wantTCP: 30303, wantTCP: 30303,