Skip to content
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

cmd/devp2p/internal/v4test: ignore FINDNODE in BondThenPingWithWrongFrom #26085

Merged
merged 5 commits into from
Nov 7, 2022
Merged

cmd/devp2p/internal/v4test: ignore FINDNODE in BondThenPingWithWrongFrom #26085

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
13264cc
ignore FindNode in BondThenPingWithWrongFrom
marcindsobczak Oct 31, 2022
3a6779d
add log
marcindsobczak Nov 1, 2022
52463f7
add break
marcindsobczak Nov 1, 2022
c1c7336
Revert "add log"
marcindsobczak Nov 1, 2022
2dddeaf
cmd/devp2p/internal/v4test: improve loop
fjl Nov 7, 2022
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
24 changes: 20 additions & 4 deletions cmd/devp2p/internal/v4test/discv4tests.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,6 +256,7 @@ func WrongPacketType(t *utesting.T) {
func BondThenPingWithWrongFrom(t *utesting.T) {
te := newTestEnv(Remote, Listen1, Listen2)
defer te.close()

bond(t, te)

wrongEndpoint := v4wire.Endpoint{IP: net.ParseIP("192.0.2.0")}
Expand All @@ -265,10 +266,25 @@ func BondThenPingWithWrongFrom(t *utesting.T) {
To: te.remoteEndpoint(),
Expiration: futureExpiration(),
})
if reply, _, err := te.read(te.l1); err != nil {
t.Fatal(err)
} else if err := te.checkPong(reply, pingHash); err != nil {
t.Fatal(err)

waitForPong:
for {
reply, _, err := te.read(te.l1)
if err != nil {
t.Fatal(err)
}
switch reply.Kind() {
case v4wire.PongPacket:
if err := te.checkPong(reply, pingHash); err != nil {
t.Fatal(err)
}
break waitForPong
case v4wire.FindnodePacket:
// FINDNODE from the node is acceptable here since the endpoint
// verification was performed earlier.
default:
t.Fatalf("Expected PONG, got %v %v", reply.Name(), reply)
}
}
}

Expand Down