Replace formatters with eth_utils

tests/core/utilities/test_formatters.py

@@ -2,7 +2,6 @@
 import pytest
 
 from web3._utils.formatters import (
-    apply_formatters_to_dict,
     map_collection,
     recursive_map,
 )
@@ -40,12 +39,3 @@ def test_recursive_collection_cycle():
     data.append(data)
     with pytest.raises(ValueError):
         recursive_map(square_int, data)
-
-
-def test_format_dict_error():
-    with pytest.raises(ValueError) as exc_info:
-        apply_formatters_to_dict(
-            {'myfield': int},
-            {'myfield': 'a'},
-        )
-    assert 'myfield' in str(exc_info.value)

tests/ens/conftest.py

@@ -103,7 +103,7 @@ def ens_setup():
     # ** Set up ENS contracts **
 
     # remove account that creates ENS, so test transactions don't have write access
-    accounts = w3.eth.accounts
+    accounts = list(w3.eth.accounts)
     ens_key = accounts.pop()
 
     # create ENS contract

web3/_utils/datatypes.py

@@ -1,4 +1,7 @@
-import web3._utils.formatters
+from eth_utils import (
+    apply_formatters_to_dict,
+)
+
 from web3._utils.toolz import (
     concat,
 )
@@ -27,7 +30,7 @@ def __new__(mcs, name, bases, namespace, normalizers=None):
             verify_attr(name, key, all_keys)
 
         if normalizers:
-            processed_namespace = web3._utils.formatters.apply_formatters_to_dict(
+            processed_namespace = apply_formatters_to_dict(
                 normalizers,
                 namespace,
             )

web3/_utils/events.py

@@ -18,16 +18,16 @@
     to_hex,
     to_tuple,
 )
+from eth_utils.curried import (
+    apply_formatter_if,
+)
 
 import web3
 from web3._utils.encoding import (
     encode_single_packed,
     hexstr_if_str,
     to_bytes,
 )
-from web3._utils.formatters import (
-    apply_formatter_if,
-)
 from web3._utils.normalizers import (
     BASE_RETURN_NORMALIZERS,
 )

web3/_utils/filters.py

@@ -10,13 +10,13 @@
     is_string,
     is_text,
 )
+from eth_utils.curried import (
+    apply_formatter_if,
+)
 from hexbytes import (
     HexBytes,
 )
 
-from web3._utils.formatters import (
-    apply_formatter_if,
-)
 from web3._utils.threads import (
     TimerClass,
 )

web3/_utils/formatters.py

@@ -4,11 +4,12 @@
 )
 
 from eth_utils import (
-    is_dict,
     is_list_like,
     is_string,
     to_dict,
-    to_list,
+)
+from eth_utils.curried import (
+    apply_formatter_at_index,
 )
 
 from web3._utils.decorators import (
@@ -28,21 +29,6 @@ def hex_to_integer(value):
 integer_to_hex = hex
 
 
-@curry
-@to_list
-def apply_formatter_at_index(formatter, at_index, value):
-    if at_index + 1 > len(value):
-        raise IndexError(
-            "Not enough values in iterable to apply formatter.  Got: {0}. "
-            "Need: {1}".format(len(value), at_index + 1)
-        )
-    for index, item in enumerate(value):
-        if index == at_index:
-            yield formatter(item)
-        else:
-            yield item
-
-
 def apply_formatters_to_args(*formatters):
     return compose(*(
         apply_formatter_at_index(formatter, index)
@@ -51,43 +37,6 @@ def apply_formatters_to_args(*formatters):
     ))
 
 
-@curry
-def apply_formatter_if(condition, formatter, value):
-    if condition(value):
-        return formatter(value)
-    else:
-        return value
-
-
-@curry
-@to_dict
-def apply_formatters_to_dict(formatters, value):
-    for key, item in value.items():
-        if key in formatters:
-            try:
-                yield key, formatters[key](item)
-            except (TypeError, ValueError) as exc:
-                raise type(exc)("Could not format value %r as field %r" % (item, key)) from exc
-        else:
-            yield key, item
-
-
-@curry
-@to_list
-def apply_formatter_to_array(formatter, value):
-    for item in value:
-        yield formatter(item)
-
-
-@curry
-def apply_one_of_formatters(formatter_condition_pairs, value):
-    for formatter, condition in formatter_condition_pairs:
-        if condition(value):
-            return formatter(value)
-    else:
-        raise ValueError("The provided value did not satisfy any of the formatter conditions")
-
-
 def map_collection(func, collection):
     '''
     Apply func to each element of a collection, or value of a dictionary.
@@ -128,16 +77,6 @@ def inner(*args, **kwargs):
     return inner
 
 
-@curry
-@to_dict
-def apply_key_map(key_mappings, value):
-    for key, item in value.items():
-        if key in key_mappings:
-            yield key_mappings[key], item
-        else:
-            yield key, item
-
-
 def is_array_of_strings(value):
     if not is_list_like(value):
         return False

web3/_utils/method_formatters.py

@@ -2,6 +2,11 @@
 import operator
 
 from eth_utils.curried import (
+    apply_formatter_at_index,
+    apply_formatter_if,
+    apply_formatter_to_array,
+    apply_formatters_to_dict,
+    apply_one_of_formatters,
     combine_argument_formatters,
     is_address,
     is_bytes,
@@ -32,11 +37,6 @@
     to_hex,
 )
 from web3._utils.formatters import (
-    apply_formatter_at_index,
-    apply_formatter_if,
-    apply_formatter_to_array,
-    apply_formatters_to_dict,
-    apply_one_of_formatters,
     hex_to_integer,
     integer_to_hex,
     is_array_of_dicts,
@@ -190,10 +190,11 @@ def is_attrdict(val):
     'receiptsRoot': to_hexbytes(32),
     'stateRoot': to_hexbytes(32),
     'totalDifficulty': to_integer_if_hex,
-    'transactions': apply_one_of_formatters((
-        (apply_formatter_to_array(transaction_formatter), is_array_of_dicts),
-        (apply_formatter_to_array(to_hexbytes(32)), is_array_of_strings),
-    )),
+    'transactions': apply_one_of_formatters(
+        (
+            (is_array_of_dicts, apply_formatter_to_array(transaction_formatter)),
+            (is_array_of_strings, apply_formatter_to_array(to_hexbytes(32))),
+        )),
     'transactionsRoot': to_hexbytes(32),
 }
 
@@ -251,8 +252,8 @@ def is_attrdict(val):
 
 
 filter_result_formatter = apply_one_of_formatters((
-    (apply_formatter_to_array(log_entry_formatter), is_array_of_dicts),
-    (apply_formatter_to_array(to_hexbytes(32)), is_array_of_strings),
+    (is_array_of_dicts, apply_formatter_to_array(log_entry_formatter)),
+    (is_array_of_strings, apply_formatter_to_array(to_hexbytes(32))),
 ))
 
 TRANSACTION_PARAM_FORMATTERS = {
@@ -300,8 +301,8 @@ def is_attrdict(val):
         block_number_formatter,
     ),
     'eth_estimateGas': apply_one_of_formatters((
-        (estimate_gas_without_block_id, is_length(1)),
-        (estimate_gas_with_block_id, is_length(2)),
+        (is_length(1), estimate_gas_without_block_id),
+        (is_length(2), estimate_gas_with_block_id),
     )),
     'eth_sendTransaction': apply_formatter_at_index(transaction_param_formatter, 0),
     # personal

web3/_utils/rpc_abi.py

@@ -1,13 +1,13 @@
 from eth_utils import (
     to_dict,
 )
+from eth_utils.curried import (
+    apply_formatter_at_index,
+)
 
 from web3._utils.abi import (
     map_abi_data,
 )
-from web3._utils.formatters import (
-    apply_formatter_at_index,
-)
 from web3._utils.toolz import (
     curry,
 )

web3/_utils/validation.py

@@ -13,6 +13,9 @@
     is_list_like,
     is_string,
 )
+from eth_utils.curried import (
+    apply_formatter_to_array,
+)
 from eth_utils.hexadecimal import (
     encode_hex,
 )
@@ -31,9 +34,6 @@
     length_of_array_type,
     sub_type_of_array_type,
 )
-from web3._utils.formatters import (
-    apply_formatter_to_array,
-)
 from web3._utils.toolz import (
     compose,
     groupby,

web3/middleware/signing.py

@@ -15,10 +15,10 @@
 from eth_utils import (
     to_dict,
 )
-
-from web3._utils.formatters import (
+from eth_utils.curried import (
     apply_formatter_if,
 )
+
 from web3._utils.method_formatters import (
     STANDARD_NORMALIZERS,
 )

web3/providers/eth_tester/defaults.py

@@ -14,9 +14,12 @@
     is_null,
     keccak,
 )
+from eth_utils.curried import (
+    apply_formatter_if,
+)
 
 from web3._utils.formatters import (
-    apply_formatter_if,
+    static_return,
 )
 from web3._utils.toolz import (
     compose,
@@ -57,12 +60,6 @@ def preprocess_params(eth_tester, params, preprocessor_fn):
     return eth_tester, preprocessor_fn(params)
 
 
-def static_return(value):
-    def inner(*args, **kwargs):
-        return value
-    return inner
-
-
 def client_version(eth_tester, params):
     # TODO: account for the backend that is in use.
     from eth_tester import __version__

web3/providers/eth_tester/middleware.py

@@ -5,13 +5,15 @@
     is_hex,
     is_string,
 )
-
-from web3._utils.formatters import (
+from eth_utils.curried import (
     apply_formatter_if,
     apply_formatter_to_array,
-    apply_formatters_to_args,
     apply_formatters_to_dict,
     apply_key_map,
+)
+
+from web3._utils.formatters import (
+    apply_formatters_to_args,
     hex_to_integer,
     integer_to_hex,
     is_array_of_dicts,