From d86dcc4752d0f8f7ffbae525b69c65b1a2ba4900 Mon Sep 17 00:00:00 2001
From: gcarq <michael.egger@tsn.at>
Date: Thu, 16 Nov 2017 16:39:06 +0100
Subject: [PATCH] check if result exists in get_ticker (fixes #106)

---
 freqtrade/exchange/bittrex.py | 20 ++++++++++++++------
 freqtrade/main.py             |  6 ++++--
 freqtrade/misc.py             |  2 +-
 3 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/freqtrade/exchange/bittrex.py b/freqtrade/exchange/bittrex.py
index 718500753..37793530f 100644
--- a/freqtrade/exchange/bittrex.py
+++ b/freqtrade/exchange/bittrex.py
@@ -2,6 +2,7 @@ import logging
 from typing import List, Dict
 
 from bittrex.bittrex import Bittrex as _Bittrex, API_V2_0, API_V1_1
+from requests.exceptions import ContentDecodingError
 
 from freqtrade.exchange.interface import Exchange
 
@@ -82,9 +83,13 @@ class Bittrex(Exchange):
             raise RuntimeError('{message} params=({pair})'.format(
                 message=data['message'],
                 pair=pair))
-        if not data['result']['Bid'] or not data['result']['Ask'] or not data['result']['Last']:
-            raise RuntimeError('{message} params=({pair})'.format(
-                message=data['message'],
+
+        if not data.get('result') \
+                or not data['result'].get('Bid') \
+                or not data['result'].get('Ask') \
+                or not data['result'].get('Last'):
+            raise ContentDecodingError('{message} params=({pair})'.format(
+                message='Got invalid response from bittrex',
                 pair=pair))
         return {
             'bid': float(data['result']['Bid']),
@@ -104,13 +109,16 @@ class Bittrex(Exchange):
 
         # These sanity check are necessary because bittrex cannot keep their API stable.
         if not data.get('result'):
-            return []
+            raise ContentDecodingError('{message} params=({pair})'.format(
+                message='Got invalid response from bittrex',
+                pair=pair))
 
         for prop in ['C', 'V', 'O', 'H', 'L', 'T']:
             for tick in data['result']:
                 if prop not in tick.keys():
-                    logger.warning('Required property %s not present in response', prop)
-                    return []
+                    raise ContentDecodingError('{message} params=({pair})'.format(
+                        message='Required property {} not present in response'.format(prop),
+                        pair=pair))
 
         if not data['success']:
             raise RuntimeError('{message} params=({pair})'.format(
diff --git a/freqtrade/main.py b/freqtrade/main.py
index 64a758bea..79f39a32f 100755
--- a/freqtrade/main.py
+++ b/freqtrade/main.py
@@ -93,8 +93,10 @@ def _process(dynamic_whitelist: Optional[bool] = False) -> bool:
 
             Trade.session.flush()
     except (requests.exceptions.RequestException, json.JSONDecodeError) as error:
-        msg = 'Got {} in _process(), retrying in 30 seconds...'.format(error.__class__.__name__)
-        logger.warning(msg)
+        logger.warning(
+            'Got %s in _process(), retrying in 30 seconds...',
+            error
+        )
         time.sleep(30)
     except RuntimeError:
         telegram.send_msg('*Status:* Got RuntimeError:\n```\n{traceback}```{hint}'.format(
diff --git a/freqtrade/misc.py b/freqtrade/misc.py
index 85c51aa71..18f642c1e 100644
--- a/freqtrade/misc.py
+++ b/freqtrade/misc.py
@@ -1,9 +1,9 @@
 import argparse
 import enum
 import logging
+import time
 from typing import Any, Callable
 
-import time
 from wrapt import synchronized
 
 from freqtrade import __version__