diff --git a/src/main/java/com/bitso/BitsoBalance.java b/src/main/java/com/bitso/BitsoBalance.java index ec18fa4..a9c98e0 100644 --- a/src/main/java/com/bitso/BitsoBalance.java +++ b/src/main/java/com/bitso/BitsoBalance.java @@ -19,8 +19,7 @@ public BitsoBalance(JSONObject o) { JSONObject balance = jsonBalances.getJSONObject(i); String currency = Helpers.getString(balance, "currency"); Balance currentBalance = new Balance(currency, Helpers.getBD(balance, "total"), - Helpers.getBD(balance, "locked"), Helpers.getBD(balance, "available"), - Helpers.getBD(balance, "pending_deposit"), Helpers.getBD(balance, "pending_withdrawal")); + Helpers.getBD(balance, "locked"), Helpers.getBD(balance, "available")); mBalances.put(currency, currentBalance); } } @@ -42,17 +41,12 @@ public class Balance { private BigDecimal mTotal; private BigDecimal mLocked; private BigDecimal mAvailable; - private BigDecimal mPendingDeposit; - private BigDecimal mPendingWithdrawal; - public Balance(String currency, BigDecimal total, BigDecimal locked, BigDecimal available, - BigDecimal pendingDeposit, BigDecimal pendingWithdrawal) { + public Balance(String currency, BigDecimal total, BigDecimal locked, BigDecimal available) { mCurrency = currency; mTotal = total; mLocked = locked; mAvailable = available; - mPendingDeposit = pendingDeposit; - mPendingWithdrawal = pendingWithdrawal; } public String getCurrency() { @@ -87,22 +81,6 @@ public void setAvailable(BigDecimal mAvailable) { this.mAvailable = mAvailable; } - public BigDecimal getPendingDeposit() { - return mPendingDeposit; - } - - public void setPendingDeposit(BigDecimal mPendingDeposit) { - this.mPendingDeposit = mPendingDeposit; - } - - public BigDecimal getPendingWithdrawal() { - return mPendingWithdrawal; - } - - public void setPendingWithdrawal(BigDecimal mPendingWithdrawal) { - this.mPendingWithdrawal = mPendingWithdrawal; - } - public String toString() { return Helpers.fieldPrinter(this, BitsoBalance.Balance.class); } diff --git a/src/test/java/JSONFiles/privateAccountBalance.json b/src/test/java/JSONFiles/privateAccountBalance.json index 7d44b38..588882f 100644 --- a/src/test/java/JSONFiles/privateAccountBalance.json +++ b/src/test/java/JSONFiles/privateAccountBalance.json @@ -5,37 +5,27 @@ "currency": "btc", "available": "0.00000000", "locked": "0.00000000", - "total": "0.00000000", - "pending_deposit": "0.00000000", - "pending_withdrawal": "0.00000000" + "total": "0.00000000" }, { "currency": "etc", "available": "0.00000000", "locked": "0.00000000", - "total": "0.00000000", - "pending_deposit": "0.00000000", - "pending_withdrawal": "0.00000000" + "total": "0.00000000" }, { "currency": "eth", "available": "6.34429758", "locked": "0.00000000", - "total": "6.34429758", - "pending_deposit": "0.00000000", - "pending_withdrawal": "0.00000000" + "total": "6.34429758" }, { "currency": "xrp", "available": "24.08387719", "locked": "0.00000000", - "total": "24.08387719", - "pending_deposit": "0.000000", - "pending_withdrawal": "0.000000" + "total": "24.08387719" }, { "currency": "mxn", "available": "15000.00100210", "locked": "0.00000000", - "total": "15000.00100210", - "pending_deposit": "0.00", - "pending_withdrawal": "0.00" + "total": "15000.00100210" }] } } \ No newline at end of file