From 84dcb55879edb4e6c9bae2713546ff761b53bf5b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E0=AE=AE=E0=AE=A9=E0=AF=8B=E0=AE=9C=E0=AF=8D=E0=AE=95?= =?UTF-8?q?=E0=AF=81=E0=AE=AE=E0=AE=BE=E0=AE=B0=E0=AF=8D=20=E0=AE=AA?= =?UTF-8?q?=E0=AE=B4=E0=AE=A9=E0=AE=BF=E0=AE=9A=E0=AF=8D=E0=AE=9A=E0=AE=BE?= =?UTF-8?q?=E0=AE=AE=E0=AE=BF?= Date: Thu, 24 Mar 2022 17:31:29 +0530 Subject: [PATCH] updated requested changes for tests in PR #6545 --- freqtrade/exchange/exchange.py | 2 +- tests/conftest.py | 2 ++ tests/rpc/test_rpc_telegram.py | 43 +++++++++++++++++++--------------- tests/test_freqtradebot.py | 5 +++- 4 files changed, 31 insertions(+), 21 deletions(-) diff --git a/freqtrade/exchange/exchange.py b/freqtrade/exchange/exchange.py index a36183162..9cac00045 100644 --- a/freqtrade/exchange/exchange.py +++ b/freqtrade/exchange/exchange.py @@ -1553,7 +1553,7 @@ class Exchange: else: logger.debug( "Fetching trades for pair %s, since %s %s...", - pair, since, + pair, since, '(' + arrow.get(since // 1000).isoformat() + ') ' if since is not None else '' ) trades = await self._api_async.fetch_trades(pair, since=since, limit=1000) diff --git a/tests/conftest.py b/tests/conftest.py index 57122c01c..b1737e5ba 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -1022,6 +1022,7 @@ def limit_buy_order_open(): 'datetime': arrow.utcnow().isoformat(), 'timestamp': arrow.utcnow().int_timestamp, 'price': 0.00001099, + 'average': 0.00001099, 'amount': 90.99181073, 'filled': 0.0, 'cost': 0.0009999, @@ -2190,6 +2191,7 @@ def limit_buy_order_usdt_open(): 'datetime': arrow.utcnow().isoformat(), 'timestamp': arrow.utcnow().int_timestamp, 'price': 2.00, + 'average': 2.00, 'amount': 30.0, 'filled': 0.0, 'cost': 60.0, diff --git a/tests/rpc/test_rpc_telegram.py b/tests/rpc/test_rpc_telegram.py index aa58efb0d..8466c17a1 100644 --- a/tests/rpc/test_rpc_telegram.py +++ b/tests/rpc/test_rpc_telegram.py @@ -420,10 +420,10 @@ def test_daily_handle(default_conf, update, ticker, limit_buy_order, fee, assert trade # Simulate fulfilled LIMIT_BUY order for trade + limit_buy_order['id'] = trade.orders[0].order_id oobj = Order.parse_from_ccxt_object(limit_buy_order, limit_buy_order['symbol'], 'buy') - trade.open_rate = oobj.safe_price - trade.amount = oobj.safe_amount_after_fee - trade.recalc_open_trade_value() + trade.update_order(limit_buy_order) + trade.update_trade(oobj) # Simulate fulfilled LIMIT_SELL order for trade oobjs = Order.parse_from_ccxt_object(limit_sell_order, limit_sell_order['symbol'], 'sell') @@ -535,10 +535,10 @@ def test_weekly_handle(default_conf, update, ticker, limit_buy_order, fee, assert trade # Simulate fulfilled LIMIT_BUY order for trade + limit_buy_order['id'] = trade.orders[0].order_id oobj = Order.parse_from_ccxt_object(limit_buy_order, limit_buy_order['symbol'], 'buy') - trade.open_rate = oobj.safe_price - trade.amount = oobj.safe_amount_after_fee - trade.recalc_open_trade_value() + trade.update_order(limit_buy_order) + trade.update_trade(oobj) # Simulate fulfilled LIMIT_SELL order for trade oobjs = Order.parse_from_ccxt_object(limit_sell_order, limit_sell_order['symbol'], 'sell') @@ -657,10 +657,10 @@ def test_monthly_handle(default_conf, update, ticker, limit_buy_order, fee, assert trade # Simulate fulfilled LIMIT_BUY order for trade + limit_buy_order['id'] = trade.orders[0].order_id oobj = Order.parse_from_ccxt_object(limit_buy_order, limit_buy_order['symbol'], 'buy') - trade.open_rate = oobj.safe_price - trade.amount = oobj.safe_amount_after_fee - trade.recalc_open_trade_value() + trade.update_order(limit_buy_order) + trade.update_trade(oobj) # Simulate fulfilled LIMIT_SELL order for trade oobjs = Order.parse_from_ccxt_object(limit_sell_order, limit_sell_order['symbol'], 'sell') @@ -781,9 +781,10 @@ def test_profit_handle(default_conf, update, ticker, ticker_sell_up, fee, trade = Trade.query.first() # Simulate fulfilled LIMIT_BUY order for trade + limit_buy_order['id'] = trade.orders[0].order_id oobj = Order.parse_from_ccxt_object(limit_buy_order, limit_buy_order['symbol'], 'buy') - trade.open_rate = oobj.safe_price - trade.amount = oobj.safe_amount_after_fee + trade.update_order(limit_buy_order) + trade.update_trade(oobj) Trade.commit() context = MagicMock() @@ -1318,9 +1319,10 @@ def test_telegram_performance_handle(default_conf, update, ticker, fee, assert trade # Simulate fulfilled LIMIT_BUY order for trade + limit_buy_order['id'] = trade.orders[0].order_id oobj = Order.parse_from_ccxt_object(limit_buy_order, limit_buy_order['symbol'], 'buy') - trade.open_rate = oobj.safe_price - trade.amount = oobj.safe_amount_after_fee + trade.update_order(limit_buy_order) + trade.update_trade(oobj) # Simulate fulfilled LIMIT_SELL order for trade oobj = Order.parse_from_ccxt_object(limit_sell_order, limit_sell_order['symbol'], 'sell') @@ -1351,9 +1353,10 @@ def test_telegram_buy_tag_performance_handle(default_conf, update, ticker, fee, trade.buy_tag = "TESTBUY" # Simulate fulfilled LIMIT_BUY order for trade + limit_buy_order['id'] = trade.orders[0].order_id oobj = Order.parse_from_ccxt_object(limit_buy_order, limit_buy_order['symbol'], 'buy') - trade.open_rate = oobj.safe_price - trade.amount = oobj.safe_amount_after_fee + trade.update_order(limit_buy_order) + trade.update_trade(oobj) # Simulate fulfilled LIMIT_SELL order for trade oobj = Order.parse_from_ccxt_object(limit_sell_order, limit_sell_order['symbol'], 'sell') @@ -1396,9 +1399,10 @@ def test_telegram_sell_reason_performance_handle(default_conf, update, ticker, f assert trade trade.sell_reason = 'TESTSELL' # Simulate fulfilled LIMIT_BUY order for trade + limit_buy_order['id'] = trade.orders[0].order_id oobj = Order.parse_from_ccxt_object(limit_buy_order, limit_buy_order['symbol'], 'buy') - trade.open_rate = oobj.safe_price - trade.amount = oobj.safe_amount_after_fee + trade.update_order(limit_buy_order) + trade.update_trade(oobj) # Simulate fulfilled LIMIT_SELL order for trade oobj = Order.parse_from_ccxt_object(limit_sell_order, limit_sell_order['symbol'], 'sell') @@ -1443,9 +1447,10 @@ def test_telegram_mix_tag_performance_handle(default_conf, update, ticker, fee, trade.sell_reason = "TESTSELL" # Simulate fulfilled LIMIT_BUY order for trade + limit_buy_order['id'] = trade.orders[0].order_id oobj = Order.parse_from_ccxt_object(limit_buy_order, limit_buy_order['symbol'], 'buy') - trade.open_rate = oobj.safe_price - trade.amount = oobj.safe_amount_after_fee + trade.update_order(limit_buy_order) + trade.update_trade(oobj) # Simulate fulfilled LIMIT_SELL order for trade oobj = Order.parse_from_ccxt_object(limit_sell_order, limit_sell_order['symbol'], 'sell') diff --git a/tests/test_freqtradebot.py b/tests/test_freqtradebot.py index 7c544e4e6..2715a5ada 100644 --- a/tests/test_freqtradebot.py +++ b/tests/test_freqtradebot.py @@ -226,7 +226,10 @@ def test_edge_overrides_stoploss(limit_buy_order_usdt, fee, caplog, mocker, freqtrade.strategy.min_roi_reached = MagicMock(return_value=False) freqtrade.enter_positions() trade = Trade.query.first() - trade.open_rate = 2 + limit_buy_order_usdt['id'] = trade.orders[0].order_id + oobj = Order.parse_from_ccxt_object(limit_buy_order_usdt, 'NEO/BTC', 'buy') + trade.update_order(limit_buy_order_usdt) + trade.update_trade(oobj) ############################################# # stoploss shoud be hit