Skip to content

pylightning: Asynchronous plugin rpc-methods and hooks #2326

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rustyrussell merged 10 commits into from
Feb 22, 2019
Merged

pylightning: Asynchronous plugin rpc-methods and hooks #2326

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
9a07d07
pylightning: Wrap the plugin methods in a class
cdecker Jan 22, 2019
25e12fc
pylightning: Wrap request in an object
cdecker Jan 22, 2019
9f3502c
pylightning: Exception if we have unfulfilled positional arguments
cdecker Jan 22, 2019
0d2431c
pylightning: Add support for *args and **kwargs in plugin dispatch
cdecker Feb 21, 2019
661cf25
pylightning: Don't always use request ID 0
cdecker Jan 22, 2019
7e65b50
pylightning: Add the `background` keyword to hooks and methods
cdecker Jan 22, 2019
73bad4c
pylightning: Add a small test for async rpcmethods
cdecker Jan 22, 2019
130afb0
pylightning: Rename peer_id to node_id in getroute
cdecker Jan 24, 2019
832ba0a
pylightning: Split @method and @async_method decorators
cdecker Feb 21, 2019
93be4d9
pylightning: Add plugin dispatch tests to check-python and fix them
cdecker Feb 21, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,6 +302,8 @@ check-python:
@# W503: line break before binary operator
@flake8 --ignore=E501,E731,W503 --exclude=contrib/pylightning/lightning/__init__.py ${PYSRC}

PYTHONPATH=contrib/pylightning:$$PYTHONPATH $(PYTEST) contrib/pylightning/

check-includes:
@tools/check-includes.sh

Expand Down
8 changes: 5 additions & 3 deletions contrib/pylightning/lightning/lightning.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,7 @@ def __init__(self, socket_path, executor=None, logger=logging, encoder=json.JSON

# Do we require the compatibility mode?
self._compat = True
self.next_id = 0

def _writeobj(self, sock, obj):
s = json.dumps(obj, cls=self.encoder)
Expand Down Expand Up @@ -208,8 +209,9 @@ def call(self, method, payload=None):
self._writeobj(sock, {
"method": method,
"params": payload,
"id": 0
"id": self.next_id,
})
self.next_id += 1
resp, _ = self._readobj_compat(sock)
sock.close()

Expand Down Expand Up @@ -291,7 +293,7 @@ def listnodes(self, node_id=None):
}
return self.call("listnodes", payload)

def getroute(self, peer_id, msatoshi, riskfactor, cltv=9, fromid=None, fuzzpercent=None, seed=None, exclude=[]):
def getroute(self, node_id, msatoshi, riskfactor, cltv=9, fromid=None, fuzzpercent=None, seed=None, exclude=[]):
"""
Show route to {id} for {msatoshi}, using {riskfactor} and optional
{cltv} (default 9). If specified search from {fromid} otherwise use
Expand All @@ -300,7 +302,7 @@ def getroute(self, peer_id, msatoshi, riskfactor, cltv=9, fromid=None, fuzzperce
seed. {exclude} is an optional array of scid/direction to exclude.
"""
payload = {
"id": peer_id,
"id": node_id,
"msatoshi": msatoshi,
"riskfactor": riskfactor,
"cltv": cltv,
Expand Down
Loading