fix(plugins/consume-engine): Fix Engine API error check (#1133)

Author: marioevz

src/ethereum_test_rpc/rpc.py

@@ -82,8 +82,7 @@ def post_request(self, method: str, *params: Any, extra_headers: Dict | None = N
         response_json = response.json()
 
         if "error" in response_json:
-            exception = JSONRPCError(**response_json["error"])
-            raise exception.exception(method)
+            raise JSONRPCError(**response_json["error"])
 
         assert "result" in response_json, "RPC response didn't contain a result field"
         result = response_json["result"]

src/ethereum_test_rpc/types.py

@@ -10,22 +10,21 @@
 from ethereum_test_types import Withdrawal
 
 
-class JSONRPCError(CamelModel):
+class JSONRPCError(Exception):
     """Model to parse a JSON RPC error response."""
 
     code: int
     message: str
 
+    def __init__(self, code: int | str, message: str, **kwargs):
+        """Initialize the JSONRPCError."""
+        self.code = int(code)
+        self.message = message
+
     def __str__(self) -> str:
         """Return string representation of the JSONRPCError."""
         return f"JSONRPCError(code={self.code}, message={self.message})"
 
-    def exception(self, method) -> Exception:
-        """Return exception representation of the JSONRPCError."""
-        return Exception(
-            f"Error calling JSON RPC {method}, code: {self.code}, " f"message: {self.message}"
-        )
-
 
 class TransactionByHashResponse(CamelModel):
     """Represents the response of a transaction by hash request."""

src/pytest_plugins/consume/hive_simulators/engine/test_via_engine.py

@@ -7,7 +7,7 @@
 
 from ethereum_test_fixtures import BlockchainEngineFixture
 from ethereum_test_rpc import EngineRPC, EthRPC
-from ethereum_test_rpc.types import ForkchoiceState, PayloadStatusEnum
+from ethereum_test_rpc.types import ForkchoiceState, JSONRPCError, PayloadStatusEnum
 from pytest_plugins.consume.hive_simulators.exceptions import GenesisBlockMismatchExceptionError
 
 from ...decorator import fixture_format
@@ -52,13 +52,24 @@ def test_via_engine(
         for i, payload in enumerate(blockchain_fixture.payloads):
             with total_payload_timing.time(f"Payload {i + 1}") as payload_timing:
                 with payload_timing.time(f"engine_newPayloadV{payload.new_payload_version}"):
-                    payload_response = engine_rpc.new_payload(
-                        *payload.params,
-                        version=payload.new_payload_version,
-                    )
-                    assert payload_response.status == (
-                        PayloadStatusEnum.VALID if payload.valid() else PayloadStatusEnum.INVALID
-                    ), f"unexpected status: {payload_response}"
+                    try:
+                        payload_response = engine_rpc.new_payload(
+                            *payload.params,
+                            version=payload.new_payload_version,
+                        )
+                        assert payload_response.status == (
+                            PayloadStatusEnum.VALID
+                            if payload.valid()
+                            else PayloadStatusEnum.INVALID
+                        ), f"unexpected status: {payload_response}"
+                    except JSONRPCError as e:
+                        if payload.error_code is None:
+                            raise Exception(f"unexpected error: {e.code} - {e.message}") from e
+                        if e.code != payload.error_code:
+                            raise Exception(
+                                f"unexpected error code: {e.code}, expected: {payload.error_code}"
+                            ) from e
+
                 if payload.valid():
                     with payload_timing.time(
                         f"engine_forkchoiceUpdatedV{payload.forkchoice_updated_version}"