Skip to content

feat: optimize with iterators #3652

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 11 commits into
base: main
Choose a base branch
from
Open

feat: optimize with iterators #3652

Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
d4440ea
feat: optimize with iterators
BobTheBuidler May 17, 2025
fd3f03e
Update method_formatters.py
BobTheBuidler May 20, 2025
b7a8f94
Update method_formatters.py
BobTheBuidler May 20, 2025
c9294d1
Update method_formatters.py
BobTheBuidler May 20, 2025
09848ff
Update method_formatters.py
BobTheBuidler May 20, 2025
d551604
Update method_formatters.py
BobTheBuidler May 20, 2025
210fc8f
Update method_formatters.py
BobTheBuidler May 20, 2025
2d71337
Update method_formatters.py
BobTheBuidler May 20, 2025
c8bef1b
Update method_formatters.py
BobTheBuidler May 20, 2025
dccb68a
Update method_formatters.py
BobTheBuidler May 20, 2025
336c615
chore: lint
BobTheBuidler May 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 32 additions & 16 deletions web3/_utils/method_formatters.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
Collection,
Dict,
Iterable,
Iterator,
NoReturn,
Tuple,
TypeVar,
Expand Down Expand Up @@ -35,7 +36,6 @@
is_string,
to_checksum_address,
to_list,
to_tuple,
)
from eth_utils.toolz import (
complement,
Expand Down Expand Up @@ -120,6 +120,29 @@

TValue = TypeVar("TValue")

AnyFilter = Union[
AsyncBlockFilter,
AsyncTransactionFilter,
AsyncLogFilter,
BlockFilter,
TransactionFilter,
LogFilter,
]

TFilter = TypeVar(
"TFilter",
AsyncBlockFilter,
AsyncTransactionFilter,
AsyncLogFilter,
BlockFilter,
TransactionFilter,
LogFilter,
)

FilterResultFormatter = Callable[
[Union["AsyncEth", "Eth"], RPCEndpoint, TValue], TFilter
]


def bytes_to_ascii(value: bytes) -> str:
return codecs.decode(value, "ascii")
Expand Down Expand Up @@ -1094,11 +1117,10 @@ def subscription_formatter(value: Any) -> Union[HexBytes, HexStr, Dict[str, Any]
}


@to_tuple
def combine_formatters(
formatter_maps: Collection[Dict[RPCEndpoint, Callable[..., TReturn]]],
method_name: RPCEndpoint,
) -> Iterable[Callable[..., TReturn]]:
) -> Iterator[Callable[..., TReturn]]:
for formatter_map in formatter_maps:
if method_name in formatter_map:
yield formatter_map[method_name]
Expand Down Expand Up @@ -1194,14 +1216,7 @@ def filter_wrapper(
module: Union["AsyncEth", "Eth"],
method: RPCEndpoint,
filter_id: HexStr,
) -> Union[
AsyncBlockFilter,
AsyncTransactionFilter,
AsyncLogFilter,
BlockFilter,
TransactionFilter,
LogFilter,
]:
) -> AnyFilter:
if method == RPC.eth_newBlockFilter:
if module.is_async:
return AsyncBlockFilter(filter_id, eth_module=cast("AsyncEth", module))
Expand All @@ -1227,19 +1242,20 @@ def filter_wrapper(
)


FILTER_RESULT_FORMATTERS: Dict[RPCEndpoint, Callable[..., Any]] = {
FILTER_RESULT_FORMATTERS: Dict[
RPCEndpoint, FilterResultFormatter[HexStr, AnyFilter]
] = {
RPC.eth_newPendingTransactionFilter: filter_wrapper,
RPC.eth_newBlockFilter: filter_wrapper,
RPC.eth_newFilter: filter_wrapper,
}


@to_tuple
def apply_module_to_formatters(
formatters: Iterable[Callable[..., TReturn]],
formatters: Iterable[FilterResultFormatter[TValue, TFilter]],
module: "Module",
method_name: Union[RPCEndpoint, Callable[..., RPCEndpoint]],
) -> Iterable[Callable[..., TReturn]]:
method_name: RPCEndpoint,
) -> Iterator[Callable[[TValue], TFilter]]:
for f in formatters:
yield partial(f, module, method_name)

Expand Down