Convert one last encode_single

Author: kclowes

tests/core/utilities/test_event_filter_builder.py

@@ -40,13 +40,13 @@ def test_match_single_string_type_properties_data_arg(value):
 
 
 @given(st.text())
-def test_match_single_string_type_properties_topic_arg(value):
-    topic_filter = TopicArgumentFilter(arg_type="string")
+def test_match_single_string_type_properties_topic_arg(web3, value):
+    topic_filter = TopicArgumentFilter(arg_type="string", abi_codec=web3.codec)
     topic_filter.match_single(value)
 
 
 @given(st.lists(elements=st.text(), max_size=10, min_size=0))
-def test_match_any_string_type_properties(values):
-    topic_filter = TopicArgumentFilter(arg_type="string")
+def test_match_any_string_type_properties(web3, values):
+    topic_filter = TopicArgumentFilter(arg_type="string", abi_codec=web3.codec)
     topic_filter.match_any(*values)
     assert len(topic_filter.match_values) == len(values)

web3/_utils/events.py

@@ -6,7 +6,6 @@
 import itertools
 
 from eth_abi import (
-    encode_single,
     grammar,
 )
 from eth_typing import (
@@ -268,12 +267,13 @@ class EventFilterBuilder:
     _address = None
     _immutable = False
 
-    def __init__(self, event_abi, formatter=None):
+    def __init__(self, event_abi, abi_codec, formatter=None):
         self.event_abi = event_abi
+        self.abi_codec = abi_codec
         self.formatter = formatter
         self.event_topic = initialize_event_topics(self.event_abi)
         self.args = AttributeDict(
-            _build_argument_filters_from_event_abi(event_abi))
+            _build_argument_filters_from_event_abi(event_abi, abi_codec))
         self._ordered_arg_names = tuple(arg['name'] for arg in event_abi['inputs'])
 
     @property
@@ -376,11 +376,11 @@ def initialize_event_topics(event_abi):
 
 
 @to_dict
-def _build_argument_filters_from_event_abi(event_abi):
+def _build_argument_filters_from_event_abi(event_abi, abi_codec):
     for item in event_abi['inputs']:
         key = item['name']
         if item['indexed'] is True:
-            value = TopicArgumentFilter(arg_type=item['type'])
+            value = TopicArgumentFilter(abi_codec, arg_type=item['type'])
         else:
             value = DataArgumentFilter(arg_type=item['type'])
         yield key, value
@@ -431,6 +431,10 @@ def match_values(self):
 
 
 class TopicArgumentFilter(BaseArgumentFilter):
+    def __init__(self, arg_type, abi_codec):
+        self.abi_codec = abi_codec
+        self.arg_type = arg_type
+
     @to_tuple
     def _get_match_values(self):
         yield from (self._encode(value) for value in self._match_values)
@@ -446,7 +450,7 @@ def _encode(self, value):
         if is_dynamic_sized_type(self.arg_type):
             return to_hex(keccak(encode_single_packed(self.arg_type, value)))
         else:
-            return to_hex(encode_single(self.arg_type, value))
+            return to_hex(self.abi_codec.encode_single(self.arg_type, value))
 
 
 class EventLogErrorFlags(Enum):

web3/contract.py

@@ -1072,7 +1072,7 @@ def createFilter(
             topics=topics,
         )
 
-        filter_builder = EventFilterBuilder(event_abi)
+        filter_builder = EventFilterBuilder(event_abi, self.web3.codec)
         filter_builder.address = event_filter_params.get('address')
         filter_builder.fromBlock = event_filter_params.get('fromBlock')
         filter_builder.toBlock = event_filter_params.get('toBlock')
@@ -1100,6 +1100,7 @@ def createFilter(
     def build_filter(self):
         builder = EventFilterBuilder(
             self._get_event_abi(),
+            self.web3.codec,
             formatter=get_event_data(self.web3.codec, self._get_event_abi()))
         builder.address = self.address
         return builder