More explicit naming

monero/backends/jsonrpc.py

@@ -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),
         }

monero/transaction.py

@@ -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):

tests/wallet.py

@@ -281,6 +281,6 @@ class SubaddrWalletTestCase(unittest.TestCase):
         self.assertEqual(len(list(payments)), 1)
         for payment in payments:
             self.assertIsInstance(payment, Payment)
-            self.assertIsInstance(payment.address, Address)
+            self.assertIsInstance(payment.local_address, Address)
             self.assertIsInstance(payment.amount, Decimal)
             self.assertIsInstance(payment.height, int)

utils/walletdump.py

@@ -33,7 +33,7 @@ def get_wallet():
         password=args.password))
 
 _TXHDR = "timestamp         height  id/hash                                                     " \
-    "         amount         fee           payment_id"
+    "         amount         fee           payment_id       {dir}"
 
 def tx2str(tx):
     return "{time} {height} {hash} {amount:17.12f} {fee:13.12f} {payment_id} {addr}".format(
@@ -43,7 +43,7 @@ def tx2str(tx):
         amount=tx.amount,
         fee=tx.fee or 0,
         payment_id=tx.payment_id,
-        addr=getattr(tx, 'receiving_address', None) or '')
+        addr=getattr(tx, 'local_address', None) or '')
 
 w = get_wallet()
 print(
@@ -66,25 +66,25 @@ if len(w.accounts) > 1:
         ins = acc.get_transactions_in()
         if ins:
             print("\nIncoming transactions:")
-            print(_TXHDR)
+            print(_TXHDR.format(dir='received by'))
             for tx in ins:
                 print(tx2str(tx))
         outs = acc.get_transactions_out()
         if outs:
             print("\nOutgoing transactions:")
-            print(_TXHDR)
+            print(_TXHDR.format(dir='sent from'))
             for tx in outs:
                 print(tx2str(tx))
 else:
     ins = w.get_transactions_in()
     if ins:
         print("\nIncoming transactions:")
-        print(_TXHDR)
+        print(_TXHDR.format(dir='received by'))
         for tx in ins:
             print(tx2str(tx))
     outs = w.get_transactions_out()
     if outs:
         print("\nOutgoing transactions:")
-        print(_TXHDR)
+        print(_TXHDR.format(dir='sent from'))
         for tx in outs:
             print(tx2str(tx))