chore: rearrange structure

Author: madlabman

main.py diffyscan/diffyscan.py

@@ -4,12 +4,12 @@
 import argparse
 import os
 
-from utils.common import load_config, load_env
-from utils.constants import DIFFS_DIR, START_TIME, DEFAULT_CONFIG_PATH
-from utils.explorer import get_contract_from_explorer
-from utils.github import get_file_from_github, get_file_from_github_recursive, resolve_dep
-from utils.helpers import create_dirs
-from utils.logger import logger
+from .utils.common import load_config, load_env
+from .utils.constants import DIFFS_DIR, START_TIME, DEFAULT_CONFIG_PATH
+from .utils.explorer import get_contract_from_explorer
+from .utils.github import get_file_from_github, get_file_from_github_recursive, resolve_dep
+from .utils.helpers import create_dirs
+from .utils.logger import logger
 
 
 __version__ = "0.0.0"

utils/common.py diffyscan/utils/common.py

@@ -5,8 +5,8 @@
 
 import requests
 
-from utils.logger import logger
-from utils.types import Config
+from .logger import logger
+from .types import Config
 
 
 def load_env(variable_name, required=True, masked=False):
@@ -32,7 +32,7 @@ def load_config(path: str) -> Config:
 
 
 def fetch(url, headers={}):
-    logger.log(f"fetch: {url}")
+    logger.log(f"Fetch: {url}")
     response = requests.get(url, headers=headers)
 
     if response.status_code == 404:

utils/constants.py diffyscan/utils/constants.py

@@ -1,8 +1,8 @@
 import json
 import sys
 
-from utils.common import fetch
-from utils.logger import logger
+from .common import fetch
+from .logger import logger
 
 
 def _errorNoSourceCodeAndExit(address):

utils/explorer.py diffyscan/utils/explorer.py

@@ -1,6 +1,7 @@
 import base64
-from utils.common import fetch, parse_repo_link
-from utils.logger import logger
+
+from .common import fetch, parse_repo_link
+from .logger import logger
 
 
 def get_file_from_github(github_api_token, dependency_repo, path_to_file, dep_name):

utils/github.py diffyscan/utils/github.py

@@ -1,6 +1,7 @@
 import termtables
-from utils.constants import LOGS_PATH
-from utils.helpers import create_dirs
+
+from .constants import LOGS_PATH
+from .helpers import create_dirs
 
 CYAN = "\033[96m"
 PURPLE = "\033[95m"
@@ -107,7 +108,7 @@ def color_row(self, row):
         hlcolor = GREEN
 
         file_found = row[2]
-        diffs_found = row[3] != None and row[3] > 0
+        diffs_found = row[3] is not None and row[3] > 0
 
         if not file_found:
             hlcolor = RED

utils/helpers.py diffyscan/utils/helpers.py

@@ -9,11 +9,11 @@ repository = "https://github.com/lidofinance/diffyscan"
 keywords = ["ethereum", "diff", "sources"]
 
 package-mode = true
-packages = [{ include = "main.py"}, { include = "utils" }]
+packages = [{ include = "diffyscan"}]
 exclude = ["config_samples"]
 
 [tool.poetry.scripts]
-diffyscan = "main:main"
+diffyscan = "diffyscan.diffyscan:main"
 
 [tool.poetry.dependencies]
 python = ">=3.10,<4"
@@ -30,7 +30,7 @@ style = "semver"
 metadata = false
 
 [tool.poetry-dynamic-versioning.substitution]
-files = ["main.py"]
+files = ["diffyscan/diffyscan.py"]
 
 [build-system]
 requires = ["poetry-core>=1.0.0", "poetry-dynamic-versioning>=1.0.0,<2.0.0"]