Add flaky decorator to both estimateGas tests

Author: kclowes

tests/integration/go_ethereum/common.py

@@ -1,5 +1,15 @@
 import pytest
 
+from eth_typing import (
+    ChecksumAddress,
+)
+from flaky import (
+    flaky,
+)
+from typing import (
+    TYPE_CHECKING,
+)
+
 from web3._utils.module_testing import (  # noqa: F401
     AsyncEthModuleTest,
     AsyncNetModuleTest,
@@ -13,6 +23,11 @@
     Web3ModuleTest,
 )
 
+if TYPE_CHECKING:
+    from web3 import (  # noqa: F401
+        Web3,
+    )
+
 
 class GoEthereumTest(Web3ModuleTest):
     def _check_web3_clientVersion(self, client_version):
@@ -40,6 +55,18 @@ def test_eth_protocol_version(self, w3):
     def test_eth_protocolVersion(self, w3):
         super().test_eth_protocolVersion(w3)
 
+    @flaky(max_runs=3)
+    def test_eth_estimate_gas(
+        self, w3: "Web3", unlocked_account_dual_type: ChecksumAddress
+    ) -> None:
+        super().test_eth_estimate_gas(w3, unlocked_account_dual_type)
+
+    @flaky(max_runs=3)
+    def test_eth_estimateGas_deprecated(
+        self, w3: "Web3", unlocked_account_dual_type: ChecksumAddress
+    ) -> None:
+        super().test_eth_estimateGas_deprecated(w3, unlocked_account_dual_type)
+
 
 class GoEthereumVersionModuleTest(VersionModuleTest):
     @pytest.mark.xfail(reason='eth_protocolVersion was removed in Geth 1.10.0')

tests/integration/go_ethereum/test_goethereum_http.py

@@ -1,19 +1,10 @@
 import pytest
 
 import pytest_asyncio
-from flaky import (
-    flaky,
-)
 
-from eth_typing import (
-    ChecksumAddress,
-)
 from tests.utils import (
     get_open_port,
 )
-from typing import (
-    TYPE_CHECKING,
-)
 from web3 import Web3
 from web3._utils.module_testing.go_ethereum_admin_module import (
     GoEthereumAsyncAdminModuleTest,
@@ -60,10 +51,6 @@
 )
 
 
-if TYPE_CHECKING:
-    from web3 import Web3  # noqa: F401
-
-
 @pytest.fixture(scope="module")
 def rpc_port():
     return get_open_port()
@@ -171,11 +158,8 @@ async def test_admin_start_stop_ws(self, w3: "Web3") -> None:
 
 
 class TestGoEthereumEthModuleTest(GoEthereumEthModuleTest):
-    @flaky(max_runs=3)
-    def test_eth_estimate_gas(
-        self, w3: "Web3", unlocked_account_dual_type: ChecksumAddress
-    ) -> None:
-        pass
+    pass
+
 
 class TestGoEthereumVersionModuleTest(GoEthereumVersionModuleTest):
     pass