adelorenzo/stable
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update method name for trade fee updating

Browse Source
This commit is contained in:
Matthias 2022-11-25 14:43:43 +01:00
parent 048119ad3d
commit 5e6cda11ef
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
freqtrade/freqtradebot.py
View File

@ -191,7 +191,7 @@ class FreqtradeBot(LoggingMixin):
# Check whether markets have to be reloaded and reload them when it's needed # Check whether markets have to be reloaded and reload them when it's needed
self.exchange.reload_markets() self.exchange.reload_markets()
self.update_closed_trades_without_assigned_fees() self.update_trades_without_assigned_fees()
# Query trades from persistence layer # Query trades from persistence layer
trades = Trade.get_open_trades() trades = Trade.get_open_trades()
@ -354,7 +354,7 @@ class FreqtradeBot(LoggingMixin):
if self.trading_mode == TradingMode.FUTURES: if self.trading_mode == TradingMode.FUTURES:
self._schedule.run_pending() self._schedule.run_pending()
def update_closed_trades_without_assigned_fees(self) -> None: def update_trades_without_assigned_fees(self) -> None:
""" """
Update closed trades without close fees assigned. Update closed trades without close fees assigned.
Only acts when Orders are in the database, otherwise the last order-id is unknown. Only acts when Orders are in the database, otherwise the last order-id is unknown.

12
tests/test_freqtradebot.py
View File

@ -5046,7 +5046,7 @@ def test_startup_backpopulate_precision(mocker, default_conf_usdt, fee, caplog):
@pytest.mark.usefixtures("init_persistence") @pytest.mark.usefixtures("init_persistence")
@pytest.mark.parametrize("is_short", [False, True]) @pytest.mark.parametrize("is_short", [False, True])
def test_update_closed_trades_without_assigned_fees(mocker, default_conf_usdt, fee, is_short): def test_update_trades_without_assigned_fees(mocker, default_conf_usdt, fee, is_short):
freqtrade = get_patched_freqtradebot(mocker, default_conf_usdt) freqtrade = get_patched_freqtradebot(mocker, default_conf_usdt)
def patch_with_fee(order): def patch_with_fee(order):
@ -5075,7 +5075,7 @@ def test_update_closed_trades_without_assigned_fees(mocker, default_conf_usdt, f
assert trade.fee_close_cost is None assert trade.fee_close_cost is None
assert trade.fee_close_currency is None assert trade.fee_close_currency is None
freqtrade.update_closed_trades_without_assigned_fees() freqtrade.update_trades_without_assigned_fees()
# Does nothing for dry-run # Does nothing for dry-run
trades = Trade.get_trades().all() trades = Trade.get_trades().all()
@ -5088,7 +5088,7 @@ def test_update_closed_trades_without_assigned_fees(mocker, default_conf_usdt, f
freqtrade.config['dry_run'] = False freqtrade.config['dry_run'] = False
freqtrade.update_closed_trades_without_assigned_fees() freqtrade.update_trades_without_assigned_fees()
trades = Trade.get_trades().all() trades = Trade.get_trades().all()
assert len(trades) == MOCK_TRADE_COUNT assert len(trades) == MOCK_TRADE_COUNT
@ -5551,7 +5551,7 @@ def test_position_adjust(mocker, default_conf_usdt, fee) -> None:
assert trade.stake_amount == 110 assert trade.stake_amount == 110
# Assume it does nothing since order is closed and trade is open # Assume it does nothing since order is closed and trade is open
freqtrade.update_closed_trades_without_assigned_fees() freqtrade.update_trades_without_assigned_fees()
trade = Trade.query.first() trade = Trade.query.first()
assert trade assert trade
@ -5622,7 +5622,7 @@ def test_position_adjust(mocker, default_conf_usdt, fee) -> None:
mocker.patch('freqtrade.exchange.Exchange.create_order', fetch_order_mm) mocker.patch('freqtrade.exchange.Exchange.create_order', fetch_order_mm)
mocker.patch('freqtrade.exchange.Exchange.fetch_order', fetch_order_mm) mocker.patch('freqtrade.exchange.Exchange.fetch_order', fetch_order_mm)
mocker.patch('freqtrade.exchange.Exchange.fetch_order_or_stoploss_order', fetch_order_mm) mocker.patch('freqtrade.exchange.Exchange.fetch_order_or_stoploss_order', fetch_order_mm)
freqtrade.update_closed_trades_without_assigned_fees() freqtrade.update_trades_without_assigned_fees()
orders = Order.query.all() orders = Order.query.all()
assert orders assert orders
@ -5839,7 +5839,7 @@ def test_position_adjust2(mocker, default_conf_usdt, fee) -> None:
assert trade.stake_amount == bid * amount assert trade.stake_amount == bid * amount
# Assume it does nothing since order is closed and trade is open # Assume it does nothing since order is closed and trade is open
freqtrade.update_closed_trades_without_assigned_fees() freqtrade.update_trades_without_assigned_fees()
trade = Trade.query.first() trade = Trade.query.first()
assert trade assert trade