Skip to content
This repository was archived by the owner on Oct 30, 2023. It is now read-only.

Commit

Permalink
Merge pull request #160 from brintal/master
Browse files Browse the repository at this point in the history
Reflect latest Binance API changes.
  • Loading branch information
joaopsilva authored Jul 20, 2018
2 parents 505a4a0 + 6b4de68 commit 29f603e
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 12 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ public interface BinanceApiAsyncRestClient {
* Get recent trades (up to last 500). Weight: 1
*
* @param symbol ticker symbol (e.g. ETHBTC)
* @param limit of last trades (Default 500; max 500.)
* @param limit of last trades (Default 500; max 1000.)
* @param callback the callback that handles the response
*/
void getTrades(String symbol, Integer limit, BinanceApiCallback<List<TradeHistoryItem>> callback);
Expand All @@ -79,7 +79,7 @@ public interface BinanceApiAsyncRestClient {
* Get older trades. Weight: 5
*
* @param symbol ticker symbol (e.g. ETHBTC)
* @param limit of last trades (Default 500; max 500.)
* @param limit of last trades (Default 500; max 1000.)
* @param fromId TradeId to fetch from. Default gets most recent trades.
* @param callback the callback that handles the response
*/
Expand All @@ -94,7 +94,7 @@ public interface BinanceApiAsyncRestClient {
*
* @param symbol symbol to aggregate (mandatory)
* @param fromId ID to get aggregate trades from INCLUSIVE (optional)
* @param limit Default 500; max 500 (optional)
* @param limit Default 500; max 1000 (optional)
* @param startTime Timestamp in ms to get aggregate trades from INCLUSIVE (optional).
* @param endTime Timestamp in ms to get aggregate trades until INCLUSIVE (optional).
* @param callback the callback that handles the response
Expand All @@ -114,7 +114,7 @@ public interface BinanceApiAsyncRestClient {
*
* @param symbol symbol to aggregate (mandatory)
* @param interval candlestick interval (mandatory)
* @param limit Default 500; max 500 (optional)
* @param limit Default 500; max 1000 (optional)
* @param startTime Timestamp in ms to get candlestick bars from INCLUSIVE (optional).
* @param endTime Timestamp in ms to get candlestick bars until INCLUSIVE (optional).
* @param callback the callback that handles the response containing a candlestick bar for the given symbol and interval
Expand Down Expand Up @@ -229,7 +229,7 @@ public interface BinanceApiAsyncRestClient {
* Get trades for a specific account and symbol.
*
* @param symbol symbol to get trades from
* @param limit default 500; max 500
* @param limit default 500; max 1000
* @param fromId TradeId to fetch from. Default gets most recent trades.
* @param callback the callback that handles the response with a list of trades
*/
Expand All @@ -239,7 +239,7 @@ public interface BinanceApiAsyncRestClient {
* Get trades for a specific account and symbol.
*
* @param symbol symbol to get trades from
* @param limit default 500; max 500
* @param limit default 500; max 1000
* @param callback the callback that handles the response with a list of trades
*/
void getMyTrades(String symbol, Integer limit, BinanceApiCallback<List<Trade>> callback);
Expand Down
12 changes: 6 additions & 6 deletions src/main/java/com/binance/api/client/BinanceApiRestClient.java
Original file line number Diff line number Diff line change
Expand Up @@ -69,15 +69,15 @@ public interface BinanceApiRestClient {
* Get recent trades (up to last 500). Weight: 1
*
* @param symbol ticker symbol (e.g. ETHBTC)
* @param limit of last trades (Default 500; max 500.)
* @param limit of last trades (Default 500; max 1000.)
*/
List<TradeHistoryItem> getTrades(String symbol, Integer limit);

/**
* Get older trades. Weight: 5
*
* @param symbol ticker symbol (e.g. ETHBTC)
* @param limit of last trades (Default 500; max 500.)
* @param limit of last trades (Default 500; max 1000.)
* @param fromId TradeId to fetch from. Default gets most recent trades.
*/
List<TradeHistoryItem> getHistoricalTrades(String symbol, Integer limit, Long fromId);
Expand All @@ -91,7 +91,7 @@ public interface BinanceApiRestClient {
*
* @param symbol symbol to aggregate (mandatory)
* @param fromId ID to get aggregate trades from INCLUSIVE (optional)
* @param limit Default 500; max 500 (optional)
* @param limit Default 500; max 1000 (optional)
* @param startTime Timestamp in ms to get aggregate trades from INCLUSIVE (optional).
* @param endTime Timestamp in ms to get aggregate trades until INCLUSIVE (optional).
* @return a list of aggregate trades for the given symbol
Expand All @@ -110,7 +110,7 @@ public interface BinanceApiRestClient {
*
* @param symbol symbol to aggregate (mandatory)
* @param interval candlestick interval (mandatory)
* @param limit Default 500; max 500 (optional)
* @param limit Default 500; max 1000 (optional)
* @param startTime Timestamp in ms to get candlestick bars from INCLUSIVE (optional).
* @param endTime Timestamp in ms to get candlestick bars until INCLUSIVE (optional).
* @return a candlestick bar for the given symbol and interval
Expand Down Expand Up @@ -215,7 +215,7 @@ public interface BinanceApiRestClient {
* Get trades for a specific account and symbol.
*
* @param symbol symbol to get trades from
* @param limit default 500; max 500
* @param limit default 500; max 1000
* @param fromId TradeId to fetch from. Default gets most recent trades.
* @return a list of trades
*/
Expand All @@ -225,7 +225,7 @@ public interface BinanceApiRestClient {
* Get trades for a specific account and symbol.
*
* @param symbol symbol to get trades from
* @param limit default 500; max 500
* @param limit default 500; max 1000
* @return a list of trades
*/
List<Trade> getMyTrades(String symbol, Integer limit);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,8 @@ public class NewOrderResponse {

private String executedQty;

private String cummulativeQuoteQty;

private OrderStatus status;

private TimeInForce timeInForce;
Expand Down Expand Up @@ -112,6 +114,14 @@ public void setExecutedQty(String executedQty) {
this.executedQty = executedQty;
}

public String getCummulativeQuoteQty() {
return cummulativeQuoteQty;
}

public void setCummulativeQuoteQty(String cummulativeQuoteQty) {
this.cummulativeQuoteQty = cummulativeQuoteQty;
}

public OrderStatus getStatus() {
return status;
}
Expand Down

0 comments on commit 29f603e

Please sign in to comment.