Merge branch 'relabsoss-master'

mallchin · Jan 29, 2018 · ef9c9aa · ef9c9aa
2 parents 93568e8 + b394684
commit ef9c9aa
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/js/dsx.js b/js/dsx.js
@@ -113,6 +113,9 @@ module.exports = class dsx extends liqui {
         let symbol = undefined;
         if (market)
             symbol = market['symbol'];
+        let average = this.safeFloat (ticker, 'avg');
+        if (typeof average !== 'undefined')
+            average = 1 / average;
         return {
             'symbol': symbol,
             'timestamp': timestamp,
@@ -128,7 +131,7 @@ module.exports = class dsx extends liqui {
             'last': this.safeFloat (ticker, 'last'),
             'change': undefined,
             'percentage': undefined,
-            'average': 1 / this.safeFloat (ticker, 'avg'),
+            'average': average,
             'baseVolume': this.safeFloat (ticker, 'vol'),
             'quoteVolume': this.safeFloat (ticker, 'vol_cur'),
             'info': ticker,

diff --git a/python/ccxt/dsx.py b/python/ccxt/dsx.py
@@ -122,7 +122,7 @@ def parse_ticker(self, ticker, market=None):
             'last': self.safe_float(ticker, 'last'),
             'change': None,
             'percentage': None,
-            'average': 1 / self.safe_float(ticker, 'avg'),
+            'average': 0 if self.safe_float(ticker, 'avg') == 0 else 1 / self.safe_float(ticker, 'avg'),
             'baseVolume': self.safe_float(ticker, 'vol'),
             'quoteVolume': self.safe_float(ticker, 'vol_cur'),
             'info': ticker,