Fix tests

Author: bmoscon

.flake8

@@ -1,3 +1,3 @@
 [flake8]
 ignore = E501,F405,F403
-exclude = tests/*,docs/*,*.md,__init__.py,cryptofeed/exchanges.py,cryptofeed/providers.py
+exclude = tests/*,docs/*,*.md,__init__.py,cryptofeed/exchanges.py

cryptofeed/exchange/bequant.py

@@ -53,7 +53,7 @@ def _parse_symbol_data(cls, data: dict) -> Tuple[Dict, Dict]:
             s = Symbol(base_currency, quote_currency)
             ret[s.normalized] = symbol['id']
             info['tick_size'][s.normalized] = symbol['tickSize']
-            info['instrument_type'][s.normalized] = SPOT
+            info['instrument_type'][s.normalized] = s.type
 
         return ret, info
 

cryptofeed/exchange/bitcoincom.py

@@ -33,7 +33,7 @@ def _parse_symbol_data(cls, data: dict) -> Tuple[Dict, Dict]:
             s = Symbol(base_currency, quote_currency)
             ret[s.normalized] = symbol['id']
             info['tick_size'][s.normalized] = symbol['tickSize']
-            info['instrument_type'][s.normalized] = SPOT
+            info['instrument_type'][s.normalized] = s.type
 
         return ret, info
 

cryptofeed/exchange/bitfinex.py

@@ -70,7 +70,7 @@ def _parse_symbol_data(cls, data: list) -> Tuple[Dict, Dict]:
 
             s = Symbol(base, quote)
             ret[s.normalized] = "t" + p
-            info['instrument_type'][s.normalized] = SPOT
+            info['instrument_type'][s.normalized] = s.type
         return ret, info
 
     def __init__(self, symbols=None, channels=None, subscription=None, **kwargs):

cryptofeed/exchange/bithumb.py

@@ -74,7 +74,7 @@ def _parse_symbol_data(cls, data: dict) -> Tuple[Dict, Dict]:
                     continue
                 s = Symbol(base_curr, quote_curr)
                 ret[s.normalized] = f"{base_curr}_{quote_curr}"
-                info['instrument_type'][s.normalized] = SPOT
+                info['instrument_type'][s.normalized] = s.type
 
         return ret, {}
 

cryptofeed/exchange/bitstamp.py

@@ -39,7 +39,7 @@ def _parse_symbol_data(cls, data: dict) -> Tuple[Dict, Dict]:
             s = Symbol(base, quote)
             symbol = d['url_symbol']
             ret[s.normalized] = symbol
-            info['instrument_type'][s.normalized] = SPOT
+            info['instrument_type'][s.normalized] = s.type
 
         return ret, info
 

cryptofeed/exchange/bittrex.py

@@ -34,7 +34,7 @@ def _parse_symbol_data(cls, data: dict) -> Tuple[Dict, Dict]:
                 continue
             s = Symbol(e['baseCurrencySymbol'], e['quoteCurrencySymbol'])
             ret[s.normalized] = e['symbol']
-            info['instrument_type'][s.normalized] = SPOT
+            info['instrument_type'][s.normalized] = s.type
         return ret, info
 
     def __init__(self, depth=500, candle_interval='1m', **kwargs):

cryptofeed/exchange/blockchain.py

@@ -31,12 +31,12 @@ def _parse_symbol_data(cls, data: dict) -> Tuple[Dict, Dict]:
         info = {'instrument_type': {}}
         ret = {}
         for entry in data:
-            if data['status'] != 'open':
+            if entry['status'] != 'open':
                 continue
             base, quote = entry['symbol'].split("-")
             s = Symbol(base, quote)
-            ret[s.normalized] = data['symbol']
-            info['instrument_type'][s.normalized] = SPOT
+            ret[s.normalized] = entry['symbol']
+            info['instrument_type'][s.normalized] = s.type
         return ret, info
 
     def __init__(self, **kwargs):

cryptofeed/exchange/gateio.py

@@ -34,7 +34,7 @@ def _parse_symbol_data(cls, data: dict) -> Tuple[Dict, Dict]:
         info = {'instrument_type': {}}
 
         for entry in data:
-            if data["trade_status"] != "tradable":
+            if entry["trade_status"] != "tradable":
                 continue
             s = Symbol(entry['base'], entry['quote'])
             ret[s.normalized] = entry['id']

cryptofeed/exchange/huobi.py

@@ -40,7 +40,7 @@ def _parse_symbol_data(cls, data: dict) -> Tuple[Dict, Dict]:
             s = Symbol(base, quote)
 
             ret[s.normalized] = e['symbol']
-            info['instrument_type'][s.normalized] = SPOT
+            info['instrument_type'][s.normalized] = s.type
         return ret, info
 
     def __init__(self, candle_interval='1m', **kwargs):