d0s3t3ch
/
wownero-python
mirror of https://git.wownero.com/lza_menace/wownero-python.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix: use proper class; add comment on pending PR

This commit is contained in:
Michał Sałaban 2018-01-22 03:21:25 +01:00
parent e0052d71e8
commit aa155b0520
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
monero/backends/jsonrpc.py
View File

@ -170,13 +170,13 @@ class JSONRPCWallet(object):
def get_transactions_in(self, account=0):
_transfers = self.raw_request('get_transfers',
{'account_index': account, 'in': True, 'out': False, 'pool': False})
return [Transaction(**self._tx2dict(tx)) for tx in
return [Payment(**self._tx2dict(tx)) for tx in
sorted(_transfers.get('in', []), key=operator.itemgetter('timestamp'))]
def get_transactions_out(self, account=0):
_transfers = self.raw_request('get_transfers',
{'account_index': account, 'in': False, 'out': True, 'pool': False})
return [Transaction(**self._tx2dict(tx)) for tx in
return [Transfer(**self._tx2dict(tx)) for tx in
sorted(_transfers.get('out', []), key=operator.itemgetter('timestamp'))]
def _tx2dict(self, tx):

10
tests/wallet.py
View File

@ -163,8 +163,9 @@ class SubaddrWalletTestCase(unittest.TestCase):
pay_in = self.wallet.get_transactions_in()
self.assertEqual(len(list(pay_in)), 3)
for tx in pay_in:
self.assertIsInstance(tx, Transaction)
# self.assertIsInstance(tx.address, Address)
self.assertIsInstance(tx, Payment)
# Once PR#3010 has been merged to Monero, update the JSON and enable the following:
# self.assertIsInstance(tx.local_address, Address)
self.assertIsInstance(tx.amount, Decimal)
self.assertIsInstance(tx.fee, Decimal)
@ -257,8 +258,9 @@ class SubaddrWalletTestCase(unittest.TestCase):
pay_out = self.wallet.get_transactions_out()
self.assertEqual(len(list(pay_out)), 6)
for tx in pay_out:
self.assertIsInstance(tx, Transaction)
# self.assertIsInstance(tx.address, Address)
self.assertIsInstance(tx, Transfer)
# Once PR#3010 has been merged to Monero, update the JSON and enable the following:
# self.assertIsInstance(tx.local_address, Address)
self.assertIsInstance(tx.amount, Decimal)
self.assertIsInstance(tx.fee, Decimal)
self.assertIsInstance(tx.timestamp, datetime)