LBRYFoundation/lbry-sdk
1
0
Fork 0
mirror of https://github.com/LBRYFoundation/lbry-sdk.git synced 2025-10-02 08:10:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix uncaught exchange rate errors

Browse source
This commit is contained in:
Jack Robison 2019-06-23 18:29:30 -04:00
parent 0397d01c0f
commit 9fe5376b42
No known key found for this signature in database
GPG key ID: DF25C68FE0239BB2
1 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
lbrynet/extras/daemon/exchange_rate_manager.py
View file

@ -3,7 +3,7 @@ import time
import logging import logging
import json import json
from decimal import Decimal from decimal import Decimal
import typing
from lbrynet.error import InvalidExchangeRateResponse, CurrencyConversionError from lbrynet.error import InvalidExchangeRateResponse, CurrencyConversionError
from lbrynet.utils import aiohttp_request from lbrynet.utils import aiohttp_request
@ -44,7 +44,7 @@ class MarketFeed:
self.params = params self.params = params
self.fee = fee self.fee = fee
self.rate = None self.rate = None
self._task: asyncio.Task = None self._task: typing.Optional[asyncio.Task] = None
self._online = True self._online = True
def rate_is_initialized(self): def rate_is_initialized(self):
@ -105,7 +105,10 @@ class BittrexFeed(MarketFeed):
) )
def _handle_response(self, response): def _handle_response(self, response):
json_response = json.loads(response) try:
json_response = json.loads(response)
except (ValueError, json.JSONDecodeError) as err:
raise InvalidExchangeRateResponse(self.name, str(err))
if 'result' not in json_response: if 'result' not in json_response:
raise InvalidExchangeRateResponse(self.name, 'result not found') raise InvalidExchangeRateResponse(self.name, 'result not found')
trades = json_response['result'] trades = json_response['result']
@ -130,7 +133,10 @@ class LBRYioFeed(MarketFeed):
) )
def _handle_response(self, response): def _handle_response(self, response):
json_response = json.loads(response) try:
json_response = json.loads(response)
except (ValueError, json.JSONDecodeError) as err:
raise InvalidExchangeRateResponse(self.name, str(err))
if 'data' not in json_response: if 'data' not in json_response:
raise InvalidExchangeRateResponse(self.name, 'result not found') raise InvalidExchangeRateResponse(self.name, 'result not found')
return 1.0 / json_response['data']['lbc_btc'] return 1.0 / json_response['data']['lbc_btc']
@ -149,7 +155,7 @@ class LBRYioBTCFeed(MarketFeed):
def _handle_response(self, response): def _handle_response(self, response):
try: try:
json_response = json.loads(response) json_response = json.loads(response)
except ValueError: except (ValueError, json.JSONDecodeError):
raise InvalidExchangeRateResponse(self.name, "invalid rate response : %s" % response) raise InvalidExchangeRateResponse(self.name, "invalid rate response : %s" % response)
if 'data' not in json_response: if 'data' not in json_response:
raise InvalidExchangeRateResponse(self.name, 'result not found') raise InvalidExchangeRateResponse(self.name, 'result not found')
@ -169,7 +175,7 @@ class CryptonatorBTCFeed(MarketFeed):
def _handle_response(self, response): def _handle_response(self, response):
try: try:
json_response = json.loads(response) json_response = json.loads(response)
except ValueError: except (ValueError, json.JSONDecodeError):
raise InvalidExchangeRateResponse(self.name, "invalid rate response") raise InvalidExchangeRateResponse(self.name, "invalid rate response")
if 'ticker' not in json_response or len(json_response['ticker']) == 0 or \ if 'ticker' not in json_response or len(json_response['ticker']) == 0 or \
'success' not in json_response or json_response['success'] is not True: 'success' not in json_response or json_response['success'] is not True:
@ -190,7 +196,7 @@ class CryptonatorFeed(MarketFeed):
def _handle_response(self, response): def _handle_response(self, response):
try: try:
json_response = json.loads(response) json_response = json.loads(response)
except ValueError: except (ValueError, json.JSONDecodeError):
raise InvalidExchangeRateResponse(self.name, "invalid rate response") raise InvalidExchangeRateResponse(self.name, "invalid rate response")
if 'ticker' not in json_response or len(json_response['ticker']) == 0 or \ if 'ticker' not in json_response or len(json_response['ticker']) == 0 or \
'success' not in json_response or json_response['success'] is not True: 'success' not in json_response or json_response['success'] is not True: