More explicit naming

This commit is contained in:
Michał Sałaban 2018-01-06 16:44:38 +01:00
parent 5355824a61
commit 6a3015d880
4 changed files with 14 additions and 11 deletions

View file

@ -76,7 +76,7 @@ class JSONRPCWallet(object):
for tx in _payments['payments']:
data = self._tx2dict(tx)
# Monero <= 0.11 : no address is passed because there's only one
data['address'] = data['address'] or self._master_address
data['local_address'] = data['local_address'] or self._master_address
pmts.append(Payment(**data))
return pmts
@ -100,7 +100,7 @@ class JSONRPCWallet(object):
'payment_id': tx['payment_id'],
'note': tx.get('note'),
# NOTE: address will be resolved only after PR#3010 has been merged to Monero
'address': address(tx['address']) if 'address' in tx else None,
'local_address': address(tx['address']) if 'address' in tx else None,
'key': tx.get('key'),
'blob': tx.get('blob', None),
}

View file

@ -5,7 +5,7 @@ class Transaction(object):
payment_id = '0000000000000000'
amount = None
fee = None
address = None
local_address = None
def __init__(self, hash=None, **kwargs):
self.hash = hash
@ -14,7 +14,10 @@ class Transaction(object):
self.payment_id = kwargs.get('payment_id', self.payment_id)
self.amount = kwargs.get('amount', self.amount)
self.fee = kwargs.get('fee', self.fee)
self.address = kwargs.get('address', self.address)
self.local_address = kwargs.get('local_address', self.local_address)
def __repr__(self):
return self.hash
class Payment(Transaction):