From 612066165a30ad181004500ac4619b8c733dec9a Mon Sep 17 00:00:00 2001 From: Lex Berezhny Date: Thu, 6 Dec 2018 13:38:56 -0500 Subject: [PATCH] improved integration test for tx synchronization --- .../integration/test_transactions.py | 92 ++++++++++++------- torba/client/baseledger.py | 2 +- 2 files changed, 62 insertions(+), 32 deletions(-) diff --git a/tests/client_tests/integration/test_transactions.py b/tests/client_tests/integration/test_transactions.py index 68a2fb182..bdbd51dfa 100644 --- a/tests/client_tests/integration/test_transactions.py +++ b/tests/client_tests/integration/test_transactions.py @@ -2,47 +2,81 @@ import logging import asyncio from itertools import chain from torba.testcase import IntegrationTestCase -from torba.client.constants import COIN +from torba.client.util import satoshis_to_coins, coins_to_satoshis class BasicTransactionTests(IntegrationTestCase): VERBOSITY = logging.WARN - async def test_stressing(self): - await self.blockchain.generate(1000) + async def test_variety_of_transactions_and_longish_history(self): + await self.blockchain.generate(300) await self.assertBalance(self.account, '0.0') addresses = await self.account.receiving.get_addresses() + # send 10 coins to first 10 receiving addresses and then 10 transactions worth 10 coins each + # to the 10th receiving address for a total of 30 UTXOs on the entire account sends = list(chain( - (self.blockchain.send_to_address(address, 10) for address in addresses), - (self.blockchain.send_to_address(addresses[-1], 10) for _ in range(10)) + (self.blockchain.send_to_address(address, 10) for address in addresses[:10]), + (self.blockchain.send_to_address(addresses[9], 10) for _ in range(10)) )) - + # use batching to reduce issues with send_to_address on cli for batch in range(0, len(sends), 10): txids = await asyncio.gather(*sends[batch:batch+10]) - await asyncio.wait([ - self.on_transaction_id(txid) for txid in txids - ]) + await asyncio.wait([self.on_transaction_id(txid) for txid in txids]) + await self.assertBalance(self.account, '200.0') + self.assertEqual(20, await self.account.get_utxo_count()) - await self.assertBalance(self.account, '300.0') + # address gap should have increase by 10 to cover the first 10 addresses we've used up addresses = await self.account.receiving.get_addresses() - self.assertEqual(40, len(addresses)) + self.assertEqual(30, len(addresses)) + + # there used to be a sync bug which failed to save TXIs between + # daemon restarts, clearing cache replicates that behavior + self.ledger._tx_cache.clear() + + # spend from each of the first 10 addresses to the subsequent 10 addresses + txs = [] + for address in addresses[10:20]: + txs.append(await self.ledger.transaction_class.create( + [], + [self.ledger.transaction_class.output_class.pay_pubkey_hash( + coins_to_satoshis('1.0'), self.ledger.address_to_hash160(address) + )], + [self.account], self.account + )) + await asyncio.wait([self.broadcast(tx) for tx in txs]) + await asyncio.wait([self.ledger.wait(tx) for tx in txs]) + + # verify that a previous bug which failed to save TXIs doesn't come back + # this check must happen before generating a new block + self.assertTrue(all([ + tx.inputs[0].txo_ref.txo is not None + for tx in await self.ledger.db.get_transactions(txid__in=[tx.id for tx in txs]) + ])) await self.blockchain.generate(1) + await asyncio.wait([self.ledger.wait(tx) for tx in txs]) + await self.assertBalance(self.account, '199.99876') + # 10 of the UTXOs have been split into a 1 coin UTXO and a 9 UTXO change self.assertEqual(30, await self.account.get_utxo_count()) - hash1 = self.ledger.address_to_hash160(addresses[-1]) + # spend all 30 UTXOs into a a 199 coin UTXO and change tx = await self.ledger.transaction_class.create( [], - [self.ledger.transaction_class.output_class.pay_pubkey_hash(299*COIN, hash1)], + [self.ledger.transaction_class.output_class.pay_pubkey_hash( + coins_to_satoshis('199.0'), self.ledger.address_to_hash160(addresses[-1]) + )], [self.account], self.account ) await self.broadcast(tx) await self.ledger.wait(tx) + await self.blockchain.generate(1) + await self.ledger.wait(tx) - self.assertEqual(2, await self.account.get_utxo_count()) # 299 + change + self.assertEqual(2, await self.account.get_utxo_count()) # 199 + change + await self.assertBalance(self.account, '199.99649') async def test_sending_and_receiving(self): account1, account2 = self.account, self.wallet.generate_account(self.ledger) @@ -51,25 +85,22 @@ class BasicTransactionTests(IntegrationTestCase): await self.assertBalance(account1, '0.0') await self.assertBalance(account2, '0.0') - sendtxids = [] - for i in range(5): - address1 = await account1.receiving.get_or_create_usable_address() - sendtxid = await self.blockchain.send_to_address(address1, 1.1) - sendtxids.append(sendtxid) - await self.on_transaction_id(sendtxid) # mempool + addresses = await self.account.receiving.get_addresses() + txids = await asyncio.gather(*( + self.blockchain.send_to_address(address, 1.1) for address in addresses[:5] + )) + await asyncio.wait([self.on_transaction_id(txid) for txid in txids]) # mempool await self.blockchain.generate(1) - await asyncio.wait([ # confirmed - self.on_transaction_id(txid) for txid in sendtxids - ]) - + await asyncio.wait([self.on_transaction_id(txid) for txid in txids]) # confirmed await self.assertBalance(account1, '5.5') await self.assertBalance(account2, '0.0') address2 = await account2.receiving.get_or_create_usable_address() - hash2 = self.ledger.address_to_hash160(address2) tx = await self.ledger.transaction_class.create( [], - [self.ledger.transaction_class.output_class.pay_pubkey_hash(2*COIN, hash2)], + [self.ledger.transaction_class.output_class.pay_pubkey_hash( + coins_to_satoshis('2.0'), self.ledger.address_to_hash160(address2) + )], [account1], account1 ) await self.broadcast(tx) @@ -91,11 +122,10 @@ class BasicTransactionTests(IntegrationTestCase): await self.blockchain.generate(1) await self.ledger.wait(tx) # confirmed - txs = await account1.get_transactions() - tx = txs[1] - self.assertEqual(round(tx.inputs[0].txo_ref.txo.amount/COIN, 1), 1.1) - self.assertEqual(round(tx.inputs[1].txo_ref.txo.amount/COIN, 1), 1.1) - self.assertEqual(round(tx.outputs[0].amount/COIN, 1), 2.0) + tx = (await account1.get_transactions())[1] + self.assertEqual(satoshis_to_coins(tx.inputs[0].amount), '1.1') + self.assertEqual(satoshis_to_coins(tx.inputs[1].amount), '1.1') + self.assertEqual(satoshis_to_coins(tx.outputs[0].amount), '2.0') self.assertEqual(tx.outputs[0].get_address(self.ledger), address2) self.assertEqual(tx.outputs[0].is_change, False) self.assertEqual(tx.outputs[1].is_change, True) diff --git a/torba/client/baseledger.py b/torba/client/baseledger.py index 26cce3da9..c99c34612 100644 --- a/torba/client/baseledger.py +++ b/torba/client/baseledger.py @@ -91,7 +91,7 @@ class SynchronizationMonitor: async def _monitor(self, coro): task = self.loop.create_task(coro) self.tasks.append(task) - log.info('sync tasks: %s', len(self.tasks)) + log.debug('sync tasks: %s', len(self.tasks)) try: await task finally: