Merge branch 'develop' into plot_profit

This commit is contained in:
kryofly
2018-01-21 14:13:08 +01:00
17 changed files with 209 additions and 134 deletions

View File

@@ -208,7 +208,7 @@ def backtesting_options(parser: argparse.ArgumentParser) -> None:
)
parser.add_argument(
'-i', '--ticker-interval',
help='specify ticker interval in minutes (default: 5)',
help='specify ticker interval in minutes (1, 5, 30, 60, 1440)',
dest='ticker_interval',
default=5,
type=int,
@@ -328,6 +328,7 @@ CONF_SCHEMA = {
'type': 'object',
'properties': {
'max_open_trades': {'type': 'integer', 'minimum': 1},
'ticker_interval': {'type': 'string', 'enum': ['1', '5', '30', '60', '1440']},
'stake_currency': {'type': 'string', 'enum': ['BTC', 'ETH', 'USDT']},
'stake_amount': {'type': 'number', 'minimum': 0.0005},
'fiat_display_currency': {'type': 'string', 'enum': ['AUD', 'BRL', 'CAD', 'CHF',
@@ -381,7 +382,8 @@ CONF_SCHEMA = {
'internals': {
'type': 'object',
'properties': {
'process_throttle_secs': {'type': 'number'}
'process_throttle_secs': {'type': 'number'},
'interval': {'type': 'integer'}
}
}
},
@@ -417,6 +419,7 @@ CONF_SCHEMA = {
],
'required': [
'max_open_trades',
'ticker_interval',
'stake_currency',
'stake_amount',
'fiat_display_currency',