Convert variables to str

lidofinance · Feb 3, 2025 · 6be1278 · 6be1278
1 parent aaa4249
commit 6be1278
Showing 1 changed file with 32 additions and 29 deletions.
diff --git a/src/variables.py b/src/variables.py
@@ -113,35 +113,38 @@ def raise_from_errors(errors):
 
 # All non-private env variables to the logs in main
 PUBLIC_ENV_VARS = {
-    'ACCOUNT': 'Dry' if ACCOUNT is None else ACCOUNT.address,
-    'LIDO_LOCATOR_ADDRESS': LIDO_LOCATOR_ADDRESS,
-    'CSM_MODULE_ADDRESS': CSM_MODULE_ADDRESS,
-    'FINALIZATION_BATCH_MAX_REQUEST_COUNT': FINALIZATION_BATCH_MAX_REQUEST_COUNT,
-    'EL_REQUESTS_BATCH_SIZE': EL_REQUESTS_BATCH_SIZE,
-    'CSM_ORACLE_MAX_CONCURRENCY': CSM_ORACLE_MAX_CONCURRENCY,
-    'TX_GAS_ADDITION': TX_GAS_ADDITION,
-    'EVENTS_SEARCH_STEP': EVENTS_SEARCH_STEP,
-    'MIN_PRIORITY_FEE': MIN_PRIORITY_FEE,
-    'MAX_PRIORITY_FEE': MAX_PRIORITY_FEE,
-    'PRIORITY_FEE_PERCENTILE': PRIORITY_FEE_PERCENTILE,
-    'DAEMON': DAEMON,
-    'SUBMIT_DATA_DELAY_IN_SLOTS': SUBMIT_DATA_DELAY_IN_SLOTS,
-    'CYCLE_SLEEP_IN_SECONDS': CYCLE_SLEEP_IN_SECONDS,
-    'ALLOW_REPORTING_IN_BUNKER_MODE': ALLOW_REPORTING_IN_BUNKER_MODE,
-    'HTTP_REQUEST_TIMEOUT_EXECUTION': HTTP_REQUEST_TIMEOUT_EXECUTION,
-    'HTTP_REQUEST_TIMEOUT_CONSENSUS': HTTP_REQUEST_TIMEOUT_CONSENSUS,
-    'HTTP_REQUEST_RETRY_COUNT_CONSENSUS': HTTP_REQUEST_RETRY_COUNT_CONSENSUS,
-    'HTTP_REQUEST_SLEEP_BEFORE_RETRY_IN_SECONDS_CONSENSUS': HTTP_REQUEST_SLEEP_BEFORE_RETRY_IN_SECONDS_CONSENSUS,
-    'HTTP_REQUEST_TIMEOUT_KEYS_API': HTTP_REQUEST_TIMEOUT_KEYS_API,
-    'HTTP_REQUEST_RETRY_COUNT_KEYS_API': HTTP_REQUEST_RETRY_COUNT_KEYS_API,
-    'HTTP_REQUEST_SLEEP_BEFORE_RETRY_IN_SECONDS_KEYS_API': HTTP_REQUEST_SLEEP_BEFORE_RETRY_IN_SECONDS_KEYS_API,
-    'HTTP_REQUEST_TIMEOUT_IPFS': HTTP_REQUEST_TIMEOUT_IPFS,
-    'HTTP_REQUEST_RETRY_COUNT_IPFS': HTTP_REQUEST_RETRY_COUNT_IPFS,
-    'PROMETHEUS_PORT': PROMETHEUS_PORT,
-    'PROMETHEUS_PREFIX': PROMETHEUS_PREFIX,
-    'HEALTHCHECK_SERVER_PORT': HEALTHCHECK_SERVER_PORT,
-    'MAX_CYCLE_LIFETIME_IN_SECONDS': MAX_CYCLE_LIFETIME_IN_SECONDS,
-    'CACHE_PATH': str(CACHE_PATH),
+    key: str(value if key != 'ACCOUNT' else 'Dry' if ACCOUNT is None else ACCOUNT.address)
+    for key, value in {
+        'ACCOUNT': ACCOUNT,
+        'LIDO_LOCATOR_ADDRESS': LIDO_LOCATOR_ADDRESS,
+        'CSM_MODULE_ADDRESS': CSM_MODULE_ADDRESS,
+        'FINALIZATION_BATCH_MAX_REQUEST_COUNT': FINALIZATION_BATCH_MAX_REQUEST_COUNT,
+        'EL_REQUESTS_BATCH_SIZE': EL_REQUESTS_BATCH_SIZE,
+        'CSM_ORACLE_MAX_CONCURRENCY': CSM_ORACLE_MAX_CONCURRENCY,
+        'TX_GAS_ADDITION': TX_GAS_ADDITION,
+        'EVENTS_SEARCH_STEP': EVENTS_SEARCH_STEP,
+        'MIN_PRIORITY_FEE': MIN_PRIORITY_FEE,
+        'MAX_PRIORITY_FEE': MAX_PRIORITY_FEE,
+        'PRIORITY_FEE_PERCENTILE': PRIORITY_FEE_PERCENTILE,
+        'DAEMON': DAEMON,
+        'SUBMIT_DATA_DELAY_IN_SLOTS': SUBMIT_DATA_DELAY_IN_SLOTS,
+        'CYCLE_SLEEP_IN_SECONDS': CYCLE_SLEEP_IN_SECONDS,
+        'ALLOW_REPORTING_IN_BUNKER_MODE': ALLOW_REPORTING_IN_BUNKER_MODE,
+        'HTTP_REQUEST_TIMEOUT_EXECUTION': HTTP_REQUEST_TIMEOUT_EXECUTION,
+        'HTTP_REQUEST_TIMEOUT_CONSENSUS': HTTP_REQUEST_TIMEOUT_CONSENSUS,
+        'HTTP_REQUEST_RETRY_COUNT_CONSENSUS': HTTP_REQUEST_RETRY_COUNT_CONSENSUS,
+        'HTTP_REQUEST_SLEEP_BEFORE_RETRY_IN_SECONDS_CONSENSUS': HTTP_REQUEST_SLEEP_BEFORE_RETRY_IN_SECONDS_CONSENSUS,
+        'HTTP_REQUEST_TIMEOUT_KEYS_API': HTTP_REQUEST_TIMEOUT_KEYS_API,
+        'HTTP_REQUEST_RETRY_COUNT_KEYS_API': HTTP_REQUEST_RETRY_COUNT_KEYS_API,
+        'HTTP_REQUEST_SLEEP_BEFORE_RETRY_IN_SECONDS_KEYS_API': HTTP_REQUEST_SLEEP_BEFORE_RETRY_IN_SECONDS_KEYS_API,
+        'HTTP_REQUEST_TIMEOUT_IPFS': HTTP_REQUEST_TIMEOUT_IPFS,
+        'HTTP_REQUEST_RETRY_COUNT_IPFS': HTTP_REQUEST_RETRY_COUNT_IPFS,
+        'PROMETHEUS_PORT': PROMETHEUS_PORT,
+        'PROMETHEUS_PREFIX': PROMETHEUS_PREFIX,
+        'HEALTHCHECK_SERVER_PORT': HEALTHCHECK_SERVER_PORT,
+        'MAX_CYCLE_LIFETIME_IN_SECONDS': MAX_CYCLE_LIFETIME_IN_SECONDS,
+        'CACHE_PATH': CACHE_PATH,
+    }.items()
 }
 
 PRIVATE_ENV_VARS = {