From 49855669a5680d9ec48a29588e8173bff3636d00 Mon Sep 17 00:00:00 2001 From: Vlad Stan Date: Fri, 9 Dec 2022 13:40:22 +0200 Subject: [PATCH] refactor: move init logic at the bottom --- lnbits/settings.py | 68 ++++++++++++++++++++++++---------------------- 1 file changed, 35 insertions(+), 33 deletions(-) diff --git a/lnbits/settings.py b/lnbits/settings.py index 1497aa94f..90013680b 100644 --- a/lnbits/settings.py +++ b/lnbits/settings.py @@ -251,44 +251,11 @@ class AdminSettings(EditableSetings): lnbits_allowed_funding_sources: Optional[List[str]] -readonly_variables = ReadOnlySettings.readonly_fields() - -settings = Settings() - -settings.lnbits_path = str(path.dirname(path.realpath(__file__))) - -try: - settings.lnbits_commit = ( - subprocess.check_output( - ["git", "-C", settings.lnbits_path, "rev-parse", "HEAD"], - stderr=subprocess.DEVNULL, - ) - .strip() - .decode("ascii") - ) -except: - settings.lnbits_commit = "docker" - - -# printing enviroment variable for debugging -if not settings.lnbits_admin_ui: - logger.debug(f"Enviroment Settings:") - for key, value in settings.dict(exclude_none=True).items(): - logger.debug(f"{key}: {value}") - - def set_cli_settings(**kwargs): for key, value in kwargs.items(): setattr(settings, key, value) -wallets_module = importlib.import_module("lnbits.wallets") -FAKE_WALLET = getattr(wallets_module, "FakeWallet")() - -# initialize as fake wallet -WALLET = FAKE_WALLET - - # set wallet class after settings are loaded def set_wallet_class(): wallet_class = getattr(wallets_module, settings.lnbits_backend_wallet_class) @@ -323,3 +290,38 @@ def send_admin_user_to_saas(): logger.error( f"error sending admin user to saas: {settings.lnbits_saas_callback}" ) + + +############### INIT ################# + +readonly_variables = ReadOnlySettings.readonly_fields() + +settings = Settings() + +settings.lnbits_path = str(path.dirname(path.realpath(__file__))) + +try: + settings.lnbits_commit = ( + subprocess.check_output( + ["git", "-C", settings.lnbits_path, "rev-parse", "HEAD"], + stderr=subprocess.DEVNULL, + ) + .strip() + .decode("ascii") + ) +except: + settings.lnbits_commit = "docker" + + +# printing enviroment variable for debugging +if not settings.lnbits_admin_ui: + logger.debug(f"Enviroment Settings:") + for key, value in settings.dict(exclude_none=True).items(): + logger.debug(f"{key}: {value}") + + +wallets_module = importlib.import_module("lnbits.wallets") +FAKE_WALLET = getattr(wallets_module, "FakeWallet")() + +# initialize as fake wallet +WALLET = FAKE_WALLET