Skip to content

Commit c4df8a3

Browse files
kcloweskclowes
committed
CamelCase params
1 parent 5ce73b0 commit c4df8a3

8 files changed

+53
-61
lines changed

‎tests/core/contracts/test_extracting_event_data.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -730,7 +730,7 @@ def test_single_log_processing_with_errors(indexed_event_contract, dup_txn_recei
730730

731731

732732
def test_get_all_entries_with_nested_tuple_event(w3, emitter):
733-
struct_args_filter = emitter.events.LogStructArgs.create_filter(from_block=0)
733+
struct_args_filter = emitter.events.LogStructArgs.create_filter(fromBlock=0)
734734

735735
tx_hash = emitter.functions.logStruct(1, (2, 3, (4,))).transact({"gas": 100000})
736736
w3.eth.wait_for_transaction_receipt(tx_hash)

‎tests/core/filtering/conftest.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -152,8 +152,8 @@ def emitter_log_topics():
152152
def return_filter(contract, args):
153153
event_name = args[0]
154154
kwargs = apply_key_map({"filter": "argument_filters"}, args[1])
155-
if "from_block" not in kwargs:
156-
kwargs["from_block"] = "latest"
155+
if "fromBlock" not in kwargs:
156+
kwargs["fromBlock"] = "latest"
157157
return contract.events[event_name].create_filter(**kwargs)
158158

159159

@@ -199,8 +199,8 @@ async def async_emitter(
199199
async def async_return_filter(contract, args):
200200
event_name = args[0]
201201
kwargs = apply_key_map({"filter": "argument_filters"}, args[1])
202-
if "from_block" not in kwargs:
203-
kwargs["from_block"] = "latest"
202+
if "fromBlock" not in kwargs:
203+
kwargs["fromBlock"] = "latest"
204204
return await contract.events[event_name].create_filter(**kwargs)
205205

206206

‎tests/core/filtering/test_contract_get_logs.py

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -45,14 +45,10 @@ def test_contract_get_logs_range(
4545
log_entries = list(contract.events.LogNoArguments.get_logs())
4646
assert len(log_entries) == 1
4747

48-
log_entries = list(
49-
contract.events.LogNoArguments.get_logs(from_block=2, to_block=3)
50-
)
48+
log_entries = list(contract.events.LogNoArguments.get_logs(fromBlock=2, toBlock=3))
5149
assert len(log_entries) == 1
5250

53-
log_entries = list(
54-
contract.events.LogNoArguments.get_logs(from_block=1, to_block=2)
55-
)
51+
log_entries = list(contract.events.LogNoArguments.get_logs(fromBlock=1, toBlock=2))
5652
assert len(log_entries) == 0
5753

5854

@@ -74,19 +70,19 @@ def test_contract_get_logs_argument_filter(
7470
for txn_hash in txn_hashes:
7571
wait_for_transaction(w3, txn_hash)
7672

77-
all_logs = contract.events.LogTripleWithIndex.get_logs(from_block=1)
73+
all_logs = contract.events.LogTripleWithIndex.get_logs(fromBlock=1)
7874
assert len(all_logs) == 4
7975

8076
# Filter all entries where arg1 in (1, 2)
8177
partial_logs = contract.events.LogTripleWithIndex.get_logs(
82-
from_block=1,
78+
fromBlock=1,
8379
argument_filters={"arg1": [1, 2]},
8480
)
8581
assert len(partial_logs) == 2
8682

8783
# Filter all entries where arg0 == 1
8884
partial_logs = contract.events.LogTripleWithIndex.get_logs(
89-
from_block=1,
85+
fromBlock=1,
9086
argument_filters={"arg0": 1},
9187
)
9288
assert len(partial_logs) == 4
@@ -146,13 +142,13 @@ async def test_async_contract_get_logs_range(
146142
assert len(log_entries) == 1
147143

148144
contract_logs = await contract.events.LogNoArguments.get_logs(
149-
from_block=2, to_block=3
145+
fromBlock=2, toBlock=3
150146
)
151147
log_entries = list(contract_logs)
152148
assert len(log_entries) == 1
153149

154150
contract_logs = await contract.events.LogNoArguments.get_logs(
155-
from_block=1, to_block=2
151+
fromBlock=1, toBlock=2
156152
)
157153
log_entries = list(contract_logs)
158154
assert len(log_entries) == 0
@@ -185,19 +181,19 @@ async def test_async_contract_get_logs_argument_filter(
185181
for txn_hash in txn_hashes:
186182
await async_wait_for_transaction(async_w3, txn_hash)
187183

188-
all_logs = await contract.events.LogTripleWithIndex.get_logs(from_block=1)
184+
all_logs = await contract.events.LogTripleWithIndex.get_logs(fromBlock=1)
189185
assert len(all_logs) == 4
190186

191187
# Filter all entries where arg1 in (1, 2)
192188
partial_logs = await contract.events.LogTripleWithIndex.get_logs(
193-
from_block=1,
189+
fromBlock=1,
194190
argument_filters={"arg1": [1, 2]},
195191
)
196192
assert len(partial_logs) == 2
197193

198194
# Filter all entries where arg0 == 1
199195
partial_logs = await contract.events.LogTripleWithIndex.get_logs(
200-
from_block=1,
196+
fromBlock=1,
201197
argument_filters={"arg0": 1},
202198
)
203199
assert len(partial_logs) == 4

‎tests/core/filtering/test_contract_on_event_filtering.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
@pytest.mark.parametrize("call_as_instance", (True, False))
1010
def test_create_filter_address_parameter(emitter, Emitter, call_as_instance):
1111
if call_as_instance:
12-
event_filter = emitter.events.LogNoArguments.create_filter(from_block="latest")
12+
event_filter = emitter.events.LogNoArguments.create_filter(fromBlock="latest")
1313
else:
14-
event_filter = Emitter.events.LogNoArguments.create_filter(from_block="latest")
14+
event_filter = Emitter.events.LogNoArguments.create_filter(fromBlock="latest")
1515

1616
if call_as_instance:
1717
# Assert this is a single string value, and not a list of addresses
@@ -155,7 +155,7 @@ def test_on_sync_filter_with_event_name_and_non_indexed_argument(
155155

156156
post_event_filter = contract.events.LogTripleWithIndex.create_filter(
157157
argument_filters={"arg0": 1, "arg1": 2},
158-
from_block=0,
158+
fromBlock=0,
159159
)
160160

161161
old_logs = post_event_filter.get_all_entries()
@@ -208,7 +208,7 @@ def test_on_sync_filter_with_topic_filter_options_on_old_apis(
208208

209209
post_event_filter = contract.events.LogTripleWithIndex.create_filter(
210210
argument_filters={"arg1": [1, 2], "arg2": [1, 2]},
211-
from_block=0,
211+
fromBlock=0,
212212
)
213213

214214
old_logs = post_event_filter.get_all_entries()
@@ -232,11 +232,11 @@ async def test_async_create_filter_address_parameter(
232232
):
233233
if call_as_instance:
234234
event_filter = await async_emitter.events.LogNoArguments.create_filter(
235-
from_block="latest"
235+
fromBlock="latest"
236236
)
237237
else:
238238
event_filter = await AsyncEmitter.events.LogNoArguments.create_filter(
239-
from_block="latest"
239+
fromBlock="latest"
240240
)
241241

242242
if call_as_instance:
@@ -400,7 +400,7 @@ async def test_on_async_filter_with_event_name_and_non_indexed_argument(
400400

401401
post_event_filter = await contract.events.LogTripleWithIndex.create_filter(
402402
argument_filters={"arg0": 1, "arg1": 2},
403-
from_block=0,
403+
fromBlock=0,
404404
)
405405

406406
old_logs = await post_event_filter.get_all_entries()
@@ -467,7 +467,7 @@ async def test_on_async_filter_with_topic_filter_options_on_old_apis(
467467

468468
post_event_filter = await contract.events.LogTripleWithIndex.create_filter(
469469
argument_filters={"arg1": [1, 2], "arg2": [1, 2]},
470-
from_block=0,
470+
fromBlock=0,
471471
)
472472

473473
old_logs = await post_event_filter.get_all_entries()

‎tests/core/filtering/test_contract_past_event_filtering.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ def test_on_filter_using_get_all_entries_interface(
2929
event_filter = builder.deploy(w3)
3030
else:
3131
event_filter = create_filter(
32-
contract, ["LogNoArguments", {"from_block": "latest"}]
32+
contract, ["LogNoArguments", {"fromBlock": "latest"}]
3333
)
3434

3535
txn_hash = emitter.functions.logNoArgs(emitter_event_ids.LogNoArguments).transact()
@@ -73,7 +73,7 @@ def test_get_all_entries_returned_block_data(
7373
event_filter = builder.deploy(w3)
7474
else:
7575
event_filter = create_filter(
76-
contract, ["LogNoArguments", {"from_block": txn_receipt["blockNumber"]}]
76+
contract, ["LogNoArguments", {"fromBlock": txn_receipt["blockNumber"]}]
7777
)
7878

7979
log_entries = event_filter.get_all_entries()
@@ -122,7 +122,7 @@ async def test_on_async_filter_using_get_all_entries_interface(
122122
event_filter = await builder.deploy(async_w3)
123123
else:
124124
event_filter = await async_create_filter(
125-
contract, ["LogNoArguments", {"from_block": "latest"}]
125+
contract, ["LogNoArguments", {"fromBlock": "latest"}]
126126
)
127127

128128
txn_hash = await async_emitter.functions.logNoArgs(
@@ -171,7 +171,7 @@ async def test_async_get_all_entries_returned_block_data(
171171
event_filter = await builder.deploy(async_w3)
172172
else:
173173
event_filter = await async_create_filter(
174-
contract, ["LogNoArguments", {"from_block": txn_receipt["blockNumber"]}]
174+
contract, ["LogNoArguments", {"fromBlock": txn_receipt["blockNumber"]}]
175175
)
176176

177177
log_entries = await event_filter.get_all_entries()

‎tests/core/filtering/test_filters_against_many_blocks.py

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,7 @@ def test_event_filter_new_events(
5151
builder.fromBlock = "latest"
5252
event_filter = builder.deploy(w3)
5353
else:
54-
event_filter = emitter.events.LogNoArguments().create_filter(
55-
from_block="latest"
56-
)
54+
event_filter = emitter.events.LogNoArguments().create_filter(fromBlock="latest")
5755

5856
expected_match_counter = 0
5957

@@ -132,9 +130,7 @@ def gen_non_matching_transact():
132130
builder.fromBlock = "latest"
133131
event_filter = builder.deploy(w3)
134132
else:
135-
event_filter = emitter.events.LogNoArguments().create_filter(
136-
from_block="latest"
137-
)
133+
event_filter = emitter.events.LogNoArguments().create_filter(fromBlock="latest")
138134

139135
expected_match_counter = 0
140136

@@ -204,7 +200,7 @@ async def test_async_event_filter_new_events(
204200
event_filter = await builder.deploy(async_w3)
205201
else:
206202
event_filter = await async_emitter.events.LogNoArguments().create_filter(
207-
from_block="latest"
203+
fromBlock="latest"
208204
)
209205

210206
expected_match_counter = 0
@@ -297,7 +293,7 @@ async def gen_non_matching_transact():
297293
event_filter = await builder.deploy(async_w3)
298294
else:
299295
event_filter = await async_emitter.events.LogNoArguments().create_filter(
300-
from_block="latest"
296+
fromBlock="latest"
301297
)
302298

303299
expected_match_counter = 0

‎web3/contract/async_contract.py

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -342,8 +342,8 @@ class AsyncContractEvent(BaseContractEvent):
342342
async def get_logs(
343343
self,
344344
argument_filters: Optional[Dict[str, Any]] = None,
345-
from_block: Optional[BlockIdentifier] = None,
346-
to_block: Optional[BlockIdentifier] = None,
345+
fromBlock: Optional[BlockIdentifier] = None,
346+
toBlock: Optional[BlockIdentifier] = None,
347347
block_hash: Optional[HexBytes] = None,
348348
) -> Awaitable[Iterable[EventData]]:
349349
"""Get events for this contract instance using eth_getLogs API.
@@ -365,7 +365,7 @@ async def get_logs(
365365
from = max(mycontract.web3.eth.block_number - 10, 1)
366366
to = mycontract.web3.eth.block_number
367367
368-
events = mycontract.events.Transfer.getLogs(from_block=from, to_block=to)
368+
events = mycontract.events.Transfer.getLogs(fromBlock=from, toBlock=to)
369369
370370
for e in events:
371371
print(e["args"]["from"],
@@ -394,17 +394,17 @@ async def get_logs(
394394
See also: :func:`web3.middleware.filter.local_filter_middleware`.
395395
396396
:param argument_filters:
397-
:param from_block: block number or "latest", defaults to "latest"
398-
:param to_block: block number or "latest". Defaults to "latest"
397+
:param fromBlock: block number or "latest", defaults to "latest"
398+
:param toBlock: block number or "latest". Defaults to "latest"
399399
:param blockHash: block hash. blockHash cannot be set at the
400-
same time as from_block or to_block
400+
same time as fromBlock or toBlock
401401
:yield: Tuple of :class:`AttributeDict` instances
402402
"""
403403
abi = self._get_event_abi()
404404
# Call JSON-RPC API
405405
logs = await self.w3.eth.get_logs(
406406
self._get_event_filter_params(
407-
abi, argument_filters, from_block, to_block, block_hash # type: ignore
407+
abi, argument_filters, fromBlock, toBlock, block_hash # type: ignore
408408
)
409409
)
410410

@@ -418,8 +418,8 @@ async def create_filter(
418418
self,
419419
*, # PEP 3102
420420
argument_filters: Optional[Dict[str, Any]] = None,
421-
from_block: Optional[BlockIdentifier] = None,
422-
to_block: BlockIdentifier = "latest",
421+
fromBlock: Optional[BlockIdentifier] = None,
422+
toBlock: BlockIdentifier = "latest",
423423
address: Optional[ChecksumAddress] = None,
424424
topics: Optional[Sequence[Any]] = None,
425425
) -> AsyncLogFilter:
@@ -429,8 +429,8 @@ async def create_filter(
429429
filter_builder = AsyncEventFilterBuilder(self._get_event_abi(), self.w3.codec)
430430
self._set_up_filter_builder(
431431
argument_filters,
432-
from_block,
433-
to_block,
432+
fromBlock,
433+
toBlock,
434434
address,
435435
topics,
436436
filter_builder,

‎web3/contract/contract.py

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -94,8 +94,8 @@ class ContractEvent(BaseContractEvent):
9494
def get_logs(
9595
self,
9696
argument_filters: Optional[Dict[str, Any]] = None,
97-
from_block: Optional[BlockIdentifier] = None,
98-
to_block: Optional[BlockIdentifier] = None,
97+
fromBlock: Optional[BlockIdentifier] = None,
98+
toBlock: Optional[BlockIdentifier] = None,
9999
block_hash: Optional[HexBytes] = None,
100100
) -> Iterable[EventData]:
101101
"""Get events for this contract instance using eth_getLogs API.
@@ -117,7 +117,7 @@ def get_logs(
117117
from = max(mycontract.web3.eth.block_number - 10, 1)
118118
to = mycontract.web3.eth.block_number
119119
120-
events = mycontract.events.Transfer.get_logs(from_block=from, to_block=to)
120+
events = mycontract.events.Transfer.get_logs(fromBlock=from, toBlock=to)
121121
122122
for e in events:
123123
print(e["args"]["from"],
@@ -146,17 +146,17 @@ def get_logs(
146146
See also: :func:`web3.middleware.filter.local_filter_middleware`.
147147
148148
:param argument_filters:
149-
:param from_block: block number or "latest", defaults to "latest"
150-
:param to_block: block number or "latest". Defaults to "latest"
149+
:param fromBlock: block number or "latest", defaults to "latest"
150+
:param toBlock: block number or "latest". Defaults to "latest"
151151
:param block_hash: block hash. block_hash cannot be set at the
152-
same time as from_block or to_block
152+
same time as fromBlock or toBlock
153153
:yield: Tuple of :class:`AttributeDict` instances
154154
"""
155155
abi = self._get_event_abi()
156156
# Call JSON-RPC API
157157
logs = self.w3.eth.get_logs(
158158
self._get_event_filter_params(
159-
abi, argument_filters, from_block, to_block, block_hash
159+
abi, argument_filters, fromBlock, toBlock, block_hash
160160
)
161161
)
162162

@@ -168,8 +168,8 @@ def create_filter(
168168
self,
169169
*, # PEP 3102
170170
argument_filters: Optional[Dict[str, Any]] = None,
171-
from_block: Optional[BlockIdentifier] = None,
172-
to_block: BlockIdentifier = "latest",
171+
fromBlock: Optional[BlockIdentifier] = None,
172+
toBlock: BlockIdentifier = "latest",
173173
address: Optional[ChecksumAddress] = None,
174174
topics: Optional[Sequence[Any]] = None,
175175
) -> LogFilter:
@@ -179,8 +179,8 @@ def create_filter(
179179
filter_builder = EventFilterBuilder(self._get_event_abi(), self.w3.codec)
180180
self._set_up_filter_builder(
181181
argument_filters,
182-
from_block,
183-
to_block,
182+
fromBlock,
183+
toBlock,
184184
address,
185185
topics,
186186
filter_builder,

0 commit comments

Comments
 (0)