pylightning: Split @method and @async_method decorators

Suggested-by: Rusty Russell <@rustyrussell>
Suggested-by: Conor Scott <@conscott>
Signed-off-by: Christian Decker <decker.christian@gmail.com>

contrib/pylightning/lightning/plugin.py

@@ -214,13 +214,23 @@ class Plugin(object):
         else:
             return self.options[name]['default']
 
-    def method(self, method_name, background=True):
+    def async_method(self, method_name):
+        """Decorator to add an async plugin method to the dispatch table.
+
+        Internally uses add_method.
+        """
+        def decorator(f):
+            self.add_method(method_name, f, background=True)
+            return f
+        return decorator
+
+    def method(self, method_name):
         """Decorator to add a plugin method to the dispatch table.
 
         Internally uses add_method.
         """
         def decorator(f):
-            self.add_method(method_name, f, background=background)
+            self.add_method(method_name, f, background=False)
             return f
         return decorator
 
@@ -235,13 +245,23 @@ class Plugin(object):
         method.background = background
         self.methods[name] = method
 
-    def hook(self, method_name, background=False):
+    def hook(self, method_name):
         """Decorator to add a plugin hook to the dispatch table.
 
         Internally uses add_hook.
         """
         def decorator(f):
-            self.add_hook(method_name, f, background=background)
+            self.add_hook(method_name, f, background=False)
+            return f
+        return decorator
+
+    def async_hook(self, method_name):
+        """Decorator to add an async plugin hook to the dispatch table.
+
+        Internally uses add_hook.
+        """
+        def decorator(f):
+            self.add_hook(method_name, f, background=True)
             return f
         return decorator
 

tests/plugins/asynctest.py

@@ -16,7 +16,7 @@ def init(configuration, options, plugin):
     plugin.requests = []
 
 
-@plugin.method('asyncqueue', sync=False)
+@plugin.async_method('asyncqueue')
 def async_queue(request, plugin):
     plugin.requests.append(request)