Start/stop miner for replaceTransaction_already_mined test

ethereum · Jan 15, 2020 · d330c5c · d330c5c
1 parent 95e8022
commit d330c5c
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 9 deletions.
diff --git a/tests/generate_go_ethereum_fixture.py b/tests/generate_go_ethereum_fixture.py
@@ -26,7 +26,7 @@
     valmap,
 )
 
-from tests.utils import (
+from utils import (
     get_open_port,
 )
 from web3 import Web3

diff --git a/tests/integration/go_ethereum/test_goethereum_http.py b/tests/integration/go_ethereum/test_goethereum_http.py
@@ -41,7 +41,7 @@ def geth_command_arguments(rpc_port,
                 (
                     '--rpc',
                     '--rpcport', rpc_port,
-                    '--rpcapi', 'admin,db,eth,net,web3,personal,shh,web3',
+                    '--rpcapi', 'admin,db,eth,net,web3,personal,shh,miner',
                     '--ipcdisable',
                     '--allow-insecure-unlock',
                 )
@@ -52,7 +52,7 @@ def geth_command_arguments(rpc_port,
                 (
                     '--rpc',
                     '--rpcport', rpc_port,
-                    '--rpcapi', 'admin,db,eth,net,web3,personal,shh,web3',
+                    '--rpcapi', 'admin,db,eth,net,web3,personal,shh,miner',
                     '--ipcdisable',
                 )
             )
@@ -92,7 +92,10 @@ def test_admin_stopRPC(web3):
 
 
 class TestGoEthereumEthModuleTest(GoEthereumEthModuleTest):
-    pass
+    def test_eth_replaceTransaction_already_mined(self, web3, unlocked_account_dual_type):
+        web3.geth.miner.start()
+        super().test_eth_replaceTransaction_already_mined(web3, unlocked_account_dual_type)
+        web3.geth.miner.stop()
 
 
 class TestGoEthereumVersionModuleTest(GoEthereumVersionModuleTest):

diff --git a/tests/integration/go_ethereum/test_goethereum_ipc.py b/tests/integration/go_ethereum/test_goethereum_ipc.py
@@ -62,7 +62,10 @@ def test_admin_peers(web3):
 
 
 class TestGoEthereumEthModuleTest(GoEthereumEthModuleTest):
-    pass
+    def test_eth_replaceTransaction_already_mined(self, web3, unlocked_account_dual_type):
+        web3.geth.miner.start()
+        super().test_eth_replaceTransaction_already_mined(web3, unlocked_account_dual_type)
+        web3.geth.miner.stop()
 
 
 class TestGoEthereumVersionModuleTest(GoEthereumVersionModuleTest):

diff --git a/tests/integration/go_ethereum/test_goethereum_ws.py b/tests/integration/go_ethereum/test_goethereum_ws.py
@@ -44,7 +44,7 @@ def geth_command_arguments(geth_binary,
                 (
                     '--ws',
                     '--wsport', ws_port,
-                    '--wsapi', 'admin,db,eth,net,shh,web3,personal,web3',
+                    '--wsapi', 'admin,db,eth,net,shh,web3,personal,miner',
                     '--wsorigins', '*',
                     '--ipcdisable',
                     '--allow-insecure-unlock',
@@ -56,7 +56,7 @@ def geth_command_arguments(geth_binary,
                 (
                     '--ws',
                     '--wsport', ws_port,
-                    '--wsapi', 'admin,db,eth,net,shh,web3,personal,web3',
+                    '--wsapi', 'admin,db,eth,net,shh,web3,personal,miner',
                     '--wsorigins', '*',
                     '--ipcdisable',
                 )
@@ -97,7 +97,10 @@ def test_admin_stopWS(self, web3):
 
 
 class TestGoEthereumEthModuleTest(GoEthereumEthModuleTest):
-    pass
+    def test_eth_replaceTransaction_already_mined(self, web3, unlocked_account_dual_type):
+        web3.geth.miner.start()
+        super().test_eth_replaceTransaction_already_mined(web3, unlocked_account_dual_type)
+        web3.geth.miner.stop()
 
 
 class TestGoEthereumVersionModuleTest(GoEthereumVersionModuleTest):

diff --git a/web3/_utils/module_testing/eth_module.py b/web3/_utils/module_testing/eth_module.py
@@ -463,7 +463,6 @@ def test_eth_replaceTransaction_non_existing_transaction(
                 txn_params
             )
 
-    # auto mine is enabled for this test
     def test_eth_replaceTransaction_already_mined(
         self, web3: "Web3", unlocked_account_dual_type: ChecksumAddress
     ) -> None:
@@ -475,6 +474,7 @@ def test_eth_replaceTransaction_already_mined(
             'gasPrice': web3.eth.gasPrice,
         }
         txn_hash = web3.eth.sendTransaction(txn_params)
+        web3.eth.waitForTransactionReceipt(txn_hash)
 
         txn_params['gasPrice'] = Wei(web3.eth.gasPrice * 2)
         with pytest.raises(ValueError, match="Supplied transaction with hash"):