Changes from comments on PR #3483

Author: fselmo

tests/core/caching-utils/test_request_caching.py

@@ -240,7 +240,8 @@ def test_blocknum_validation_against_validation_threshold_when_caching(
     ):
         assert len(w3.provider._request_cache.items()) == 0
         w3.manager.request_blocking(endpoint, [blocknum, False])
-        assert len(w3.provider._request_cache.items()) == int(should_cache)
+        cached_items = len(w3.provider._request_cache.items())
+        assert cached_items == 1 if should_cache else cached_items == 0
 
 
 @pytest.mark.parametrize(
@@ -281,7 +282,8 @@ def test_block_id_param_caching(
     ):
         assert len(w3.provider._request_cache.items()) == 0
         w3.manager.request_blocking(RPCEndpoint(endpoint), [block_id, False])
-        assert len(w3.provider._request_cache.items()) == int(should_cache)
+        cached_items = len(w3.provider._request_cache.items())
+        assert cached_items == 1 if should_cache else cached_items == 0
 
 
 @pytest.mark.parametrize(
@@ -530,7 +532,8 @@ async def test_async_blocknum_validation_against_validation_threshold(
     ):
         assert len(async_w3.provider._request_cache.items()) == 0
         await async_w3.manager.coro_request(endpoint, [blocknum, False])
-        assert len(async_w3.provider._request_cache.items()) == int(should_cache)
+        cached_items = len(async_w3.provider._request_cache.items())
+        assert cached_items == 1 if should_cache else cached_items == 0
 
 
 @pytest.mark.asyncio
@@ -572,7 +575,8 @@ async def test_async_block_id_param_caching(
     ):
         assert len(async_w3.provider._request_cache.items()) == 0
         await async_w3.manager.coro_request(RPCEndpoint(endpoint), [block_id, False])
-        assert len(async_w3.provider._request_cache.items()) == int(should_cache)
+        cached_items = len(async_w3.provider._request_cache.items())
+        assert cached_items == 1 if should_cache else cached_items == 0
 
 
 @pytest.mark.asyncio

web3/_utils/caching/caching_utils.py

@@ -1,3 +1,6 @@
+from asyncio import (
+    iscoroutinefunction,
+)
 import collections
 import hashlib
 import threading
@@ -31,7 +34,6 @@
 from web3._utils.caching.request_caching_validation import (
     UNCACHEABLE_BLOCK_IDS,
     always_cache_request,
-    async_always_cache_request,
     async_validate_blockhash_in_params,
     async_validate_blocknum_in_params,
     async_validate_blocknum_in_result,
@@ -197,13 +199,13 @@ def wrapper(
 
 # -- async -- #
 
-ASYNC_INTERNAL_VALIDATION_MAP: Dict[
-    "RPCEndpoint",
-    Callable[
-        [ASYNC_PROVIDER_TYPE, Sequence[Any], Dict[str, Any]], Coroutine[Any, Any, bool]
-    ],
-] = {
-    **{endpoint: async_always_cache_request for endpoint in ALWAYS_CACHE},
+ASYNC_VALIDATOR_TYPE = Callable[
+    ["AsyncBaseProvider", Sequence[Any], Dict[str, Any]],
+    Union[bool, Coroutine[Any, Any, bool]],
+]
+
+ASYNC_INTERNAL_VALIDATION_MAP: Dict["RPCEndpoint", ASYNC_VALIDATOR_TYPE] = {
+    **{endpoint: always_cache_request for endpoint in ALWAYS_CACHE},
     **{endpoint: async_validate_blocknum_in_params for endpoint in BLOCKNUM_IN_PARAMS},
     **{endpoint: async_validate_blocknum_in_result for endpoint in BLOCKNUM_IN_RESULT},
     **{
@@ -225,7 +227,12 @@ async def _async_should_cache_response(
         method in ASYNC_INTERNAL_VALIDATION_MAP
         and provider.request_cache_validation_threshold is not None
     ):
-        return await ASYNC_INTERNAL_VALIDATION_MAP[method](provider, params, result)
+        cache_validator = ASYNC_INTERNAL_VALIDATION_MAP[method]
+        return (
+            await cache_validator(provider, params, result)
+            if iscoroutinefunction(cache_validator)
+            else cache_validator(provider, params, result)
+        )
     return True
 
 

web3/_utils/caching/request_caching_validation.py

@@ -82,10 +82,6 @@ def validate_blockhash_in_params(
 # -- async -- #
 
 
-async def async_always_cache_request(*_args: Any, **_kwargs: Any) -> bool:
-    return True
-
-
 async def async_is_beyond_validation_threshold(
     provider: ASYNC_PROVIDER_TYPE, blocknum: int
 ) -> bool: