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

get without fee address defaults pays to claim address

Browse source
This commit is contained in:
Victor Shyba 2019-06-07 00:51:10 -03:00 committed by Lex Berezhny
parent 1cc6b2e31e
commit 2b7cbf9759
3 changed files with 22 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lbrynet/schema/attrs.py
View file

@ -217,11 +217,11 @@ class Fee(Metadata):
@property @property
def address(self) -> str: def address(self) -> str:
return Base58.encode(self.message.address) return Base58.encode(self.address_bytes) if self.address_bytes else ''
@address.setter @address.setter
def address(self, address: str): def address(self, address: str):
self.message.address = Base58.decode(address) self.address_bytes = Base58.decode(address)
@property @property
def address_bytes(self) -> bytes: def address_bytes(self) -> bytes:

2
lbrynet/stream/stream_manager.py
View file

@ -407,7 +407,7 @@ class StreamManager:
msg = f"fee of {fee_amount} exceeds max available balance" msg = f"fee of {fee_amount} exceeds max available balance"
log.warning(msg) log.warning(msg)
raise InsufficientFundsError(msg) raise InsufficientFundsError(msg)
fee_address = claim.stream.fee.address fee_address = claim.stream.fee.address or resolved['address']
stream = ManagedStream( stream = ManagedStream(
self.loop, self.config, self.blob_manager, claim.stream.source.sd_hash, download_directory, self.loop, self.config, self.blob_manager, claim.stream.source.sd_hash, download_directory,

19
tests/integration/test_file_commands.py
View file

@ -259,3 +259,22 @@ class FileCommands(CommandTestCase):
await self.daemon.stream_manager.start() await self.daemon.stream_manager.start()
self.assertEqual(len(self.daemon.jsonrpc_file_list()), 1) self.assertEqual(len(self.daemon.jsonrpc_file_list()), 1)
self.assertEqual(self.daemon.jsonrpc_file_list()[0].content_fee.raw, raw_content_fee) self.assertEqual(self.daemon.jsonrpc_file_list()[0].content_fee.raw, raw_content_fee)
await self.daemon.jsonrpc_file_delete(claim_name='icanpay')
# PASS: no fee address --> use the claim address to pay
await self.stream_create(
'nofeeaddress', '0.01', data=b'free stuff?',
)
await self.stream_update(
claim_id=self.daemon.jsonrpc_file_list()[0].claim_id,
data=b'new price', 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, '')
await self.daemon.jsonrpc_file_delete(claim_name='nofeeaddress')
self.assertEqual(len(self.daemon.jsonrpc_file_list()), 0)
response = await self.out(self.daemon.jsonrpc_get('lbry://nofeeaddress'))
self.assertIsNotNone(response['content_fee'])
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]['address'], target_address)