Fixed Withdraw & Deposit history Responses Bug binance-exchange#391

rezazadeh93 · Sep 5, 2021 · 7935a73 · 7935a73
1 parent 14f98a9
commit 7935a73
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 47 deletions.
diff --git a/src/main/java/com/binance/api/client/BinanceApiAsyncRestClient.java b/src/main/java/com/binance/api/client/BinanceApiAsyncRestClient.java
@@ -1,15 +1,6 @@
 package com.binance.api.client;
 
-import com.binance.api.client.domain.account.Account;
-import com.binance.api.client.domain.account.DepositAddress;
-import com.binance.api.client.domain.account.DepositHistory;
-import com.binance.api.client.domain.account.NewOrder;
-import com.binance.api.client.domain.account.NewOrderResponse;
-import com.binance.api.client.domain.account.Order;
-import com.binance.api.client.domain.account.Trade;
-import com.binance.api.client.domain.account.TradeHistoryItem;
-import com.binance.api.client.domain.account.WithdrawHistory;
-import com.binance.api.client.domain.account.WithdrawResult;
+import com.binance.api.client.domain.account.*;
 import com.binance.api.client.domain.account.request.AllOrdersRequest;
 import com.binance.api.client.domain.account.request.CancelOrderRequest;
 import com.binance.api.client.domain.account.request.CancelOrderResponse;
@@ -272,7 +263,7 @@ void withdraw(String coin, String clientOrderId, String network, String address,
    *
    * @param callback the callback that handles the response and returns the deposit history
    */
-  void getDepositHistory(String coin, BinanceApiCallback<DepositHistory> callback);
+  void getDepositHistory(String coin, BinanceApiCallback<List<Deposit>> callback);
 
 
   /**
@@ -281,22 +272,22 @@ void withdraw(String coin, String clientOrderId, String network, String address,
    * @param callback the callback that handles the response and returns the deposit history
    */
   void getDepositHistory(String coin, int status, Long startTime, Long endTime,
-                         int offset, int limit, BinanceApiCallback<DepositHistory> callback);
+                         int offset, int limit, BinanceApiCallback<List<Deposit>> callback);
 
   /**
    * Fetch account withdraw history.
    *
    * @param callback the callback that handles the response and returns the withdraw history
    */
-  void getWithdrawHistory(String coin, BinanceApiCallback<WithdrawHistory> callback);
+  void getWithdrawHistory(String coin, BinanceApiCallback<List<Withdraw>> callback);
 
   /**
    * Fetch account withdraw history.
    *
    * @param callback the callback that handles the response and returns the withdraw history
    */
   void getWithdrawHistory(String coin, int status, Long startTime, Long endTime,
-                          int offset, int limit, BinanceApiCallback<WithdrawHistory> callback);
+                          int offset, int limit, BinanceApiCallback<List<Withdraw>> callback);
 
   /**
    * Fetch deposit address.

diff --git a/src/main/java/com/binance/api/client/BinanceApiRestClient.java b/src/main/java/com/binance/api/client/BinanceApiRestClient.java
@@ -2,16 +2,9 @@
 
 import com.binance.api.client.domain.account.*;
 import com.binance.api.client.domain.account.request.*;
-import com.binance.api.client.domain.general.ExchangeInfo;
 import com.binance.api.client.domain.general.Asset;
-import com.binance.api.client.domain.market.AggTrade;
-import com.binance.api.client.domain.market.BookTicker;
-import com.binance.api.client.domain.market.Candlestick;
-import com.binance.api.client.domain.market.CandlestickInterval;
-import com.binance.api.client.domain.market.OrderBook;
-import com.binance.api.client.domain.market.TickerPrice;
-import com.binance.api.client.domain.market.TickerStatistics;
-import retrofit2.http.Query;
+import com.binance.api.client.domain.general.ExchangeInfo;
+import com.binance.api.client.domain.market.*;
 
 import java.util.List;
 
@@ -286,29 +279,29 @@ WithdrawResult withdraw(String coin, String clientOrderId, String network, Strin
    *
    * @return deposit history, containing a list of deposits
    */
-  DepositHistory getDepositHistory(String coin);
+  List<Deposit> getDepositHistory(String coin);
 
   /**
    * Fetch account deposit history.
    *
    * @return deposit history, containing a list of deposits
    */
-  DepositHistory getDepositHistory(String coin, int status, Long startTime, Long endTime,
+  List<Deposit> getDepositHistory(String coin, int status, Long startTime, Long endTime,
                                    int offset, int limit);
 
   /**
    * Fetch account withdraw history.
    *
    * @return withdraw history, containing a list of withdrawals
    */
-  WithdrawHistory getWithdrawHistory(String coin);
+  List<Withdraw> getWithdrawHistory(String coin);
 
   /**
    * Fetch account withdraw history.
    *
    * @return withdraw history, containing a list of withdrawals
    */
-  WithdrawHistory getWithdrawHistory(String coin, int status, Long startTime, Long endTime,
+  List<Withdraw> getWithdrawHistory(String coin, int status, Long startTime, Long endTime,
                                      int offset, int limit);
 
   /**

diff --git a/src/main/java/com/binance/api/client/impl/BinanceApiAsyncRestClientImpl.java b/src/main/java/com/binance/api/client/impl/BinanceApiAsyncRestClientImpl.java
@@ -4,16 +4,7 @@
 import com.binance.api.client.BinanceApiCallback;
 import com.binance.api.client.config.BinanceApiConfig;
 import com.binance.api.client.constant.BinanceApiConstants;
-import com.binance.api.client.domain.account.Account;
-import com.binance.api.client.domain.account.DepositAddress;
-import com.binance.api.client.domain.account.DepositHistory;
-import com.binance.api.client.domain.account.NewOrder;
-import com.binance.api.client.domain.account.NewOrderResponse;
-import com.binance.api.client.domain.account.Order;
-import com.binance.api.client.domain.account.Trade;
-import com.binance.api.client.domain.account.TradeHistoryItem;
-import com.binance.api.client.domain.account.WithdrawHistory;
-import com.binance.api.client.domain.account.WithdrawResult;
+import com.binance.api.client.domain.account.*;
 import com.binance.api.client.domain.account.request.AllOrdersRequest;
 import com.binance.api.client.domain.account.request.CancelOrderRequest;
 import com.binance.api.client.domain.account.request.CancelOrderResponse;
@@ -218,30 +209,30 @@ public void withdraw(String coin, String clientOrderId, String network, String a
 
 
   @Override
-  public void getDepositHistory(String coin, BinanceApiCallback<DepositHistory> callback) {
+  public void getDepositHistory(String coin, BinanceApiCallback<List<Deposit>> callback) {
     binanceApiService.getDepositHistory(coin, 0, null, null, 0, 1000,
             BinanceApiConstants.DEFAULT_RECEIVING_WINDOW, System.currentTimeMillis())
             .enqueue(new BinanceApiCallbackAdapter<>(callback));
   }
 
   @Override
   public void getDepositHistory(String coin, int status, Long startTime, Long endTime,
-                                int offset, int limit, BinanceApiCallback<DepositHistory> callback) {
+                                int offset, int limit, BinanceApiCallback<List<Deposit>> callback) {
     binanceApiService.getDepositHistory(coin, status, startTime, endTime, offset, limit,
             BinanceApiConstants.DEFAULT_RECEIVING_WINDOW, System.currentTimeMillis())
         .enqueue(new BinanceApiCallbackAdapter<>(callback));
   }
 
   @Override
-  public void getWithdrawHistory(String coin, BinanceApiCallback<WithdrawHistory> callback) {
+  public void getWithdrawHistory(String coin, BinanceApiCallback<List<Withdraw>> callback) {
     binanceApiService.getWithdrawHistory(coin, 0, null, null, 0, 1000,
             BinanceApiConstants.DEFAULT_RECEIVING_WINDOW, System.currentTimeMillis())
             .enqueue(new BinanceApiCallbackAdapter<>(callback));
   }
 
   @Override
   public void getWithdrawHistory(String coin, int status, Long startTime, Long endTime,
-                                 int offset, int limit, BinanceApiCallback<WithdrawHistory> callback) {
+                                 int offset, int limit, BinanceApiCallback<List<Withdraw>> callback) {
     binanceApiService.getWithdrawHistory(coin, status, startTime, endTime, offset, limit,
             BinanceApiConstants.DEFAULT_RECEIVING_WINDOW, System.currentTimeMillis())
         .enqueue(new BinanceApiCallbackAdapter<>(callback));

diff --git a/src/main/java/com/binance/api/client/impl/BinanceApiRestClientImpl.java b/src/main/java/com/binance/api/client/impl/BinanceApiRestClientImpl.java
@@ -242,26 +242,26 @@ public DustTransferResponse dustTranfer(List<String> asset) {
 	}
 
 	@Override
-	public DepositHistory getDepositHistory(String coin) {
+	public List<Deposit> getDepositHistory(String coin) {
 		return executeSync(binanceApiService.getDepositHistory(coin, 0, null, null, 0, 1000,
 				BinanceApiConstants.DEFAULT_RECEIVING_WINDOW, System.currentTimeMillis()));
 	}
 
 	@Override
-	public DepositHistory getDepositHistory(String coin, int status, Long startTime, Long endTime,
+	public List<Deposit> getDepositHistory(String coin, int status, Long startTime, Long endTime,
 											int offset, int limit) {
 		return executeSync(binanceApiService.getDepositHistory(coin, status, startTime, endTime, offset, limit,
 				BinanceApiConstants.DEFAULT_RECEIVING_WINDOW, System.currentTimeMillis()));
 	}
 
 	@Override
-	public WithdrawHistory getWithdrawHistory(String coin) {
+	public List<Withdraw> getWithdrawHistory(String coin) {
 		return executeSync(binanceApiService.getWithdrawHistory(coin, 0, null, null, 0, 1000,
 				BinanceApiConstants.DEFAULT_RECEIVING_WINDOW, System.currentTimeMillis()));
 	}
 
 	@Override
-	public WithdrawHistory getWithdrawHistory(String coin, int status, Long startTime, Long endTime,
+	public List<Withdraw> getWithdrawHistory(String coin, int status, Long startTime, Long endTime,
 											  int offset, int limit) {
 		return executeSync(binanceApiService.getWithdrawHistory(coin, status, startTime, endTime, offset, limit,
 				BinanceApiConstants.DEFAULT_RECEIVING_WINDOW, System.currentTimeMillis()));

diff --git a/src/main/java/com/binance/api/client/impl/BinanceApiService.java b/src/main/java/com/binance/api/client/impl/BinanceApiService.java
@@ -162,14 +162,14 @@ Call<WithdrawResult> withdraw(@Query("coin") String coin,@Query("withdrawOrderId
 
     @Headers(BinanceApiConstants.ENDPOINT_SECURITY_TYPE_SIGNED_HEADER)
     @GET("/sapi/v1/capital/deposit/hisrec")
-    Call<DepositHistory> getDepositHistory(@Query("coin") String coin, @Query("status") int status,
+    Call<List<Deposit>> getDepositHistory(@Query("coin") String coin, @Query("status") int status,
                                            @Query("startTime") Long startTime, @Query("endTime") Long endTime,
                                            @Query("offset") int offset, @Query("limit") int limit,
                                            @Query("recvWindow") Long recvWindow, @Query("timestamp") Long timestamp);
 
     @Headers(BinanceApiConstants.ENDPOINT_SECURITY_TYPE_SIGNED_HEADER)
     @GET("/sapi/v1/capital/withdraw/history")
-    Call<WithdrawHistory> getWithdrawHistory(@Query("coin") String coin, @Query("status") int status,
+    Call<List<Withdraw>> getWithdrawHistory(@Query("coin") String coin, @Query("status") int status,
                                              @Query("startTime") Long startTime, @Query("endTime") Long endTime,
                                              @Query("offset") int offset, @Query("limit") int limit,
                                              @Query("recvWindow") Long recvWindow, @Query("timestamp") Long timestamp);