From 87a9a27aad3c9e5d207c101d75619d64caa56d3e 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 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lbry/testcase.py b/lbry/testcase.py index fb3240176..371f0aad4 100644 --- a/lbry/testcase.py +++ b/lbry/testcase.py @@ -489,8 +489,8 @@ 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. """ - await self.on_transaction_id(txid, ledger) - on_tx = self.on_transaction_id(txid, 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