Skip to content

Add maker and taker attributes to fee model #42

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nvcruzhe merged 2 commits into from
Nov 21, 2018
Merged

Add maker and taker attributes to fee model #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c35b3ac
Add maker and taker attributes to fee model
carlosguerreroo Jun 8, 2018
46e9aa6
Mark feeDecimal and feePercent attributes in BitsoFee model as deprec…
carlosguerreroo Jun 9, 2018
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
51 changes: 44 additions & 7 deletions src/main/java/com/bitso/BitsoFee.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
package com.bitso;

import java.math.BigDecimal;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Set;
import com.bitso.helpers.Helpers;

import org.json.JSONArray;
import org.json.JSONObject;

import com.bitso.helpers.Helpers;
import java.math.BigDecimal;
import java.util.HashMap;
import java.util.Iterator;

public class BitsoFee {
private HashMap<String, Fee> mTradeFees;
Expand All @@ -27,7 +26,12 @@ private void processTradeFees(JSONObject o) {
JSONObject fee = jsonFees.getJSONObject(i);
String book = Helpers.getString(fee, "book");
Fee currentFee = new Fee(book, Helpers.getBD(fee, "fee_decimal"),
Helpers.getBD(fee, "fee_percent"));
Helpers.getBD(fee, "fee_percent"),
Helpers.getBD(fee, "taker_fee_decimal"),
Helpers.getBD(fee, "taker_fee_percent"),
Helpers.getBD(fee, "maker_fee_decimal"),
Helpers.getBD(fee, "maker_fee_percent")
);
mTradeFees.put(book, currentFee);
}
}
Expand Down Expand Up @@ -63,15 +67,27 @@ public String toString() {
}

public class Fee {

private String mBook;
@Deprecated
private BigDecimal mFeeDecimal;
@Deprecated
private BigDecimal mFeePercent;
private BigDecimal mTakerFeeDecimal;
private BigDecimal mTakerFeePercent;
private BigDecimal mMakerFeeDecimal;
private BigDecimal mMakerFeePercent;

public Fee(String mBook, BigDecimal mFeeDecimal, BigDecimal mFeePercent) {
public Fee(String mBook, BigDecimal mFeeDecimal, BigDecimal mFeePercent, BigDecimal mTakerFeeDecimal,
BigDecimal mTakerFeePercent, BigDecimal mMakerFeeDecimal, BigDecimal mMakerFeePercent) {
super();
this.mBook = mBook;
this.mFeeDecimal = mFeeDecimal;
this.mFeePercent = mFeePercent;
this.mTakerFeeDecimal = mTakerFeeDecimal;
this.mTakerFeePercent = mTakerFeePercent;
this.mMakerFeeDecimal = mMakerFeeDecimal;
this.mMakerFeePercent = mMakerFeePercent;
}

public String getBook() {
Expand All @@ -82,24 +98,45 @@ public void setBook(String mBook) {
this.mBook = mBook;
}

@Deprecated
public BigDecimal getFeeDecimal() {
return mFeeDecimal;
}

@Deprecated
public void setFeeDecimal(BigDecimal mFeeDecimal) {
this.mFeeDecimal = mFeeDecimal;
}

@Deprecated
public BigDecimal getFeePercent() {
return mFeePercent;
}

@Deprecated
public void setFeePercent(BigDecimal mFeePercent) {
this.mFeePercent = mFeePercent;
}

public String toString() {
return Helpers.fieldPrinter(this, BitsoFee.Fee.class);
}

public BigDecimal getTakerFeePercent() {
return mTakerFeePercent;
}

public BigDecimal getTakerFeeDecimal() {
return mTakerFeeDecimal;
}

public BigDecimal getMakerFeePercent() {
return mMakerFeePercent;
}

public BigDecimal getMakerFeeDecimal() {
return mMakerFeeDecimal;
}

}
}
42 changes: 32 additions & 10 deletions src/test/java/JSONFiles/privateFees.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,30 +1,52 @@
{
"success": true,
"payload": {
"fees": [{
"book": "btc_mxn",
"fee_percent": "0.0000",
"fee_decimal": "0.0000"
}, {
"fees": [
{
"book":"btc_mxn",
"fee_percent":"0.0000",
"fee_decimal":"0.0000",
"taker_fee_percent":"0.0000",
"taker_fee_decimal":"0.0000",
"maker_fee_percent":"0.0000",
"maker_fee_decimal":"0.0000"
},
{
"book": "eth_mxn",
"fee_percent": "0.0000",
"fee_decimal": "0.0000"
"fee_decimal": "0.0000",
"taker_fee_percent":"0.0000",
"taker_fee_decimal":"0.0000",
"maker_fee_percent":"0.0000",
"maker_fee_decimal":"0.0000"
}, {
"book": "xrp_btc",
"fee_percent": "0.8000",
"fee_decimal": "0.0080"
"fee_decimal": "0.0080",
"taker_fee_percent":"0.0000",
"taker_fee_decimal":"0.0000",
"maker_fee_percent":"0.0000",
"maker_fee_decimal":"0.0000"
}, {
"book": "xrp_mxn",
"fee_percent": "0.8000",
"fee_decimal": "0.0080"
"fee_decimal": "0.0080",
"taker_fee_percent":"0.0000",
"taker_fee_decimal":"0.0000",
"maker_fee_percent":"0.0000",
"maker_fee_decimal":"0.0000"
}, {
"book": "eth_btc",
"fee_percent": "1.0000",
"fee_decimal": "0.0100"
"fee_decimal": "0.0100",
"taker_fee_percent":"0.0000",
"taker_fee_decimal":"0.0000",
"maker_fee_percent":"0.0000",
"maker_fee_decimal":"0.0000"
}],
"withdrawal_fees": {
"btc": "0.001",
"eth": "0.0025"
}
}
}
}