mirrors/core-lightning
1
0
Fork 0
mirror of https://github.com/ElementsProject/lightning.git synced 2025-03-01 17:47:30 +01:00
Code Issues Projects Releases Wiki Activity

pyln: remove deprecated fundchannel/fundchannel_start variants.

Browse source 
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Changelog-Removed: pyln: removed deprecated fundchannel/fundchannel_start `satoshi` arg.
This commit is contained in:
Rusty Russell 2021-04-07 11:58:03 +09:30
parent 0ed614d5c4
commit fad4aee5da
1 changed files with 16 additions and 58 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

74
contrib/pyln-client/pyln/client/lightning.py
View file

@ -692,22 +692,7 @@ class LightningRpc(UnixDomainSocketRpc):
} }
return self.call("feerates", payload) return self.call("feerates", payload)
def _deprecated_fundchannel(self, node_id, satoshi, feerate=None, announce=True, minconf=None, utxos=None): def fundchannel(self, node_id, amount, feerate=None, announce=True, minconf=None, utxos=None, push_msat=None, close_to=None):
warnings.warn("fundchannel: the 'satoshi' field is renamed 'amount' : expect removal"
" in Mid-2020",
DeprecationWarning)
payload = {
"id": node_id,
"satoshi": satoshi,
"feerate": feerate,
"announce": announce,
"minconf": minconf,
"utxos": utxos
}
return self.call("fundchannel", payload)
def fundchannel(self, node_id, *args, **kwargs):
""" """
Fund channel with {id} using {amount} satoshis with feerate Fund channel with {id} using {amount} satoshis with feerate
of {feerate} (uses default feerate if unset). of {feerate} (uses default feerate if unset).
@ -717,39 +702,19 @@ class LightningRpc(UnixDomainSocketRpc):
fund a channel from these specifics utxos. fund a channel from these specifics utxos.
{close_to} is a valid Bitcoin address. {close_to} is a valid Bitcoin address.
""" """
if 'satoshi' in kwargs:
return self._deprecated_fundchannel(node_id, *args, **kwargs)
def _fundchannel(node_id, amount, feerate=None, announce=True, minconf=None, utxos=None, push_msat=None, close_to=None):
payload = {
"id": node_id,
"amount": amount,
"feerate": feerate,
"announce": announce,
"minconf": minconf,
"utxos": utxos,
"push_msat": push_msat,
"close_to": close_to,
}
return self.call("fundchannel", payload)
return _fundchannel(node_id, *args, **kwargs)
def _deprecated_fundchannel_start(self, node_id, satoshi, feerate=None, announce=True):
warnings.warn("fundchannel_start: the 'satoshi' field is renamed 'amount' : expect removal"
" in Mid-2020",
DeprecationWarning)
payload = { payload = {
"id": node_id, "id": node_id,
"satoshi": satoshi, "amount": amount,
"feerate": feerate, "feerate": feerate,
"announce": announce, "announce": announce,
"minconf": minconf,
"utxos": utxos,
"push_msat": push_msat,
"close_to": close_to,
} }
return self.call("fundchannel_start", payload) return self.call("fundchannel", payload)
def fundchannel_start(self, node_id, *args, **kwargs): def fundchannel_start(self, node_id, amount, feerate=None, announce=True, close_to=None):
""" """
Start channel funding with {id} for {amount} satoshis Start channel funding with {id} for {amount} satoshis
with feerate of {feerate} (uses default feerate if unset). with feerate of {feerate} (uses default feerate if unset).
@ -759,21 +724,14 @@ class LightningRpc(UnixDomainSocketRpc):
'fundchannel_complete' to complete channel establishment 'fundchannel_complete' to complete channel establishment
with peer. with peer.
""" """
payload = {
if 'satoshi' in kwargs: "id": node_id,
return self._deprecated_fundchannel_start(node_id, *args, **kwargs) "amount": amount,
"feerate": feerate,
def _fundchannel_start(node_id, amount, feerate=None, announce=True, close_to=None): "announce": announce,
payload = { "close_to": close_to,
"id": node_id, }
"amount": amount, return self.call("fundchannel_start", payload)
"feerate": feerate,
"announce": announce,
"close_to": close_to,
}
return self.call("fundchannel_start", payload)
return _fundchannel_start(node_id, *args, **kwargs)
def fundchannel_cancel(self, node_id): def fundchannel_cancel(self, node_id):
""" """