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

move wallet_syncing to wallet status is_syncing

Browse source
This commit is contained in:
Victor Shyba 2020-03-24 21:22:51 -03:00 • committed by Jack Robison
parent 1052126522
commit 460bdc4148
No known key found for this signature in database
GPG key ID: DF25C68FE0239BB2
3 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
lbry/extras/daemon/components.py
View file

@ -146,7 +146,6 @@ class WalletComponent(Component):
best_hash = await self.wallet_manager.get_best_blockhash() best_hash = await self.wallet_manager.get_best_blockhash()
result.update({ result.update({
'headers_synchronization_progress': progress, 'headers_synchronization_progress': progress,
'wallet_syncing': len(self.wallet_manager.ledger._update_tasks) > 0,
'blocks': max(local_height, 0), 'blocks': max(local_height, 0),
'blocks_behind': max(remote_height - local_height, 0), 'blocks_behind': max(remote_height - local_height, 0),
'best_blockhash': best_hash, 'best_blockhash': best_hash,

6
lbry/extras/daemon/daemon.py
View file

@ -1326,7 +1326,11 @@ class Daemon(metaclass=JSONRPCServerType):
Dictionary of wallet status information. Dictionary of wallet status information.
""" """
wallet = self.wallet_manager.get_wallet_or_default(wallet_id) wallet = self.wallet_manager.get_wallet_or_default(wallet_id)
return {'is_encrypted': wallet.is_encrypted, 'is_locked': wallet.is_locked} return {
'is_encrypted': wallet.is_encrypted,
'is_syncing': len(self.ledger._update_tasks) > 0,
'is_locked': wallet.is_locked
}
@requires(WALLET_COMPONENT) @requires(WALLET_COMPONENT)
def jsonrpc_wallet_unlock(self, password, wallet_id=None): def jsonrpc_wallet_unlock(self, password, wallet_id=None):

4
tests/integration/blockchain/test_wallet_commands.py
View file

@ -25,8 +25,8 @@ class WalletCommands(CommandTestCase):
sendtxid = await self.blockchain.send_to_address(address, 1) sendtxid = await self.blockchain.send_to_address(address, 1)
async def eventually_will_sync(): async def eventually_will_sync():
while not (await self.daemon.jsonrpc_status())['wallet']['wallet_syncing']: while not self.daemon.jsonrpc_wallet_status()['is_syncing']:
pass await asyncio.sleep(0)
check_sync = asyncio.create_task(eventually_will_sync()) check_sync = asyncio.create_task(eventually_will_sync())
await self.confirm_tx(sendtxid, self.ledger) await self.confirm_tx(sendtxid, self.ledger)
await asyncio.wait_for(check_sync, timeout=10) await asyncio.wait_for(check_sync, timeout=10)