Add ability to calculate volume from quoteVolume, and fix Huobi volume.

dummy-2-io · Sep 6, 2021 · 475f613 · 475f613
1 parent bbf4c84
commit 475f613
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/xchange-core/src/main/java/org/knowm/xchange/dto/marketdata/Ticker.java b/xchange-core/src/main/java/org/knowm/xchange/dto/marketdata/Ticker.java
@@ -5,6 +5,7 @@
 import com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder;
 import java.io.Serializable;
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.util.Date;
 import java.util.Objects;
 import org.knowm.xchange.currency.CurrencyPair;
@@ -149,6 +150,9 @@ public BigDecimal getVwap() {
   }
 
   public BigDecimal getVolume() {
+    if (volume == null && quoteVolume != null && last != null && last != BigDecimal.ZERO) {
+      return quoteVolume.divide(last, RoundingMode.HALF_UP);
+    }
 
     return volume;
   }

diff --git a/xchange-huobi/src/main/java/org/knowm/xchange/huobi/HuobiAdapters.java b/xchange-huobi/src/main/java/org/knowm/xchange/huobi/HuobiAdapters.java
@@ -44,7 +44,7 @@ public static Ticker adaptTicker(HuobiTicker huobiTicker, CurrencyPair currencyP
     builder.last(huobiTicker.getClose());
     builder.high(huobiTicker.getHigh());
     builder.low(huobiTicker.getLow());
-    builder.volume(huobiTicker.getVol());
+    builder.quoteVolume(huobiTicker.getVol());
     builder.timestamp(huobiTicker.getTs());
     builder.currencyPair(currencyPair);
     return builder.build();
@@ -69,7 +69,7 @@ public static List<Ticker> adaptAllTickers(HuobiAllTicker[] allTickers) {
                     .last(huobiTicker.getClose())
                     .high(huobiTicker.getHigh())
                     .low(huobiTicker.getLow())
-                    .volume(huobiTicker.getVol())
+                    .quoteVolume(huobiTicker.getVol())
                     .timestamp(huobiTicker.getTs())
                     .build())
         .collect(Collectors.toList());