Fix failing tests mostly due to residual camelCase args

Author: kclowes

newsfragments/2567.breaking-change.rst renamed to newsfragments/2567.breaking.rst

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

tests/core/filtering/conftest.py

@@ -9,9 +9,9 @@
 @pytest.mark.parametrize("call_as_instance", (True, False))
 def test_create_filter_address_parameter(emitter, Emitter, call_as_instance):
     if call_as_instance:
-        event_filter = emitter.events.LogNoArguments.create_filter(fromBlock="latest")
+        event_filter = emitter.events.LogNoArguments.create_filter(from_block="latest")
     else:
-        event_filter = Emitter.events.LogNoArguments.create_filter(fromBlock="latest")
+        event_filter = Emitter.events.LogNoArguments.create_filter(from_block="latest")
 
     if call_as_instance:
         # 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(
 
     post_event_filter = contract.events.LogTripleWithIndex.create_filter(
         argument_filters={"arg0": 1, "arg1": 2},
-        fromBlock=0,
+        from_block=0,
     )
 
     old_logs = post_event_filter.get_all_entries()
@@ -208,7 +208,7 @@ def test_on_sync_filter_with_topic_filter_options_on_old_apis(
 
     post_event_filter = contract.events.LogTripleWithIndex.create_filter(
         argument_filters={"arg1": [1, 2], "arg2": [1, 2]},
-        fromBlock=0,
+        from_block=0,
     )
 
     old_logs = post_event_filter.get_all_entries()
@@ -232,11 +232,11 @@ async def test_async_create_filter_address_parameter(
 ):
     if call_as_instance:
         event_filter = await async_emitter.events.LogNoArguments.create_filter(
-            fromBlock="latest"
+            from_block="latest"
         )
     else:
         event_filter = await AsyncEmitter.events.LogNoArguments.create_filter(
-            fromBlock="latest"
+            from_block="latest"
         )
 
     if call_as_instance:
@@ -400,7 +400,7 @@ async def test_on_async_filter_with_event_name_and_non_indexed_argument(
 
     post_event_filter = await contract.events.LogTripleWithIndex.create_filter(
         argument_filters={"arg0": 1, "arg1": 2},
-        fromBlock=0,
+        from_block=0,
     )
 
     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(
 
     post_event_filter = await contract.events.LogTripleWithIndex.create_filter(
         argument_filters={"arg1": [1, 2], "arg2": [1, 2]},
-        fromBlock=0,
+        from_block=0,
     )
 
     old_logs = await post_event_filter.get_all_entries()

tests/core/filtering/test_contract_on_event_filtering.py

@@ -29,7 +29,7 @@ def test_on_filter_using_get_all_entries_interface(
         event_filter = builder.deploy(w3)
     else:
         event_filter = create_filter(
-            contract, ["LogNoArguments", {"fromBlock": "latest"}]
+            contract, ["LogNoArguments", {"from_block": "latest"}]
         )
 
     txn_hash = emitter.functions.logNoArgs(emitter_event_ids.LogNoArguments).transact()
@@ -73,7 +73,7 @@ def test_get_all_entries_returned_block_data(
         event_filter = builder.deploy(w3)
     else:
         event_filter = create_filter(
-            contract, ["LogNoArguments", {"fromBlock": txn_receipt["blockNumber"]}]
+            contract, ["LogNoArguments", {"from_block": txn_receipt["blockNumber"]}]
         )
 
     log_entries = event_filter.get_all_entries()
@@ -122,7 +122,7 @@ async def test_on_async_filter_using_get_all_entries_interface(
         event_filter = await builder.deploy(async_w3)
     else:
         event_filter = await async_create_filter(
-            contract, ["LogNoArguments", {"fromBlock": "latest"}]
+            contract, ["LogNoArguments", {"from_block": "latest"}]
         )
 
     txn_hash = await async_emitter.functions.logNoArgs(
@@ -171,7 +171,7 @@ async def test_async_get_all_entries_returned_block_data(
         event_filter = await builder.deploy(async_w3)
     else:
         event_filter = await async_create_filter(
-            contract, ["LogNoArguments", {"fromBlock": txn_receipt["blockNumber"]}]
+            contract, ["LogNoArguments", {"from_block": txn_receipt["blockNumber"]}]
         )
 
     log_entries = await event_filter.get_all_entries()

tests/core/filtering/test_contract_past_event_filtering.py

@@ -51,7 +51,9 @@ def test_event_filter_new_events(
         builder.fromBlock = "latest"
         event_filter = builder.deploy(w3)
     else:
-        event_filter = emitter.events.LogNoArguments().create_filter(fromBlock="latest")
+        event_filter = emitter.events.LogNoArguments().create_filter(
+            from_block="latest"
+        )
 
     expected_match_counter = 0
 
@@ -130,7 +132,9 @@ def gen_non_matching_transact():
         builder.fromBlock = "latest"
         event_filter = builder.deploy(w3)
     else:
-        event_filter = emitter.events.LogNoArguments().create_filter(fromBlock="latest")
+        event_filter = emitter.events.LogNoArguments().create_filter(
+            from_block="latest"
+        )
 
     expected_match_counter = 0
 
@@ -200,7 +204,7 @@ async def test_async_event_filter_new_events(
         event_filter = await builder.deploy(async_w3)
     else:
         event_filter = await async_emitter.events.LogNoArguments().create_filter(
-            fromBlock="latest"
+            from_block="latest"
         )
 
     expected_match_counter = 0
@@ -293,7 +297,7 @@ async def gen_non_matching_transact():
         event_filter = await builder.deploy(async_w3)
     else:
         event_filter = await async_emitter.events.LogNoArguments().create_filter(
-            fromBlock="latest"
+            from_block="latest"
         )
 
     expected_match_counter = 0

tests/core/filtering/test_filters_against_many_blocks.py

@@ -285,7 +285,9 @@ async def call(
             **self.kwargs,
         )
 
-    async def transact(self, transaction: Optional[TxParams] = None) -> HexBytes:
+    async def transact(  # type: ignore
+        self, transaction: Optional[TxParams] = None
+    ) -> HexBytes:
         setup_transaction = self._transact(transaction)
         return await async_transact_with_contract_function(
             self.address,
@@ -338,9 +340,9 @@ class AsyncContractEvent(BaseContractEvent):
     async def get_logs(
         self,
         argument_filters: Optional[Dict[str, Any]] = None,
-        fromBlock: Optional[BlockIdentifier] = None,
-        toBlock: Optional[BlockIdentifier] = None,
-        blockHash: Optional[HexBytes] = None,
+        from_block: Optional[BlockIdentifier] = None,
+        to_block: Optional[BlockIdentifier] = None,
+        block_hash: Optional[HexBytes] = None,
     ) -> Awaitable[Iterable[EventData]]:
         """Get events for this contract instance using eth_getLogs API.
 
@@ -361,7 +363,7 @@ async def get_logs(
             from = max(mycontract.web3.eth.block_number - 10, 1)
             to = mycontract.web3.eth.block_number
 
-            events = mycontract.events.Transfer.getLogs(fromBlock=from, toBlock=to)
+            events = mycontract.events.Transfer.getLogs(from_block=from, to_block=to)
 
             for e in events:
                 print(e["args"]["from"],
@@ -390,17 +392,17 @@ async def get_logs(
         See also: :func:`web3.middleware.filter.local_filter_middleware`.
 
         :param argument_filters:
-        :param fromBlock: block number or "latest", defaults to "latest"
-        :param toBlock: block number or "latest". Defaults to "latest"
+        :param from_block: block number or "latest", defaults to "latest"
+        :param to_block: block number or "latest". Defaults to "latest"
         :param blockHash: block hash. blockHash cannot be set at the
-          same time as fromBlock or toBlock
+          same time as from_block or to_block
         :yield: Tuple of :class:`AttributeDict` instances
         """
         abi = self._get_event_abi()
         # Call JSON-RPC API
         logs = await self.w3.eth.get_logs(
             self._get_event_filter_params(
-                abi, argument_filters, fromBlock, toBlock, blockHash  # type: ignore
+                abi, argument_filters, from_block, to_block, block_hash  # type: ignore
             )
         )
 
@@ -414,8 +416,8 @@ async def create_filter(
         self,
         *,  # PEP 3102
         argument_filters: Optional[Dict[str, Any]] = None,
-        fromBlock: Optional[BlockIdentifier] = None,
-        toBlock: BlockIdentifier = "latest",
+        from_block: Optional[BlockIdentifier] = None,
+        to_block: BlockIdentifier = "latest",
         address: Optional[ChecksumAddress] = None,
         topics: Optional[Sequence[Any]] = None,
     ) -> AsyncLogFilter:
@@ -425,8 +427,8 @@ async def create_filter(
         filter_builder = AsyncEventFilterBuilder(self._get_event_abi(), self.w3.codec)
         self._set_up_filter_builder(
             argument_filters,
-            fromBlock,
-            toBlock,
+            from_block,
+            to_block,
             address,
             topics,
             filter_builder,

web3/contract/async_contract.py

@@ -168,8 +168,8 @@ def create_filter(
         self,
         *,  # PEP 3102
         argument_filters: Optional[Dict[str, Any]] = None,
-        fromBlock: Optional[BlockIdentifier] = None,
-        toBlock: BlockIdentifier = "latest",
+        from_block: Optional[BlockIdentifier] = None,
+        to_block: BlockIdentifier = "latest",
         address: Optional[ChecksumAddress] = None,
         topics: Optional[Sequence[Any]] = None,
     ) -> LogFilter:
@@ -179,8 +179,8 @@ def create_filter(
         filter_builder = EventFilterBuilder(self._get_event_abi(), self.w3.codec)
         self._set_up_filter_builder(
             argument_filters,
-            fromBlock,
-            toBlock,
+            from_block,
+            to_block,
             address,
             topics,
             filter_builder,

web3/contract/contract.py

@@ -2,7 +2,6 @@
 from typing import (
     TYPE_CHECKING,
     Any,
-    Awaitable,
     Callable,
     List,
     Optional,