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

Change ticker_interval from integer to string (1m, 5m, 1d, ...)

Browse Source
This commit is contained in:
enenn
2018-02-04 19:41:49 +01:00
parent 1c64b7b0a7
commit e6181fee0e
14 changed files with 193 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files

88
freqtrade/tests/test_main.py
View File

@@ -31,7 +31,7 @@ def test_parse_args_backtesting(mocker):
assert call_args.loglevel == 20
assert call_args.subparser == 'backtesting'
assert call_args.func is not None
assert call_args.ticker_interval == 5
assert call_args.ticker_interval == '5m'
def test_main_start_hyperopt(mocker):
@@ -49,9 +49,9 @@ def test_main_start_hyperopt(mocker):
def test_process_maybe_execute_buy(default_conf, mocker):
mocker.patch.dict('freqtrade.main._CONF', default_conf)
mocker.patch('freqtrade.main.create_trade', return_value=True)
assert main.process_maybe_execute_buy(int(default_conf['ticker_interval']))
assert main.process_maybe_execute_buy(default_conf['ticker_interval'])
mocker.patch('freqtrade.main.create_trade', return_value=False)
assert not main.process_maybe_execute_buy(int(default_conf['ticker_interval']))
assert not main.process_maybe_execute_buy(default_conf['ticker_interval'])
def test_process_maybe_execute_sell(default_conf, mocker):
@@ -60,17 +60,17 @@ def test_process_maybe_execute_sell(default_conf, mocker):
mocker.patch('freqtrade.exchange.get_order', return_value=1)
trade = MagicMock()
trade.open_order_id = '123'
assert not main.process_maybe_execute_sell(trade, int(default_conf['ticker_interval']))
assert not main.process_maybe_execute_sell(trade, default_conf['ticker_interval'])
trade.is_open = True
trade.open_order_id = None
# Assert we call handle_trade() if trade is feasible for execution
assert main.process_maybe_execute_sell(trade, int(default_conf['ticker_interval']))
assert main.process_maybe_execute_sell(trade, default_conf['ticker_interval'])
def test_process_maybe_execute_buy_exception(default_conf, mocker, caplog):
mocker.patch.dict('freqtrade.main._CONF', default_conf)
mocker.patch('freqtrade.main.create_trade', MagicMock(side_effect=DependencyException))
main.process_maybe_execute_buy(int(default_conf['ticker_interval']))
main.process_maybe_execute_buy(default_conf['ticker_interval'])
tt.log_has('Unable to create trade:', caplog.record_tuples)
@@ -88,7 +88,7 @@ def test_process_trade_creation(default_conf, ticker, limit_buy_order, health, m
trades = Trade.query.filter(Trade.is_open.is_(True)).all()
assert not trades
result = _process(interval=int(default_conf['ticker_interval']))
result = _process(interval=default_conf['ticker_interval'])
assert result is True
trades = Trade.query.filter(Trade.is_open.is_(True)).all()
@@ -113,7 +113,7 @@ def test_process_exchange_failures(default_conf, ticker, health, mocker):
get_ticker=ticker,
buy=MagicMock(side_effect=requests.exceptions.RequestException))
init(default_conf, create_engine('sqlite://'))
result = _process(interval=int(default_conf['ticker_interval']))
result = _process(interval=default_conf['ticker_interval'])
assert result is False
assert sleep_mock.has_calls()
@@ -130,7 +130,7 @@ def test_process_operational_exception(default_conf, ticker, health, mocker):
init(default_conf, create_engine('sqlite://'))
assert get_state() == State.RUNNING
result = _process(interval=int(default_conf['ticker_interval']))
result = _process(interval=default_conf['ticker_interval'])
assert result is False
assert get_state() == State.STOPPED
assert 'OperationalException' in msg_mock.call_args_list[-1][0][0]
@@ -149,12 +149,12 @@ def test_process_trade_handling(default_conf, ticker, limit_buy_order, health, m
trades = Trade.query.filter(Trade.is_open.is_(True)).all()
assert not trades
result = _process(interval=int(default_conf['ticker_interval']))
result = _process(interval=default_conf['ticker_interval'])
assert result is True
trades = Trade.query.filter(Trade.is_open.is_(True)).all()
assert len(trades) == 1
result = _process(interval=int(default_conf['ticker_interval']))
result = _process(interval=default_conf['ticker_interval'])
assert result is False
@@ -170,7 +170,7 @@ def test_create_trade(default_conf, ticker, limit_buy_order, mocker):
whitelist = copy.deepcopy(default_conf['exchange']['pair_whitelist'])
init(default_conf, create_engine('sqlite://'))
create_trade(0.001, int(default_conf['ticker_interval']))
create_trade(0.001, default_conf['ticker_interval'])
trade = Trade.query.first()
assert trade is not None
@@ -200,7 +200,7 @@ def test_create_trade_minimal_amount(default_conf, ticker, mocker):
get_ticker=ticker)
init(default_conf, create_engine('sqlite://'))
min_stake_amount = 0.0005
create_trade(min_stake_amount, int(default_conf['ticker_interval']))
create_trade(min_stake_amount, default_conf['ticker_interval'])
rate, amount = buy_mock.call_args[0][1], buy_mock.call_args[0][2]
assert rate * amount >= min_stake_amount
@@ -215,7 +215,7 @@ def test_create_trade_no_stake_amount(default_conf, ticker, mocker):
buy=MagicMock(return_value='mocked_limit_buy'),
get_balance=MagicMock(return_value=default_conf['stake_amount'] * 0.5))
with pytest.raises(DependencyException, match=r'.*stake amount.*'):
create_trade(default_conf['stake_amount'], int(default_conf['ticker_interval']))
create_trade(default_conf['stake_amount'], default_conf['ticker_interval'])
def test_create_trade_no_pairs(default_conf, ticker, mocker):
@@ -231,7 +231,7 @@ def test_create_trade_no_pairs(default_conf, ticker, mocker):
conf = copy.deepcopy(default_conf)
conf['exchange']['pair_whitelist'] = []
mocker.patch.dict('freqtrade.main._CONF', conf)
create_trade(default_conf['stake_amount'], int(default_conf['ticker_interval']))
create_trade(default_conf['stake_amount'], default_conf['ticker_interval'])
def test_create_trade_no_pairs_after_blacklist(default_conf, ticker, mocker):
@@ -248,7 +248,7 @@ def test_create_trade_no_pairs_after_blacklist(default_conf, ticker, mocker):
conf['exchange']['pair_whitelist'] = ["ETH/BTC"]
conf['exchange']['pair_blacklist'] = ["ETH/BTC"]
mocker.patch.dict('freqtrade.main._CONF', conf)
create_trade(default_conf['stake_amount'], int(default_conf['ticker_interval']))
create_trade(default_conf['stake_amount'], default_conf['ticker_interval'])
def test_create_trade_no_signal(default_conf, mocker):
@@ -262,7 +262,7 @@ def test_create_trade_no_signal(default_conf, mocker):
stake_amount = 10
Trade.query = MagicMock()
Trade.query.filter = MagicMock()
assert not create_trade(stake_amount, int(default_conf['ticker_interval']))
assert not create_trade(stake_amount, default_conf['ticker_interval'])
def test_handle_trade(default_conf, limit_buy_order, limit_sell_order, mocker):
@@ -283,7 +283,7 @@ def test_handle_trade(default_conf, limit_buy_order, limit_sell_order, mocker):
ticker=MagicMock(return_value={'price_usd': 15000.0}),
_cache_symbols=MagicMock(return_value={'BTC': 1}))
init(default_conf, create_engine('sqlite://'))
create_trade(0.001, int(default_conf['ticker_interval']))
create_trade(0.001, default_conf['ticker_interval'])
trade = Trade.query.first()
assert trade
@@ -292,7 +292,7 @@ def test_handle_trade(default_conf, limit_buy_order, limit_sell_order, mocker):
assert trade.is_open is True
mocker.patch('freqtrade.main.get_signal', side_effect=lambda s, t: (False, True))
assert handle_trade(trade, int(default_conf['ticker_interval'])) is True
assert handle_trade(trade, default_conf['ticker_interval']) is True
assert trade.open_order_id == 'mocked_limit_sell'
# Simulate fulfilled LIMIT_SELL order for trade
@@ -317,7 +317,7 @@ def test_handle_overlpapping_signals(default_conf, ticker, mocker):
mocker.patch('freqtrade.main.min_roi_reached', return_value=False)
init(default_conf, create_engine('sqlite://'))
create_trade(0.001, int(default_conf['ticker_interval']))
create_trade(0.001, default_conf['ticker_interval'])
# Buy and Sell triggering, so doing nothing ...
trades = Trade.query.all()
@@ -326,7 +326,7 @@ def test_handle_overlpapping_signals(default_conf, ticker, mocker):
# Buy is triggering, so buying ...
mocker.patch('freqtrade.main.get_signal', side_effect=lambda s, t: (True, False))
create_trade(0.001, int(default_conf['ticker_interval']))
create_trade(0.001, default_conf['ticker_interval'])
trades = Trade.query.all()
nb_trades = len(trades)
assert nb_trades == 1
@@ -334,7 +334,7 @@ def test_handle_overlpapping_signals(default_conf, ticker, mocker):
# Buy and Sell are not triggering, so doing nothing ...
mocker.patch('freqtrade.main.get_signal', side_effect=lambda s, t: (False, False))
assert handle_trade(trades[0], int(default_conf['ticker_interval'])) is False
assert handle_trade(trades[0], default_conf['ticker_interval']) is False
trades = Trade.query.all()
nb_trades = len(trades)
assert nb_trades == 1
@@ -342,7 +342,7 @@ def test_handle_overlpapping_signals(default_conf, ticker, mocker):
# Buy and Sell are triggering, so doing nothing ...
mocker.patch('freqtrade.main.get_signal', side_effect=lambda s, t: (True, True))
assert handle_trade(trades[0], int(default_conf['ticker_interval'])) is False
assert handle_trade(trades[0], default_conf['ticker_interval']) is False
trades = Trade.query.all()
nb_trades = len(trades)
assert nb_trades == 1
@@ -351,7 +351,7 @@ def test_handle_overlpapping_signals(default_conf, ticker, mocker):
# Sell is triggering, guess what : we are Selling!
mocker.patch('freqtrade.main.get_signal', side_effect=lambda s, t: (False, True))
trades = Trade.query.all()
assert handle_trade(trades[0], int(default_conf['ticker_interval'])) is True
assert handle_trade(trades[0], default_conf['ticker_interval']) is True
def test_handle_trade_roi(default_conf, ticker, mocker, caplog):
@@ -367,7 +367,7 @@ def test_handle_trade_roi(default_conf, ticker, mocker, caplog):
mocker.patch('freqtrade.main.min_roi_reached', return_value=True)
init(default_conf, create_engine('sqlite://'))
create_trade(0.001, int(default_conf['ticker_interval']))
create_trade(0.001, default_conf['ticker_interval'])
trade = Trade.query.first()
trade.is_open = True
@@ -378,11 +378,11 @@ def test_handle_trade_roi(default_conf, ticker, mocker, caplog):
# executing
# if ROI is reached we must sell
mocker.patch('freqtrade.main.get_signal', side_effect=lambda s, t: (False, True))
assert handle_trade(trade, interval=int(default_conf['ticker_interval']))
assert handle_trade(trade, interval=default_conf['ticker_interval'])
assert ('freqtrade', logging.DEBUG, 'Executing sell due to ROI ...') in caplog.record_tuples
# if ROI is reached we must sell even if sell-signal is not signalled
mocker.patch('freqtrade.main.get_signal', side_effect=lambda s, t: (False, True))
assert handle_trade(trade, interval=int(default_conf['ticker_interval']))
assert handle_trade(trade, interval=default_conf['ticker_interval'])
assert ('freqtrade', logging.DEBUG, 'Executing sell due to ROI ...') in caplog.record_tuples
@@ -399,16 +399,16 @@ def test_handle_trade_experimental(default_conf, ticker, mocker, caplog):
mocker.patch('freqtrade.main.min_roi_reached', return_value=False)
init(default_conf, create_engine('sqlite://'))
create_trade(0.001, int(default_conf['ticker_interval']))
create_trade(0.001, default_conf['ticker_interval'])
trade = Trade.query.first()
trade.is_open = True
mocker.patch('freqtrade.main.get_signal', side_effect=lambda s, t: (False, False))
value_returned = handle_trade(trade, int(default_conf['ticker_interval']))
value_returned = handle_trade(trade, default_conf['ticker_interval'])
assert value_returned is False
mocker.patch('freqtrade.main.get_signal', side_effect=lambda s, t: (False, True))
assert handle_trade(trade, int(default_conf['ticker_interval']))
assert handle_trade(trade, default_conf['ticker_interval'])
s = 'Executing sell due to sell signal ...'
assert ('freqtrade', logging.DEBUG, s) in caplog.record_tuples
@@ -424,7 +424,7 @@ def test_close_trade(default_conf, ticker, limit_buy_order, limit_sell_order, mo
# Create trade and sell it
init(default_conf, create_engine('sqlite://'))
create_trade(0.001, int(default_conf['ticker_interval']))
create_trade(0.001, default_conf['ticker_interval'])
trade = Trade.query.first()
assert trade
@@ -434,7 +434,7 @@ def test_close_trade(default_conf, ticker, limit_buy_order, limit_sell_order, mo
assert trade.is_open is False
with pytest.raises(ValueError, match=r'.*closed trade.*'):
handle_trade(trade, int(default_conf['ticker_interval']))
handle_trade(trade, default_conf['ticker_interval'])
def test_check_handle_timedout_buy(default_conf, ticker, limit_buy_order_old, mocker):
@@ -600,7 +600,7 @@ def test_execute_sell_up(default_conf, ticker, ticker_sell_up, mocker):
init(default_conf, create_engine('sqlite://'))
# Create some test data
create_trade(0.001, int(default_conf['ticker_interval']))
create_trade(0.001, default_conf['ticker_interval'])
trade = Trade.query.first()
assert trade
@@ -640,7 +640,7 @@ def test_execute_sell_down(default_conf, ticker, ticker_sell_down, mocker):
init(default_conf, create_engine('sqlite://'))
# Create some test data
create_trade(0.001, int(default_conf['ticker_interval']))
create_trade(0.001, default_conf['ticker_interval'])
trade = Trade.query.first()
assert trade
@@ -673,7 +673,7 @@ def test_execute_sell_without_conf_sell_down(default_conf, ticker, ticker_sell_d
init(default_conf, create_engine('sqlite://'))
# Create some test data
create_trade(0.001, int(default_conf['ticker_interval']))
create_trade(0.001, default_conf['ticker_interval'])
trade = Trade.query.first()
assert trade
@@ -706,7 +706,7 @@ def test_execute_sell_without_conf_sell_up(default_conf, ticker, ticker_sell_up,
init(default_conf, create_engine('sqlite://'))
# Create some test data
create_trade(0.001, int(default_conf['ticker_interval']))
create_trade(0.001, default_conf['ticker_interval'])
trade = Trade.query.first()
assert trade
@@ -750,12 +750,12 @@ def test_sell_profit_only_enable_profit(default_conf, limit_buy_order, mocker):
buy=MagicMock(return_value='mocked_limit_buy'))
init(default_conf, create_engine('sqlite://'))
create_trade(0.001, int(default_conf['ticker_interval']))
create_trade(0.001, default_conf['ticker_interval'])
trade = Trade.query.first()
trade.update(limit_buy_order)
mocker.patch('freqtrade.main.get_signal', side_effect=lambda s, t: (False, True))
assert handle_trade(trade, int(default_conf['ticker_interval'])) is True
assert handle_trade(trade, default_conf['ticker_interval']) is True
def test_sell_profit_only_disable_profit(default_conf, limit_buy_order, mocker):
@@ -779,12 +779,12 @@ def test_sell_profit_only_disable_profit(default_conf, limit_buy_order, mocker):
buy=MagicMock(return_value='mocked_limit_buy'))
init(default_conf, create_engine('sqlite://'))
create_trade(0.001, int(default_conf['ticker_interval']))
create_trade(0.001, default_conf['ticker_interval'])
trade = Trade.query.first()
trade.update(limit_buy_order)
mocker.patch('freqtrade.main.get_signal', side_effect=lambda s, t: (False, True))
assert handle_trade(trade, int(default_conf['ticker_interval'])) is True
assert handle_trade(trade, default_conf['ticker_interval']) is True
def test_sell_profit_only_enable_loss(default_conf, limit_buy_order, mocker):
@@ -808,12 +808,12 @@ def test_sell_profit_only_enable_loss(default_conf, limit_buy_order, mocker):
buy=MagicMock(return_value='mocked_limit_buy'))
init(default_conf, create_engine('sqlite://'))
create_trade(0.001, int(default_conf['ticker_interval']))
create_trade(0.001, default_conf['ticker_interval'])
trade = Trade.query.first()
trade.update(limit_buy_order)
mocker.patch('freqtrade.main.get_signal', side_effect=lambda s, t: (False, True))
assert handle_trade(trade, int(default_conf['ticker_interval'])) is False
assert handle_trade(trade, default_conf['ticker_interval']) is False
def test_sell_profit_only_disable_loss(default_conf, limit_buy_order, mocker):
@@ -837,9 +837,9 @@ def test_sell_profit_only_disable_loss(default_conf, limit_buy_order, mocker):
buy=MagicMock(return_value='mocked_limit_buy'))
init(default_conf, create_engine('sqlite://'))
create_trade(0.001, int(default_conf['ticker_interval']))
create_trade(0.001, default_conf['ticker_interval'])
trade = Trade.query.first()
trade.update(limit_buy_order)
mocker.patch('freqtrade.main.get_signal', side_effect=lambda s, t: (False, True))
assert handle_trade(trade, int(default_conf['ticker_interval'])) is True
assert handle_trade(trade, default_conf['ticker_interval']) is True