From d85b7d27f5142c6f8a4762f615bbc3fcdcb8ea53 Mon Sep 17 00:00:00 2001
From: kclowes <kclowes@users.noreply.github.com>
Date: Fri, 28 May 2021 11:29:32 -0600
Subject: [PATCH] Remove unused middleware

---
 newsfragments/2015.misc.rst         |  1 +
 web3/manager.py                     |  2 --
 web3/middleware/__init__.py         |  3 --
 web3/middleware/normalize_errors.py | 43 -----------------------------
 4 files changed, 1 insertion(+), 48 deletions(-)
 create mode 100644 newsfragments/2015.misc.rst
 delete mode 100644 web3/middleware/normalize_errors.py

diff --git a/newsfragments/2015.misc.rst b/newsfragments/2015.misc.rst
new file mode 100644
index 0000000000..8b30f07493
--- /dev/null
+++ b/newsfragments/2015.misc.rst
@@ -0,0 +1 @@
+Remove unused normalize_errors_middleware
diff --git a/web3/manager.py b/web3/manager.py
index c48299928a..bf21021b5a 100644
--- a/web3/manager.py
+++ b/web3/manager.py
@@ -34,7 +34,6 @@
     buffered_gas_estimate_middleware,
     gas_price_strategy_middleware,
     name_to_address_middleware,
-    normalize_errors_middleware,
     pythonic_middleware,
     request_parameter_normalizer,
     validation_middleware,
@@ -116,7 +115,6 @@ def default_middlewares(
             (name_to_address_middleware(web3), 'name_to_address'),  # Add Async
             (attrdict_middleware, 'attrdict'),  # Delete
             (pythonic_middleware, 'pythonic'),  # Delete
-            (normalize_errors_middleware, 'normalize_errors'),  # Add async
             (validation_middleware, 'validation'),  # Add async
             (abi_middleware, 'abi'),  # Delete
             (buffered_gas_estimate_middleware, 'gas_estimate'),
diff --git a/web3/middleware/__init__.py b/web3/middleware/__init__.py
index 99819f3fc6..baad91b1b6 100644
--- a/web3/middleware/__init__.py
+++ b/web3/middleware/__init__.py
@@ -56,9 +56,6 @@
 from .names import (  # noqa: F401
     name_to_address_middleware,
 )
-from .normalize_errors import (  # noqa: F401
-    normalize_errors_middleware,
-)
 from .normalize_request_parameters import (  # noqa: F401
     request_parameter_normalizer,
 )
diff --git a/web3/middleware/normalize_errors.py b/web3/middleware/normalize_errors.py
deleted file mode 100644
index fce1032446..0000000000
--- a/web3/middleware/normalize_errors.py
+++ /dev/null
@@ -1,43 +0,0 @@
-from typing import (
-    TYPE_CHECKING,
-    Any,
-    Callable,
-)
-
-from eth_utils.toolz import (
-    assoc,
-    dissoc,
-)
-
-from web3.types import (
-    RPCEndpoint,
-    RPCResponse,
-)
-
-if TYPE_CHECKING:
-    from web3 import Web3  # noqa: F401
-
-
-def normalize_errors_middleware(
-    make_request: Callable[[RPCEndpoint, Any], Any], web3: "Web3"
-) -> Callable[[RPCEndpoint, Any], RPCResponse]:
-    def middleware(method: RPCEndpoint, params: Any) -> RPCResponse:
-        result = make_request(method, params)
-
-        # As of v1.8, Geth returns errors when you request a
-        # receipt for a transaction that is not in the chain.
-        # It used to return a result of None, so we simulate the old behavior.
-
-        if method == "eth_getTransactionReceipt" and "error" in result:
-            is_geth = str(web3.clientVersion).startswith("Geth")
-            if is_geth and result["error"]["code"] == -32000:
-                return assoc(
-                    dissoc(result, "error"),
-                    "result",
-                    None,
-                )
-            else:
-                return result
-        else:
-            return result
-    return middleware