Skip to content

Commit 41ef2ca

Browse files
committed
chore: refactor out _apply_request_formatters
1 parent 7bec6f7 commit 41ef2ca

File tree

3 files changed

+8
-28
lines changed

3 files changed

+8
-28
lines changed

tests/core/method-class/test_method.py

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
)
1818
from web3.method import (
1919
Method,
20-
_apply_request_formatters,
2120
default_root_munger,
2221
)
2322
from web3.module import (
@@ -61,11 +60,7 @@ def test_get_formatters_default_formatter_for_falsy_config():
6160
default_result_formatters = method.result_formatters(
6261
method.method_selector_fn(), "some module"
6362
)
64-
assert _apply_request_formatters(["a", "b", "c"], default_request_formatters) == (
65-
"a",
66-
"b",
67-
"c",
68-
)
63+
assert default_request_formatters(["a", "b", "c"]) == ("a", "b", "c")
6964
assert apply_result_formatters(default_result_formatters, ["a", "b", "c"]) == [
7065
"a",
7166
"b",

web3/_utils/method_formatters.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1069,7 +1069,7 @@ def get_request_formatters(
10691069
PYTHONIC_REQUEST_FORMATTERS,
10701070
)
10711071
formatters = combine_formatters(request_formatter_maps, method_name)
1072-
return compose(*formatters)
1072+
return compose(tuple, *formatters)
10731073

10741074

10751075
def raise_block_not_found(params: Tuple[BlockIdentifier, bool]) -> NoReturn:

web3/method.py

Lines changed: 6 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,6 @@
1414
)
1515
import warnings
1616

17-
from eth_utils.curried import (
18-
to_tuple,
19-
)
20-
from eth_utils.toolz import (
21-
pipe,
22-
)
23-
2417
from web3._utils.batching import (
2518
RPC_METHODS_UNSUPPORTED_DURING_BATCH,
2619
)
@@ -56,16 +49,6 @@
5649
Munger = Callable[..., Any]
5750

5851

59-
@to_tuple
60-
def _apply_request_formatters(
61-
params: Any, request_formatters: Dict[RPCEndpoint, Callable[..., TReturn]]
62-
) -> Tuple[Any, ...]:
63-
if request_formatters:
64-
formatted_params = pipe(params, request_formatters)
65-
return formatted_params
66-
return params
67-
68-
6952
def _set_mungers(
7053
mungers: Optional[Sequence[Munger]], is_property: bool
7154
) -> Sequence[Any]:
@@ -232,10 +215,12 @@ def process_params(
232215
get_error_formatters(method),
233216
self.null_result_formatters(method),
234217
)
235-
request = (
236-
method,
237-
_apply_request_formatters(params, self.request_formatters(method)),
238-
)
218+
219+
if request_formatters := self.request_formatters(method):
220+
params = request_formatters(params)
221+
222+
request = method, params
223+
239224
return request, response_formatters
240225

241226

0 commit comments

Comments
 (0)