LBRYFoundation/lbry-sdk
1
0
Fork 0
mirror of https://github.com/LBRYFoundation/lbry-sdk.git synced 2025-09-01 01:35:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix updating fee address to claim address, fix testing for malformed claims

Browse source
This commit is contained in:
Victor Shyba 2019-06-10 18:43:08 -03:00 • committed by Lex Berezhny
parent 2b7cbf9759
commit 912c102d9a
3 changed files with 31 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lbrynet/extras/daemon/Daemon.py
View file

@ -2609,8 +2609,8 @@ class Daemon(metaclass=JSONRPCServerType):
elif old_txo.claim.is_signed and not clear_channel and not replace: elif old_txo.claim.is_signed and not clear_channel and not replace:
channel = old_txo.channel channel = old_txo.channel
if 'fee_address' in kwargs: if 'fee_amount' in kwargs:
self.valid_address_or_error(kwargs['fee_address']) kwargs['fee_address'] = self.get_fee_address(kwargs, claim_address)
if replace: if replace:
claim = Claim() claim = Claim()

8
tests/integration/test_claim_commands.py
View file

@ -711,6 +711,14 @@ class StreamCommands(ClaimTestCase):
del fixed_values['fee'] del fixed_values['fee']
self.assertEqual(txo['value'], fixed_values) self.assertEqual(txo['value'], fixed_values)
# setting the fee after it has been cleared, without a fee address, sets the fee address to claim address
tx = await self.out(self.stream_update(claim_id, fee_amount='0.1', fee_currency='LBC'))
txo = tx['outputs'][0]
self.assertIn('fee', txo['value'])
self.assertIn('address', txo['value']['fee'])
self.assertEqual(txo['value']['fee']['address'], txo['address'])
fixed_values['fee'] = txo['value']['fee']
# modifying hash/size/name # modifying hash/size/name
fixed_values['source']['name'] = 'changed_name' fixed_values['source']['name'] = 'changed_name'
fixed_values['source']['hash'] = 'cafebeef' fixed_values['source']['hash'] = 'cafebeef'

25
tests/integration/test_file_commands.py
View file

@ -4,8 +4,10 @@ import os
from binascii import unhexlify, hexlify from binascii import unhexlify, hexlify
from lbrynet.schema import Claim from lbrynet.schema import Claim
from lbrynet.schema.claim import Stream
from lbrynet.testcase import CommandTestCase from lbrynet.testcase import CommandTestCase
from lbrynet.blob_exchange.downloader import BlobDownloader from lbrynet.blob_exchange.downloader import BlobDownloader
from lbrynet.wallet.transaction import Transaction
class FileCommands(CommandTestCase): class FileCommands(CommandTestCase):
@ -262,12 +264,12 @@ class FileCommands(CommandTestCase):
await self.daemon.jsonrpc_file_delete(claim_name='icanpay') await self.daemon.jsonrpc_file_delete(claim_name='icanpay')
# PASS: no fee address --> use the claim address to pay # PASS: no fee address --> use the claim address to pay
await self.stream_create( tx = await self.stream_create(
'nofeeaddress', '0.01', data=b'free stuff?', 'nofeeaddress', '0.01', data=b'free stuff?',
) )
await self.stream_update( await self.__raw_value_update(
claim_id=self.daemon.jsonrpc_file_list()[0].claim_id, old_tx=tx,
data=b'new price', fee_amount='2.0', fee_currency='LBC', claim_address=target_address fee_amount='2.0', fee_currency='LBC', claim_address=target_address
) )
self.assertIs(self.daemon.jsonrpc_file_list()[0].stream_claim_info.claim.stream.fee.address, '') self.assertIs(self.daemon.jsonrpc_file_list()[0].stream_claim_info.claim.stream.fee.address, '')
await self.daemon.jsonrpc_file_delete(claim_name='nofeeaddress') await self.daemon.jsonrpc_file_delete(claim_name='nofeeaddress')
@ -278,3 +280,18 @@ class FileCommands(CommandTestCase):
self.assertEqual(len(self.daemon.jsonrpc_file_list()), 1) self.assertEqual(len(self.daemon.jsonrpc_file_list()), 1)
self.assertEqual(response['content_fee']['outputs'][0]['amount'], '2.0') self.assertEqual(response['content_fee']['outputs'][0]['amount'], '2.0')
self.assertEqual(response['content_fee']['outputs'][0]['address'], target_address) self.assertEqual(response['content_fee']['outputs'][0]['address'], target_address)
async def __raw_value_update(self, old_tx, claim_address, **kwargs):
old_tx = Transaction(raw=unhexlify(old_tx['hex']))
old_txo = old_tx.outputs[0]
claim = Claim()
claim.stream.message.source.CopyFrom(
old_txo.claim.stream.message.source
)
claim.stream.update(**kwargs)
tx = await Transaction.claim_update(
old_txo, claim, 1, claim_address, [self.account], self.account
)
await tx.sign([self.account])
await self.broadcast(tx)
await self.confirm_tx(tx.id)