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

pylint

Browse source
This commit is contained in:
Lex Berezhny 2019-05-04 22:58:56 -04:00
parent 9accbfcf8b
commit 2e6297f834
2 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lbrynet/wallet/ledger.py
View file

@ -3,9 +3,6 @@ import logging
from binascii import unhexlify from binascii import unhexlify
from typing import Tuple, List, Dict from typing import Tuple, List, Dict
from ecdsa import BadSignatureError
from cryptography.exceptions import InvalidSignature
from torba.client.baseledger import BaseLedger from torba.client.baseledger import BaseLedger
from lbrynet.schema.result import Outputs from lbrynet.schema.result import Outputs
from lbrynet.schema.url import URL from lbrynet.schema.url import URL

10
lbrynet/wallet/resolve.py
View file

@ -34,7 +34,7 @@ class Resolver:
if len(uris) > 1: if len(uris) > 1:
return await self._batch_handle(resolutions, uris, page, page_size, claim_trie_root) return await self._batch_handle(resolutions, uris, page, page_size, claim_trie_root)
return await self._handle_resolutions(resolutions, uris, page, page_size, claim_trie_root) return await self._handle_resolutions(resolutions, uris, page, page_size, claim_trie_root)
except URIParseError as err: except ValueError as err:
return {'error': err.args[0]} return {'error': err.args[0]}
except Exception as e: except Exception as e:
log.exception(e) log.exception(e)
@ -72,7 +72,7 @@ class Resolver:
async def _handle_resolve_uri_response(self, uri, resolution, claim_trie_root, page=0, page_size=10): async def _handle_resolve_uri_response(self, uri, resolution, claim_trie_root, page=0, page_size=10):
result = {} result = {}
parsed_uri = parse_lbry_uri(uri) parsed_uri = URL.parse(uri)
certificate_response = None certificate_response = None
# parse an included certificate # parse an included certificate
if 'certificate' in resolution: if 'certificate' in resolution:
@ -80,7 +80,7 @@ class Resolver:
certificate_resolution_type = resolution['certificate']['resolution_type'] certificate_resolution_type = resolution['certificate']['resolution_type']
if certificate_resolution_type == "winning" and certificate_response: if certificate_resolution_type == "winning" and certificate_response:
if 'height' in certificate_response: if 'height' in certificate_response:
certificate_response = _verify_proof(parsed_uri.name, certificate_response = _verify_proof(parsed_uri.stream.name,
claim_trie_root, claim_trie_root,
certificate_response, certificate_response,
ledger=self.ledger) ledger=self.ledger)
@ -95,7 +95,7 @@ class Resolver:
claim_resolution_type = resolution['claim']['resolution_type'] claim_resolution_type = resolution['claim']['resolution_type']
if claim_resolution_type == "winning" and claim_response: if claim_resolution_type == "winning" and claim_response:
if 'height' in claim_response: if 'height' in claim_response:
claim_response = _verify_proof(parsed_uri.name, claim_response = _verify_proof(parsed_uri.stream.name,
claim_trie_root, claim_trie_root,
claim_response, claim_response,
ledger=self.ledger) ledger=self.ledger)
@ -140,7 +140,7 @@ class Resolver:
# invalid signatures can only return outside a channel # invalid signatures can only return outside a channel
if result.get('claim', {}).get('has_signature', False): if result.get('claim', {}).get('has_signature', False):
if parsed_uri.path and not result['claim']['signature_is_valid']: if parsed_uri.has_stream and not result['claim']['signature_is_valid']:
return {'error': 'claim not found', 'success': False, 'uri': str(parsed_uri)} return {'error': 'claim not found', 'success': False, 'uri': str(parsed_uri)}
return result return result