diff --git a/freqtrade/rpc/__init__.py b/freqtrade/rpc/__init__.py index 23c7242dd..7c331c552 100644 --- a/freqtrade/rpc/__init__.py +++ b/freqtrade/rpc/__init__.py @@ -65,28 +65,6 @@ def shorten_date(_date): return new_date -def _exec_forcesell(trade: Trade) -> None: - # Check if there is there is an open order - if trade.open_order_id: - order = exchange.get_order(trade.open_order_id) - - # Cancel open LIMIT_BUY orders and close trade - if order and not order['closed'] and order['type'] == 'LIMIT_BUY': - exchange.cancel_order(trade.open_order_id) - trade.close(order.get('rate') or trade.open_rate) - # TODO: sell amount which has been bought already - return - - # Ignore trades with an attached LIMIT_SELL order - if order and not order['closed'] and order['type'] == 'LIMIT_SELL': - return - - # Get current rate and execute sell - current_rate = exchange.get_ticker(trade.pair, False)['bid'] - from freqtrade.main import execute_sell - execute_sell(trade, current_rate) - - # # Below follows the RPC backend # it is prefixed with rpc_ @@ -387,6 +365,27 @@ def rpc_forcesell(trade_id) -> None: Sells the given trade at current price :return: error or None """ + def _exec_forcesell(trade: Trade) -> None: + # Check if there is there is an open order + if trade.open_order_id: + order = exchange.get_order(trade.open_order_id) + + # Cancel open LIMIT_BUY orders and close trade + if order and not order['closed'] and order['type'] == 'LIMIT_BUY': + exchange.cancel_order(trade.open_order_id) + trade.close(order.get('rate') or trade.open_rate) + # TODO: sell amount which has been bought already + return + + # Ignore trades with an attached LIMIT_SELL order + if order and not order['closed'] and order['type'] == 'LIMIT_SELL': + return + + # Get current rate and execute sell + current_rate = exchange.get_ticker(trade.pair, False)['bid'] + from freqtrade.main import execute_sell + execute_sell(trade, current_rate) + if get_state() != State.RUNNING: return (True, '`trader is not running`') @@ -402,8 +401,8 @@ def rpc_forcesell(trade_id) -> None: Trade.is_open.is_(True) )).first() if not trade: - logger.warning('/forcesell: Invalid argument received') - return (True, 'Invalid argument. See `/help` to view usage') + logger.warning('forcesell: Invalid argument received') + return (True, 'Invalid argument.') _exec_forcesell(trade) diff --git a/freqtrade/rpc/telegram.py b/freqtrade/rpc/telegram.py index 3596ae6e8..1b39c96ff 100644 --- a/freqtrade/rpc/telegram.py +++ b/freqtrade/rpc/telegram.py @@ -18,9 +18,8 @@ from freqtrade.rpc.__init__ import (rpc_status_table, rpc_count, ) -from freqtrade import __version__, exchange +from freqtrade import __version__ from freqtrade.fiat_convert import CryptoToFiatConverter -from freqtrade.persistence import Trade # Remove noisy log messages @@ -400,28 +399,6 @@ def _version(bot: Bot, update: Update) -> None: send_msg('*Version:* `{}`'.format(__version__), bot=bot) -def _exec_forcesell(trade: Trade) -> None: - # Check if there is there is an open order - if trade.open_order_id: - order = exchange.get_order(trade.open_order_id) - - # Cancel open LIMIT_BUY orders and close trade - if order and not order['closed'] and order['type'] == 'LIMIT_BUY': - exchange.cancel_order(trade.open_order_id) - trade.close(order.get('rate') or trade.open_rate) - # TODO: sell amount which has been bought already - return - - # Ignore trades with an attached LIMIT_SELL order - if order and not order['closed'] and order['type'] == 'LIMIT_SELL': - return - - # Get current rate and execute sell - current_rate = exchange.get_ticker(trade.pair, False)['bid'] - from freqtrade.main import execute_sell - execute_sell(trade, current_rate) - - def send_msg(msg: str, bot: Bot = None, parse_mode: ParseMode = ParseMode.MARKDOWN) -> None: """ Send given markdown message diff --git a/freqtrade/tests/conftest.py b/freqtrade/tests/conftest.py index 1e53648e1..1cdc2fd55 100644 --- a/freqtrade/tests/conftest.py +++ b/freqtrade/tests/conftest.py @@ -256,3 +256,9 @@ def ticker_history_without_bv(): "T": "2017-11-26T09:00:00" } ] + +# FIX: +# Create an fixture/function +# that inserts a trade of some type and open-status +# return the open-order-id +# See tests in rpc/main that could use this diff --git a/freqtrade/tests/rpc/test_rpc.py b/freqtrade/tests/rpc/test_rpc.py index 4cb8f654e..bf8d8a15b 100644 --- a/freqtrade/tests/rpc/test_rpc.py +++ b/freqtrade/tests/rpc/test_rpc.py @@ -232,3 +232,72 @@ def test_rpc_balance_handle(default_conf, update, mocker): # res:: # (False, ([{'currency': 'BTC', 'available': 12.0, 'balance': 10.0, # 'pending': 0.0, 'est_btc': 10.0}], 10.0, 'USD', 150000.0)) + + +def test_exec_forcesell_open_orders(default_conf, ticker, mocker, limit_buy_order): + mocker.patch.dict('freqtrade.main._CONF', default_conf) + cancel_order_mock = MagicMock() + mocker.patch.multiple('freqtrade.rpc.telegram', + _CONF=default_conf, + init=MagicMock(), + send_msg=MagicMock()) + mocker.patch.multiple('freqtrade.main.exchange', + get_ticker=ticker, + get_order=MagicMock(return_value={ + 'closed': None, + 'type': 'LIMIT_BUY', + }), + cancel_order=cancel_order_mock) + # Insert an open trade (which we can cancel) + # trade = Trade( + # pair='BTC_ETH', + # open_rate=1, + # exchange='BITTREX', + # open_order_id='123456789', + # amount=1, + # fee=0.0, + # open_date=datetime.utcnow(), + # is_open=False, + # ) + # FIX: Cant make an open trade..... + # trade = Trade.query.first() + # print('###############', trade) + res = rpc.rpc_forcesell('123456789') + assert(res) + # print(res) + # assert cancel_order_mock.call_count == 1 + # assert trade.is_open is False + + +def test_performance_handle( + default_conf, update, ticker, limit_buy_order, limit_sell_order, mocker): + mocker.patch.dict('freqtrade.main._CONF', default_conf) + mocker.patch('freqtrade.main.get_signal', side_effect=lambda s, t: (True, False)) + msg_mock = MagicMock() + mocker.patch('freqtrade.main.rpc.send_msg', MagicMock()) + mocker.patch.multiple('freqtrade.rpc.telegram', + _CONF=default_conf, + init=MagicMock(), + send_msg=msg_mock) + mocker.patch.multiple('freqtrade.main.exchange', + validate_pairs=MagicMock(), + get_ticker=ticker) + main.init(default_conf, create_engine('sqlite://')) + + # Create some test data + main.create_trade(0.001, int(default_conf['ticker_interval'])) + trade = Trade.query.first() + assert trade + + # Simulate fulfilled LIMIT_BUY order for trade + trade.update(limit_buy_order) + + # Simulate fulfilled LIMIT_SELL order for trade + trade.update(limit_sell_order) + + trade.close_date = datetime.utcnow() + trade.is_open = False + res = rpc.rpc_performance() + print(res) + # assert 'Performance' in msg_mock.call_args_list[0][0][0] + # assert 'BTC_ETH\t6.20% (1)' in msg_mock.call_args_list[0][0][0] diff --git a/freqtrade/tests/rpc/test_rpc_telegram.py b/freqtrade/tests/rpc/test_rpc_telegram.py index 5ecb17cf8..a8dbac555 100644 --- a/freqtrade/tests/rpc/test_rpc_telegram.py +++ b/freqtrade/tests/rpc/test_rpc_telegram.py @@ -14,8 +14,7 @@ from freqtrade.misc import update_state, State, get_state from freqtrade.persistence import Trade from freqtrade.rpc import telegram from freqtrade.rpc.telegram import authorized_only, is_enabled, send_msg, _status, _status_table, \ - _profit, _forcesell, _performance, _daily, _count, _start, _stop, _balance, _version, _help, \ - _exec_forcesell + _profit, _forcesell, _performance, _daily, _count, _start, _stop, _balance, _version, _help def test_is_enabled(default_conf, mocker): @@ -282,30 +281,6 @@ def test_forcesell_down_handle(default_conf, update, ticker, ticker_sell_down, m assert '-0.824 USD' in rpc_mock.call_args_list[-1][0][0] -def test_exec_forcesell_open_orders(default_conf, ticker, mocker): - mocker.patch.dict('freqtrade.main._CONF', default_conf) - cancel_order_mock = MagicMock() - mocker.patch.multiple('freqtrade.main.exchange', - get_ticker=ticker, - get_order=MagicMock(return_value={ - 'closed': None, - 'type': 'LIMIT_BUY', - }), - cancel_order=cancel_order_mock) - trade = Trade( - pair='BTC_ETH', - open_rate=1, - exchange='BITTREX', - open_order_id='123456789', - amount=1, - fee=0.0, - ) - _exec_forcesell(trade) - - assert cancel_order_mock.call_count == 1 - assert trade.is_open is False - - def test_forcesell_all_handle(default_conf, update, ticker, mocker): mocker.patch.dict('freqtrade.main._CONF', default_conf) mocker.patch('freqtrade.main.get_signal', side_effect=lambda s, t: (True, False))