Skip to content

p2p/discover: fix TestUDPv4_findnode data race with revalidation ping #33010

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

p2p/discover: fix TestUDPv4_findnode data race with revalidation ping #33010

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 23 additions & 11 deletions p2p/discover/v4_udp_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,19 +281,31 @@ func TestUDPv4_findnode(t *testing.T) {
// check that closest neighbors are returned.
expected := test.table.findnodeByID(testTarget.ID(), bucketSize, true)
test.packetIn(nil, &v4wire.Findnode{Target: testTarget, Expiration: futureExp})
waitNeighbors := func(want []*enode.Node) {
test.waitPacketOut(func(p *v4wire.Neighbors, to netip.AddrPort, hash []byte) {
if len(p.Nodes) != len(want) {
t.Errorf("wrong number of results: got %d, want %d", len(p.Nodes), len(want))
return
}
for i, n := range p.Nodes {
if n.ID.ID() != want[i].ID() {
t.Errorf("result mismatch at %d:\n got: %v\n want: %v", i, n, expected.entries[i])
deadline := time.Now().Add(1 * time.Minute)
var waitNeighbors func([]*enode.Node)
waitNeighbors = func(want []*enode.Node) {
if time.Now().After(deadline) {
t.Fatal("timeout waiting for neighbors response")
}
test.waitPacketOut(func(p v4wire.Packet, to netip.AddrPort, hash []byte) {
switch p := p.(type) {
case *v4wire.Ping:
waitNeighbors(want)
case *v4wire.Neighbors:
if len(p.Nodes) != len(want) {
t.Errorf("wrong number of results: got %d, want %d", len(p.Nodes), len(want))
return
}
if !live[n.ID.ID()] {
t.Errorf("result includes dead node %v", n.ID.ID())
for i, n := range p.Nodes {
if n.ID.ID() != want[i].ID() {
t.Errorf("result mismatch at %d:\n got: %v\n want: %v", i, n, expected.entries[i])
}
if !live[n.ID.ID()] {
t.Errorf("result includes dead node %v", n.ID.ID())
}
}
default:
t.Fatalf("unexpected packet type: %T", p)
}
})
}
Expand Down