aljaz/lightning
1
0
Fork 0
mirror of https://github.com/aljazceru/lightning.git synced 2025-12-22 08:34:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

pyln: remove deprecated pay/sendpay variants.

Browse Source 
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Changelog-Removed: pyln: removed deprecated pay/sendpay `description` arg.
This commit is contained in:
Rusty Russell
2021-04-07 11:57:03 +09:30
parent 10dee030f1
commit 0ed614d5c4
1 changed files with 13 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
contrib/pyln-client/pyln/client/lightning.py
View File

@@ -607,7 +607,7 @@ class LightningRpc(UnixDomainSocketRpc):
return self.call("dev-memleak") return self.call("dev-memleak")
def dev_pay(self, bolt11, msatoshi=None, label=None, riskfactor=None, def dev_pay(self, bolt11, msatoshi=None, label=None, riskfactor=None,
description=None, maxfeepercent=None, retry_for=None, maxfeepercent=None, retry_for=None,
maxdelay=None, exemptfee=None, use_shadow=True): maxdelay=None, exemptfee=None, use_shadow=True):
""" """
A developer version of `pay`, with the possibility to deactivate A developer version of `pay`, with the possibility to deactivate
@@ -623,8 +623,6 @@ class LightningRpc(UnixDomainSocketRpc):
"maxdelay": maxdelay, "maxdelay": maxdelay,
"exemptfee": exemptfee, "exemptfee": exemptfee,
"use_shadow": use_shadow, "use_shadow": use_shadow,
# Deprecated.
"description": description,
} }
return self.call("pay", payload) return self.call("pay", payload)
@@ -1030,7 +1028,7 @@ class LightningRpc(UnixDomainSocketRpc):
return self.call("newaddr", {"addresstype": addresstype}) return self.call("newaddr", {"addresstype": addresstype})
def pay(self, bolt11, msatoshi=None, label=None, riskfactor=None, def pay(self, bolt11, msatoshi=None, label=None, riskfactor=None,
description=None, maxfeepercent=None, retry_for=None, maxfeepercent=None, retry_for=None,
maxdelay=None, exemptfee=None): maxdelay=None, exemptfee=None):
""" """
Send payment specified by {bolt11} with {msatoshi} Send payment specified by {bolt11} with {msatoshi}
@@ -1046,8 +1044,6 @@ class LightningRpc(UnixDomainSocketRpc):
"retry_for": retry_for, "retry_for": retry_for,
"maxdelay": maxdelay, "maxdelay": maxdelay,
"exemptfee": exemptfee, "exemptfee": exemptfee,
# Deprecated.
"description": description,
} }
return self.call("pay", payload) return self.call("pay", payload)
@@ -1161,39 +1157,20 @@ class LightningRpc(UnixDomainSocketRpc):
} }
return self.call("plugin", payload) return self.call("plugin", payload)
def _deprecated_sendpay(self, route, payment_hash, description, msatoshi=None): def sendpay(self, route, payment_hash, label=None, msatoshi=None, bolt11=None, payment_secret=None, partid=None):
warnings.warn("sendpay: the 'description' field is renamed 'label' : expect removal"
" in early-2020",
DeprecationWarning)
payload = {
"route": route,
"payment_hash": payment_hash,
"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}. Send along {route} in return for preimage of {payment_hash}.
""" """
payload = {
if 'description' in kwargs: "route": route,
return self._deprecated_sendpay(route, payment_hash, *args, **kwargs) "payment_hash": payment_hash,
"label": label,
def _sendpay(route, payment_hash, label=None, msatoshi=None, bolt11=None, payment_secret=None, partid=None): "msatoshi": msatoshi,
payload = { "bolt11": bolt11,
"route": route, "payment_secret": payment_secret,
"payment_hash": payment_hash, "partid": partid,
"label": label, }
"msatoshi": msatoshi, return self.call("sendpay", payload)
"bolt11": bolt11,
"payment_secret": payment_secret,
"partid": partid,
}
return self.call("sendpay", payload)
return _sendpay(route, payment_hash, *args, **kwargs)
def setchannelfee(self, id, base=None, ppm=None): def setchannelfee(self, id, base=None, ppm=None):
""" """