[gateio-v4] Add Currency deserializer

knowm · Oct 26, 2023 · 2bc4db1 · 2bc4db1
1 parent 9400af4
commit 2bc4db1
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/xchange-gateio-v4/src/main/java/org/knowm/xchange/gateio/dto/account/GateioOrder.java b/xchange-gateio-v4/src/main/java/org/knowm/xchange/gateio/dto/account/GateioOrder.java
@@ -8,10 +8,12 @@
 import lombok.Builder;
 import lombok.Data;
 import lombok.extern.jackson.Jacksonized;
+import org.knowm.xchange.currency.Currency;
 import org.knowm.xchange.currency.CurrencyPair;
 import org.knowm.xchange.dto.Order.OrderType;
 import org.knowm.xchange.gateio.config.converter.CurrencyPairToStringConverter;
 import org.knowm.xchange.gateio.config.converter.OrderTypeToStringConverter;
+import org.knowm.xchange.gateio.config.converter.StringToCurrencyConverter;
 import org.knowm.xchange.gateio.config.converter.StringToCurrencyPairConverter;
 import org.knowm.xchange.gateio.config.converter.StringToOrderTypeConverter;
 
@@ -85,7 +87,8 @@ public class GateioOrder {
   BigDecimal fee;
 
   @JsonProperty("fee_currency")
-  String feeCurrency;
+  @JsonDeserialize(converter = StringToCurrencyConverter.class)
+  Currency feeCurrency;
 
   @JsonProperty("point_fee")
   BigDecimal pointFee;
@@ -106,7 +109,8 @@ public class GateioOrder {
   BigDecimal rebatedFee;
 
   @JsonProperty("rebated_fee_currency")
-  String rebatedFeeCurrency;
+  @JsonDeserialize(converter = StringToCurrencyConverter.class)
+  Currency rebatedFeeCurrency;
 
   @JsonProperty("stp_id")
   Integer stpId;

diff --git a/xchange-gateio-v4/src/test/java/org/knowm/xchange/gateio/GateioExchangeWiremock.java b/xchange-gateio-v4/src/test/java/org/knowm/xchange/gateio/GateioExchangeWiremock.java
@@ -16,6 +16,7 @@ public abstract class GateioExchangeWiremock {
 
   protected static GateioExchange exchange;
 
+//  private static final boolean IS_RECORDING = true;
   private static final boolean IS_RECORDING = false;
 
   private static WireMockServer wireMockServer;

diff --git a/...e-gateio-v4/src/test/java/org/knowm/xchange/gateio/service/GateioTradeServiceRawTest.java b/...e-gateio-v4/src/test/java/org/knowm/xchange/gateio/service/GateioTradeServiceRawTest.java
@@ -7,6 +7,7 @@
 import java.time.Instant;
 import java.util.List;
 import org.junit.jupiter.api.Test;
+import org.knowm.xchange.currency.Currency;
 import org.knowm.xchange.currency.CurrencyPair;
 import org.knowm.xchange.dto.Order.OrderStatus;
 import org.knowm.xchange.dto.Order.OrderType;
@@ -36,14 +37,14 @@ class GateioTradeServiceRawTest extends GateioExchangeWiremock {
       .avgDealPrice(new BigDecimal("27038.3"))
       .fee(new BigDecimal("0.0000014"))
       .price(BigDecimal.ZERO)
-      .feeCurrency("BTC")
+      .feeCurrency(Currency.BTC)
       .pointFee(BigDecimal.ZERO)
       .gtFee(BigDecimal.ZERO)
       .gtMakerFee(BigDecimal.ZERO)
       .gtTakerFee(BigDecimal.ZERO)
       .rebatedFee(BigDecimal.ZERO)
       .gtDiscount(false)
-      .rebatedFeeCurrency("USDT")
+      .rebatedFeeCurrency(Currency.USDT)
       .finishAs("filled")
       .build();
 
@@ -112,14 +113,14 @@ void valid_market_sell_order() throws IOException {
         .avgDealPrice(new BigDecimal("27062.6"))
         .fee(new BigDecimal("0.03788764"))
         .price(BigDecimal.ZERO)
-        .feeCurrency("USDT")
+        .feeCurrency(Currency.USDT)
         .pointFee(BigDecimal.ZERO)
         .gtFee(BigDecimal.ZERO)
         .gtMakerFee(BigDecimal.ZERO)
         .gtTakerFee(BigDecimal.ZERO)
         .rebatedFee(BigDecimal.ZERO)
         .gtDiscount(false)
-        .rebatedFeeCurrency("BTC")
+        .rebatedFeeCurrency(Currency.BTC)
         .finishAs("filled")
         .build();