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

fix another merge conflict

Browse source
This commit is contained in:
Jack Robison 2022-01-21 15:54:58 -05:00
parent 7bd157ef17
commit b093aa3911
No known key found for this signature in database
GPG key ID: DF25C68FE0239BB2
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lbry/testcase.py
View file

@ -489,8 +489,14 @@ class CommandTestCase(IntegrationTestCase):
async def confirm_tx(self, txid, ledger=None): 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. """ """ 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 (ledger or self.ledger).on_transaction.where(lambda e: e.tx.id == txid)
await self.generate_and_wait(1, [txid], ledger=ledger) 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 return txid
async def on_transaction_dict(self, tx): async def on_transaction_dict(self, tx):