adelorenzo/stable
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Raise InvalidOrder error when stoploss-creation fails

Browse Source
This commit is contained in:
Matthias 2019-09-01 09:08:35 +02:00
parent ee808abfea
commit 9f53e9f5dd
3 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
freqtrade/exchange/binance.py
View File

@ -4,7 +4,8 @@ from typing import Dict
import ccxt import ccxt
from freqtrade import DependencyException, OperationalException, TemporaryError from freqtrade import (DependencyException, InvalidOrderException,
OperationalException, TemporaryError)
from freqtrade.exchange import Exchange from freqtrade.exchange import Exchange
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
@ -69,7 +70,9 @@ class Binance(Exchange):
f'Tried to sell amount {amount} at rate {rate}.' f'Tried to sell amount {amount} at rate {rate}.'
f'Message: {e}') from e f'Message: {e}') from e
except ccxt.InvalidOrder as e: except ccxt.InvalidOrder as e:
raise DependencyException( # Errors:
# `binance Order would trigger immediately.`
raise InvalidOrderException(
f'Could not create {ordertype} sell order on market {pair}. ' f'Could not create {ordertype} sell order on market {pair}. '
f'Tried to sell amount {amount} at rate {rate}.' f'Tried to sell amount {amount} at rate {rate}.'
f'Message: {e}') from e f'Message: {e}') from e

6
freqtrade/freqtradebot.py
View File

@ -632,6 +632,12 @@ class FreqtradeBot(object):
rate=rate * LIMIT_PRICE_PCT) rate=rate * LIMIT_PRICE_PCT)
trade.stoploss_order_id = str(stoploss_order['id']) trade.stoploss_order_id = str(stoploss_order['id'])
return True return True
except InvalidOrderException:
trade.stoploss_order_id = None
logger.exception('Unable to place a stoploss order on exchange.')
logger.warning('Selling the trade forcefully')
self.execute_sell(trade, trade.stop_loss, sell_reason=SellType.EMERGENCY_SELL)
except DependencyException: except DependencyException:
trade.stoploss_order_id = None trade.stoploss_order_id = None
logger.exception('Unable to place a stoploss order on exchange.') logger.exception('Unable to place a stoploss order on exchange.')

8
freqtrade/tests/exchange/test_binance.py
View File

@ -4,7 +4,8 @@ from unittest.mock import MagicMock
import ccxt import ccxt
import pytest import pytest
from freqtrade import DependencyException, OperationalException, TemporaryError from freqtrade import (DependencyException, InvalidOrderException,
OperationalException, TemporaryError)
from freqtrade.tests.conftest import get_patched_exchange from freqtrade.tests.conftest import get_patched_exchange
@ -49,8 +50,9 @@ def test_stoploss_limit_order(default_conf, mocker):
exchange = get_patched_exchange(mocker, default_conf, api_mock, 'binance') exchange = get_patched_exchange(mocker, default_conf, api_mock, 'binance')
exchange.stoploss_limit(pair='ETH/BTC', amount=1, stop_price=220, rate=200) exchange.stoploss_limit(pair='ETH/BTC', amount=1, stop_price=220, rate=200)
with pytest.raises(DependencyException): with pytest.raises(InvalidOrderException):
api_mock.create_order = MagicMock(side_effect=ccxt.InvalidOrder("Order not found")) api_mock.create_order = MagicMock(
side_effect=ccxt.InvalidOrder("binance Order would trigger immediately."))
exchange = get_patched_exchange(mocker, default_conf, api_mock, 'binance') exchange = get_patched_exchange(mocker, default_conf, api_mock, 'binance')
exchange.stoploss_limit(pair='ETH/BTC', amount=1, stop_price=220, rate=200) exchange.stoploss_limit(pair='ETH/BTC', amount=1, stop_price=220, rate=200)