Fix python lint issues

Author: Damon Chen

integration_tests/conftest.py

@@ -1,8 +1,8 @@
 import pytest
 
+from .expansion import expand_and_output_yamls
 from .network import setup_cronos, setup_geth
 
-from .expansion import expand_and_output_yamls
 
 def pytest_configure(config):
     config.addinivalue_line("markers", "slow: marks tests as slow")
@@ -45,7 +45,7 @@ def cronos(tmp_path_factory, yamls):
 @pytest.fixture(scope="session")
 def geth(tmp_path_factory):
     path = tmp_path_factory.mktemp("geth")
-    yield from setup_geth(path, 8545)
+    yield from setup_geth(path, 26450)
 
 
 @pytest.fixture(scope="session", params=["cronos", "geth"])
@@ -61,6 +61,7 @@ def cluster(request, cronos, geth):
     else:
         raise NotImplementedError
 
+
 @pytest.fixture(scope="session")
 def yamls():
     yield expand_and_output_yamls()

integration_tests/expansion.py

@@ -1,14 +1,13 @@
+import errno
+import os
 import re
+from pathlib import Path
 from typing import Any, Mapping, Optional, Text
 
-from dotenv.variables import parse_variables
-
 import yaml
-import os
-import errno
 from dotenv import dotenv_values, load_dotenv
-from pathlib import Path
-import sys
+from dotenv.variables import parse_variables
+
 
 def expand_posix_vars(obj: Any, variables: Mapping[Text, Optional[Any]]) -> Any:
     """expand_posix_vars recursively expands POSIX values in an object.
@@ -63,6 +62,7 @@ def _str_to_python_value(val):
     #     return int(val)
     return val
 
+
 def expand_yaml(config_path):
     def load_system_envvars():
         config_vars = dict(os.environ)
@@ -73,11 +73,13 @@ def load_system_envvars():
     if "dotenv" in config:
         dotenv = config.pop("dotenv", {})
         if not isinstance(dotenv, str):
-            raise ValueError(f'Invalid value passed to dotenv: {dotenv}')
+            raise ValueError(f"Invalid value passed to dotenv: {dotenv}")
         config_vars = load_system_envvars()
         env_path = Path(config_path).parent.joinpath(dotenv)
         if not env_path.is_file():
-            raise ValueError(f"Dotenv specified in config but not found at path: {env_path}")
+            raise ValueError(
+                f"Dotenv specified in config but not found at path: {env_path}"
+            )
         config_vars.update(dotenv_values(dotenv_path=env_path))  # type: ignore
         load_dotenv(dotenv_path=env_path)
         config = expand_posix_vars(config, config_vars)
@@ -86,22 +88,35 @@ def load_system_envvars():
     if not os.path.exists(output_path.parent):
         try:
             os.makedirs(output_path.parent)
-        except OSError as exc: # Guard against race condition
+        except OSError as exc:  # Guard against race condition
             if exc.errno != errno.EEXIST:
                 raise
-    yaml.dump(config, output_path.open("w+"),)
+    yaml.dump(
+        config,
+        output_path.open("w+"),
+    )
     print(f"{config_path} was expanded as: {output_path}")
     return output_path
 
+
 def expand_and_output_yamls():
     yaml_dict = {}
-    yaml_dict["cronos-devnet"] = expand_yaml(Path(__file__).parent / "../scripts/cronos-devnet.yaml")
-    yaml_dict["chainmain-devnet"] = expand_yaml(Path(__file__).parent / "../scripts/chainmain-devnet.yaml")
+    yaml_dict["cronos-devnet"] = expand_yaml(
+        Path(__file__).parent / "../scripts/cronos-devnet.yaml"
+    )
+    yaml_dict["chainmain-devnet"] = expand_yaml(
+        Path(__file__).parent / "../scripts/chainmain-devnet.yaml"
+    )
     yaml_dict["devnet"] = expand_yaml(Path(__file__).parent / "../scripts/devnet.yaml")
-    yaml_dict["disable_auto_deployment"] = expand_yaml(Path(__file__).parent / "../scripts/disable_auto_deployment.yaml")
-    yaml_dict["genesis_token_mapping"] = expand_yaml(Path(__file__).parent / "../scripts/genesis_token_mapping.yaml")
+    yaml_dict["disable_auto_deployment"] = expand_yaml(
+        Path(__file__).parent / "../scripts/disable_auto_deployment.yaml"
+    )
+    yaml_dict["genesis_token_mapping"] = expand_yaml(
+        Path(__file__).parent / "../scripts/genesis_token_mapping.yaml"
+    )
     return yaml_dict
 
+
 if __name__ == "__main__":
     expand_and_output_yamls()
     # yaml_path = sys.argv[1]

integration_tests/network.py

@@ -3,7 +3,6 @@
 import signal
 import subprocess
 import time
-from pathlib import Path
 
 import tomlkit
 import web3
@@ -83,7 +82,11 @@ def __init__(self, w3):
 
 
 def setup_cronos(path, base_port, yamls, enable_auto_deployment=True):
-    cfg = yamls["cronos-devnet"] if enable_auto_deployment else yamls["disable_auto_deployment"]
+    cfg = (
+        yamls["cronos-devnet"]
+        if enable_auto_deployment
+        else yamls["disable_auto_deployment"]
+    )
 
     yield from setup_custom_cronos(path, base_port, cfg)
 

integration_tests/test_gravity.py

@@ -85,7 +85,9 @@ def geth(tmp_path_factory):
 @pytest.fixture(scope="module", params=[True, False])
 def cronos(request, tmp_path_factory, yamls):
     "start-cronos"
-    yield from setup_cronos(tmp_path_factory.mktemp("cronos"), 26700, request.param, yamls)
+    yield from setup_cronos(
+        tmp_path_factory.mktemp("cronos"), 26700, request.param, yamls
+    )
 
 
 @pytest.fixture(scope="module")

integration_tests/test_ibc.py

@@ -4,10 +4,10 @@
 from pathlib import Path
 
 import pytest
+from eth_account import Account
 
 from .network import setup_chainmain, setup_cronos, setup_hermes
-from .utils import wait_for_port, KEYS
-from eth_account import Account
+from .utils import KEYS, wait_for_port
 
 
 @pytest.fixture(scope="module")

integration_tests/utils.py

@@ -17,13 +17,13 @@
 import toml
 import yaml
 from dateutil.parser import isoparse
+from dotenv import load_dotenv
 from eth_account import Account
 from hexbytes import HexBytes
 from pystarport import cluster, ledger
 from pystarport.ports import rpc_port
 from web3._utils.transactions import fill_nonce, fill_transaction_defaults
 
-from dotenv import load_dotenv
 load_dotenv("../scripts/.env")
 
 KEYS = {