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

pylint and mypy fixes

Browse source
This commit is contained in:
Lex Berezhny 2018-11-18 23:07:54 -05:00
parent 345d4f8ab1
commit ee28bbc19b
3 changed files with 13 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
torba/client/basedatabase.py
View file

@ -2,7 +2,6 @@ import logging
import asyncio import asyncio
from asyncio import wrap_future from asyncio import wrap_future
from concurrent.futures.thread import ThreadPoolExecutor from concurrent.futures.thread import ThreadPoolExecutor
from operator import itemgetter
from typing import Tuple, List, Union, Callable, Any, Awaitable, Iterable from typing import Tuple, List, Union, Callable, Any, Awaitable, Iterable

24
torba/client/baseledger.py
View file

@ -52,18 +52,18 @@ class TransactionCacheItem:
__slots__ = '_tx', 'lock', 'has_tx' __slots__ = '_tx', 'lock', 'has_tx'
def __init__(self, def __init__(self,
tx: Optional[basetransaction.BaseTransaction] = None, tx: Optional[basetransaction.BaseTransaction] = None,
lock: Optional[asyncio.Lock] = None): lock: Optional[asyncio.Lock] = None):
self.has_tx = asyncio.Event() self.has_tx = asyncio.Event()
self.lock = lock or asyncio.Lock() self.lock = lock or asyncio.Lock()
self.tx = tx self._tx = self.tx = tx
@property @property
def tx(self): def tx(self) -> Optional[basetransaction.BaseTransaction]:
return self._tx return self._tx
@tx.setter @tx.setter
def tx(self, tx): def tx(self, tx: basetransaction.BaseTransaction):
self._tx = tx self._tx = tx
if tx is not None: if tx is not None:
self.has_tx.set() self.has_tx.set()
@ -251,11 +251,8 @@ class BaseLedger(metaclass=LedgerRegistry):
log.info("Subscribing and updating accounts.") log.info("Subscribing and updating accounts.")
await self.update_headers() await self.update_headers()
await self.network.subscribe_headers() await self.network.subscribe_headers()
import time
start = time.time()
await self.subscribe_accounts() await self.subscribe_accounts()
await self.sync.done.wait() await self.sync.done.wait()
log.info(f'elapsed: {time.time()-start}')
async def stop(self): async def stop(self):
self.sync.cancel() self.sync.cancel()
@ -397,6 +394,7 @@ class BaseLedger(metaclass=LedgerRegistry):
if cache_item is not None: if cache_item is not None:
if cache_item.tx is None: if cache_item.tx is None:
await cache_item.has_tx.wait() await cache_item.has_tx.wait()
assert cache_item.tx is not None
txi.txo_ref = cache_item.tx.outputs[txi.txo_ref.position].ref txi.txo_ref = cache_item.tx.outputs[txi.txo_ref.position].ref
else: else:
check_db_for_txos.append(txi.txo_ref.tx_ref.id) check_db_for_txos.append(txi.txo_ref.tx_ref.id)
@ -409,7 +407,7 @@ class BaseLedger(metaclass=LedgerRegistry):
if txi.txo_ref.txo is not None: if txi.txo_ref.txo is not None:
continue continue
referenced_txo = referenced_txos.get(txi.txo_ref.tx_ref.id) referenced_txo = referenced_txos.get(txi.txo_ref.tx_ref.id)
if referenced_txos: if referenced_txo is not None:
txi.txo_ref = referenced_txo.ref txi.txo_ref = referenced_txo.ref
synced_history.write(f'{tx.id}:{tx.height}:') synced_history.write(f'{tx.id}:{tx.height}:')
@ -423,7 +421,8 @@ class BaseLedger(metaclass=LedgerRegistry):
if address_manager is None: if address_manager is None:
address_manager = await self.get_address_manager_for_address(address) address_manager = await self.get_address_manager_for_address(address)
await address_manager.ensure_address_gap() if address_manager is not None:
await address_manager.ensure_address_gap()
async def cache_transaction(self, txid, remote_height): async def cache_transaction(self, txid, remote_height):
cache_item = self._tx_cache.get(txid) cache_item = self._tx_cache.get(txid)
@ -456,7 +455,7 @@ class BaseLedger(metaclass=LedgerRegistry):
if tx is None: if tx is None:
raise ValueError(f'Transaction {txid} was not in database and not on network.') raise ValueError(f'Transaction {txid} was not in database and not on network.')
if 0 < remote_height and not tx.is_verified: if remote_height > 0 and not tx.is_verified:
# tx from cache / db is not up-to-date # tx from cache / db is not up-to-date
await self.maybe_verify_transaction(tx, remote_height) await self.maybe_verify_transaction(tx, remote_height)
await self.db.update_transaction(tx) await self.db.update_transaction(tx)
@ -475,11 +474,12 @@ class BaseLedger(metaclass=LedgerRegistry):
tx.position = merkle['pos'] tx.position = merkle['pos']
tx.is_verified = merkle_root == header['merkle_root'] tx.is_verified = merkle_root == header['merkle_root']
async def get_address_manager_for_address(self, address) -> baseaccount.AddressManager: async def get_address_manager_for_address(self, address) -> Optional[baseaccount.AddressManager]:
details = await self.db.get_address(address=address) details = await self.db.get_address(address=address)
for account in self.accounts: for account in self.accounts:
if account.id == details['account']: if account.id == details['account']:
return account.address_managers[details['chain']] return account.address_managers[details['chain']]
return None
def broadcast(self, tx): def broadcast(self, tx):
return self.network.broadcast(hexlify(tx.raw).decode()) return self.network.broadcast(hexlify(tx.raw).decode())

2
torba/testcase.py
View file

@ -160,7 +160,7 @@ class IntegrationTestCase(AsyncioTestCase):
async def asyncTearDown(self): async def asyncTearDown(self):
await self.conductor.stop() await self.conductor.stop()
async def assertBalance(self, account, expected_balance: str): async def assertBalance(self, account, expected_balance: str): # pylint: disable=C0103
balance = await account.get_balance() balance = await account.get_balance()
self.assertEqual(satoshis_to_coins(balance), expected_balance) self.assertEqual(satoshis_to_coins(balance), expected_balance)