From 31b5026570398daf2e24336af96837b6cc8853ca Mon Sep 17 00:00:00 2001 From: Jack Robison Date: Wed, 12 Apr 2017 13:53:07 -0400 Subject: [PATCH] return false from claim_show when claim is not found --- lbrynet/lbrynet_daemon/Daemon.py | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/lbrynet/lbrynet_daemon/Daemon.py b/lbrynet/lbrynet_daemon/Daemon.py index 363ca67a7..b9e7635e0 100644 --- a/lbrynet/lbrynet_daemon/Daemon.py +++ b/lbrynet/lbrynet_daemon/Daemon.py @@ -1412,6 +1412,7 @@ class Daemon(AuthJSONRPCServer): """ return self.jsonrpc_claim_show(**kwargs) + @defer.inlineCallbacks def jsonrpc_claim_show(self, name, txid=None, nout=None, claim_id=None): """ @@ -1436,11 +1437,13 @@ class Daemon(AuthJSONRPCServer): 'supports': (list) list of supports associated with claim } """ - - d = self.session.wallet.get_claim_info(name, txid, nout, claim_id) - d.addCallback(format_json_out_amount_as_float) - d.addCallback(lambda r: self._render_response(r)) - return d + try: + claim_results = yield self.session.wallet.get_claim_info(name, txid, nout, claim_id) + result = format_json_out_amount_as_float(claim_results) + except (TypeError, UnknownNameError): + result = False + response = yield self._render_response(result) + defer.returnValue(response) @AuthJSONRPCServer.auth_required @defer.inlineCallbacks