From 6021dffb4afde541490260d1eb1a1d9b30f7630b Mon Sep 17 00:00:00 2001 From: Kavinkumar <33546454+mkavinkumar1@users.noreply.github.com> Date: Fri, 18 Feb 2022 16:06:50 +0530 Subject: [PATCH] updated unit test --- freqtrade/persistence/models.py | 4 ++-- freqtrade/rpc/telegram.py | 20 ++++++++++---------- tests/test_freqtradebot.py | 11 +++++++++++ 3 files changed, 23 insertions(+), 12 deletions(-) diff --git a/freqtrade/persistence/models.py b/freqtrade/persistence/models.py index 7cb6dff36..0b701aa45 100644 --- a/freqtrade/persistence/models.py +++ b/freqtrade/persistence/models.py @@ -452,7 +452,7 @@ class LocalTrade(): f"Trailing stoploss saved us: " f"{float(self.stop_loss) - float(self.initial_stop_loss):.8f}.") - def update(self, order: Dict, partial:bool=False) -> None: + def update(self, order: Dict, sub_trade:bool=False) -> None: """ Updates this entity with amount and actual open/close rates. :param order: order retrieved by exchange.fetch_order() @@ -477,7 +477,7 @@ class LocalTrade(): if self.is_open: logger.info(f'{order_type.upper()}_SELL has been fulfilled for {self}.') self.open_order_id = None - if partial: + if sub_trade: orders=(self.select_filled_orders('buy')) lbuy=orders[-2] lamount = (lbuy.filled or lbuy.amount) diff --git a/freqtrade/rpc/telegram.py b/freqtrade/rpc/telegram.py index fa2d2aecd..6c9ad083a 100644 --- a/freqtrade/rpc/telegram.py +++ b/freqtrade/rpc/telegram.py @@ -251,9 +251,9 @@ class Telegram(RPCHandler): if msg.get('fiat_currency', None): message += f", {round_coin_value(total, msg['fiat_currency'])}" - message += ")`\n" - if msg['partial']: - message += f"*Balance:* `({round_coin_value(msg['stake_amount'], msg['stake_currency'])}" + message += ")`" + if msg.get('sub_trade'): + message += f"\n*Balance:* `({round_coin_value(msg['stake_amount'], msg['stake_currency'])}" if msg.get('fiat_currency', None): message += f", {round_coin_value(msg['stake_amount_fiat'], msg['fiat_currency'])}" @@ -300,13 +300,13 @@ class Telegram(RPCHandler): elif msg['type'] == RPCMessageType.SELL_FILL: message += f"*Close Rate:* `{msg['close_rate']:.8f}`" - if self._rpc._fiat_converter: - msg['stake_amount_fiat'] = self._rpc._fiat_converter.convert_amount( - msg['stake_amount'], msg['stake_currency'], msg['fiat_currency']) - else: - msg['stake_amount_fiat'] = 0 - if msg['partial']: - message += f"*Balance:* `({round_coin_value(msg['stake_amount'], msg['stake_currency'])}" + if msg.get('sub_trade'): + if self._rpc._fiat_converter: + msg['stake_amount_fiat'] = self._rpc._fiat_converter.convert_amount( + msg['stake_amount'], msg['stake_currency'], msg['fiat_currency']) + else: + msg['stake_amount_fiat'] = 0 + message += f"\n*Balance:* `({round_coin_value(msg['stake_amount'], msg['stake_currency'])}" if msg.get('fiat_currency', None): message += f", {round_coin_value(msg['stake_amount_fiat'], msg['fiat_currency'])}" diff --git a/tests/test_freqtradebot.py b/tests/test_freqtradebot.py index 4bbf26362..cf02da6bc 100644 --- a/tests/test_freqtradebot.py +++ b/tests/test_freqtradebot.py @@ -2619,6 +2619,9 @@ def test_execute_trade_exit_up(default_conf_usdt, ticker_usdt, fee, ticker_usdt_ 'open_date': ANY, 'close_date': ANY, 'close_rate': ANY, + 'partial': False, + 'stake_amount': 60.0, + } == last_msg @@ -2673,6 +2676,8 @@ def test_execute_trade_exit_down(default_conf_usdt, ticker_usdt, fee, ticker_usd 'open_date': ANY, 'close_date': ANY, 'close_rate': ANY, + 'partial': False, + 'stake_amount': 60.0, } == last_msg @@ -2741,6 +2746,8 @@ def test_execute_trade_exit_custom_exit_price(default_conf_usdt, ticker_usdt, fe 'open_date': ANY, 'close_date': ANY, 'close_rate': ANY, + 'partial': False, + 'stake_amount': 60.0, } == last_msg @@ -2801,6 +2808,8 @@ def test_execute_trade_exit_down_stoploss_on_exchange_dry_run( 'open_date': ANY, 'close_date': ANY, 'close_rate': ANY, + 'partial': False, + 'stake_amount': 60.0, } == last_msg @@ -3019,6 +3028,8 @@ def test_execute_trade_exit_market_order(default_conf_usdt, ticker_usdt, fee, 'open_date': ANY, 'close_date': ANY, 'close_rate': ANY, + 'partial': False, + 'stake_amount': 60.0, } == last_msg