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

remove supports from resolve

Browse source
This commit is contained in:
Victor Shyba 2019-05-15 23:17:42 -03:00 committed by Lex Berezhny
parent 8777dcee7c
commit 8afe178d62
2 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lbrynet/wallet/server/session.py
View file

@ -190,7 +190,7 @@ class LBRYElectrumX(ElectrumX):
claims = await self.daemon.getclaimsforname(name) claims = await self.daemon.getclaimsforname(name)
if claims: if claims:
claims['claims'] = [self.format_claim_from_daemon(claim, name) for claim in claims['claims']] claims['claims'] = [self.format_claim_from_daemon(claim, name) for claim in claims['claims']]
claims['supports_without_claims'] = claims['supports without claims'] claims['supports_without_claims'] = [] # fixme temporary
del claims['supports without claims'] del claims['supports without claims']
claims['last_takeover_height'] = claims['nLastTakeoverHeight'] claims['last_takeover_height'] = claims['nLastTakeoverHeight']
del claims['nLastTakeoverHeight'] del claims['nLastTakeoverHeight']
@ -224,7 +224,9 @@ class LBRYElectrumX(ElectrumX):
# raise RPCError("Lbrycrd has {} but not lbryumx, please submit a bug report.".format(claim_id)) # raise RPCError("Lbrycrd has {} but not lbryumx, please submit a bug report.".format(claim_id))
return {} return {}
address = info.address.decode() address = info.address.decode()
supports = self.format_supports_from_daemon(claim.get('supports', [])) # fixme: temporary
#supports = self.format_supports_from_daemon(claim.get('supports', []))
supports = []
amount = get_from_possible_keys(claim, 'amount', 'nAmount') amount = get_from_possible_keys(claim, 'amount', 'nAmount')
height = get_from_possible_keys(claim, 'height', 'nHeight') height = get_from_possible_keys(claim, 'height', 'nHeight')

8
tests/integration/test_chris45.py
View file

@ -138,8 +138,6 @@ class EpicAdventuresOfChris45(CommandTestCase):
# It obviously did! Because, blockchain baby \O/ # It obviously did! Because, blockchain baby \O/
self.assertEqual(resolve_result[uri]['claim']['amount'], '1.0') self.assertEqual(resolve_result[uri]['claim']['amount'], '1.0')
self.assertEqual(resolve_result[uri]['claim']['effective_amount'], '1.2') self.assertEqual(resolve_result[uri]['claim']['effective_amount'], '1.2')
self.assertEqual(resolve_result[uri]['claim']['supports'][0]['amount'], '0.2')
self.assertEqual(resolve_result[uri]['claim']['supports'][0]['txid'], tx['txid'])
await self.generate(5) await self.generate(5)
# Now he also wanted to support the original creator of the Award Winning Novel # Now he also wanted to support the original creator of the Award Winning Novel
@ -152,8 +150,7 @@ class EpicAdventuresOfChris45(CommandTestCase):
# And again checks if it went to the just right place # And again checks if it went to the just right place
resolve_result = await self.out(self.daemon.jsonrpc_resolve(uri)) resolve_result = await self.out(self.daemon.jsonrpc_resolve(uri))
# Which it obviously did. Because....????? # Which it obviously did. Because....?????
self.assertEqual(resolve_result[uri]['claim']['supports'][1]['amount'], '0.3') self.assertEqual(resolve_result[uri]['claim']['effective_amount'], '1.5')
self.assertEqual(resolve_result[uri]['claim']['supports'][1]['txid'], tx['txid'])
await self.generate(5) await self.generate(5)
# Seeing the ravishing success of his novel Chris adds support to his claim too # Seeing the ravishing success of his novel Chris adds support to his claim too
@ -163,8 +160,7 @@ class EpicAdventuresOfChris45(CommandTestCase):
# And check if his support showed up # And check if his support showed up
resolve_result = await self.out(self.daemon.jsonrpc_resolve(uri)) resolve_result = await self.out(self.daemon.jsonrpc_resolve(uri))
# It did! # It did!
self.assertEqual(resolve_result[uri]['claim']['supports'][2]['amount'], '0.4') self.assertEqual(resolve_result[uri]['claim']['effective_amount'], '1.9')
self.assertEqual(resolve_result[uri]['claim']['supports'][2]['txid'], tx['txid'])
await self.generate(5) await self.generate(5)
# Now Ramsey who is a singer by profession, is preparing for his new "gig". He has everything in place for that # Now Ramsey who is a singer by profession, is preparing for his new "gig". He has everything in place for that