Try enabling the geth miner for replaceTransaction

ethereum · Jan 15, 2020 · 2c90120 · 2c90120
1 parent 6e16d4b
commit 2c90120
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 9 deletions.
diff --git a/tests/integration/go_ethereum/common.py b/tests/integration/go_ethereum/common.py
@@ -10,8 +10,8 @@
     Web3ModuleTest,
 )
 
-OLDER_GETH_VERSIONS = ['v1.7.2', 'v1.8.22']
-NEWER_GETH_VERSIONS = ['v1.8.22', 'v1.9.7']
+GETH_VERSIONS_WITHOUT_MINING_CONTROL = ['v1.7.2', 'v1.8.22']
+GETH_VERSIONS_WITHOUT_ETH_SUBMITHASH = ['v1.8.22', 'v1.9.7']
 
 
 class GoEthereumTest(Web3ModuleTest):
@@ -21,19 +21,19 @@ def _check_web3_clientVersion(self, client_version):
 
 class GoEthereumEthModuleTest(EthModuleTest):
     def test_eth_replaceTransaction(self, web3, unlocked_account):
-        if any([v in web3.clientVersion for v in OLDER_GETH_VERSIONS]):
-            pytest.xfail(reason='Needs ability to efficiently control mining')
+        # if any([v in web3.clientVersion for v in GETH_VERSIONS_WITHOUT_MINING_CONTROL]):
+        #     pytest.xfail(reason='Needs ability to efficiently control mining')
         super().test_eth_replaceTransaction(web3, unlocked_account)
 
     def test_eth_replaceTransaction_gas_price_defaulting_minimum(self, web3, unlocked_account):
-        if any([v in web3.clientVersion for v in OLDER_GETH_VERSIONS]):
+        if any([v in web3.clientVersion for v in GETH_VERSIONS_WITHOUT_MINING_CONTROL]):
             pytest.xfail(reason='Needs ability to efficiently control mining')
         super().test_eth_replaceTransaction_gas_price_defaulting_minimum(web3, unlocked_account)
 
     def test_eth_replaceTransaction_gas_price_defaulting_strategy_higher(self,
                                                                          web3,
                                                                          unlocked_account):
-        if any([v in web3.clientVersion for v in OLDER_GETH_VERSIONS]):
+        if any([v in web3.clientVersion for v in GETH_VERSIONS_WITHOUT_MINING_CONTROL]):
             pytest.xfail(reason='Needs ability to efficiently control mining')
         super().test_eth_replaceTransaction_gas_price_defaulting_strategy_higher(
             web3, unlocked_account
@@ -42,14 +42,14 @@ def test_eth_replaceTransaction_gas_price_defaulting_strategy_higher(self,
     def test_eth_replaceTransaction_gas_price_defaulting_strategy_lower(self,
                                                                         web3,
                                                                         unlocked_account):
-        if any([v in web3.clientVersion for v in OLDER_GETH_VERSIONS]):
+        if any([v in web3.clientVersion for v in GETH_VERSIONS_WITHOUT_MINING_CONTROL]):
             pytest.xfail(reason='Needs ability to efficiently control mining')
         super().test_eth_replaceTransaction_gas_price_defaulting_strategy_lower(
             web3, unlocked_account
         )
 
     def test_eth_modifyTransaction(self, web3, unlocked_account):
-        if any([v in web3.clientVersion for v in OLDER_GETH_VERSIONS]):
+        if any([v in web3.clientVersion for v in GETH_VERSIONS_WITHOUT_MINING_CONTROL]):
             pytest.xfail(reason='Needs ability to efficiently control mining')
         super().test_eth_modifyTransaction(web3, unlocked_account)
 
@@ -62,7 +62,7 @@ def test_eth_estimateGas_with_block(self,
         )
 
     def test_eth_submitHashrate(self, web3):
-        if any([v in web3.clientVersion for v in NEWER_GETH_VERSIONS]):
+        if any([v in web3.clientVersion for v in GETH_VERSIONS_WITHOUT_ETH_SUBMITHASH]):
             # https://github.com/ethereum/go-ethereum/commit/51db5975cc5fb88db6a0dba1826b534fd4df29d7
             pytest.xfail('eth_submitHashrate deprecated in 1.8.22 for ethash_submitHashRate')
         super().test_eth_submitHashrate(web3)

diff --git a/web3/_utils/module_testing/eth_module.py b/web3/_utils/module_testing/eth_module.py
@@ -438,8 +438,11 @@ def test_eth_replaceTransaction(
         txn_hash = web3.eth.sendTransaction(txn_params)
 
         txn_params['gasPrice'] = Wei(web3.eth.gasPrice * 2)
+        web3.geth.miner.start()
         replace_txn_hash = web3.eth.replaceTransaction(txn_hash, txn_params)
+        web3.eth.waitForTransactionReceipt(replace_txn_hash)
         replace_txn = web3.eth.getTransaction(replace_txn_hash)
+        web3.geth.miner.stop()
 
         assert is_same_address(replace_txn['from'], cast(ChecksumAddress, txn_params['from']))
         assert is_same_address(replace_txn['to'], cast(ChecksumAddress, txn_params['to']))