diff --git a/contrib/pyln-client/pyln/client/lightning.py b/contrib/pyln-client/pyln/client/lightning.py index 753bd8f2c..20abe9567 100644 --- a/contrib/pyln-client/pyln/client/lightning.py +++ b/contrib/pyln-client/pyln/client/lightning.py @@ -1172,19 +1172,7 @@ class LightningRpc(UnixDomainSocketRpc): return self.call("withdraw", payload) - def _deprecated_txprepare(self, destination, satoshi, feerate=None, minconf=None): - warnings.warn("txprepare now takes output arg: expect removal" - " in Mid-2020", - DeprecationWarning) - payload = { - "destination": destination, - "satoshi": satoshi, - "feerate": feerate, - "minconf": minconf, - } - return self.call("txprepare", payload) - - def txprepare(self, *args, **kwargs): + def txprepare(self, outputs, feerate=None, minconf=None, utxos=None): """ Prepare a Bitcoin transaction which sends to [outputs]. The format of output is like [{address1: amount1}, @@ -1194,22 +1182,13 @@ class LightningRpc(UnixDomainSocketRpc): Outputs will be reserved until you call txdiscard or txsend, or lightningd restarts. """ - if 'destination' in kwargs or 'satoshi' in kwargs: - return self._deprecated_txprepare(*args, **kwargs) - - if len(args) and not isinstance(args[0], list): - return self._deprecated_txprepare(*args, **kwargs) - - def _txprepare(outputs, feerate=None, minconf=None, utxos=None): - payload = { - "outputs": outputs, - "feerate": feerate, - "minconf": minconf, - "utxos": utxos, - } - return self.call("txprepare", payload) - - return _txprepare(*args, **kwargs) + payload = { + "outputs": outputs, + "feerate": feerate, + "minconf": minconf, + "utxos": utxos, + } + return self.call("txprepare", payload) def txdiscard(self, txid): """