Additional tests

tests/core/manager/test_response_formatters.py

@@ -28,6 +28,14 @@
 }
 NONE_RESPONSE = {"jsonrpc": "2.0", "id": 1, "result": None}
 ZERO_X_RESPONSE = {"jsonrpc": "2.0", "id": 1, "result": "0x"}
+INVALID_JSONRPC_RESP_FORMAT = {
+    "jsonrpc": "999",
+    "error": {
+        "code": -32000,
+        "message": "Requested block number is in a range that is not available yet, "
+        "because the ancient block sync is still in progress.",
+    },
+}
 UNEXPECTED_RESPONSE_FORMAT = {"jsonrpc": "2.0", "id": 1}
 ANOTHER_UNEXPECTED_RESP_FORMAT = {
     "name": "LimitError",
@@ -50,6 +58,13 @@
         "available",
     },
 }
+MISSING_CODE_RESP_FORMAT = {
+    "jsonrpc": "2.0",
+    "error": {
+        "message": "the method eth_getTransactionByHash does not exist/is not "
+        "available",
+    },
+}
 INVALID_MESSAGE_RESP_FORMAT = {
     "jsonrpc": "2.0",
     "error": {
@@ -185,21 +200,33 @@ def test_formatted_response_raises_errors(
             TransactionNotFound,
             "Transaction with hash: '0x01' not found.",
         ),
+        (
+            INVALID_JSONRPC_RESP_FORMAT,
+            (),
+            identity,
+            identity,
+            BadResponseFormat,
+            f"The response was in an unexpected format and unable to be parsed. "
+            f'The "jsonrpc" field must be present with a value of "2.0". '
+            f"The raw response is: {INVALID_JSONRPC_RESP_FORMAT}",
+        ),
         (
             UNEXPECTED_RESPONSE_FORMAT,
             (),
             identity,
             identity,
             BadResponseFormat,
-            f"The response was in an unexpected format and unable to be parsed. The raw response is: {UNEXPECTED_RESPONSE_FORMAT}",  # noqa: E501
+            f"The response was in an unexpected format and unable to be parsed. "
+            f"The raw response is: {UNEXPECTED_RESPONSE_FORMAT}",
         ),
         (
             ANOTHER_UNEXPECTED_RESP_FORMAT,
             (),
             identity,
             identity,
             BadResponseFormat,
-            f"The response was in an unexpected format and unable to be parsed. The raw response is: {ANOTHER_UNEXPECTED_RESP_FORMAT}",  # noqa: E501
+            f"The response was in an unexpected format and unable to be parsed. "
+            f"The raw response is: {ANOTHER_UNEXPECTED_RESP_FORMAT}",
         ),
         (
             INVALID_CODE_RESP_FORMAT,
@@ -209,10 +236,22 @@ def test_formatted_response_raises_errors(
             BadResponseFormat,
             re.escape(
                 f"The response was in an unexpected format and unable to be parsed. "
-                f"The error is: error['code'] must be an integer. "
+                f"error['code'] must be an integer. "
                 f"The raw response is: {INVALID_CODE_RESP_FORMAT}"
             ),
         ),
+        (
+            MISSING_CODE_RESP_FORMAT,
+            (),
+            identity,
+            identity,
+            BadResponseFormat,
+            re.escape(
+                f"The response was in an unexpected format and unable to be parsed. "
+                f"error['code'] must be an integer. "
+                f"The raw response is: {MISSING_CODE_RESP_FORMAT}"
+            ),
+        ),
         (
             INVALID_MESSAGE_RESP_FORMAT,
             (),
@@ -221,7 +260,7 @@ def test_formatted_response_raises_errors(
             BadResponseFormat,
             re.escape(
                 f"The response was in an unexpected format and unable to be parsed. "
-                f"The error is: error['message'] must be a string, integer or null. "
+                f"error['message'] must be a string. "
                 f"The raw response is: {INVALID_MESSAGE_RESP_FORMAT}"
             ),
         ),

tests/core/utilities/test_method_formatters.py

@@ -8,13 +8,15 @@
     RPC,
 )
 from web3.exceptions import (
+    ContractCustomError,
     ContractLogicError,
+    ContractPanicError,
+    OffchainLookup,
 )
 from web3.types import (
     RPCResponse,
 )
 
-# OpenEthereum/default case:
 REVERT_WITH_MSG = RPCResponse(
     {
         "jsonrpc": "2.0",
@@ -45,6 +47,42 @@
     }
 )
 
+OFFCHAIN_LOOKUP_ERROR = RPCResponse(
+    {
+        "jsonrpc": "2.0",
+        "error": {
+            "code": -32601,
+            # keccak hash for OffchainLookup(address,string[],bytes,bytes4,bytes)
+            "data": "0x556f18302ad20acabcb7abd78e46143543eff9de9c87236fb097a1398d41115e",  # noqa: E501
+        },
+        "id": 1,
+    }
+)
+
+SOLIDITY_PANIC_ERROR = RPCResponse(
+    {
+        "jsonrpc": "2.0",
+        "error": {
+            "code": -32601,
+            # keccak hash for Panic("0x00")
+            "data": "0x8d38ad3815d96c20b434751afbfc963108fb93355287c65ea179f470d074b982",  # noqa: E501
+        },
+        "id": 1,
+    }
+)
+
+SOLIDITY_CUSTOM_ERROR = RPCResponse(
+    {
+        "jsonrpc": "2.0",
+        "error": {
+            "code": -32601,
+            # keccak hash for Error("There was a custom error")
+            "data": "0x1fbc1b4970cb0e8bb59e70ff5ba55ce3575f3befbabf16fd7111ab7ab5cd1a84",  # noqa: E501
+        },
+        "id": 1,
+    }
+)
+
 OTHER_ERROR = RPCResponse(
     {
         "jsonrpc": "2.0",
@@ -181,6 +219,24 @@ def test_get_revert_reason(response, expected) -> None:
         raise_contract_logic_error_on_revert(response)
 
 
+def test_get_revert_reason_offchain_lookup_error() -> None:
+    data = OFFCHAIN_LOOKUP_ERROR["error"]["data"]
+    with pytest.raises(OffchainLookup, match=data):
+        raise_contract_logic_error_on_revert(OFFCHAIN_LOOKUP_ERROR)
+
+
+def test_get_revert_reason_solidity_panic_error() -> None:
+    with pytest.raises(ContractPanicError, match=SOLIDITY_PANIC_ERROR["error"]["data"]):
+        raise_contract_logic_error_on_revert(SOLIDITY_PANIC_ERROR)
+
+
+def test_get_revert_reason_solidity_custom_error() -> None:
+    with pytest.raises(
+        ContractCustomError, match=SOLIDITY_CUSTOM_ERROR["error"]["data"]
+    ):
+        raise_contract_logic_error_on_revert(SOLIDITY_CUSTOM_ERROR)
+
+
 def test_get_revert_reason_other_error() -> None:
     assert raise_contract_logic_error_on_revert(OTHER_ERROR) is OTHER_ERROR