From 83f5e0c5f7205e4433ec9ac08015024dc1c5218b Mon Sep 17 00:00:00 2001 From: Felix Lange Date: Thu, 12 Dec 2024 18:15:32 +0100 Subject: [PATCH] p2p/enode: fix test --- p2p/enode/node.go | 6 ++++++ p2p/enode/node_test.go | 9 +++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/p2p/enode/node.go b/p2p/enode/node.go index ae6b4ca4b7..d6f2ac7ff5 100644 --- a/p2p/enode/node.go +++ b/p2p/enode/node.go @@ -81,6 +81,8 @@ func newNodeWithID(r *enr.Record, id ID) *Node { n.setIP4(ip4) case valid6: n.setIP6(ip6) + default: + n.setIPv4Ports() } return n } @@ -107,6 +109,10 @@ func localityScore(ip netip.Addr) int { func (n *Node) setIP4(ip netip.Addr) { n.ip = ip + n.setIPv4Ports() +} + +func (n *Node) setIPv4Ports() { n.Load((*enr.UDP)(&n.udp)) n.Load((*enr.TCP)(&n.tcp)) } diff --git a/p2p/enode/node_test.go b/p2p/enode/node_test.go index 7604f1c50e..e9fe631f34 100644 --- a/p2p/enode/node_test.go +++ b/p2p/enode/node_test.go @@ -91,6 +91,7 @@ func TestNodeEndpoints(t *testing.T) { r.Set(enr.UDP(9000)) return SignNull(&r, id) }(), + wantUDP: 9000, }, { name: "tcp-only", @@ -99,6 +100,7 @@ func TestNodeEndpoints(t *testing.T) { r.Set(enr.TCP(9000)) return SignNull(&r, id) }(), + wantTCP: 9000, }, { name: "quic-only", @@ -273,10 +275,9 @@ func TestNodeEndpoints(t *testing.T) { name: "dns-only", node: func() *Node { var r enr.Record - n := SignNull(&r, id) - n.hostname = "example.com" - n.tcp = 30303 - n.udp = 30303 + r.Set(enr.UDP(30303)) + r.Set(enr.TCP(30303)) + n := SignNull(&r, id).WithHostname("example.com") return n }(), wantTCP: 30303,