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

Merge pull request #403 from lbryio/fix-result

Browse source 
bug fix: jsonrpc methods no longer have a 'result' key
This commit is contained in:
Alex Grin 2017-01-12 12:19:27 -05:00 committed by GitHub
parent bb1b7b66f7 20f113d3da
commit 7f6e9fff30
1 changed files with 13 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
lbrynet/lbrynet_daemon/Daemon.py
View file

@ -1128,7 +1128,7 @@ class Daemon(AuthJSONRPCServer):
"""
d = self.jsonrpc_status({'blockchain_status': True})
d.addCallback(lambda x: self._render_response(
x['result']['blockchain_status']['best_blockhash']))
x['blockchain_status']['best_blockhash']))
return d
def jsonrpc_is_running(self):
@ -1136,7 +1136,7 @@ class Daemon(AuthJSONRPCServer):
DEPRECATED. Use `status` instead
"""
d = self.jsonrpc_status({'blockchain_status': True})
d.addCallback(lambda x: self._render_response(x['result']['is_running']))
d.addCallback(lambda x: self._render_response(x['is_running']))
return d
def jsonrpc_daemon_status(self):
@ -1145,23 +1145,23 @@ class Daemon(AuthJSONRPCServer):
"""
def _simulate_old_daemon_status(status):
message = status['result']['startup_status']['message']
message = status['startup_status']['message']
problem_code = None
progress = None
if self.connection_status_code != CONNECTION_STATUS_CONNECTED:
problem_code = self.connection_status_code
message = CONNECTION_MESSAGES[self.connection_status_code]
elif status['result']['startup_status']['code'] == LOADING_WALLET_CODE:
elif status['startup_status']['code'] == LOADING_WALLET_CODE:
message = "Catching up with the blockchain."
progress = 0
if status['result']['blocks_behind'] > 0:
message += ' ' + str(status['result']['blocks_behind']) + " blocks behind."
if status['blocks_behind'] > 0:
message += ' ' + str(status['blocks_behind']) + " blocks behind."
progress = self.session.wallet.catchup_progress
return {
'message': message,
'code': status['result']['startup_status']['code'],
'code': status['startup_status']['code'],
'progress': progress,
'is_lagging': self.connection_status_code != CONNECTION_STATUS_CONNECTED,
'problem_code': problem_code,
@ -1177,7 +1177,7 @@ class Daemon(AuthJSONRPCServer):
DEPRECATED. Use `status` instead
"""
d = self.jsonrpc_status({'blockchain_status': True})
d.addCallback(lambda x: self._render_response(x['result']['is_first_run']))
d.addCallback(lambda x: self._render_response(x['is_first_run']))
return d
def jsonrpc_get_lbry_session_info(self):
@ -1187,9 +1187,9 @@ class Daemon(AuthJSONRPCServer):
d = self.jsonrpc_status({'session_status': True})
d.addCallback(lambda x: self._render_response({
'lbry_id': x['result']['lbry_id'],
'managed_blobs': x['result']['session_status']['managed_blobs'],
'managed_streams': x['result']['session_status']['managed_streams'],
'lbry_id': x['lbry_id'],
'managed_blobs': x['session_status']['managed_blobs'],
'managed_streams': x['session_status']['managed_streams'],
}))
return d
@ -1198,7 +1198,7 @@ class Daemon(AuthJSONRPCServer):
DEPRECATED. Use `status` instead
"""
d = self.jsonrpc_status({'blockchain_status': True}) # blockchain_status=True is needed
d.addCallback(lambda x: self._render_response(x['result']['blocks_behind']))
d.addCallback(lambda x: self._render_response(x['blocks_behind']))
return d
def jsonrpc_version(self):
@ -2445,8 +2445,7 @@ class Daemon(AuthJSONRPCServer):
Startup message, such as first run notification
"""
def _get_startup_message(resp):
status = resp['result']
def _get_startup_message(status):
if status['is_first_run'] and self.session.wallet.wallet_balance:
return self._render_response(None)
else: