Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 2 additions & 24 deletions src/main/java/com/bitso/BitsoBalance.java
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}
Expand All @@ -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() {
Expand Down Expand Up @@ -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);
}
Expand Down
20 changes: 5 additions & 15 deletions src/test/java/JSONFiles/privateAccountBalance.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}]
}
}