Madiator2011/lbry-sdk
1
0
Fork 0
forked from LBRYCommunity/lbry-sdk
Code Pull requests Activity

Wait on block height too in generate_and_wait().

Browse source
This commit is contained in:
Jonathan Moody 2022-09-09 08:52:58 -05:00 committed by Lex Berezhny
parent a7d7efecc7
commit 749a92d0e5
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lbry/testcase.py
View file

@ -298,13 +298,15 @@ class IntegrationTestCase(AsyncioTestCase):
async def generate_and_wait(self, blocks_to_generate, txids, ledger=None): async def generate_and_wait(self, blocks_to_generate, txids, ledger=None):
if blocks_to_generate > 0: if blocks_to_generate > 0:
watcher = (ledger or self.ledger).on_transaction.where( watcher1 = (ledger or self.ledger).on_transaction.where(
lambda e: ((e.tx.id in txids and txids.remove(e.tx.id)), len(txids) <= 0)[-1] # multi-statement lambda lambda e: ((e.tx.id in txids and txids.remove(e.tx.id)), len(txids) <= 0)[-1] # multi-statement lambda
) )
watcher2 = (ledger or self.ledger).on_header.where(self.blockchain.is_expected_block)
self.conductor.spv_node.server.synchronized.clear() self.conductor.spv_node.server.synchronized.clear()
await self.blockchain.generate(blocks_to_generate) await self.blockchain.generate(blocks_to_generate)
height = self.blockchain.block_expected height = self.blockchain.block_expected
await watcher await watcher1
await watcher2
while True: while True:
await self.conductor.spv_node.server.synchronized.wait() await self.conductor.spv_node.server.synchronized.wait()
self.conductor.spv_node.server.synchronized.clear() self.conductor.spv_node.server.synchronized.clear()