From 498aa9c8be2c9f95d0bb1876c3686193acd6d4f5 Mon Sep 17 00:00:00 2001 From: Kavinkumar <33546454+mkavinkumar1@users.noreply.github.com> Date: Sun, 6 Mar 2022 17:21:34 +0530 Subject: [PATCH] Updated unittests MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: மனோஜ்குமார் பழனிச்சாமி --- freqtrade/persistence/models.py | 3 ++- freqtrade/rpc/rpc.py | 2 +- freqtrade/rpc/telegram.py | 3 ++- tests/rpc/test_rpc.py | 2 ++ 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/freqtrade/persistence/models.py b/freqtrade/persistence/models.py index 9db57e7d8..c6ad2dc45 100644 --- a/freqtrade/persistence/models.py +++ b/freqtrade/persistence/models.py @@ -374,6 +374,7 @@ class LocalTrade(): if self.close_date else None), 'close_timestamp': int(self.close_date.replace( tzinfo=timezone.utc).timestamp() * 1000) if self.close_date else None, + 'realized_profit': self.realized_profit, 'close_rate': self.close_rate, 'close_rate_requested': self.close_rate_requested, 'close_profit': self.close_profit, # Deprecated @@ -880,7 +881,7 @@ class Trade(_DECL_BASE, LocalTrade): open_trade_value = Column(Float) close_rate: Optional[float] = Column(Float) close_rate_requested = Column(Float) - realized_profit = Column(Float) + realized_profit = Column(Float, default=0.0) close_profit = Column(Float) close_profit_abs = Column(Float) stake_amount = Column(Float, nullable=False) diff --git a/freqtrade/rpc/rpc.py b/freqtrade/rpc/rpc.py index fb5194117..d26f8f07d 100644 --- a/freqtrade/rpc/rpc.py +++ b/freqtrade/rpc/rpc.py @@ -193,11 +193,11 @@ class RPC: stoploss_current_dist_ratio = stoploss_current_dist / current_rate trade_dict = trade.to_json() + import pprint;logger.info(pprint.pformat(trade_dict)) trade_dict.update(dict( base_currency=self._freqtrade.config['stake_currency'], close_profit=trade.close_profit if not trade.is_open else None, current_rate=current_rate, - realized_profit=trade.realized_profit, current_profit=current_profit, # Deprecated current_profit_pct=round(current_profit * 100, 2), # Deprecated current_profit_abs=current_profit_abs, # Deprecated diff --git a/freqtrade/rpc/telegram.py b/freqtrade/rpc/telegram.py index 76fc86d29..cfc10d010 100644 --- a/freqtrade/rpc/telegram.py +++ b/freqtrade/rpc/telegram.py @@ -500,7 +500,8 @@ class Telegram(RPCHandler): ]) if r['is_open']: - lines.append("*Realized Prodir:* `{realized_profit:.8f}`") + if r.get('realized_profit'): + lines.append("*Realized Profit:* `{realized_profit:.8f}`") if (r['stop_loss_abs'] != r['initial_stop_loss_abs'] and r['initial_stop_loss_ratio'] is not None): # Adding initial stoploss only if it is different from stoploss diff --git a/tests/rpc/test_rpc.py b/tests/rpc/test_rpc.py index 951c7d5ad..29c6f3044 100644 --- a/tests/rpc/test_rpc.py +++ b/tests/rpc/test_rpc.py @@ -108,6 +108,7 @@ def test_rpc_trade_status(default_conf, ticker, fee, mocker) -> None: 'stoploss_entry_dist': -0.00010475, 'stoploss_entry_dist_ratio': -0.10448878, 'open_order': None, + 'realized_profit': 0.0, 'exchange': 'binance', 'orders': [{ 'amount': 91.07468123, 'average': 1.098e-05, 'safe_price': 1.098e-05, @@ -183,6 +184,7 @@ def test_rpc_trade_status(default_conf, ticker, fee, mocker) -> None: 'stoploss_entry_dist_ratio': -0.10448878, 'open_order': None, 'exchange': 'binance', + 'realized_profit': 0.0, 'orders': [{ 'amount': 91.07468123, 'average': 1.098e-05, 'safe_price': 1.098e-05, 'cost': 0.0009999999999054, 'filled': 91.07468123, 'ft_order_side': 'buy',