diff --git a/electrum/plugin.py b/electrum/plugin.py index 3ef989614..7350e0241 100644 --- a/electrum/plugin.py +++ b/electrum/plugin.py @@ -290,11 +290,7 @@ class Plugins(DaemonThread): else: zipfile = zipimport.zipimporter(metadata['path']) init_spec = zipfile.find_spec(name) - module = self.exec_module_from_spec(init_spec, base_name) - # import config vars - if hasattr(module, 'config_vars'): - for cv in module.config_vars: - setattr(SimpleConfig, cv.key().upper(), cv) + self.exec_module_from_spec(init_spec, base_name) if name == "trustedcoin": # removes trustedcoin after loading to not show it in the list of plugins del self.internal_plugin_metadata[name] diff --git a/electrum/plugins/payserver/__init__.py b/electrum/plugins/payserver/__init__.py index d8b55e48c..9e10d3f76 100644 --- a/electrum/plugins/payserver/__init__.py +++ b/electrum/plugins/payserver/__init__.py @@ -1,6 +1,5 @@ -from electrum.simple_config import ConfigVar -config_vars = [ - ConfigVar('payserver_port', default=8080, type_=int), - ConfigVar('payserver_root', default='/r', type_=str), - ConfigVar('payserver_allow_create_invoice', default=False, type_=bool), -] +from electrum.simple_config import ConfigVar, SimpleConfig + +SimpleConfig.PAYSERVER_PORT = ConfigVar('payserver_port', default=8080, type_=int) +SimpleConfig.PAYSERVER_ROOT = ConfigVar('payserver_root', default='/r', type_=str) +SimpleConfig.PAYSERVER_ALLOW_CREATE_INVOICE = ConfigVar('payserver_allow_create_invoice', default=False, type_=bool) diff --git a/electrum/plugins/swapserver/__init__.py b/electrum/plugins/swapserver/__init__.py index 6868d31b3..0aeeb4629 100644 --- a/electrum/plugins/swapserver/__init__.py +++ b/electrum/plugins/swapserver/__init__.py @@ -1,6 +1,5 @@ -from electrum.simple_config import ConfigVar -config_vars = [ - ConfigVar('swapserver_port', default=None, type_=int), - ConfigVar('swapserver_fee_millionths', default=5000, type_=int), - ConfigVar('swapserver_ann_pow_nonce', default=0, type_=int), -] +from electrum.simple_config import ConfigVar, SimpleConfig + +SimpleConfig.SWAPSERVER_PORT = ConfigVar('swapserver_port', default=None, type_=int) +SimpleConfig.SWAPSERVER_FEE_MILLIONTHS = ConfigVar('swapserver_fee_millionths', default=5000, type_=int) +SimpleConfig.SWAPSERVER_ANN_POW_NONCE = ConfigVar('swapserver_ann_pow_nonce', default=0, type_=int) diff --git a/electrum/plugins/watchtower/__init__.py b/electrum/plugins/watchtower/__init__.py index 1a35470fc..35384fbdc 100644 --- a/electrum/plugins/watchtower/__init__.py +++ b/electrum/plugins/watchtower/__init__.py @@ -1,6 +1,5 @@ -from electrum.simple_config import ConfigVar -config_vars = [ - ConfigVar('watchtower_server_port', default=None, type_=int), - ConfigVar('watchtower_server_user', default=None, type_=str), - ConfigVar('watchtower_server_password', default=None, type_=str), -] +from electrum.simple_config import ConfigVar, SimpleConfig + +SimpleConfig.WATCHTOWER_SERVER_PORT = ConfigVar('watchtower_server_port', default=None, type_=int) +SimpleConfig.WATCHTOWER_SERVER_USER = ConfigVar('watchtower_server_user', default=None, type_=str) +SimpleConfig.WATCHTOWER_SERVER_PASSWORD = ConfigVar('watchtower_server_password', default=None, type_=str)