fix

Author: BobTheBuidler

faster_web3/_utils/events.py

@@ -9,6 +9,7 @@
 from typing import (
     TYPE_CHECKING,
     Any,
+    Callable,
     Collection,
     Dict,
     Final,
@@ -337,7 +338,7 @@ def __init__(
         self,
         event_abi: ABIEvent,
         abi_codec: ABICodec,
-        formatter: Optional[EventData] = None,
+        formatter: Optional[Callable[[LogReceipt], LogReceipt]] = None,
     ) -> None:
         self.event_abi: Final = event_abi
         self.abi_codec: Final = abi_codec
@@ -408,7 +409,7 @@ def data_args(self) -> Tuple[Any, ...]:
         return tuple(filter(is_not_indexed, self.ordered_args))
 
     @property
-    def topics(self) -> List[HexStr]:
+    def topics(self) -> Tuple[HexStr, ...]:
         arg_topics = tuple(arg.match_values for arg in self.indexed_args)
         return normalize_topic_list(cons(to_hex(self.event_topic), arg_topics))
 

faster_web3/_utils/filters.py

@@ -238,7 +238,7 @@ class LogFilter(Filter):
     data_filter_set = None
     data_filter_set_regex = None
     data_filter_set_function = None
-    log_entry_formatter = None
+    log_entry_formatter: Optional[Callable[[LogReceipt], LogReceipt]] = None
     filter_params: Optional[FilterParams] = None
     builder: Optional[EventFilterBuilder] = None
 
@@ -252,9 +252,8 @@ def __init__(self, *args: Any, **kwargs: Any) -> None:
         super().__init__(*args, **kwargs)
 
     def format_entry(self, entry: LogReceipt) -> LogReceipt:
-        if self.log_entry_formatter:
-            return self.log_entry_formatter(entry)
-        return entry
+        formatter = self.log_entry_formatter
+        return formatter(entry) if formatter else entry
 
     def set_data_filters(
         self, data_filter_set: Collection[Tuple[TypeStr, Any]]