From f23e1b9fd69870d9360436130a5e30de43a88b3b Mon Sep 17 00:00:00 2001 From: osiris account Date: Sun, 12 Mar 2023 22:14:45 -0700 Subject: [PATCH] =?UTF-8?q?=F0=9F=92=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- token-scanner-api/src/utils/os_utils.py | 2 +- token-scanner-api/src/utils/test_api.py | 32 ++++++++++++++++++------- 2 files changed, 25 insertions(+), 9 deletions(-) diff --git a/token-scanner-api/src/utils/os_utils.py b/token-scanner-api/src/utils/os_utils.py index a0851e3..a3ab172 100644 --- a/token-scanner-api/src/utils/os_utils.py +++ b/token-scanner-api/src/utils/os_utils.py @@ -74,7 +74,7 @@ def log_info(string) -> None: def log_debug(string) -> None: """Print STDOUT debug using the logging library.""" - logging.debug('⚠️ %s', string) + logging.debug('🟡 %s', string) def open_json(filepath) -> dict: diff --git a/token-scanner-api/src/utils/test_api.py b/token-scanner-api/src/utils/test_api.py index 52c8d7b..55d960f 100644 --- a/token-scanner-api/src/utils/test_api.py +++ b/token-scanner-api/src/utils/test_api.py @@ -4,21 +4,35 @@ import src.utils.os_utils as os_utils +def _craft_url(env_vars, endpoint): + """Craft the URL for the API.""" -def fetch_token_balance(ewallet): + host = env_vars['API_HOST_URL'] + if host == '0.0.0.0': + host = 'http://localhost' + port = env_vars['API_HOST_PORT'] + + return f"{host}:{port}/{endpoint}" + + +def fetch_token_balance(env_vars, wallet): """Test the fetch_token_balance function.""" - endpoint = f"balance/{wallet}" - url = f'http://localhost:80/{endpoint}' + endpoint = f'balance/{wallet}' + + url = _craft_url(env_vars, endpoint) + response = os_utils.send_get_request(url) os_utils.log_info(response) -def fetch_top_token_holders(env_vars, top_number): +def fetch_top_token_holders(env_vars): """Test the fetch_top_token_holders function.""" - url = os_utils.format_url(f"{env_vars['API_HOST_URL']}:{env_vars['API_HOST_PORT']}", \ - "top") + endpoint = f'top' + + url = _craft_url(env_vars, endpoint) + response = os_utils.send_get_request(url) os_utils.log_info(response) @@ -26,7 +40,9 @@ def fetch_top_token_holders(env_vars, top_number): def fetch_change(env_vars, wallet): """Test the fetch_change function.""" - url = os_utils.format_url(f"{env_vars['API_HOST_URL']}:{env_vars['API_HOST_PORT']}", \ - f"/weekly/{wallet}") + endpoint = f'weekly/{wallet}' + + url = _craft_url(env_vars, endpoint) + response = os_utils.send_get_request(url) os_utils.log_info(response)