tremove --deserialized option, redundant with deserialize command - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit 5bbffb0cbf080620b4a856334cc9e4288b199b34
DIR parent 369d5d881231cfdd8a4636da55989448edccc4ba
HTML Author: ThomasV <thomasv@electrum.org>
Date: Thu, 29 Oct 2015 14:44:41 +0100
remove --deserialized option, redundant with deserialize command
Diffstat:
M lib/commands.py | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
---
DIR diff --git a/lib/commands.py b/lib/commands.py
t@@ -419,18 +419,18 @@ class Commands:
return tx
@command('wpn')
- def payto(self, destination, amount, tx_fee=None, from_addr=None, change_addr=None, nocheck=False, unsigned=False, deserialized=False):
+ def payto(self, destination, amount, tx_fee=None, from_addr=None, change_addr=None, nocheck=False, unsigned=False):
"""Create a transaction. """
domain = [from_addr] if from_addr else None
tx = self._mktx([(destination, amount)], tx_fee, change_addr, domain, nocheck, unsigned)
- return tx.deserialize() if deserialized else tx.as_dict()
+ return tx.as_dict()
@command('wpn')
- def paytomany(self, outputs, tx_fee=None, from_addr=None, change_addr=None, nocheck=False, unsigned=False, deserialized=False):
+ def paytomany(self, outputs, tx_fee=None, from_addr=None, change_addr=None, nocheck=False, unsigned=False):
"""Create a multi-output transaction. """
domain = [from_addr] if from_addr else None
tx = self._mktx(outputs, tx_fee, change_addr, domain, nocheck, unsigned)
- return tx.deserialize() if deserialized else tx.as_dict()
+ return tx.as_dict()
@command('wn')
def history(self):
t@@ -503,7 +503,7 @@ class Commands:
return out
@command('nw')
- def gettransaction(self, txid, deserialized=False):
+ def gettransaction(self, txid):
"""Retrieve a transaction. """
tx = self.wallet.transactions.get(txid) if self.wallet else None
if tx is None and self.network:
t@@ -512,7 +512,7 @@ class Commands:
tx = Transaction(raw)
else:
raise BaseException("Unknown transaction")
- return tx.deserialize() if deserialized else tx.as_dict()
+ return tx.as_dict()
@command('')
def encrypt(self, pubkey, message):
t@@ -636,7 +636,6 @@ command_options = {
'entropy': (None, "--entropy", "Custom entropy"),
'language': ("-L", "--lang", "Default language for wordlist"),
'gap_limit': ("-G", "--gap", "Gap limit"),
- 'deserialized':("-d", "--deserialized","Return deserialized transaction"),
'privkey': (None, "--privkey", "Private key. Set to '?' to get a prompt."),
'unsigned': ("-u", "--unsigned", "Do not sign transaction"),
'domain': ("-D", "--domain", "List of addresses"),