LBRYCommunity/lbry-sdk
1
0
Fork 1
Code Issues Pull requests Projects Releases 282 Packages Wiki Activity

fix last test

Browse source
This commit is contained in:
Victor Shyba 2019-12-19 22:34:10 -03:00
parent 6652d55455
commit 4c6dedfa4f
2 changed files with 17 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
lbry/tests/integration/test_purchase_command.py
View file

@ -36,16 +36,17 @@ class PurchaseCommandTests(CommandTestCase):
await self.ledger.wait(purchase) await self.ledger.wait(purchase)
return claim_id return claim_id
async def assertStreamPurchased(self, stream: Transaction, purchase: Transaction): async def assertStreamPurchased(self, stream: Transaction, operation):
stream_txo, purchase_txo = stream.outputs[0], purchase.outputs[0]
stream_fee = stream_txo.claim.stream.fee
self.assertEqual(stream_fee.dewies, purchase_txo.amount)
self.assertEqual(stream_fee.address, purchase_txo.get_address(self.ledger))
await self.account.release_all_outputs() await self.account.release_all_outputs()
buyer_balance = await self.account.get_balance() buyer_balance = await self.account.get_balance()
merchant_balance = lbc_to_dewies(str(await self.blockchain.get_balance())) merchant_balance = lbc_to_dewies(str(await self.blockchain.get_balance()))
pre_purchase_count = (await self.daemon.jsonrpc_purchase_list())['total_items'] pre_purchase_count = (await self.daemon.jsonrpc_purchase_list())['total_items']
purchase = await operation()
stream_txo, purchase_txo = stream.outputs[0], purchase.outputs[0]
stream_fee = stream_txo.claim.stream.fee
self.assertEqual(stream_fee.dewies, purchase_txo.amount)
self.assertEqual(stream_fee.address, purchase_txo.get_address(self.ledger))
await self.ledger.wait(purchase) await self.ledger.wait(purchase)
await self.generate(1) await self.generate(1)
@ -76,7 +77,7 @@ class PurchaseCommandTests(CommandTestCase):
claim_id = stream.outputs[0].claim_id claim_id = stream.outputs[0].claim_id
# explicit purchase of claim # explicit purchase of claim
tx = await self.daemon.jsonrpc_purchase_create(claim_id) tx = lambda: self.daemon.jsonrpc_purchase_create(claim_id)
await self.assertStreamPurchased(stream, tx) await self.assertStreamPurchased(stream, tx)
# check that `get` doesn't purchase it again # check that `get` doesn't purchase it again
@ -88,8 +89,12 @@ class PurchaseCommandTests(CommandTestCase):
# `get` does purchase a stream we don't have yet # `get` does purchase a stream we don't have yet
another_stream = await self.priced_stream('another') another_stream = await self.priced_stream('another')
async def imagine_its_a_lambda():
response = await self.daemon.jsonrpc_get('lbry://another') response = await self.daemon.jsonrpc_get('lbry://another')
await self.assertStreamPurchased(another_stream, response.content_fee) return response.content_fee
await self.assertStreamPurchased(another_stream, imagine_its_a_lambda)
# purchase non-existent claim fails # purchase non-existent claim fails
with self.assertRaisesRegex(Exception, "Could not find claim with claim_id"): with self.assertRaisesRegex(Exception, "Could not find claim with claim_id"):
@ -105,12 +110,12 @@ class PurchaseCommandTests(CommandTestCase):
await self.daemon.jsonrpc_purchase_create(claim_id) await self.daemon.jsonrpc_purchase_create(claim_id)
# force purchasing claim you already own # force purchasing claim you already own
tx = await self.daemon.jsonrpc_purchase_create(claim_id, allow_duplicate_purchase=True) tx = lambda: self.daemon.jsonrpc_purchase_create(claim_id, allow_duplicate_purchase=True)
await self.assertStreamPurchased(stream, tx) await self.assertStreamPurchased(stream, tx)
# purchase by uri # purchase by uri
abc_stream = await self.priced_stream('abc') abc_stream = await self.priced_stream('abc')
tx = await self.daemon.jsonrpc_purchase_create(url='lbry://abc') tx = lambda: self.daemon.jsonrpc_purchase_create(url='lbry://abc')
await self.assertStreamPurchased(abc_stream, tx) await self.assertStreamPurchased(abc_stream, tx)
async def test_purchase_and_transaction_list(self): async def test_purchase_and_transaction_list(self):

4
torba/torba/client/baseledger.py
View file

@ -575,7 +575,7 @@ class BaseLedger(metaclass=LedgerRegistry):
# broadcast can't be a retriable call yet # broadcast can't be a retriable call yet
return self.network.broadcast(hexlify(tx.raw).decode()) return self.network.broadcast(hexlify(tx.raw).decode())
async def wait(self, tx: basetransaction.BaseTransaction, height=-1, timeout=2): async def wait(self, tx: basetransaction.BaseTransaction, height=-1, timeout=1):
addresses = set() addresses = set()
for txi in tx.inputs: for txi in tx.inputs:
if txi.txo_ref.txo is not None: if txi.txo_ref.txo is not None:
@ -601,4 +601,4 @@ class BaseLedger(metaclass=LedgerRegistry):
found = True found = True
if not found: if not found:
print(record['history'], addresses, tx.id) print(record['history'], addresses, tx.id)
raise asyncio.TimeoutError('Timed out waiting for transaction: %s', tx.id) raise asyncio.TimeoutError('Timed out waiting for transaction.')