Merge pull request ccxt#17065 from ttodua/bitget-ohlcv-fix2

bitget - fetchOHLCV for spot
codepp3839 · Mar 6, 2023 · 755c0c4 · 755c0c4
2 parents a6770fa + 0763c8a
commit 755c0c4
Showing 1 changed file with 8 additions and 9 deletions.
diff --git a/js/bitget.js b/js/bitget.js
@@ -2064,24 +2064,23 @@ module.exports = class bitget extends Exchange {
         if (limit === undefined) {
             limit = 100;
         }
-        if (market['type'] === 'spot') {
-            const timeframes = this.options['timeframes']['spot'];
-            request['period'] = this.safeString (timeframes, timeframe, timeframe);
+        const timeframes = this.options['timeframes'][marketType];
+        const selectedTimeframe = this.safeString (timeframes, timeframe, timeframe);
+        const duration = this.parseTimeframe (timeframe);
+        if (market['spot']) {
+            request['period'] = selectedTimeframe;
             request['limit'] = limit;
             if (since !== undefined) {
                 request['after'] = since;
                 if (until === undefined) {
-                    const millisecondsPerTimeframe = this.options['timeframes']['swap'][timeframe] * 1000;
-                    request['before'] = this.sum (since, millisecondsPerTimeframe * limit);
+                    request['before'] = this.sum (since, limit * duration * 1000);
                 }
             }
             if (until !== undefined) {
                 request['before'] = until;
             }
-        } else if (market['type'] === 'swap') {
-            const timeframes = this.options['timeframes']['swap'];
-            request['granularity'] = this.safeString (timeframes, timeframe, timeframe);
-            const duration = this.parseTimeframe (timeframe);
+        } else if (market['swap']) {
+            request['granularity'] = selectedTimeframe;
             const now = this.milliseconds ();
             if (since === undefined) {
                 request['startTime'] = now - (limit - 1) * (duration * 1000);