From 6b8ca7217bfe5039773993f47a1249819a478a5e Mon Sep 17 00:00:00 2001 From: Axel-CH Date: Wed, 11 Sep 2024 21:48:48 -0400 Subject: [PATCH] flake8 fix and cleanup --- freqtrade/freqtradebot.py | 4 ++-- freqtrade/persistence/trade_model.py | 2 +- tests/freqtradebot/test_integration.py | 11 ----------- 3 files changed, 3 insertions(+), 14 deletions(-) diff --git a/freqtrade/freqtradebot.py b/freqtrade/freqtradebot.py index e1d56d581..dd39eb395 100644 --- a/freqtrade/freqtradebot.py +++ b/freqtrade/freqtradebot.py @@ -1710,7 +1710,7 @@ class FreqtradeBot(LoggingMixin): self.handle_cancel_exit( trade, order, open_order, reason ) - + def cancel_all_open_orders(self) -> None: """ Cancel all orders that are currently open @@ -1975,7 +1975,7 @@ class FreqtradeBot(LoggingMixin): [trade.exit_side] ) Trade.commit() - + # First cancelling stoploss on exchange ... trade = self.cancel_stoploss_on_exchange(trade) diff --git a/freqtrade/persistence/trade_model.py b/freqtrade/persistence/trade_model.py index 76f69793f..2746806c5 100644 --- a/freqtrade/persistence/trade_model.py +++ b/freqtrade/persistence/trade_model.py @@ -639,7 +639,7 @@ class LocalTrade: logger.info(f"untied_remaining: {untied_remaining}") return untied_remaining - + @property def has_untied_assets(self) -> bool: """ diff --git a/tests/freqtradebot/test_integration.py b/tests/freqtradebot/test_integration.py index 418d38d07..e65225e4e 100644 --- a/tests/freqtradebot/test_integration.py +++ b/tests/freqtradebot/test_integration.py @@ -480,23 +480,12 @@ def test_dca_order_adjust(default_conf_usdt, ticker_usdt, leverage, fee, mocker, assert pytest.approx(trade.orders[-1].amount) == 91.689215 * leverage assert freqtrade.strategy.adjust_entry_price.call_count == 0 - print("BEFORE Process trade.orders") - print(trade.orders) - - # adding this will prevent the second exit order creation, but this test case must be handled properly - #freqtrade.strategy.custom_exit = MagicMock(return_value=None) - caplog.clear() caplog.set_level(logging.DEBUG) # Process again, should not adjust entry price freqtrade.process() trade = Trade.get_trades().first() - print(f"DEBUG TEST") - print(caplog.text) - print("AFTER Process trade.orders") - print(trade.orders) - assert trade.orders[-2].status == "canceled" assert len(trade.orders) == 6 assert trade.orders[-1].side == trade.exit_side