Change RPCResponse type to only allow an RPCError

Author: kclowes

conftest.py

@@ -1,4 +1,3 @@
-import os
 import pytest
 import time
 import warnings

newsfragments/validate_files.py

@@ -3,7 +3,6 @@
 # Towncrier silently ignores files that do not match the expected ending.
 # We use this script to ensure we catch these as errors in CI.
 
-import os
 import pathlib
 import sys
 

web3/exceptions.py

@@ -197,6 +197,6 @@ class InvalidEventABI(ValueError):
 class InvalidParityMode(TypeError, ValueError):
     # Inherits from TypeError for backwards compatibility
     """
-    Raised when web3.parity.setMode() is called with no args
+    Raised when web3.parity.setMode() is called with no or invalid args
     """
     pass

web3/module.py

@@ -99,4 +99,5 @@ def __init__(self, web3: "Web3") -> None:
             self.retrieve_caller_fn = retrieve_async_method_call_fn(web3, self)
         else:
             self.retrieve_caller_fn = retrieve_blocking_method_call_fn(web3, self)
+        # TODO - remove once web3 calls are moved to middleware
         self.web3 = web3

web3/parity.py

@@ -170,7 +170,7 @@ def list_storage_keys_munger(
     )
 
     def trace_replay_transaction_munger(
-        self, block_identifier: _Hash32, mode: ParityTraceMode=['trace']
+        self, block_identifier: Union[_Hash32, BlockIdentifier], mode: ParityTraceMode=['trace']
     ) -> Tuple[Union[BlockIdentifier, _Hash32], ParityTraceMode]:
         return (block_identifier, mode)
 
@@ -179,14 +179,9 @@ def trace_replay_transaction_munger(
         mungers=[trace_replay_transaction_munger],
     )
 
-    def trace_replay_block_transactions_munger(
-        self, block_identifier: BlockIdentifier, mode: ParityTraceMode=['trace']
-    ) -> Tuple[BlockIdentifier, ParityTraceMode]:
-        return (block_identifier, mode)
-
     traceReplayBlockTransactions: Method[Callable[..., List[ParityBlockTrace]]] = Method(
         RPC.trace_replayBlockTransactions,
-        mungers=[trace_replay_block_transactions_munger]
+        mungers=[trace_replay_transaction_munger]
     )
 
     traceBlock: Method[Callable[[BlockIdentifier], List[ParityBlockTrace]]] = Method(

web3/providers/eth_tester/main.py

@@ -14,6 +14,7 @@
 )
 from web3.types import (
     RPCEndpoint,
+    RPCError,
     RPCResponse,
 )
 
@@ -87,16 +88,18 @@ def make_request(self, method: RPCEndpoint, params: Any) -> RPCResponse:
         try:
             delegator = self.api_endpoints[namespace][endpoint]
         except KeyError:
-            return RPCResponse({
-                "error": "Unknown RPC Endpoint: {0}".format(method),
-            })
-
+            return RPCResponse(
+                {"error": RPCError({"message": f"Unknown RPC Endpoint: {method}", "code": -32600})}
+            )
         try:
             response = delegator(self.ethereum_tester, params)
         except NotImplementedError:
-            return RPCResponse({
-                "error": "RPC Endpoint has not been implemented: {0}".format(method),
-            })
+            return RPCResponse(
+                {"error": RPCError({
+                    "message": f"RPC Endpoint has not been implemented: {method}",
+                    "code": -32600,
+                })}
+            )
         else:
             return {
                 'result': response,

web3/types.py

@@ -119,7 +119,7 @@ class RPCError(TypedDict):
 
 
 class RPCResponse(TypedDict, total=False):
-    error: Union[RPCError, str]
+    error: RPCError
     id: int
     jsonrpc: Literal["2.0"]
     result: Any