diff --git a/freqtrade/exchange/__init__.py b/freqtrade/exchange/__init__.py index f255647b7..b424660bf 100644 --- a/freqtrade/exchange/__init__.py +++ b/freqtrade/exchange/__init__.py @@ -84,9 +84,11 @@ def get_balance(currency: str) -> float: return EXCHANGE.get_balance(currency) + def get_balances(): return EXCHANGE.get_balances() + def get_ticker(pair: str) -> dict: return EXCHANGE.get_ticker(pair) diff --git a/freqtrade/persistence.py b/freqtrade/persistence.py index fa51b1349..dc9078d5f 100644 --- a/freqtrade/persistence.py +++ b/freqtrade/persistence.py @@ -5,7 +5,6 @@ from sqlalchemy import Boolean, Column, DateTime, Float, Integer, String, create from sqlalchemy.ext.declarative import declarative_base from sqlalchemy.orm.scoping import scoped_session from sqlalchemy.orm.session import sessionmaker -from sqlalchemy.types import Enum from freqtrade import exchange diff --git a/freqtrade/rpc/telegram.py b/freqtrade/rpc/telegram.py index 4cf71586f..fef8c46b5 100644 --- a/freqtrade/rpc/telegram.py +++ b/freqtrade/rpc/telegram.py @@ -202,6 +202,7 @@ def _profit(bot: Bot, update: Update) -> None: ) send_msg(markdown_msg, bot=bot) + @authorized_only def _balance(bot: Bot, update: Update) -> None: """ @@ -222,6 +223,7 @@ def _balance(bot: Bot, update: Update) -> None: send_msg(output) + @authorized_only def _start(bot: Bot, update: Update) -> None: """ diff --git a/freqtrade/tests/test_analyze.py b/freqtrade/tests/test_analyze.py index 0c363e4a3..18d232eef 100644 --- a/freqtrade/tests/test_analyze.py +++ b/freqtrade/tests/test_analyze.py @@ -7,6 +7,7 @@ from pandas import DataFrame from freqtrade.analyze import parse_ticker_dataframe, populate_buy_trend, populate_indicators, \ get_buy_signal + @pytest.fixture def result(): with open('freqtrade/tests/testdata/btc-eth.json') as data_file: @@ -14,18 +15,22 @@ def result(): return parse_ticker_dataframe(data['result']) + def test_dataframe_has_correct_columns(result): assert result.columns.tolist() == \ ['close', 'high', 'low', 'open', 'date', 'volume'] + def test_dataframe_has_correct_length(result): assert len(result.index) == 5751 + def test_populates_buy_trend(result): dataframe = populate_buy_trend(populate_indicators(result)) assert 'buy' in dataframe.columns assert 'buy_price' in dataframe.columns + def test_returns_latest_buy_signal(mocker): buydf = DataFrame([{'buy': 1, 'date': datetime.today()}]) mocker.patch('freqtrade.analyze.analyze_ticker', return_value=buydf) diff --git a/freqtrade/tests/test_backtesting.py b/freqtrade/tests/test_backtesting.py index 7ddab1fd3..4bd04e721 100644 --- a/freqtrade/tests/test_backtesting.py +++ b/freqtrade/tests/test_backtesting.py @@ -13,6 +13,7 @@ from freqtrade.persistence import Trade logging.disable(logging.DEBUG) # disable debug logs that slow backtesting a lot + def format_results(results): return 'Made {} buys. Average profit {:.2f}%. Total profit was {:.3f}. Average duration {:.1f} mins.'.format( len(results.index), @@ -21,15 +22,18 @@ def format_results(results): results.duration.mean() * 5 ) + def print_pair_results(pair, results): print('For currency {}:'.format(pair)) print(format_results(results[results.currency == pair])) + @pytest.fixture def pairs(): return ['btc-neo', 'btc-eth', 'btc-omg', 'btc-edg', 'btc-pay', 'btc-pivx', 'btc-qtum', 'btc-mtl', 'btc-etc', 'btc-ltc'] + @pytest.fixture def conf(): return { @@ -42,6 +46,7 @@ def conf(): "stoploss": -0.40 } + def backtest(conf, pairs, mocker): trades = [] mocked_history = mocker.patch('freqtrade.analyze.get_ticker_history') @@ -66,6 +71,7 @@ def backtest(conf, pairs, mocker): results = DataFrame.from_records(trades, columns=labels) return results + @pytest.mark.skipif(not os.environ.get('BACKTEST', False), reason="BACKTEST not set") def test_backtest(conf, pairs, mocker, report=True): results = backtest(conf, pairs, mocker) diff --git a/freqtrade/tests/test_hyperopt.py b/freqtrade/tests/test_hyperopt.py index d196bbfe4..5fedff519 100644 --- a/freqtrade/tests/test_hyperopt.py +++ b/freqtrade/tests/test_hyperopt.py @@ -23,6 +23,7 @@ def pairs(): return ['btc-neo', 'btc-eth', 'btc-omg', 'btc-edg', 'btc-pay', 'btc-pivx', 'btc-qtum', 'btc-mtl', 'btc-etc', 'btc-ltc'] + @pytest.fixture def conf(): return { @@ -35,8 +36,10 @@ def conf(): "stoploss": -0.05 } + def buy_strategy_generator(params): print(params) + def populate_buy_trend(dataframe: DataFrame) -> DataFrame: conditions = [] # GUARDS AND TRENDS @@ -77,9 +80,11 @@ def buy_strategy_generator(params): return dataframe return populate_buy_trend + @pytest.mark.skipif(not os.environ.get('BACKTEST', False), reason="BACKTEST not set") def test_hyperopt(conf, pairs, mocker): mocked_buy_trend = mocker.patch('freqtrade.analyze.populate_buy_trend') + def optimizer(params): mocked_buy_trend.side_effect = buy_strategy_generator(params) diff --git a/freqtrade/tests/test_main.py b/freqtrade/tests/test_main.py index 050d21ad4..67e66bd23 100644 --- a/freqtrade/tests/test_main.py +++ b/freqtrade/tests/test_main.py @@ -48,6 +48,7 @@ def conf(): validate(configuration, CONF_SCHEMA) return configuration + def test_create_trade(conf, mocker): mocker.patch.dict('freqtrade.main._CONF', conf) buy_signal = mocker.patch('freqtrade.main.get_buy_signal', side_effect=lambda _: True) @@ -82,6 +83,7 @@ def test_create_trade(conf, mocker): [call('BTC_ETH'), call('BTC_TKN'), call('BTC_TRST'), call('BTC_SWT')] ) + def test_handle_trade(conf, mocker): mocker.patch.dict('freqtrade.main._CONF', conf) mocker.patch.multiple('freqtrade.main.telegram', init=MagicMock(), send_msg=MagicMock()) @@ -101,6 +103,7 @@ def test_handle_trade(conf, mocker): assert trade.close_date is not None assert trade.open_order_id == 'dry_run' + def test_close_trade(conf, mocker): mocker.patch.dict('freqtrade.main._CONF', conf) trade = Trade.query.filter(Trade.is_open.is_(True)).first() @@ -113,14 +116,17 @@ def test_close_trade(conf, mocker): assert closed assert not trade.is_open + def test_balance_fully_ask_side(mocker): mocker.patch.dict('freqtrade.main._CONF', {'bid_strategy': {'ask_last_balance': 0.0}}) assert get_target_bid({'ask': 20, 'last': 10}) == 20 + def test_balance_fully_last_side(mocker): mocker.patch.dict('freqtrade.main._CONF', {'bid_strategy': {'ask_last_balance': 1.0}}) assert get_target_bid({'ask': 20, 'last': 10}) == 10 + def test_balance_when_last_bigger_than_ask(mocker): mocker.patch.dict('freqtrade.main._CONF', {'bid_strategy': {'ask_last_balance': 1.0}}) assert get_target_bid({'ask': 5, 'last': 10}) == 5 diff --git a/freqtrade/tests/test_persistence.py b/freqtrade/tests/test_persistence.py index 8cf280130..6a74ad715 100644 --- a/freqtrade/tests/test_persistence.py +++ b/freqtrade/tests/test_persistence.py @@ -2,6 +2,7 @@ from freqtrade.exchange import Exchanges from freqtrade.persistence import Trade + def test_exec_sell_order(mocker): api_mock = mocker.patch('freqtrade.main.exchange.sell', side_effect='mocked_order_id') trade = Trade( diff --git a/freqtrade/tests/test_telegram.py b/freqtrade/tests/test_telegram.py index c6c5902c5..354abb086 100644 --- a/freqtrade/tests/test_telegram.py +++ b/freqtrade/tests/test_telegram.py @@ -82,6 +82,7 @@ def test_status_handle(conf, update, mocker): assert msg_mock.call_count == 2 assert '[BTC_ETH]' in msg_mock.call_args_list[-1][0][0] + def test_profit_handle(conf, update, mocker): mocker.patch.dict('freqtrade.main._CONF', conf) mocker.patch('freqtrade.main.get_buy_signal', side_effect=lambda _: True) @@ -112,6 +113,7 @@ def test_profit_handle(conf, update, mocker): assert msg_mock.call_count == 2 assert '(100.00%)' in msg_mock.call_args_list[-1][0][0] + def test_forcesell_handle(conf, update, mocker): mocker.patch.dict('freqtrade.main._CONF', conf) mocker.patch('freqtrade.main.get_buy_signal', side_effect=lambda _: True) @@ -140,6 +142,7 @@ def test_forcesell_handle(conf, update, mocker): assert 'Selling [BTC/ETH]' in msg_mock.call_args_list[-1][0][0] assert '0.072561' in msg_mock.call_args_list[-1][0][0] + def test_performance_handle(conf, update, mocker): mocker.patch.dict('freqtrade.main._CONF', conf) mocker.patch('freqtrade.main.get_buy_signal', side_effect=lambda _: True) @@ -171,6 +174,7 @@ def test_performance_handle(conf, update, mocker): assert 'Performance' in msg_mock.call_args_list[-1][0][0] assert 'BTC_ETH 100.00%' in msg_mock.call_args_list[-1][0][0] + def test_start_handle(conf, update, mocker): mocker.patch.dict('freqtrade.main._CONF', conf) msg_mock = MagicMock() @@ -184,6 +188,7 @@ def test_start_handle(conf, update, mocker): assert get_state() == State.RUNNING assert msg_mock.call_count == 0 + def test_stop_handle(conf, update, mocker): mocker.patch.dict('freqtrade.main._CONF', conf) msg_mock = MagicMock() @@ -198,6 +203,7 @@ def test_stop_handle(conf, update, mocker): assert msg_mock.call_count == 1 assert 'Stopping trader' in msg_mock.call_args_list[0][0][0] + def test_balance_handle(conf, update, mocker): mock_balance = [{ 'Currency': 'BTC',