Use yield instead of long if statement

kclowes · kclowes · commit cdf35dd44b64 · 2020-01-23T10:48:14.000-07:00
diff --git a/tests/integration/go_ethereum/common.py b/tests/integration/go_ethereum/common.py
@@ -10,8 +10,8 @@
     Web3ModuleTest,
 )
 
-GETH_VERSIONS_WITHOUT_MINING_CONTROL = ['v1.7.2', 'v1.8.22']
-GETH_VERSIONS_WITHOUT_ETH_SUBMITHASH = ['v1.8.22', 'v1.9.7']
+VERSIONS_WITHOUT_MINING_CONTROL = ['v1.7.2', 'v1.8.22']
+VERSIONS_WITHOUT_ETH_SUBMITHASH = ['v1.8.22', 'v1.9.7']
 
 
 class GoEthereumTest(Web3ModuleTest):
@@ -21,7 +21,7 @@ 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 GETH_VERSIONS_WITHOUT_MINING_CONTROL]):
+        if any([v in web3.clientVersion for v in VERSIONS_WITHOUT_MINING_CONTROL]):
             pytest.xfail(reason='Needs ability to efficiently control mining')
         super().test_eth_replaceTransaction(web3, unlocked_account)
 
@@ -31,14 +31,14 @@ def test_eth_replaceTransaction_already_mined(self, web3, unlocked_account_dual_
         web3.geth.miner.stop()
 
     def test_eth_replaceTransaction_gas_price_defaulting_minimum(self, web3, unlocked_account):
-        if any([v in web3.clientVersion for v in GETH_VERSIONS_WITHOUT_MINING_CONTROL]):
+        if any([v in web3.clientVersion for v in 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 GETH_VERSIONS_WITHOUT_MINING_CONTROL]):
+        if any([v in web3.clientVersion for v in 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
@@ -47,14 +47,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 GETH_VERSIONS_WITHOUT_MINING_CONTROL]):
+        if any([v in web3.clientVersion for v in 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 GETH_VERSIONS_WITHOUT_MINING_CONTROL]):
+        if any([v in web3.clientVersion for v in VERSIONS_WITHOUT_MINING_CONTROL]):
             pytest.xfail(reason='Needs ability to efficiently control mining')
         super().test_eth_modifyTransaction(web3, unlocked_account)
 
@@ -67,7 +67,7 @@ def test_eth_estimateGas_with_block(self,
         )
 
     def test_eth_submitHashrate(self, web3):
-        if any([v in web3.clientVersion for v in GETH_VERSIONS_WITHOUT_ETH_SUBMITHASH]):
+        if any([v in web3.clientVersion for v in 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/tests/integration/go_ethereum/test_goethereum_http.py b/tests/integration/go_ethereum/test_goethereum_http.py
@@ -29,37 +29,35 @@ def endpoint_uri(rpc_port):
     return 'http://localhost:{0}'.format(rpc_port)
 
 
+def _geth_command_arguments(rpc_port,
+                            base_geth_command_arguments,
+                            geth_version):
+    yield from base_geth_command_arguments
+    if geth_version.major == 1:
+        yield from (
+            '--rpc',
+            '--rpcport', rpc_port,
+            '--rpcapi', 'admin,db,eth,net,web3,personal,shh,miner',
+            '--ipcdisable',
+        )
+        if geth_version.minor == 9:
+            yield '--allow-insecure-unlock'
+        elif geth_version.minor not in [9, 8, 7]:
+            raise AssertionError("Unsupported Geth version")
+    else:
+        raise AssertionError("Unsupported Geth version")
+
+
 @pytest.fixture(scope='module')
 def geth_command_arguments(rpc_port,
                            base_geth_command_arguments,
                            get_geth_version):
 
-    if get_geth_version.major == 1:
-        if get_geth_version.minor == 9:
-            return (
-                base_geth_command_arguments +
-                (
-                    '--rpc',
-                    '--rpcport', rpc_port,
-                    '--rpcapi', 'admin,db,eth,net,web3,personal,shh,miner',
-                    '--ipcdisable',
-                    '--allow-insecure-unlock',
-                )
-            )
-        elif get_geth_version.minor == 8 or get_geth_version.minor == 7:
-            return (
-                base_geth_command_arguments +
-                (
-                    '--rpc',
-                    '--rpcport', rpc_port,
-                    '--rpcapi', 'admin,db,eth,net,web3,personal,shh,miner',
-                    '--ipcdisable',
-                )
-            )
-        else:
-            assert False, "Unsupported geth version"
-    else:
-        assert False, "Unsupported geth version"
+    return _geth_command_arguments(
+        rpc_port,
+        base_geth_command_arguments,
+        get_geth_version
+    )
 
 
 @pytest.fixture(scope="module")
diff --git a/tests/integration/go_ethereum/test_goethereum_ipc.py b/tests/integration/go_ethereum/test_goethereum_ipc.py
@@ -21,16 +21,24 @@
 )
 
 
+def _geth_command_arguments(geth_ipc_path,
+                            base_geth_command_arguments):
+
+    geth_port = get_open_port()
+    yield from base_geth_command_arguments
+    yield from (
+        '--port', geth_port,
+        '--ipcpath', geth_ipc_path,
+    )
+
+
 @pytest.fixture(scope='module')
 def geth_command_arguments(geth_ipc_path,
                            base_geth_command_arguments):
-    geth_port = get_open_port()
-    return (
-        base_geth_command_arguments +
-        (
-            '--port', geth_port,
-            '--ipcpath', geth_ipc_path,
-        )
+
+    return _geth_command_arguments(
+        geth_ipc_path,
+        base_geth_command_arguments
     )
 
 
diff --git a/tests/integration/go_ethereum/test_goethereum_ws.py b/tests/integration/go_ethereum/test_goethereum_ws.py
@@ -30,41 +30,38 @@ def endpoint_uri(ws_port):
     return 'ws://localhost:{0}'.format(ws_port)
 
 
+def _geth_command_arguments(ws_port,
+                            base_geth_command_arguments,
+                            geth_version):
+    yield from base_geth_command_arguments
+    if geth_version.major == 1:
+        yield from (
+            '--ws',
+            '--wsport', ws_port,
+            '--wsapi', 'admin,db,eth,net,shh,web3,personal,miner',
+            '--wsorigins', '*',
+            '--ipcdisable',
+        )
+        if geth_version.minor == 9:
+            yield '--allow-insecure-unlock'
+        elif geth_version.minor not in [9, 8, 7]:
+            raise AssertionError("Unsupported Geth version")
+    else:
+        raise AssertionError("Unsupported Geth version")
+
+
 @pytest.fixture(scope='module')
 def geth_command_arguments(geth_binary,
                            get_geth_version,
                            datadir,
                            ws_port,
                            base_geth_command_arguments):
 
-    if get_geth_version.major == 1:
-        if get_geth_version.minor == 9:
-            return (
-                base_geth_command_arguments +
-                (
-                    '--ws',
-                    '--wsport', ws_port,
-                    '--wsapi', 'admin,db,eth,net,shh,web3,personal,miner',
-                    '--wsorigins', '*',
-                    '--ipcdisable',
-                    '--allow-insecure-unlock',
-                )
-            )
-        elif get_geth_version.minor == 8 or get_geth_version.minor == 7:
-            return (
-                base_geth_command_arguments +
-                (
-                    '--ws',
-                    '--wsport', ws_port,
-                    '--wsapi', 'admin,db,eth,net,shh,web3,personal,miner',
-                    '--wsorigins', '*',
-                    '--ipcdisable',
-                )
-            )
-        else:
-            assert False, "Unsupported geth version"
-    else:
-        assert False, "Unsupported geth version"
+    return _geth_command_arguments(
+        ws_port,
+        base_geth_command_arguments,
+        get_geth_version
+    )
 
 
 @pytest.fixture(scope="module")
diff --git a/web3/_utils/module_testing/eth_module.py b/web3/_utils/module_testing/eth_module.py
@@ -356,7 +356,7 @@ def test_eth_signTransaction(self, web3: "Web3", unlocked_account: ChecksumAddre
             'nonce': Nonce(0),
         }
         result = web3.eth.signTransaction(txn_params)
-        signatory_account = web3.eth.account.recoverTransaction(result['raw'])
+        signatory_account = web3.eth.account.recover_transaction(result['raw'])
         assert unlocked_account == signatory_account
         assert result['tx']['to'] == txn_params['to']
         assert result['tx']['value'] == txn_params['value']

Original file line number	Diff line number	Diff line change
`@@ -356,7 +356,7 @@ def test_eth_signTransaction(self, web3: "Web3", unlocked_account: ChecksumAddre`
`356`	`356`	`'nonce': Nonce(0),`
`357`	`357`	`}`
`358`	`358`	`result = web3.eth.signTransaction(txn_params)`
`359`		`- signatory_account = web3.eth.account.recoverTransaction(result['raw'])`
	`359`	`+ signatory_account = web3.eth.account.recover_transaction(result['raw'])`
`360`	`360`	`assert unlocked_account == signatory_account`
`361`	`361`	`assert result['tx']['to'] == txn_params['to']`
`362`	`362`	`assert result['tx']['value'] == txn_params['value']`