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

remove --cancel_open_orders cli switch

Browse Source
This commit is contained in:
Matthias 2020-05-16 13:23:40 +02:00
parent 7a11219b61
commit fed75d8718
5 changed files with 1 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
freqtrade/commands/arguments.py
View File

@ -13,7 +13,7 @@ ARGS_COMMON = ["verbosity", "logfile", "version", "config", "datadir", "user_dat
ARGS_STRATEGY = ["strategy", "strategy_path"] ARGS_STRATEGY = ["strategy", "strategy_path"]
ARGS_TRADE = ["db_url", "sd_notify", "dry_run", "cancel_open_orders_on_exit"] ARGS_TRADE = ["db_url", "sd_notify", "dry_run"]
ARGS_COMMON_OPTIMIZE = ["ticker_interval", "timerange", ARGS_COMMON_OPTIMIZE = ["ticker_interval", "timerange",
"max_open_trades", "stake_amount", "fee"] "max_open_trades", "stake_amount", "fee"]

5
freqtrade/commands/cli_options.py
View File

@ -109,11 +109,6 @@ AVAILABLE_CLI_OPTIONS = {
help='Enforce dry-run for trading (removes Exchange secrets and simulates trades).', help='Enforce dry-run for trading (removes Exchange secrets and simulates trades).',
action='store_true', action='store_true',
), ),
"cancel_open_orders_on_exit": Arg(
'--cancel-open-orders-on-exit',
help='Close unfilled and partially filled open orders when the bot stops / exits.',
action='store_true',
),
# Optimize common # Optimize common
"ticker_interval": Arg( "ticker_interval": Arg(
'-i', '--ticker-interval', '-i', '--ticker-interval',

5
freqtrade/configuration/configuration.py
View File

@ -134,11 +134,6 @@ class Configuration:
if config['runmode'] not in TRADING_MODES: if config['runmode'] not in TRADING_MODES:
return return
if self.args.get('cancel_open_orders_on_exit', False):
config.update({
'cancel_open_orders_on_exit': self.args.get('cancel_open_orders_on_exit')
})
if config.get('dry_run', False): if config.get('dry_run', False):
logger.info('Dry run is enabled') logger.info('Dry run is enabled')
if config.get('db_url') in [None, constants.DEFAULT_DB_PROD_URL]: if config.get('db_url') in [None, constants.DEFAULT_DB_PROD_URL]:

8
tests/test_arguments.py
View File

@ -64,14 +64,6 @@ def test_parse_args_db_url() -> None:
assert args["db_url"] == 'sqlite:///test.sqlite' assert args["db_url"] == 'sqlite:///test.sqlite'
def test_parse_args_cancel_open_orders_on_exit() -> None:
args = Arguments(['trade']).get_parsed_arg()
assert args["cancel_open_orders_on_exit"] is False
args = Arguments(['trade', '--cancel-open-orders-on-exit']).get_parsed_arg()
assert args["cancel_open_orders_on_exit"] is True
def test_parse_args_verbose() -> None: def test_parse_args_verbose() -> None:
args = Arguments(['trade', '-v']).get_parsed_arg() args = Arguments(['trade', '-v']).get_parsed_arg()
assert args["verbosity"] == 1 assert args["verbosity"] == 1

2
tests/test_configuration.py
View File

@ -250,7 +250,6 @@ def test_load_config_with_params(default_conf, mocker) -> None:
'--strategy', 'TestStrategy', '--strategy', 'TestStrategy',
'--strategy-path', '/some/path', '--strategy-path', '/some/path',
'--db-url', 'sqlite:///someurl', '--db-url', 'sqlite:///someurl',
'--cancel-open-orders-on-exit',
] ]
args = Arguments(arglist).get_parsed_arg() args = Arguments(arglist).get_parsed_arg()
configuration = Configuration(args) configuration = Configuration(args)
@ -259,7 +258,6 @@ def test_load_config_with_params(default_conf, mocker) -> None:
assert validated_conf.get('strategy') == 'TestStrategy' assert validated_conf.get('strategy') == 'TestStrategy'
assert validated_conf.get('strategy_path') == '/some/path' assert validated_conf.get('strategy_path') == '/some/path'
assert validated_conf.get('db_url') == 'sqlite:///someurl' assert validated_conf.get('db_url') == 'sqlite:///someurl'
assert validated_conf.get('cancel_open_orders_on_exit') is True
# Test conf provided db_url prod # Test conf provided db_url prod
conf = default_conf.copy() conf = default_conf.copy()