From 2d184d464f115922e9968ff4c3d67a9f7eff87ab Mon Sep 17 00:00:00 2001 From: trueptolemy Date: Tue, 24 Sep 2019 12:25:58 +0800 Subject: [PATCH] pylightning: Fix the parameter `label` of `sendpay` `description` is renamed as `label` in 0.7.0 --- contrib/pylightning/lightning/lightning.py | 29 ++++++++++++++++++---- 1 file changed, 24 insertions(+), 5 deletions(-) diff --git a/contrib/pylightning/lightning/lightning.py b/contrib/pylightning/lightning/lightning.py index 94e4ea08e..73e10a0db 100644 --- a/contrib/pylightning/lightning/lightning.py +++ b/contrib/pylightning/lightning/lightning.py @@ -804,18 +804,37 @@ class LightningRpc(UnixDomainSocketRpc): } return self.call("plugin", payload) - def sendpay(self, route, payment_hash, description=None, msatoshi=None): - """ - Send along {route} in return for preimage of {payment_hash} - """ + def _deprecated_sendpay(self, route, payment_hash, description, msatoshi=None): + warnings.warn("sendpay: the 'description' field is renamed 'label' : expect removal" + " in early-2020", + DeprecationWarning) payload = { "route": route, "payment_hash": payment_hash, - "description": description, + "label": description, "msatoshi": msatoshi, } return self.call("sendpay", payload) + def sendpay(self, route, payment_hash, *args, **kwargs): + """ + Send along {route} in return for preimage of {payment_hash} + """ + + if 'description' in kwargs: + return self._deprecated_sendpay(route, payment_hash, *args, **kwargs) + + def _sendpay(route, payment_hash, label=None, msatoshi=None): + payload = { + "route": route, + "payment_hash": payment_hash, + "label": label, + "msatoshi": msatoshi, + } + return self.call("sendpay", payload) + + return _sendpay(route, payment_hash, *args, **kwargs) + def setchannelfee(self, id, base=None, ppm=None): """ Set routing fees for a channel/peer {id} (or 'all'). {base} is a value in millisatoshi