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

Update market order validation

Browse Source
This commit is contained in:
Matthias 2022-03-28 19:24:57 +02:00
parent 440967e483
commit cee09493be
2 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
freqtrade/configuration/config_validation.py
View File

@ -103,14 +103,15 @@ def _validate_price_config(conf: Dict[str, Any]) -> None:
""" """
When using market orders, price sides must be using the "other" side of the price When using market orders, price sides must be using the "other" side of the price
""" """
# TODO-lev: check this again when determining how to migrate pricing strategies! # TODO: The below could be an enforced setting when using market orders
if (conf.get('order_types', {}).get('entry') == 'market' if (conf.get('order_types', {}).get('entry') == 'market'
and conf.get('entry_pricing', {}).get('price_side') != 'ask'): and conf.get('entry_pricing', {}).get('price_side') not in ('ask', 'other')):
raise OperationalException('Market buy orders require entry_pricing.price_side = "ask".') raise OperationalException(
'Market entry orders require entry_pricing.price_side = "other".')
if (conf.get('order_types', {}).get('exit') == 'market' if (conf.get('order_types', {}).get('exit') == 'market'
and conf.get('ask_strategy', {}).get('price_side') != 'bid'): and conf.get('exit_pricing', {}).get('price_side') not in ('bid', 'other')):
raise OperationalException('Market sell orders require ask_strategy.price_side = "bid".') raise OperationalException('Market exit orders require exit_pricing.price_side = "other".')
def _validate_trailing_stoploss(conf: Dict[str, Any]) -> None: def _validate_trailing_stoploss(conf: Dict[str, Any]) -> None:

14
tests/test_configuration.py
View File

@ -809,13 +809,13 @@ def test_validate_price_side(default_conf):
conf = deepcopy(default_conf) conf = deepcopy(default_conf)
conf['order_types']['entry'] = 'market' conf['order_types']['entry'] = 'market'
with pytest.raises(OperationalException, with pytest.raises(OperationalException,
match='Market buy orders require entry_pricing.price_side = "ask".'): match='Market entry orders require entry_pricing.price_side = "other".'):
validate_config_consistency(conf) validate_config_consistency(conf)
conf = deepcopy(default_conf) conf = deepcopy(default_conf)
conf['order_types']['exit'] = 'market' conf['order_types']['exit'] = 'market'
with pytest.raises(OperationalException, with pytest.raises(OperationalException,
match='Market sell orders require exit_pricing.price_side = "bid".'): match='Market exit orders require exit_pricing.price_side = "other".'):
validate_config_consistency(conf) validate_config_consistency(conf)
# Validate inversed case # Validate inversed case
@ -1234,15 +1234,15 @@ def test_pairlist_resolving_fallback(mocker):
@pytest.mark.parametrize("setting", [ @pytest.mark.parametrize("setting", [
("exit_pricing", "use_sell_signal", True, ("ask_strategy", "use_sell_signal", True,
None, "use_sell_signal", False), None, "use_sell_signal", False),
("exit_pricing", "sell_profit_only", True, ("ask_strategy", "sell_profit_only", True,
None, "sell_profit_only", False), None, "sell_profit_only", False),
("exit_pricing", "sell_profit_offset", 0.1, ("ask_strategy", "sell_profit_offset", 0.1,
None, "sell_profit_offset", 0.01), None, "sell_profit_offset", 0.01),
("exit_pricing", "ignore_roi_if_buy_signal", True, ("ask_strategy", "ignore_roi_if_buy_signal", True,
None, "ignore_roi_if_buy_signal", False), None, "ignore_roi_if_buy_signal", False),
("exit_pricing", "ignore_buying_expired_candle_after", 5, ("ask_strategy", "ignore_buying_expired_candle_after", 5,
None, "ignore_buying_expired_candle_after", 6), None, "ignore_buying_expired_candle_after", 6),
]) ])
def test_process_temporary_deprecated_settings(mocker, default_conf, setting, caplog): def test_process_temporary_deprecated_settings(mocker, default_conf, setting, caplog):