vincenzopalazzo
/
rgb-cln
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

pylightning: Merge option_values into options 

Suggested-by: Rusty Russell <@rustyrussell>
Signed-off-by: Christian Decker <decker.christian@gmail.com>
This commit is contained in:
Christian Decker 2018-12-14 14:01:37 +01:00
parent 1eb23d6b29
commit 42d8e07d70
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
contrib/pylightning/lightning/plugin.py
View File

@ -17,7 +17,6 @@ class Plugin(object):
def __init__(self, stdout=None, stdin=None, autopatch=True):
self.methods = {}
self.options = {}
self.option_values = {}
if not stdout:
self.stdout = sys.stdout
@ -77,16 +76,18 @@ class Plugin(object):
'default': default,
'description': description,
'type': 'string',
'value': None,
}
def get_option(self, name):
if name in self.option_values:
return self.option_values[name]
elif name in self.options:
return self.options[name]['default']
else:
if name not in self.options:
raise ValueError("No option with name {} registered".format(name))
if self.options[name]['value'] is not None:
return self.options[name]['value']
else:
return self.options[name]['default']
def method(self, method_name, *args, **kwargs):
"""Decorator to add a plugin method to the dispatch table.
@ -209,7 +210,7 @@ class Plugin(object):
self.rpc_filename = configuration['rpc-file']
self.lightning_dir = configuration['lightning-dir']
for name, value in options.items():
self.option_values[name] = value
self.options[name]['value'] = value
# Swap the registered `init` method handler back in and
# re-dispatch