From 2042a11963f3e3e8af41e2f67a25c169f3bc0426 Mon Sep 17 00:00:00 2001
From: Jared Wasinger <j-wasinger@hotmail.com>
Date: Tue, 25 Feb 2025 21:14:39 +0100
Subject: [PATCH] reenable all ethsuite tests

---
 cmd/devp2p/internal/ethtest/suite.go | 39 ++++++++++++++--------------
 eth/handler_eth.go                   |  1 +
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/cmd/devp2p/internal/ethtest/suite.go b/cmd/devp2p/internal/ethtest/suite.go
index d8dd25e5d9..ad0e69374e 100644
--- a/cmd/devp2p/internal/ethtest/suite.go
+++ b/cmd/devp2p/internal/ethtest/suite.go
@@ -64,27 +64,26 @@ func NewSuite(dest *enode.Node, chainDir, engineURL, jwt string) (*Suite, error)
 
 func (s *Suite) EthTests() []utesting.Test {
 	return []utesting.Test{
-		/*
-			// status
-			{Name: "Status", Fn: s.TestStatus},
-			// get block headers
-			{Name: "GetBlockHeaders", Fn: s.TestGetBlockHeaders},
-			{Name: "SimultaneousRequests", Fn: s.TestSimultaneousRequests},
-			{Name: "SameRequestID", Fn: s.TestSameRequestID},
-			{Name: "ZeroRequestID", Fn: s.TestZeroRequestID},
-			// get block bodies
-			{Name: "GetBlockBodies", Fn: s.TestGetBlockBodies},
-			// // malicious handshakes + status
-			{Name: "MaliciousHandshake", Fn: s.TestMaliciousHandshake},
-			// test transactions
-			{Name: "LargeTxRequest", Fn: s.TestLargeTxRequest, Slow: true},
-			{Name: "Transaction", Fn: s.TestTransaction},
-			{Name: "InvalidTxs", Fn: s.TestInvalidTxs},
-			{Name: "NewPooledTxs", Fn: s.TestNewPooledTxs},
-			{Name: "BlobViolations", Fn: s.TestBlobViolations},
-		*/
+		// status
+		{Name: "Status", Fn: s.TestStatus},
+		// get block headers
+		{Name: "GetBlockHeaders", Fn: s.TestGetBlockHeaders},
+		{Name: "SimultaneousRequests", Fn: s.TestSimultaneousRequests},
+		{Name: "SameRequestID", Fn: s.TestSameRequestID},
+		{Name: "ZeroRequestID", Fn: s.TestZeroRequestID},
+		// get block bodies
+		{Name: "GetBlockBodies", Fn: s.TestGetBlockBodies},
+		// // malicious handshakes + status
+		{Name: "MaliciousHandshake", Fn: s.TestMaliciousHandshake},
+		// test transactions
+		{Name: "LargeTxRequest", Fn: s.TestLargeTxRequest, Slow: true},
+		{Name: "Transaction", Fn: s.TestTransaction},
+		{Name: "InvalidTxs", Fn: s.TestInvalidTxs},
+		{Name: "NewPooledTxs", Fn: s.TestNewPooledTxs},
+		{Name: "BlobViolations", Fn: s.TestBlobViolations},
+
 		{Name: "TestBlobTxWithoutSidecar", Fn: s.TestBlobTxWithoutSidecar},
-		//{Name: "TestBlobTxWithMismatchedSidecar", Fn: s.TestBlobTxWithMismatchedSidecar},
+		{Name: "TestBlobTxWithMismatchedSidecar", Fn: s.TestBlobTxWithMismatchedSidecar},
 	}
 }
 
diff --git a/eth/handler_eth.go b/eth/handler_eth.go
index 3475258c46..11742b14ad 100644
--- a/eth/handler_eth.go
+++ b/eth/handler_eth.go
@@ -19,6 +19,7 @@ package eth
 import (
 	"errors"
 	"fmt"
+
 	"github.com/ethereum/go-ethereum/core"
 	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/ethereum/go-ethereum/eth/protocols/eth"