Fix failing tests and use 1559 defaults for test params

- Fixed tests that broke from the implementation of the new EIP-1559 fields (maxFeePerGas and maxPriorityFeePerGas). Updated most of our existing tests to use these new fields in order to encourage their use / be updated to the new standard.

Author: fselmo

newsfragments/2053.bugfix.rst

@@ -0,0 +1 @@
+Fix broken tests and use the new 1559 params for most of our test transactions.

tests/integration/conftest.py

@@ -15,6 +15,31 @@
 )
 
 
+def pytest_collection_modifyitems(items):
+    """
+    Certain tests have their context dirtied by other tests. We can somewhat
+    control when these tests are run by overriding this pytest hook and setting
+    conflicting tests at either the start or the end of the test suite.
+    """
+
+    test_names_to_append_to_start = [
+        'test_eth_get_logs_with_logs',
+        'test_eth_call_old_contract_state',
+    ]
+    # test_names_to_append_to_end = []
+    index = 0
+    for item in enumerate(items):
+        test_name = item[1].name
+        test_name = test_name if "[" not in test_name else test_name[:test_name.find("[")]
+        if test_name in test_names_to_append_to_start:
+            test_item = items.pop(index)
+            items.insert(0, test_item)
+        # if test_name in test_names_to_append_to_end:
+        #     test_item = items.pop(index)
+        #     items.append(test_item)
+        index += 1
+
+
 @pytest.fixture(scope="module")
 def math_contract_factory(web3):
     contract_factory = web3.eth.contract(abi=MATH_ABI, bytecode=MATH_BYTECODE)

tests/integration/go_ethereum/common.py

@@ -1,6 +1,3 @@
-#  from concurrent.futures._base import (
-#  TimeoutError as FuturesTimeoutError,
-#  )
 import pytest
 
 from web3._utils.module_testing import (  # noqa: F401
@@ -20,20 +17,16 @@ def _check_web3_clientVersion(self, client_version):
 
 
 class GoEthereumEthModuleTest(EthModuleTest):
-    #  @pytest.mark.xfail(
-    #  strict=False,
-    #  raises=FuturesTimeoutError,
-    #  reason='Sometimes a TimeoutError is hit when waiting for the txn to be mined',
-    #  )
-    @pytest.mark.skip(reason="London TODO: crashes on [address_conversion_func1]")
+    @pytest.mark.xfail(
+        strict=False,
+        reason='Sometimes a TimeoutError is hit when waiting for the txn to be mined',
+    )
     def test_eth_replace_transaction_already_mined(self, web3, unlocked_account_dual_type):
-        web3.geth.miner.start()
-        super().test_eth_replace_transaction_already_mined(web3, unlocked_account_dual_type)
-        web3.geth.miner.stop()
-
-    @pytest.mark.skip(reason="London TODO: pending call isn't found")
-    def test_eth_call_old_contract_state(self, web3, math_contract, unlocked_account):
-        super().test_eth_call_old_contract_state(web3, math_contract, unlocked_account)
+        try:
+            web3.geth.miner.start()
+            super().test_eth_replace_transaction_already_mined(web3, unlocked_account_dual_type)
+        finally:
+            web3.geth.miner.stop()
 
     @pytest.mark.xfail(reason='eth_signTypedData has not been released in geth')
     def test_eth_sign_typed_data(self, web3, unlocked_account_dual_type):

tests/integration/test_ethereum_tester.py

@@ -272,18 +272,34 @@ def test_eth_getBlockByHash_pending(
         assert block['hash'] is not None
 
     @disable_auto_mine
+    @pytest.mark.xfail(reason='EIP 1559 is not implemented on eth-tester')
     def test_eth_get_transaction_receipt_unmined(self, eth_tester, web3, unlocked_account):
         super().test_eth_get_transaction_receipt_unmined(web3, unlocked_account)
 
     @disable_auto_mine
-    def test_eth_replaceTransaction_deprecated(self, eth_tester, web3, unlocked_account):
-        super().test_eth_replaceTransaction_deprecated(web3, unlocked_account)
+    def test_eth_replace_transaction_legacy(self, eth_tester, web3, unlocked_account):
+        super().test_eth_replace_transaction_legacy(web3, unlocked_account)
 
     @disable_auto_mine
+    @pytest.mark.xfail(reason='EIP 1559 is not implemented on eth-tester')
     def test_eth_replace_transaction(self, eth_tester, web3, unlocked_account):
         super().test_eth_replace_transaction(web3, unlocked_account)
 
+    @pytest.mark.xfail(reason='EIP 1559 is not implemented on eth-tester')
+    def test_eth_replace_transaction_underpriced(self, web3, emitter_contract_address):
+        super().test_eth_replace_transaction_underpriced(web3, emitter_contract_address)
+
+    @disable_auto_mine
+    @pytest.mark.xfail(reason='EIP 1559 is not implemented on eth-tester')
+    def test_eth_replaceTransaction_deprecated(self, eth_tester, web3, unlocked_account):
+        super().test_eth_replaceTransaction_deprecated(web3, unlocked_account)
+
+    @pytest.mark.xfail(reason='EIP 1559 is not implemented on eth-tester')
+    def test_eth_replace_transaction_already_mined(self, web3, emitter_contract_address):
+        super().test_eth_replace_transaction_already_mined(web3, emitter_contract_address)
+
     @disable_auto_mine
+    @pytest.mark.xfail(reason='EIP 1559 is not implemented on eth-tester')
     def test_eth_replace_transaction_incorrect_nonce(self, eth_tester, web3, unlocked_account):
         super().test_eth_replace_transaction_incorrect_nonce(web3, unlocked_account)
 
@@ -429,24 +445,32 @@ def test_eth_estimate_gas_revert_without_msg(self, web3, revert_contract, unlock
             web3.eth.estimate_gas(txn_params)
 
     @pytest.mark.xfail(reason='EIP 1559 is not implemented on eth-tester')
-    def test_1559_default_fees(self, web3, emitter_contract_address):
-        super().test_1559_default_fees(web3, emitter_contract_address)
+    def test_eth_send_transaction(self, web3, emitter_contract_address):
+        super().test_eth_send_transaction(web3, emitter_contract_address)
+
+    @pytest.mark.xfail(reason='EIP 1559 is not implemented on eth-tester')
+    def test_eth_sendTransaction_deprecated(self, web3, emitter_contract_address):
+        super().test_eth_sendTransaction_deprecated(web3, emitter_contract_address)
+
+    @pytest.mark.xfail(reason='EIP 1559 is not implemented on eth-tester')
+    def test_eth_send_transaction_with_nonce(self, web3, emitter_contract_address):
+        super().test_eth_send_transaction_with_nonce(web3, emitter_contract_address)
 
     @pytest.mark.xfail(reason='EIP 1559 is not implemented on eth-tester')
-    def test_1559_canonical(self, web3, emitter_contract_address):
-        super().test_1559_canonical(web3, emitter_contract_address)
+    def test_eth_send_transaction_default_fees(self, web3, emitter_contract_address):
+        super().test_eth_send_transaction_default_fees(web3, emitter_contract_address)
 
     @pytest.mark.xfail(reason='EIP 1559 is not implemented on eth-tester')
-    def test_1559_hex_fees(self, web3, emitter_contract_address):
-        super().test_1559_hex_fees(web3, emitter_contract_address)
+    def test_eth_send_transaction_hex_fees(self, web3, emitter_contract_address):
+        super().test_eth_send_transaction_hex_fees(web3, emitter_contract_address)
 
     @pytest.mark.xfail(reason='EIP 1559 is not implemented on eth-tester')
-    def test_1559_no_gas(self, web3, emitter_contract_address):
-        super().test_1559_no_gas(web3, emitter_contract_address)
+    def test_eth_send_transaction_no_gas(self, web3, emitter_contract_address):
+        super().test_eth_send_transaction_no_gas(web3, emitter_contract_address)
 
     @pytest.mark.xfail(reason='EIP 1559 is not implemented on eth-tester')
-    def test_1559_no_max_fee(self, web3, emitter_contract_address):
-        super().test_1559_no_max_fee(web3, emitter_contract_address)
+    def test_eth_send_transaction_no_max_fee(self, web3, emitter_contract_address):
+        super().test_eth_send_transaction_no_max_fee(web3, emitter_contract_address)
 
 
 class TestEthereumTesterVersionModule(VersionModuleTest):