Stop passing the whole web3 object around

Author: kclowes

tests/core/utilities/test_construct_event_data_set.py

@@ -69,5 +69,5 @@ def hex_and_pad(i):
     )
 )
 def test_construct_event_data_set(web3, event_abi, arguments, expected):
-    actual = construct_event_data_set(event_abi, web3, arguments)
+    actual = construct_event_data_set(event_abi, web3.codec, arguments)
     assert actual == expected

tests/core/utilities/test_construct_event_filter_params.py

@@ -47,7 +47,7 @@
     ),
 )
 def test_construct_event_filter_params(web3, event_abi, fn_kwargs, expected):
-    _, actual = construct_event_filter_params(event_abi, web3, **fn_kwargs)
+    _, actual = construct_event_filter_params(event_abi, web3.codec, **fn_kwargs)
     assert actual == expected
 
 
@@ -70,5 +70,5 @@ def hex_and_pad(i):
 )
 def test_construct_event_filter_params_for_data_filters(event_abi, web3, fn_kwargs,
                                                         expected):
-    actual, _ = construct_event_filter_params(event_abi, web3, **fn_kwargs)
+    actual, _ = construct_event_filter_params(event_abi, web3.codec, **fn_kwargs)
     assert actual == expected

tests/core/utilities/test_construct_event_topics.py

@@ -76,5 +76,5 @@ def hex_and_pad(i):
     )
 )
 def test_construct_event_topics(web3, event_abi, arguments, expected):
-    actual = construct_event_topic_set(event_abi, web3, arguments)
+    actual = construct_event_topic_set(event_abi, web3.codec, arguments)
     assert actual == expected

web3/_utils/abi.py

@@ -287,16 +287,16 @@ def from_type_str(cls, abi_type, registry):
         )
 
 
-def filter_by_encodability(w3, args, kwargs, contract_abi):
+def filter_by_encodability(abi_encoder, args, kwargs, contract_abi):
     return [
         function_abi
         for function_abi
         in contract_abi
-        if check_if_arguments_can_be_encoded(function_abi, w3, args, kwargs)
+        if check_if_arguments_can_be_encoded(function_abi, abi_encoder, args, kwargs)
     ]
 
 
-def check_if_arguments_can_be_encoded(function_abi, w3, args, kwargs):
+def check_if_arguments_can_be_encoded(function_abi, abi_encoder, args, kwargs):
     try:
         arguments = merge_args_and_kwargs(function_abi, args, kwargs)
     except TypeError:
@@ -311,7 +311,7 @@ def check_if_arguments_can_be_encoded(function_abi, w3, args, kwargs):
         return False
 
     return all(
-        w3.codec.is_encodable(_type, arg)
+        abi_encoder.is_encodable(_type, arg)
         for _type, arg in zip(types, aligned_args)
     )
 

web3/_utils/contracts.py

@@ -69,7 +69,7 @@ def find_matching_event_abi(abi, event_name=None, argument_names=None):
         raise ValueError("Multiple events found")
 
 
-def find_matching_fn_abi(abi, w3, fn_identifier=None, args=None, kwargs=None):
+def find_matching_fn_abi(abi, abi_encoder, fn_identifier=None, args=None, kwargs=None):
     args = args or tuple()
     kwargs = kwargs or dict()
     num_arguments = len(args) + len(kwargs)
@@ -82,7 +82,7 @@ def find_matching_fn_abi(abi, w3, fn_identifier=None, args=None, kwargs=None):
 
     name_filter = functools.partial(filter_by_name, fn_identifier)
     arg_count_filter = functools.partial(filter_by_argument_count, num_arguments)
-    encoding_filter = functools.partial(filter_by_encodability, w3, args, kwargs)
+    encoding_filter = functools.partial(filter_by_encodability, abi_encoder, args, kwargs)
 
     function_candidates = pipe(abi, name_filter, arg_count_filter, encoding_filter)
 
@@ -126,7 +126,7 @@ def find_matching_fn_abi(abi, w3, fn_identifier=None, args=None, kwargs=None):
 def encode_abi(web3, abi, arguments, data=None):
     argument_types = get_abi_input_types(abi)
 
-    if not check_if_arguments_can_be_encoded(abi, web3, arguments, {}):
+    if not check_if_arguments_can_be_encoded(abi, web3.codec, arguments, {}):
         raise TypeError(
             "One or more arguments could not be encoded to the necessary "
             "ABI type.  Expected types are: {0}".format(
@@ -209,7 +209,7 @@ def encode_transaction_data(
         fn_abi, fn_selector, fn_arguments = get_fallback_function_info(contract_abi, fn_abi)
     elif is_text(fn_identifier):
         fn_abi, fn_selector, fn_arguments = get_function_info(
-            fn_identifier, web3, contract_abi, fn_abi, args, kwargs,
+            fn_identifier, web3.codec, contract_abi, fn_abi, args, kwargs,
         )
     else:
         raise TypeError("Unsupported function identifier")
@@ -225,14 +225,14 @@ def get_fallback_function_info(contract_abi=None, fn_abi=None):
     return fn_abi, fn_selector, fn_arguments
 
 
-def get_function_info(fn_name, web3, contract_abi=None, fn_abi=None, args=None, kwargs=None):
+def get_function_info(fn_name, abi_encoder, contract_abi=None, fn_abi=None, args=None, kwargs=None):
     if args is None:
         args = tuple()
     if kwargs is None:
         kwargs = {}
 
     if fn_abi is None:
-        fn_abi = find_matching_fn_abi(contract_abi, web3, fn_name, args, kwargs)
+        fn_abi = find_matching_fn_abi(contract_abi, abi_encoder, fn_name, args, kwargs)
 
     fn_selector = encode_hex(function_abi_to_4byte_selector(fn_abi))
 

web3/_utils/events.py

@@ -61,7 +61,7 @@
 )
 
 
-def construct_event_topic_set(event_abi, web3, arguments=None):
+def construct_event_topic_set(event_abi, abi_encoder, arguments=None):
     if arguments is None:
         arguments = {}
     if isinstance(arguments, (list, tuple)):
@@ -89,7 +89,7 @@ def construct_event_topic_set(event_abi, web3, arguments=None):
     ]
     encoded_args = [
         [
-            None if option is None else encode_hex(web3.codec.encode_single(arg['type'], option))
+            None if option is None else encode_hex(abi_encoder.encode_single(arg['type'], option))
             for option in arg_options]
         for arg, arg_options in zipped_abi_and_args
     ]
@@ -98,7 +98,7 @@ def construct_event_topic_set(event_abi, web3, arguments=None):
     return topics
 
 
-def construct_event_data_set(event_abi, web3, arguments=None):
+def construct_event_data_set(event_abi, abi_encoder, arguments=None):
     if arguments is None:
         arguments = {}
     if isinstance(arguments, (list, tuple)):
@@ -125,7 +125,7 @@ def construct_event_data_set(event_abi, web3, arguments=None):
     ]
     encoded_args = [
         [
-            None if option is None else encode_hex(web3.codec.encode_single(arg['type'], option))
+            None if option is None else encode_hex(abi_encoder.encode_single(arg['type'], option))
             for option in arg_options]
         for arg, arg_options in zipped_abi_and_args
     ]

web3/_utils/filters.py

@@ -31,15 +31,15 @@
 
 
 def construct_event_filter_params(event_abi,
-                                  web3,
+                                  abi_encoder,
                                   contract_address=None,
                                   argument_filters=None,
                                   topics=None,
                                   fromBlock=None,
                                   toBlock=None,
                                   address=None):
     filter_params = {}
-    topic_set = construct_event_topic_set(event_abi, web3, argument_filters)
+    topic_set = construct_event_topic_set(event_abi, abi_encoder, argument_filters)
 
     if topics is not None:
         if len(topic_set) > 1:
@@ -81,7 +81,7 @@ def construct_event_filter_params(event_abi,
     if toBlock is not None:
         filter_params['toBlock'] = toBlock
 
-    data_filters_set = construct_event_data_set(event_abi, web3, argument_filters)
+    data_filters_set = construct_event_data_set(event_abi, abi_encoder, argument_filters)
 
     return data_filters_set, filter_params
 

web3/contract.py

@@ -351,7 +351,7 @@ def encodeABI(cls, fn_name, args=None, kwargs=None, data=None):
         :param data: defaults to function selector
         """
         fn_abi, fn_selector, fn_arguments = get_function_info(
-            fn_name, cls.web3, contract_abi=cls.abi, args=args, kwargs=kwargs,
+            fn_name, cls.web3.codec, contract_abi=cls.abi, args=args, kwargs=kwargs,
         )
 
         if data is None:
@@ -1066,7 +1066,7 @@ def createFilter(
 
         _, event_filter_params = construct_event_filter_params(
             self._get_event_abi(),
-            self.web3,
+            self.web3.codec,
             contract_address=self.address,
             argument_filters=_filters,
             fromBlock=fromBlock,