From e02e2a249abf6acd8f3a221f6c3dfda2a79fb7eb Mon Sep 17 00:00:00 2001 From: Lex Berezhny Date: Tue, 16 Oct 2018 16:00:12 -0400 Subject: [PATCH] fix wallet component --- lbrynet/daemon/Components.py | 7 +++---- lbrynet/daemon/auth/server.py | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/lbrynet/daemon/Components.py b/lbrynet/daemon/Components.py index a00bf610e..4aa61ee8a 100644 --- a/lbrynet/daemon/Components.py +++ b/lbrynet/daemon/Components.py @@ -329,19 +329,18 @@ class WalletComponent(Component): def component(self): return self.wallet_manager - @defer.inlineCallbacks def get_status(self): if self.wallet_manager: local_height = self.wallet_manager.network.get_local_height() remote_height = self.wallet_manager.network.get_server_height() - best_hash = yield f2d(self.wallet_manager.get_best_blockhash()) - defer.returnValue({ + best_hash = self.wallet_manager.get_best_blockhash() + return { 'blocks': max(local_height, 0), 'blocks_behind': max(remote_height - local_height, 0), 'best_blockhash': best_hash, 'is_encrypted': self.wallet_manager.wallet.use_encryption, 'is_locked': not self.wallet_manager.is_wallet_unlocked, - }) + } @defer.inlineCallbacks def start(self): diff --git a/lbrynet/daemon/auth/server.py b/lbrynet/daemon/auth/server.py index 1c150c920..e06e8a740 100644 --- a/lbrynet/daemon/auth/server.py +++ b/lbrynet/daemon/auth/server.py @@ -457,7 +457,7 @@ class AuthJSONRPCServer(AuthorizedBase): else: d = defer.succeed(result) except: - d = Failure(captureVars=Deferred.debug) + d = defer.fail(Failure(captureVars=Deferred.debug)) # finished_deferred will callback when the request is finished # and errback if something went wrong. If the errback is