Verify if fee for this side has been updated

This commit is contained in:
Matthias 2020-05-01 19:54:16 +02:00
parent 6b33d5af1e
commit 6d620ba1f6
3 changed files with 16 additions and 1 deletions

View File

@ -1174,7 +1174,7 @@ class FreqtradeBot:
if order_amount is None:
order_amount = order['amount']
# Only run for closed orders
if trade.fee_open_currency is not None or order['status'] == 'open':
if trade.fee_updated(order['side']) or order['status'] == 'open':
return order_amount
trade_base_currency = self.exchange.get_pair_base_currency(trade.pair)

View File

@ -394,6 +394,15 @@ class Trade(_DECL_BASE):
if fee_rate is not None:
self.fee_close = fee_rate
def fee_updated(self, side: str) -> bool:
"""
Verify if this side (buy / sell) has already been updated
"""
if side == 'buy':
return self.fee_open_currency is not None
elif side == 'sell':
return self.fee_close_currency is not None
def _calc_open_trade_price(self) -> float:
"""
Calculate the open_rate including open_fee.

View File

@ -890,8 +890,12 @@ def test_update_fee(fee):
fee_currency = 'BTC'
fee_rate = 0.0075
assert trade.fee_open_currency is None
assert not trade.fee_updated('buy')
assert not trade.fee_updated('sell')
trade.update_fee(fee_cost, fee_currency, fee_rate, 'buy')
assert trade.fee_updated('buy')
assert not trade.fee_updated('sell')
assert trade.fee_open_currency == fee_currency
assert trade.fee_open_cost == fee_cost
assert trade.fee_open == fee_rate
@ -902,6 +906,8 @@ def test_update_fee(fee):
fee_rate = 0.0076
trade.update_fee(fee_cost, fee_currency, fee_rate, 'sell')
assert trade.fee_updated('buy')
assert trade.fee_updated('sell')
assert trade.fee_close == 0.0076
assert trade.fee_close_cost == fee_cost
assert trade.fee_close == fee_rate