From b093aa391196713f7f7f98e7f68deb1ec40dac69 Mon Sep 17 00:00:00 2001 From: Jack Robison Date: Fri, 21 Jan 2022 15:54:58 -0500 Subject: [PATCH] fix another merge conflict --- lbry/testcase.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/lbry/testcase.py b/lbry/testcase.py index 0403117af..371f0aad4 100644 --- a/lbry/testcase.py +++ b/lbry/testcase.py @@ -489,8 +489,14 @@ class CommandTestCase(IntegrationTestCase): async def confirm_tx(self, txid, ledger=None): """ Wait for tx to be in mempool, then generate a block, wait for tx to be in a block. """ - # actually, if it's in the mempool or in the block we're fine - await self.generate_and_wait(1, [txid], ledger=ledger) + # await (ledger or self.ledger).on_transaction.where(lambda e: e.tx.id == txid) + on_tx = (ledger or self.ledger).on_transaction.where(lambda e: e.tx.id == txid) + await asyncio.wait([self.generate(1), on_tx], timeout=5) + + # # actually, if it's in the mempool or in the block we're fine + # await self.generate_and_wait(1, [txid], ledger=ledger) + # return txid + return txid async def on_transaction_dict(self, tx):