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

refactor: move generate to blockchain call

Browse source
This commit is contained in:
Victor Shyba 2019-04-28 23:18:42 -03:00 committed by Lex Berezhny
parent c2ca0a9467
commit 46c03c0cb2
3 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
lbrynet/testcase.py
View file

@ -151,11 +151,15 @@ class CommandTestCase(IntegrationTestCase):
await self.blockchain.generate(blocks) await self.blockchain.generate(blocks)
await self.ledger.on_header.where(self.blockchain.is_expected_block) await self.ledger.on_header.where(self.blockchain.is_expected_block)
def blockchain_claim_name(self, name: str, value: str, amount: str): async def blockchain_claim_name(self, name: str, value: str, amount: str):
return self.blockchain._cli_cmnd('claimname', name, value, amount) txid = await self.blockchain._cli_cmnd('claimname', name, value, amount)
await self.generate(1)
return txid
def blockchain_update_name(self, txid: str, value: str, amount: str): async def blockchain_update_name(self, txid: str, value: str, amount: str):
return self.blockchain._cli_cmnd('updateclaim', txid, value, amount) txid = await self.blockchain._cli_cmnd('updateclaim', txid, value, amount)
await self.generate(1)
return txid
async def out(self, awaitable): async def out(self, awaitable):
""" Serializes lbrynet API results to JSON then loads and returns it as dictionary. """ """ Serializes lbrynet API results to JSON then loads and returns it as dictionary. """

2
tests/integration/test_file_commands.py
View file

@ -34,12 +34,10 @@ class FileCommands(CommandTestCase):
claim = claim['lbry://foo']['claim']['protobuf'].decode() claim = claim['lbry://foo']['claim']['protobuf'].decode()
await self.daemon.jsonrpc_file_delete(claim_name='foo') await self.daemon.jsonrpc_file_delete(claim_name='foo')
txid = await self.blockchain_claim_name('bar', claim, '0.01') txid = await self.blockchain_claim_name('bar', claim, '0.01')
await self.generate(1)
await self.daemon.jsonrpc_get('lbry://bar') await self.daemon.jsonrpc_get('lbry://bar')
claim = Claim.from_bytes(unhexlify(claim)) claim = Claim.from_bytes(unhexlify(claim))
claim.stream.description = "fix typos, fix the world" claim.stream.description = "fix typos, fix the world"
await self.blockchain_update_name(txid, hexlify(claim.to_bytes()).decode(), '0.01') await self.blockchain_update_name(txid, hexlify(claim.to_bytes()).decode(), '0.01')
await self.generate(1)
await self.daemon.jsonrpc_resolve('lbry://bar') await self.daemon.jsonrpc_resolve('lbry://bar')
file_list = self.daemon.jsonrpc_file_list() file_list = self.daemon.jsonrpc_file_list()
self.assertEqual(file_list[0].stream_claim_info.claim.stream.description, claim.stream.description) self.assertEqual(file_list[0].stream_claim_info.claim.stream.description, claim.stream.description)

1
tests/integration/test_resolve_command.py
View file

@ -72,7 +72,6 @@ class ResolveCommand(CommandTestCase):
# resolve handles invalid data # resolve handles invalid data
txid = await self.blockchain_claim_name( txid = await self.blockchain_claim_name(
"gibberish", hexlify(b"{'invalid':'json'}").decode(), "0.1") "gibberish", hexlify(b"{'invalid':'json'}").decode(), "0.1")
await self.generate(1)
response = await self.resolve("lbry://gibberish") response = await self.resolve("lbry://gibberish")
self.assertSetEqual({'lbry://gibberish'}, set(response)) self.assertSetEqual({'lbry://gibberish'}, set(response))
claim = response['lbry://gibberish']['claim'] claim = response['lbry://gibberish']['claim']