From 6a528fce3357176e2da2fe07b379842f596bb566 Mon Sep 17 00:00:00 2001
From: rene <41963722+renaynay@users.noreply.github.com>
Date: Fri, 19 Mar 2021 09:57:23 +0000
Subject: [PATCH] cmd/devp2p/internal/ethtest: return request ID in
BlockHeaders response (#22508)
This PR fixes an issue with the eth66 test suite where, during a readAndServe when
the test is manually responding to GetBlockHeader requests, it now responds
with a BlockHeaders eth66 packet that includes the inbound request ID.
---
cmd/devp2p/internal/ethtest/eth66_suiteHelpers.go | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/cmd/devp2p/internal/ethtest/eth66_suiteHelpers.go b/cmd/devp2p/internal/ethtest/eth66_suiteHelpers.go
index b7fa1dce2..a3f1aaa4f 100644
--- a/cmd/devp2p/internal/ethtest/eth66_suiteHelpers.go
+++ b/cmd/devp2p/internal/ethtest/eth66_suiteHelpers.go
@@ -141,8 +141,11 @@ func (c *Conn) readAndServe66(chain *Chain, timeout time.Duration) (uint64, Mess
if err != nil {
return 0, errorf("could not get headers for inbound header request: %v", err)
}
-
- if err := c.Write(headers); err != nil {
+ resp := ð.BlockHeadersPacket66{
+ RequestId: reqID,
+ BlockHeadersPacket: eth.BlockHeadersPacket(headers),
+ }
+ if err := c.write66(resp, BlockHeaders{}.Code()); err != nil {
return 0, errorf("could not write to connection: %v", err)
}
default:
--
GitLab