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

Jump to bottom

cmd/devp2p/internal/ethtest: only use eth66 if eth66 is negotiated #23568

Merged
merged 3 commits into from Sep 15, 2021
Merged

cmd/devp2p/internal/ethtest: only use eth66 if eth66 is negotiated #23568

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
79663c8
cmd/devp2p/internal/ethtest: only use eth66 if eth66 is negotiated
MariusVanDerWijden Sep 13, 2021
830fa2c
cmd/devp2p/internal/ethtest: switch on concrete type not pointer
MariusVanDerWijden Sep 13, 2021
3f4d987
cmd/devp2p/internal/ethtest: switch on concrete type not pointer
MariusVanDerWijden Sep 13, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
17 changes: 12 additions & 5 deletions cmd/devp2p/internal/ethtest/helpers.go
View file
Open in desktop
Expand Up @@ -242,18 +242,25 @@ func (s *Suite) createSendAndRecvConns(isEth66 bool) (*Conn, *Conn, error) {
return sendConn, recvConn, nil
}

func (c *Conn) readAndServe(chain *Chain, timeout time.Duration) Message {
if c.negotiatedProtoVersion == 66 {
_, msg := c.readAndServe66(chain, timeout)
return msg
}
return c.readAndServe65(chain, timeout)
}

// readAndServe serves GetBlockHeaders requests while waiting
// on another message from the node.
func (c *Conn) readAndServe(chain *Chain, timeout time.Duration) Message {
func (c *Conn) readAndServe65(chain *Chain, timeout time.Duration) Message {
start := time.Now()
for time.Since(start) < timeout {
c.SetReadDeadline(time.Now().Add(5 * time.Second))
switch msg := c.Read().(type) {
case *Ping:
case Ping:
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This change looks like it either makes something that didn't work, work, or vice versa. What's that about?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ha, yes it fixes something, but I accidentally fixed it in the wrong method

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Read66 returns GetBlockHeaders instead of *GetBlockHeaderswhich is returned by 65

c.Write(&Pong{})
case *GetBlockHeaders:
req := *msg
headers, err := chain.GetHeaders(req)
case GetBlockHeaders:
headers, err := chain.GetHeaders(msg)
if err != nil {
return errorf("could not get headers for inbound header request: %v", err)
}
Expand Down