Skip to content

Commit a59bcb3

Browse files
author
Paul Robinson
authored
snake_case createFilter (#2692)
1 parent af3a750 commit a59bcb3

File tree

12 files changed

+29
-28
lines changed

12 files changed

+29
-28
lines changed

docs/contracts.rst

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -235,9 +235,9 @@ Each Contract Factory exposes the following methods.
235235
>>> contract_data = token_contract.constructor(web3.eth.coinbase, 12345).build_transaction(transaction)
236236
>>> web3.eth.send_transaction(contract_data)
237237
238-
.. _contract_createFilter:
238+
.. _contract_create_filter:
239239

240-
.. py:classmethod:: Contract.events.your_event_name.createFilter(fromBlock=block, toBlock=block, \
240+
.. py:classmethod:: Contract.events.your_event_name.create_filter(fromBlock=block, toBlock=block, \
241241
argument_filters={"arg1": "value"}, topics=[])
242242
243243
Creates a new event filter, an instance of :py:class:`web3.utils.filters.LogFilter`.
@@ -1041,7 +1041,7 @@ Event Log Object
10411041
* ``blockNumber``: Number - the block number where this log was in. null
10421042
when it's pending.
10431043

1044-
.. testsetup:: createFilter
1044+
.. testsetup:: create_filter
10451045

10461046
from web3 import Web3
10471047
from hexbytes import HexBytes
@@ -1064,9 +1064,9 @@ Event Log Object
10641064
tx_hash = contract.functions.transfer(alice, 10).transact({'gas': 899000, 'gasPrice': Web3.to_wei(1, 'gwei')})
10651065
tx_receipt = w3.eth.wait_for_transaction_receipt(tx_hash)
10661066

1067-
.. doctest:: createFilter
1067+
.. doctest:: create_filter
10681068

1069-
>>> transfer_filter = my_token_contract.events.Transfer.createFilter(fromBlock="0x0", argument_filters={'from': '0x7E5F4552091A69125d5DfCb7b8C2659029395Bdf'})
1069+
>>> transfer_filter = my_token_contract.events.Transfer.create_filter(fromBlock="0x0", argument_filters={'from': '0x7E5F4552091A69125d5DfCb7b8C2659029395Bdf'})
10701070
>>> transfer_filter.get_new_entries()
10711071
[AttributeDict({'args': AttributeDict({'from': '0x7E5F4552091A69125d5DfCb7b8C2659029395Bdf',
10721072
'to': '0x7E5F4552091A69125d5DfCb7b8C2659029395Bdf',

docs/examples.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1176,7 +1176,7 @@ The script can be run with: ``python ./eventscanner.py <your JSON-RPC API URL>``
11761176
11771177
This method is detached from any contract instance.
11781178
1179-
This is a stateless method, as opposed to createFilter.
1179+
This is a stateless method, as opposed to create_filter.
11801180
It can be safely called against nodes which do not provide `eth_newFilter` API, like Infura.
11811181
"""
11821182

docs/filters.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ The :meth:`web3.eth.Eth.filter` method can be used to set up filters for:
2727

2828
.. code-block:: python
2929
30-
event_filter = mycontract.events.myEvent.createFilter(fromBlock='latest', argument_filters={'arg1':10})
30+
event_filter = mycontract.events.myEvent.create_filter(fromBlock='latest', argument_filters={'arg1':10})
3131
3232
Or built manually by supplying `valid filter params <https://github.com/ethereum/execution-apis/blob/bea0266c42919a2fb3ee524fb91e624a23bc17c5/src/schemas/filter.json#L28>`_:
3333

@@ -129,15 +129,15 @@ Event Log Filters
129129
-----------------
130130

131131
You can set up a filter for event logs using the web3.py contract api:
132-
:meth:`web3.contract.Contract.events.your_event_name.createFilter`, which provides some conveniences for
132+
:meth:`web3.contract.Contract.events.your_event_name.create_filter`, which provides some conveniences for
133133
creating event log filters. Refer to the following example:
134134

135135
.. code-block:: python
136136
137-
event_filter = myContract.events.<event_name>.createFilter(fromBlock="latest", argument_filters={'arg1':10})
137+
event_filter = myContract.events.<event_name>.create_filter(fromBlock="latest", argument_filters={'arg1':10})
138138
event_filter.get_new_entries()
139139
140-
See :meth:`web3.contract.Contract.events.your_event_name.createFilter()` documentation for more information.
140+
See :meth:`web3.contract.Contract.events.your_event_name.create_filter()` documentation for more information.
141141

142142
You can set up an event log filter like the one above with ``web3.eth.filter`` by supplying a
143143
dictionary containing the standard filter parameters. Assuming that ``arg1`` is indexed, the

docs/overview.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,7 @@ a contract, you can leverage Web3.py filters.
264264
>>> new_filter = web3.eth.filter('latest')
265265
266266
# Use case: filter for contract event "MyEvent"
267-
>>> new_filter = deployed_contract.events.MyEvent.createFilter(fromBlock='latest')
267+
>>> new_filter = deployed_contract.events.MyEvent.create_filter(fromBlock='latest')
268268
269269
# retrieve filter results:
270270
>>> new_filter.get_all_entries()
@@ -282,7 +282,7 @@ API
282282
- :meth:`web3.eth.get_filter_logs() <web3.eth.Eth.get_filter_logs>`
283283
- :meth:`web3.eth.uninstall_filter() <web3.eth.Eth.uninstall_filter>`
284284
- :meth:`web3.eth.get_logs() <web3.eth.Eth.get_logs>`
285-
- :meth:`Contract.events.your_event_name.createFilter() <web3.contract.Contract.events.your_event_name.createFilter>`
285+
- :meth:`Contract.events.your_event_name.create_filter() <web3.contract.Contract.events.your_event_name.create_filter>`
286286
- :meth:`Contract.events.your_event_name.build_filter() <web3.contract.Contract.events.your_event_name.build_filter>`
287287
- :meth:`Filter.get_new_entries() <web3.utils.filters.Filter.get_new_entries>`
288288
- :meth:`Filter.get_all_entries() <web3.utils.filters.Filter.get_all_entries>`

docs/releases.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2363,7 +2363,7 @@ Released Mar 27, 2018
23632363
until a third-party audit is complete & resolved.
23642364
- New API for contract deployment, which enables gas estimation, local signing, etc.
23652365
See :meth:`~web3.contract.Contract.constructor`.
2366-
- Find contract events with :ref:`contract.events.$my_event.createFilter() <contract_createFilter>`
2366+
- Find contract events with :ref:`contract.events.$my_event.createFilter() <contract_create_filter>`
23672367
- Support auto-complete for contract methods.
23682368
- Upgrade most dependencies to stable
23692369

newsfragments/2692.breaking.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
change instances of `createFilter` to `create_filter`

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.createFilter(fromBlock=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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ def return_filter(contract=None, args=[]):
168168
kwargs = apply_key_map({"filter": "argument_filters"}, args[1])
169169
if "fromBlock" not in kwargs:
170170
kwargs["fromBlock"] = "latest"
171-
return contract.events[event_name].createFilter(**kwargs)
171+
return contract.events[event_name].create_filter(**kwargs)
172172

173173

174174
@pytest.fixture(scope="module")

tests/core/filtering/test_contract_createFilter_topic_merging.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ def test_merged_topic_list_event(emitter):
99
"0x0000000000000000000000000000000000000000000000000000000000000457", # 1111
1010
]
1111
with pytest.raises(TypeError):
12-
emitter.events.LogTripleWithIndex().createFilter(
12+
emitter.events.LogTripleWithIndex().create_filter(
1313
fromBlock="latest",
1414
topics=manual_topics,
1515
argument_filters={"arg0": 2222, "arg1": 2222, "arg2": 2222},

tests/core/filtering/test_contract_on_event_filtering.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
@pytest.mark.parametrize("call_as_instance", (True, False))
99
def test_create_filter_address_parameter(emitter, Emitter, call_as_instance):
1010
if call_as_instance:
11-
event_filter = emitter.events.LogNoArguments.createFilter(fromBlock="latest")
11+
event_filter = emitter.events.LogNoArguments.create_filter(fromBlock="latest")
1212
else:
13-
event_filter = Emitter.events.LogNoArguments.createFilter(fromBlock="latest")
13+
event_filter = Emitter.events.LogNoArguments.create_filter(fromBlock="latest")
1414

1515
if call_as_instance:
1616
# Assert this is a single string value, and not a list of addresses
@@ -152,7 +152,7 @@ def test_on_sync_filter_with_event_name_and_non_indexed_argument(
152152
assert len(seen_logs) == 1
153153
assert seen_logs[0]["transactionHash"] == txn_hashes[1]
154154

155-
post_event_filter = contract.events.LogTripleWithIndex.createFilter(
155+
post_event_filter = contract.events.LogTripleWithIndex.create_filter(
156156
argument_filters={"arg0": 1, "arg1": 2},
157157
fromBlock=0,
158158
)
@@ -205,7 +205,7 @@ def test_on_sync_filter_with_topic_filter_options_on_old_apis(
205205
seen_logs = event_filter.get_new_entries()
206206
assert len(seen_logs) == 4
207207

208-
post_event_filter = contract.events.LogTripleWithIndex.createFilter(
208+
post_event_filter = contract.events.LogTripleWithIndex.create_filter(
209209
argument_filters={"arg1": [1, 2], "arg2": [1, 2]},
210210
fromBlock=0,
211211
)

0 commit comments

Comments
 (0)