fix: issue where NotImplmeneted error was not raised

src/ape_ethereum/provider.py

@@ -1,4 +1,5 @@
 import os
+import re
 import sys
 import time
 from abc import ABC
@@ -958,6 +959,16 @@ def _make_request(self, endpoint: str, parameters: Optional[List] = None) -> Any
             message = (
                 error["message"] if isinstance(error, dict) and "message" in error else str(error)
             )
+
+            if (
+                "does not exist/is not available" in str(message)
+                or re.match(r"Method .*?not found", message)
+                or message.startswith("Unknown RPC Endpoint")
+            ):
+                raise APINotImplementedError(
+                    f"RPC method '{endpoint}' is not implemented by this node instance."
+                )
+
             raise ProviderError(message)
 
         elif "result" in result:
@@ -1252,18 +1263,6 @@ def _get_contract_creation_receipt(self, address: AddressType) -> Optional[Recei
 
         return None
 
-    def _make_request(self, endpoint: str, parameters: Optional[List] = None) -> Any:
-        parameters = parameters or []
-        try:
-            return super()._make_request(endpoint, parameters)
-        except ProviderError as err:
-            if "does not exist/is not available" in str(err):
-                raise APINotImplementedError(
-                    f"RPC method '{endpoint}' is not implemented by this node instance."
-                ) from err
-
-            raise  # Original error
-
     def _stream_request(self, method: str, params: List, iter_path="result.item"):
         payload = {"jsonrpc": "2.0", "id": 1, "method": method, "params": params}
         results = ijson.sendable_list()

tests/functional/geth/test_provider.py

@@ -6,6 +6,7 @@
 from hexbytes import HexBytes
 
 from ape.exceptions import (
+    APINotImplementedError,
     BlockNotFoundError,
     NetworkMismatchError,
     TransactionError,
@@ -308,3 +309,11 @@ def test_network_choice_when_custom(geth_provider):
         geth_provider.network.name = name
 
     assert actual == "http://127.0.0.1:5550"
+
+
+def test_make_request_not_exists(geth_provider):
+    with pytest.raises(
+        APINotImplementedError,
+        match="RPC method 'ape_thisDoesNotExist' is not implemented by this node instance.",
+    ):
+        geth_provider._make_request("ape_thisDoesNotExist")

tests/functional/test_provider.py

@@ -9,6 +9,7 @@
 from web3.exceptions import ContractPanicError
 
 from ape.exceptions import (
+    APINotImplementedError,
     BlockNotFoundError,
     ContractLogicError,
     ProviderError,
@@ -342,3 +343,34 @@ def test_network_choice_when_custom(eth_tester_provider):
             _ = eth_tester_provider.network_choice
     finally:
         eth_tester_provider.network.name = name
+
+
+def test_make_request_not_exists(eth_tester_provider):
+    with pytest.raises(
+        APINotImplementedError,
+        match="RPC method 'ape_thisDoesNotExist' is not implemented by this node instance.",
+    ):
+        eth_tester_provider._make_request("ape_thisDoesNotExist")
+
+
+@pytest.mark.parametrize("msg", ("Method not found", "Method ape_thisDoesNotExist not found"))
+def test_make_request_not_exists_dev_nodes(eth_tester_provider, mock_web3, msg):
+    """
+    Simulate what *most* of the dev providers do, like hardhat, anvil, and ganache.
+    """
+    real_web3 = eth_tester_provider._web3
+    mock_web3.eth = real_web3.eth
+    eth_tester_provider._web3 = mock_web3
+
+    def custom_make_request(rpc, params):
+        if rpc == "ape_thisDoesNotExist":
+            return {"error": {"message": msg}}
+
+        return real_web3.make_request(rpc, params)
+
+    mock_web3.provider.make_request.side_effect = custom_make_request
+    with pytest.raises(
+        APINotImplementedError,
+        match="RPC method 'ape_thisDoesNotExist' is not implemented by this node instance.",
+    ):
+        eth_tester_provider._make_request("ape_thisDoesNotExist")