Remove unnecessary w3 arguments to tests while reviewing PR ethereum#2357

Author: fselmo

tests/core/contracts/test_contract_call_interface.py

@@ -150,7 +150,7 @@ def bytes32_contract(w3, Bytes32Contract, request, address_conversion_func):
 
 
 @pytest.fixture()
-def undeployed_math_contract(w3, MathContract, address_conversion_func):
+def undeployed_math_contract(MathContract, address_conversion_func):
     empty_address = address_conversion_func("0x000000000000000000000000000000000000dEaD")
     _undeployed_math_contract = MathContract(address=empty_address)
     return _undeployed_math_contract
@@ -191,7 +191,7 @@ def nested_tuple_contract(w3, NestedTupleContract, address_conversion_func):
     return deploy(w3, NestedTupleContract, address_conversion_func)
 
 
-def test_invalid_address_in_deploy_arg(w3, WithConstructorAddressArgumentsContract):
+def test_invalid_address_in_deploy_arg(WithConstructorAddressArgumentsContract):
     with pytest.raises(InvalidAddress):
         WithConstructorAddressArgumentsContract.constructor(
             "0xd3cda913deb6f67967b99d67acdfa1712c293601",
@@ -704,7 +704,7 @@ def test_call_sending_ether_to_nonpayable_function(payable_tester_contract, call
         ('reflect_short_u', Decimal('25.5')),
     ),
 )
-def test_reflect_fixed_value(w3, fixed_reflection_contract, function, value):
+def test_reflect_fixed_value(fixed_reflection_contract, function, value):
     contract_func = fixed_reflection_contract.functions[function]
     reflected = contract_func(value).call({'gas': 420000})
     assert reflected == value
@@ -741,7 +741,7 @@ def test_reflect_fixed_value(w3, fixed_reflection_contract, function, value):
         ('reflect', 0, "Ambiguous argument encoding"),
     ),
 )
-def test_invalid_fixed_value_reflections(w3, fixed_reflection_contract, function, value, error):
+def test_invalid_fixed_value_reflections(fixed_reflection_contract, function, value, error):
     contract_func = fixed_reflection_contract.functions[function]
     with pytest.raises(ValidationError, match=error):
         contract_func(value).call({'gas': 420000})

tests/core/contracts/test_extracting_event_data.py

@@ -662,7 +662,6 @@ def test_event_rich_log_with_byte_args(
 
 
 def test_receipt_processing_with_discard_flag(
-        w3,
         event_contract,
         indexed_event_contract,
         dup_txn_receipt,
@@ -675,7 +674,6 @@ def test_receipt_processing_with_discard_flag(
 
 
 def test_receipt_processing_with_ignore_flag(
-        w3,
         event_contract,
         indexed_event_contract,
         dup_txn_receipt,
@@ -704,7 +702,6 @@ def test_receipt_processing_with_ignore_flag(
 
 
 def test_receipt_processing_with_warn_flag(
-        w3,
         indexed_event_contract,
         dup_txn_receipt):
 
@@ -716,7 +713,6 @@ def test_receipt_processing_with_warn_flag(
 
 
 def test_receipt_processing_with_strict_flag(
-        w3,
         indexed_event_contract,
         dup_txn_receipt):
 
@@ -727,7 +723,6 @@ def test_receipt_processing_with_strict_flag(
 
 
 def test_receipt_processing_with_invalid_flag(
-        w3,
         indexed_event_contract,
         dup_txn_receipt):
 
@@ -738,7 +733,6 @@ def test_receipt_processing_with_invalid_flag(
 
 
 def test_receipt_processing_with_no_flag(
-        w3,
         indexed_event_contract,
         dup_txn_receipt):
 
@@ -750,7 +744,6 @@ def test_receipt_processing_with_no_flag(
 
 
 def test_single_log_processing_with_errors(
-        w3,
         indexed_event_contract,
         dup_txn_receipt):
     event_instance = indexed_event_contract.events.LogSingleWithIndex()

tests/core/contracts/test_implicit_contract.py

@@ -62,7 +62,7 @@ def test_implicitcontract_call_default(math_contract, get_transaction_count):
     assert get_transaction_count("pending") == (blocknum, 0)
 
 
-def test_implicitcontract_transact_default(w3, math_contract, get_transaction_count):
+def test_implicitcontract_transact_default(math_contract, get_transaction_count):
     # Use to verify correct operation later on
     with pytest.warns(DeprecationWarning, match='deprecated in favor of classic contract syntax'):
         start_count = math_contract.counter()

tests/core/filtering/test_contract_createFilter_topic_merging.py

@@ -1,11 +1,7 @@
 import pytest
 
 
-def test_merged_topic_list_event(
-        w3,
-        emitter,
-        emitter_event_ids,
-        wait_for_transaction):
+def test_merged_topic_list_event(emitter):
     manual_topics = [
         '0xf16c999b533366ca5138d78e85da51611089cd05749f098d6c225d4cd42ee6ec',  # event sig
         '0x0000000000000000000000000000000000000000000000000000000000000457',  # 1111

tests/core/filtering/test_contract_on_event_filtering.py

@@ -6,7 +6,7 @@
 
 
 @pytest.mark.parametrize('call_as_instance', (True, False))
-def test_create_filter_address_parameter(w3, emitter, Emitter, call_as_instance):
+def test_create_filter_address_parameter(emitter, Emitter, call_as_instance):
     if call_as_instance:
         event_filter = emitter.events.LogNoArguments.createFilter(fromBlock="latest")
     else:

tests/core/manager/conftest.py

@@ -15,7 +15,7 @@ class Wrapper:
             def __repr__(self):
                 return 'middleware-' + key
 
-            def __call__(self, make_request, web3):
+            def __call__(self, make_request, w3):
                 def middleware_fn(method, params):
                     params.append(key)
                     method = "|".join((method, key))

tests/core/manager/test_middleware_can_be_stateful.py

@@ -6,7 +6,7 @@
 )
 
 
-def stateful_middleware(make_request, web3):
+def stateful_middleware(make_request, w3):
     state = []
 
     def middleware(method, params):

tests/core/mining-module/test_miner_hashrate.py

@@ -4,8 +4,8 @@
 
 
 @flaky(max_runs=3)
-def test_miner_hashrate(web3_empty, wait_for_miner_start):
-    web3 = web3_empty
+def test_miner_hashrate(w3_empty, wait_for_miner_start):
+    w3 = w3_empty
 
-    hashrate = web3.eth.hashrate
+    hashrate = w3.eth.hashrate
     assert hashrate > 0

tests/core/mining-module/test_miner_start.py

@@ -10,25 +10,25 @@
 
 
 @flaky(max_runs=3)
-def test_miner_start(web3_empty, wait_for_miner_start):
-    web3 = web3_empty
+def test_miner_start(w3_empty, wait_for_miner_start):
+    w3 = w3_empty
 
     # sanity
-    assert web3.eth.mining
-    assert web3.eth.hashrate
+    assert w3.eth.mining
+    assert w3.eth.hashrate
 
-    web3.geth.miner.stop()
+    w3.geth.miner.stop()
 
     with Timeout(60) as timeout:
-        while web3.eth.mining or web3.eth.hashrate:
+        while w3.eth.mining or w3.eth.hashrate:
             timeout.sleep(random.random())
 
-    assert not web3.eth.mining
-    assert not web3.eth.hashrate
+    assert not w3.eth.mining
+    assert not w3.eth.hashrate
 
-    web3.miner.start(1)
+    w3.miner.start(1)
 
-    wait_for_miner_start(web3)
+    wait_for_miner_start(w3)
 
-    assert web3.eth.mining
-    assert web3.eth.hashrate
+    assert w3.eth.mining
+    assert w3.eth.hashrate

tests/core/mining-module/test_miner_stop.py

@@ -10,18 +10,18 @@
 
 
 @flaky(max_runs=3)
-def test_miner_stop(web3_empty):
-    web3 = web3_empty
+def test_miner_stop(w3_empty):
+    w3 = w3_empty
 
-    assert web3.eth.mining
-    assert web3.eth.hashrate
+    assert w3.eth.mining
+    assert w3.eth.hashrate
 
-    web3.geth.miner.stop()
+    w3.geth.miner.stop()
 
     with Timeout(60) as timeout:
-        while web3.eth.mining or web3.eth.hashrate:
+        while w3.eth.mining or w3.eth.hashrate:
             timeout.sleep(random.random())
             timeout.check()
 
-    assert not web3.eth.mining
-    assert not web3.eth.hashrate
+    assert not w3.eth.mining
+    assert not w3.eth.hashrate

tests/core/utilities/test_attach_modules.py

@@ -169,7 +169,7 @@ def test_attach_external_modules_that_do_not_inherit_from_module_class(
     assert is_integer(w3.eth.chain_id)
 
 
-def test_attach_modules_for_module_with_more_than_one_init_argument(w3, module_many_init_args):
+def test_attach_modules_for_module_with_more_than_one_init_argument(module_many_init_args):
     with pytest.raises(
         UnsupportedOperation,
         match=(

tests/integration/go_ethereum/conftest.py

@@ -140,7 +140,7 @@ def math_contract_deploy_txn_hash(geth_fixture_data):
 
 
 @pytest.fixture(scope="module")
-def math_contract(w3, math_contract_factory, geth_fixture_data):
+def math_contract(math_contract_factory, geth_fixture_data):
     return math_contract_factory(address=geth_fixture_data['math_address'])
 
 
@@ -150,7 +150,7 @@ def math_contract_address(math_contract, address_conversion_func):
 
 
 @pytest.fixture(scope="module")
-def emitter_contract(w3, emitter_contract_factory, geth_fixture_data):
+def emitter_contract(emitter_contract_factory, geth_fixture_data):
     return emitter_contract_factory(address=geth_fixture_data['emitter_address'])
 
 
@@ -172,7 +172,7 @@ def unlockable_account_pw(geth_fixture_data):
 
 
 @pytest.fixture(scope="module")
-def unlockable_account(w3, coinbase):
+def unlockable_account(coinbase):
     yield coinbase
 
 
@@ -237,5 +237,5 @@ def block_hash_revert_with_msg(geth_fixture_data):
 
 
 @pytest.fixture(scope="module")
-def revert_contract(w3, revert_contract_factory, geth_fixture_data):
+def revert_contract(revert_contract_factory, geth_fixture_data):
     return revert_contract_factory(address=geth_fixture_data['revert_address'])

tests/integration/test_ethereum_tester.py

@@ -163,7 +163,7 @@ def revert_contract(w3, revert_contract_factory, revert_contract_deploy_txn_hash
 
 
 @pytest.fixture(scope='module')
-def unlockable_account_pw(w3):
+def unlockable_account_pw():
     return 'web3-testing'
 
 

web3/_utils/transactions.py

@@ -86,7 +86,7 @@ def fill_nonce(w3: "Web3", transaction: TxParams) -> TxParams:
 @curry
 def fill_transaction_defaults(w3: "Web3", transaction: TxParams) -> TxParams:
     """
-    if web3 is None, fill as much as possible while offline
+    if w3 is None, fill as much as possible while offline
     """
     strategy_based_gas_price = w3.eth.generate_gas_price(transaction)
     is_dynamic_fee_transaction = (