unified hitbtc parseTrade and removed the duplicate parseOrderTrades …

…method ccxt#1354
mallchin · Jan 28, 2018 · b1b5938 · b1b5938
1 parent 93baeab
commit b1b5938
Showing 1 changed file with 42 additions and 29 deletions.
diff --git a/js/hitbtc.js b/js/hitbtc.js
@@ -17,6 +17,7 @@ module.exports = class hitbtc extends Exchange {
             'version': '1',
             'has': {
                 'CORS': false,
+                'fetchTrades': true,
                 'fetchOrder': true,
                 'fetchOpenOrders': true,
                 'fetchClosedOrders': true,
@@ -626,6 +627,12 @@ module.exports = class hitbtc extends Exchange {
     }
 
     parseTrade (trade, market = undefined) {
+        if (Array.isArray (trade))
+            return this.parsePublicTrade (trade, market);
+        return this.parseOrderTrade (trade, market);
+    }
+
+    parsePublicTrade (trade, market = undefined) {
         let symbol = undefined;
         if (market)
             symbol = market['symbol'];
@@ -642,6 +649,37 @@ module.exports = class hitbtc extends Exchange {
         };
     }
 
+    parseOrderTrade (trade, market = undefined) {
+        let symbol = undefined;
+        if (market)
+            symbol = market['symbol'];
+        let amount = parseFloat (trade['execQuantity']);
+        if (market)
+            amount *= market['lot'];
+        let price = parseFloat (trade['execPrice']);
+        let cost = price * amount;
+        let fee = {
+            'cost': parseFloat (trade['fee']),
+            'currency': undefined,
+            'rate': undefined,
+        };
+        let timestamp = trade['timestamp'];
+        return {
+            'info': trade,
+            'id': trade['tradeId'],
+            'order': trade['clientOrderId'],
+            'timestamp': timestamp,
+            'datetime': this.iso8601 (timestamp),
+            'symbol': symbol,
+            'type': undefined,
+            'side': trade['side'],
+            'price': price,
+            'amount': amount,
+            'cost': cost,
+            'fee': fee,
+        };
+    }
+
     async fetchTrades (symbol, since = undefined, limit = undefined, params = {}) {
         await this.loadMarkets ();
         let market = this.market (symbol);
@@ -811,38 +849,13 @@ module.exports = class hitbtc extends Exchange {
 
     async fetchOrderTrades (id, symbol = undefined, since = undefined, limit = undefined, params = {}) {
         await this.loadMarkets ();
+        let market = undefined;
+        if (typeof symbol !== 'undefined')
+            market = this.market (symbol);
         let response = await this.tradingGetTradesByOrder (this.extend ({
             'clientOrderId': id,
         }, params));
-        return this.parseOrderTrades (response['trades'], since, limit);
-    }
-
-    parseOrderTrades (trades, since = undefined, limit = undefined) {
-        let result = [];
-        if (trades.length !== 0) {
-            let market = this.markets_by_id[trades[0]['symbol']];
-            for (let i = 0; i < trades.length; i++) {
-                result.push (this.parseOrderTrade (trades[i], market));
-            }
-        }
-        return this.filterBySinceLimit (result, since, limit);
-    }
-
-    parseOrderTrade (trade,market) {
-        return {
-            'info': trade,
-            'id': trade['tradeId'],
-            'order': trade['clientOrderId'],
-            'timestamp': trade['timestamp'],
-            'datetime': this.iso8601 (trade['timestamp']),
-            'symbol': market['symbol'],
-            'type': undefined,
-            'side': trade['side'],
-            'price': parseFloat (trade['execPrice']),
-            'amount': parseFloat (trade['execQuantity'] * market['lot']),
-            'cost': parseFloat (trade['execPrice'] * trade['execQuantity'] * market['lot']),
-            'fee': parseFloat (trade['fee']),
-        };
+        return this.parseTrades (response['trades'], market, since, limit);
     }
 
     async withdraw (code, amount, address, tag = undefined, params = {}) {