Small refactor for readability; fix test case

Author: fselmo

tests/core/manager/test_response_formatters.py

@@ -84,7 +84,9 @@
 )
 ERROR_RESPONSE_INVALID_ID = merge(VALID_ERROR_RESPONSE, {"id": b"invalid"})
 
-ERROR_RESPONSE_INVALID_CODE = merge(VALID_ERROR_RESPONSE, {"error": {"code": "-32601"}})
+ERROR_RESPONSE_INVALID_CODE = merge(
+    VALID_ERROR_RESPONSE, {"error": {"code": "-32601", "message": ""}}
+)
 ERROR_RESPONSE_INVALID_MISSING_CODE = merge(
     VALID_ERROR_RESPONSE, {"error": {"message": "msg"}}
 )

web3/manager.py

@@ -204,6 +204,13 @@ def _validate_response(
                 "JSON-RPC 2.0 specification.",
             )
 
+        # errors must include a message
+        error_message = error.get("message")
+        if not isinstance(error_message, str):
+            _raise_bad_response_format(
+                response, 'error["message"] is required and must be a string value.'
+            )
+
         # errors must include an integer code
         code = error.get("code")
         if not isinstance(code, int):
@@ -220,15 +227,7 @@ def _validate_response(
                     "currently enabled."
                 ),
             )
-
-        # errors must include a message
-        error_message = error.get("message")
-        if not isinstance(error_message, str):
-            _raise_bad_response_format(
-                response, 'error["message"] is required and must be a string value.'
-            )
-
-        if any(
+        elif any(
             # parse specific timeout messages
             timeout_str in error_message.lower()
             for timeout_str in KNOWN_REQUEST_TIMEOUT_MESSAGING