core/types:fix run error(regenerated gen_header_rlp.go)

cp-yoonjin · Nov 21, 2022 · 8d33e21 · 8d33e21
1 parent 74cb266
commit 8d33e21
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 13 deletions.
diff --git a/core/types/gen_header_rlp.go b/core/types/gen_header_rlp.go
diff --git a/eth/protocols/eth/handler_test.go b/eth/protocols/eth/handler_test.go
@@ -272,16 +272,17 @@ func testGetBlockHeaders(t *testing.T, protocol uint) {
 			}
 
 		} else {
-			p2p.Send(peer.app, GetBlockHeadersMsg, GetBlockHeadersPacket66{
+			p2p.Send(peer.app, GetBlockHeadersMsg, &GetBlockHeadersPacket66{
 				RequestId:             123,
 				GetBlockHeadersPacket: tt.query,
 			})
-			if err := p2p.ExpectMsg(peer.app, BlockHeadersMsg, BlockHeadersPacket66{
+			if err := p2p.ExpectMsg(peer.app, BlockHeadersMsg, &BlockHeadersPacket66{
 				RequestId:          123,
 				BlockHeadersPacket: headers,
 			}); err != nil {
 				t.Errorf("test %d: headers mismatch: %v", i, err)
 			}
+
 		}
 		// If the test used number origins, repeat with hashes as the too
 		if tt.query.Origin.Hash == (common.Hash{}) {
@@ -294,14 +295,12 @@ func testGetBlockHeaders(t *testing.T, protocol uint) {
 						t.Errorf("test %d: headers mismatch: %v", i, err)
 					}
 				} else {
-					p2p.Send(peer.app, GetBlockHeadersMsg, GetBlockHeadersPacket66{
+					p2p.Send(peer.app, GetBlockHeadersMsg, &GetBlockHeadersPacket66{
 						RequestId:             456,
 						GetBlockHeadersPacket: tt.query,
 					})
-					if err := p2p.ExpectMsg(peer.app, BlockHeadersMsg, BlockHeadersPacket66{
-						RequestId:          456,
-						BlockHeadersPacket: headers,
-					}); err != nil {
+					expected := &BlockHeadersPacket66{RequestId: 456, BlockHeadersPacket: headers}
+					if err := p2p.ExpectMsg(peer.app, BlockHeadersMsg, expected); err != nil {
 						t.Errorf("test %d by hash: headers mismatch: %v", i, err)
 					}
 				}
@@ -387,11 +386,11 @@ func testGetBlockBodies(t *testing.T, protocol uint) {
 				t.Errorf("test %d: bodies mismatch: %v", i, err)
 			}
 		} else {
-			p2p.Send(peer.app, GetBlockBodiesMsg, GetBlockBodiesPacket66{
+			p2p.Send(peer.app, GetBlockBodiesMsg, &GetBlockBodiesPacket66{
 				RequestId:            123,
 				GetBlockBodiesPacket: hashes,
 			})
-			if err := p2p.ExpectMsg(peer.app, BlockBodiesMsg, BlockBodiesPacket66{
+			if err := p2p.ExpectMsg(peer.app, BlockBodiesMsg, &BlockBodiesPacket66{
 				RequestId:         123,
 				BlockBodiesPacket: bodies,
 			}); err != nil {
@@ -464,7 +463,7 @@ func testGetNodeData(t *testing.T, protocol uint) {
 	if protocol <= ETH65 {
 		p2p.Send(peer.app, GetNodeDataMsg, hashes)
 	} else {
-		p2p.Send(peer.app, GetNodeDataMsg, GetNodeDataPacket66{
+		p2p.Send(peer.app, GetNodeDataMsg, &GetNodeDataPacket66{
 			RequestId:         123,
 			GetNodeDataPacket: hashes,
 		})
@@ -589,11 +588,11 @@ func testGetBlockReceipts(t *testing.T, protocol uint) {
 			t.Errorf("receipts mismatch: %v", err)
 		}
 	} else {
-		p2p.Send(peer.app, GetReceiptsMsg, GetReceiptsPacket66{
+		p2p.Send(peer.app, GetReceiptsMsg, &GetReceiptsPacket66{
 			RequestId:         123,
 			GetReceiptsPacket: hashes,
 		})
-		if err := p2p.ExpectMsg(peer.app, ReceiptsMsg, ReceiptsPacket66{
+		if err := p2p.ExpectMsg(peer.app, ReceiptsMsg, &ReceiptsPacket66{
 			RequestId:      123,
 			ReceiptsPacket: receipts,
 		}); err != nil {