fee currency, rate, cost

sakiyama · Sep 23, 2017 · bb376e7 · bb376e7
1 parent f954338
commit bb376e7
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 26 deletions.
diff --git a/ccxt.js b/ccxt.js
@@ -773,23 +773,16 @@ const Exchange = function (config) {
         return this.createOrder (market, 'market', 'sell', amount, undefined, params)
     }
 
-    this.calculateFeeRate = function (symbol, type, side, amount, price, fee = 'taker', params = {}) {
-        return {
-            'base': 0.0,
-            'quote': this.markets[symbol][fee],
-        };
+    this.calculateFeeRate = function (symbol, type, side, amount, price, takerOrMaker = 'taker', params = {}) {
+        const market = this.markets[symbol]
+        return { 'currency': market['quote'], 'rate': market[takerOrMaker] }
     }
 
-    this.calculateFee = function (symbol, type, side, amount, price, fee = 'taker', params = {}) {
-        const rate = this.calculateFeeRate (symbol, type, side, amount, price, fee, params);
-        return {
-            'rate': rate,
-            'cost': {
-                'base': amount * rate['base'],
-                'quote': amount * price * rate['quote'],
-            },
-        };
-    },
+    this.calculateFee = function (symbol, type, side, amount, price, takerOrMaker = 'taker', params = {}) {
+        let fee = this.calculateFeeRate (symbol, type, side, amount, price, takerOrMaker, params)
+        fee['cost'] = amount * price * fee['rate']
+        return fee
+    }
 
     this.iso8601         = timestamp => new Date (timestamp).toISOString ()
     this.parse8601       = Date.parse
@@ -16340,14 +16333,10 @@ var poloniex = {
         'funding': 0.0,
     },
 
-    calculateFeeRate (symbol, type, side, amount, price, fee = 'taker', params = {}) {
-        let result = {
-            'base': 0.0,
-            'quote': 0.0,
-        };
+    calculateFeeRate (symbol, type, side, amount, price, takerOrMaker = 'taker', params = {}) {
         let key = (side == 'sell') ? 'quote' : 'base';
-        result[key] = this.markets[symbol][fee];
-        return result;
+        let market = this.markets[symbol];
+        return { 'currency': market[key], 'rate': market[takerOrMaker] };
     },
 
     async fetchMarkets () {

diff --git a/test/test_base.js b/test/test_base.js
@@ -43,13 +43,14 @@ describe ('ccxt base code', () => {
             'markets': { 'FOO/BAR': market }
         })
 
-        Object.keys (fees).forEach (fee => {
+        Object.keys (fees).forEach (takerOrMaker => {
 
-            const result = exchange.calculateFee (market['symbol'], 'limit', 'sell', amount, price, fee, {})
+            const result = exchange.calculateFee (market['symbol'], 'limit', 'sell', amount, price, takerOrMaker, {})
 
             assert.deepEqual (result, {
-                'rate': { 'base': 0.0, 'quote': fees[fee], },
-                'cost': { 'base': 0.0, 'quote': fees[fee] * amount * price, },
+                'currency': 'BAR',
+                'rate': fees[takerOrMaker],
+                'cost': fees[takerOrMaker] * amount * price,
             })
         })
     })