From 6115fb08c0f4763d21914ec7e00f6a066e507487 Mon Sep 17 00:00:00 2001 From: enenn Date: Mon, 9 Apr 2018 21:04:52 +0200 Subject: [PATCH] Remove get_fee_maker/taker and add argument to get_fee instead --- freqtrade/exchange/__init__.py | 14 ++++---------- freqtrade/freqtradebot.py | 2 +- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/freqtrade/exchange/__init__.py b/freqtrade/exchange/__init__.py index a658a790a..26e49654f 100644 --- a/freqtrade/exchange/__init__.py +++ b/freqtrade/exchange/__init__.py @@ -342,18 +342,12 @@ def get_id() -> str: return _API.id -def get_fee_maker() -> float: - return _API.fees['trading']['maker'] - - -def get_fee_taker() -> float: - return _API.fees['trading']['taker'] - - -def get_fee() -> float: +def get_fee(symbol='ETH/BTC', type='', side='', amount=1, + price=1, taker_or_maker='maker') -> float: # validate that markets are loaded before trying to get fee if _API.markets is None or len(_API.markets) == 0: _API.load_markets() - return _API.calculate_fee(symbol='ETH/BTC', type='', side='', amount=1, price=1)['rate'] + return _API.calculate_fee(symbol=symbol, type=type, side=side, amount=amount, + price=price, takerOrMaker=taker_or_maker)['rate'] diff --git a/freqtrade/freqtradebot.py b/freqtrade/freqtradebot.py index 62ade805a..6c07963f5 100644 --- a/freqtrade/freqtradebot.py +++ b/freqtrade/freqtradebot.py @@ -323,7 +323,7 @@ class FreqtradeBot(object): pair=pair, stake_amount=stake_amount, amount=amount, - fee=exchange.get_fee_maker(), + fee=exchange.get_fee(taker_or_maker='maker'), open_rate=buy_limit, open_date=datetime.utcnow(), exchange=exchange.get_id(),