Fix tests related to attribute dict formatter changes

- fix test_process_params to expect one result formatter
- add attribute dict middlewares to sync and async local filter middleware tests
- add attrdict middleware check to async http provider test

Author: fselmo

tests/core/method-class/test_method.py

@@ -337,11 +337,11 @@ def test_process_params(
             object(), *args, **kwargs
         )
         assert request_params == expected_request_result
-        first_formatter = (output_formatter[0].first,)
-        all_other_formatters = output_formatter[0].funcs
 
-        # the expected result formatters length is 2
-        assert len(first_formatter + all_other_formatters) == 2
+        first_formatter = (output_formatter[0],)
+
+        # the expected result formatters length is 1
+        assert len(first_formatter) == 1
 
 
 def keywords(module, keyword_one, keyword_two):

tests/core/middleware/test_filter_middleware.py

@@ -15,8 +15,10 @@
     AsyncEth,
 )
 from web3.middleware import (
+    async_attrdict_middleware,
     async_construct_result_generator_middleware,
     async_local_filter_middleware,
+    attrdict_middleware,
     construct_result_generator_middleware,
     local_filter_middleware,
 )
@@ -105,6 +107,7 @@ def w3_base():
 @pytest.fixture(scope="function")
 def w3(w3_base, result_generator_middleware):
     w3_base.middleware_onion.add(result_generator_middleware)
+    w3_base.middleware_onion.add(attrdict_middleware)
     w3_base.middleware_onion.add(local_filter_middleware)
     return w3_base
 
@@ -284,6 +287,7 @@ def async_w3_base():
 @pytest.fixture(scope="function")
 def async_w3(async_w3_base, async_result_generator_middleware):
     async_w3_base.middleware_onion.add(async_result_generator_middleware)
+    async_w3_base.middleware_onion.add(async_attrdict_middleware)
     async_w3_base.middleware_onion.add(async_local_filter_middleware)
     return async_w3_base
 

tests/core/providers/test_async_http_provider.py

@@ -20,6 +20,7 @@
     Geth,
 )
 from web3.middleware import (
+    async_attrdict_middleware,
     async_buffered_gas_estimate_middleware,
     async_gas_price_strategy_middleware,
     async_validation_middleware,
@@ -63,12 +64,13 @@ def test_web3_with_async_http_provider_has_default_middlewares_and_modules() ->
 
     # the following length check should fail and will need to be added to once more
     # async middlewares are added to the defaults
-    assert len(async_w3.middleware_onion.middlewares) == 3
+    assert len(async_w3.middleware_onion.middlewares) == 4
 
     assert (
         async_w3.middleware_onion.get("gas_price_strategy")
         == async_gas_price_strategy_middleware
     )
+    assert async_w3.middleware_onion.get("attrdict") == async_attrdict_middleware
     assert async_w3.middleware_onion.get("validation") == async_validation_middleware
     assert (
         async_w3.middleware_onion.get("gas_estimate")

web3/_utils/method_formatters.py

@@ -152,14 +152,14 @@ def is_attrdict(val: Any) -> bool:
     return isinstance(val, AttributeDict)
 
 
-not_attrdict = complement(is_attrdict)
-
-
 @curry
 def type_aware_apply_formatters_to_dict(
     formatters: Formatters,
     value: Union[AttributeDict[str, Any], Dict[str, Any]],
 ) -> Union[ReadableAttributeDict[str, Any], Dict[str, Any]]:
+    """
+    Preserve ``AttributeDict`` types if original ``value`` was an ``AttributeDict``.
+    """
     formatted_dict: Dict[str, Any] = apply_formatters_to_dict(formatters, dict(value))
     return (
         AttributeDict.recursive(formatted_dict)