From 3de0b78934113bff6d697bb340389f4609fc08fa Mon Sep 17 00:00:00 2001 From: Jean-Baptiste LE STANG Date: Fri, 29 Dec 2017 23:29:21 +0100 Subject: [PATCH 1/8] Add the ability to have a dynamic stake_amount based on the balance. the stake_amount in the conf is used has the maximum stake_amount authorized --- config.json.example | 1 + freqtrade/main.py | 13 ++++++++++--- freqtrade/misc.py | 3 ++- freqtrade/tests/test_main.py | 16 ++++++++-------- freqtrade/tests/test_rpc_telegram.py | 18 +++++++++--------- 5 files changed, 30 insertions(+), 21 deletions(-) diff --git a/config.json.example b/config.json.example index f94e423eb..33672ef5d 100644 --- a/config.json.example +++ b/config.json.example @@ -33,6 +33,7 @@ }, "experimental": { "use_sell_signal": false + "auto_stake_amount": false }, "telegram": { "enabled": true, diff --git a/freqtrade/main.py b/freqtrade/main.py index ad7cc7289..7b747b71b 100755 --- a/freqtrade/main.py +++ b/freqtrade/main.py @@ -72,8 +72,15 @@ def _process(dynamic_whitelist: Optional[int] = 0) -> bool: trades = Trade.query.filter(Trade.is_open.is_(True)).all() if len(trades) < _CONF['max_open_trades']: try: + balance = exchange.get_balance(_CONF['stake_currency']) + stake_amount = float(_CONF['stake_amount']) + if _CONF.get('experimental', {}).get('auto_stake_amount'): + #Numbers of trading slots available + nb_trades_left = float(_CONF['max_open_trades'] - len (trades)) + #stake_amount in the conf is being used as the max value authorized + stake_amount = min(_CONF['stake_amount'], balance / nb_trades_left) # Create entity and execute trade - state_changed = create_trade(float(_CONF['stake_amount'])) + state_changed = create_trade(stake_amount, balance) if not state_changed: logger.info( 'Checked all whitelisted currencies. ' @@ -203,7 +210,7 @@ def get_target_bid(ticker: Dict[str, float]) -> float: return ticker['ask'] + balance * (ticker['last'] - ticker['ask']) -def create_trade(stake_amount: float) -> bool: +def create_trade(stake_amount: float, balance: float) -> bool: """ Checks the implemented trading indicator(s) for a randomly picked pair, if one pair triggers the buy_signal a new trade record gets created @@ -216,7 +223,7 @@ def create_trade(stake_amount: float) -> bool: ) whitelist = copy.deepcopy(_CONF['exchange']['pair_whitelist']) # Check if stake_amount is fulfilled - if exchange.get_balance(_CONF['stake_currency']) < stake_amount: + if balance < stake_amount: raise DependencyException( 'stake amount is not fulfilled (currency={})'.format(_CONF['stake_currency']) ) diff --git a/freqtrade/misc.py b/freqtrade/misc.py index 57e7c6735..70e9f16f1 100644 --- a/freqtrade/misc.py +++ b/freqtrade/misc.py @@ -234,7 +234,8 @@ CONF_SCHEMA = { 'experimental': { 'type': 'object', 'properties': { - 'use_sell_signal': {'type': 'boolean'} + 'use_sell_signal': {'type': 'boolean'}, + 'auto_stake_amount': {'type': 'boolean'} } }, 'telegram': { diff --git a/freqtrade/tests/test_main.py b/freqtrade/tests/test_main.py index 3d6335572..fa8480897 100644 --- a/freqtrade/tests/test_main.py +++ b/freqtrade/tests/test_main.py @@ -116,7 +116,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) + create_trade(0.001,1) trade = Trade.query.first() assert trade is not None @@ -146,7 +146,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) + create_trade(min_stake_amount, 1) rate, amount = buy_mock.call_args[0][1], buy_mock.call_args[0][2] assert rate * amount >= min_stake_amount @@ -161,7 +161,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']) + create_trade(default_conf['stake_amount'], default_conf['stake_amount'] - 0.0001) def test_create_trade_no_pairs(default_conf, ticker, mocker): @@ -177,7 +177,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']) + create_trade(default_conf['stake_amount'], default_conf['stake_amount']) def test_handle_trade(default_conf, limit_buy_order, limit_sell_order, mocker): @@ -197,7 +197,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) + create_trade(0.001,1) trade = Trade.query.first() assert trade @@ -230,7 +230,7 @@ def test_handle_trade_roi(default_conf, ticker, limit_buy_order, mocker, caplog) mocker.patch('freqtrade.main.min_roi_reached', return_value=True) init(default_conf, create_engine('sqlite://')) - create_trade(0.001) + create_trade(0.001,1) trade = Trade.query.first() trade.is_open = True @@ -262,7 +262,7 @@ def test_handle_trade_experimental(default_conf, ticker, limit_buy_order, mocker mocker.patch('freqtrade.main.min_roi_reached', return_value=False) init(default_conf, create_engine('sqlite://')) - create_trade(0.001) + create_trade(0.001,1) trade = Trade.query.first() trade.is_open = True @@ -288,7 +288,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) + create_trade(0.001,1) trade = Trade.query.first() assert trade diff --git a/freqtrade/tests/test_rpc_telegram.py b/freqtrade/tests/test_rpc_telegram.py index 5a5765ba2..8a701b29b 100644 --- a/freqtrade/tests/test_rpc_telegram.py +++ b/freqtrade/tests/test_rpc_telegram.py @@ -102,7 +102,7 @@ def test_status_handle(default_conf, update, ticker, mocker): msg_mock.reset_mock() # Create some test data - create_trade(0.001) + create_trade(0.001,1) # Trigger status while we have a fulfilled order for the open trade _status(bot=MagicMock(), update=update) @@ -138,7 +138,7 @@ def test_status_table_handle(default_conf, update, ticker, mocker): msg_mock.reset_mock() # Create some test data - create_trade(15.0) + create_trade(15.0,15.0) _status_table(bot=MagicMock(), update=update) @@ -175,7 +175,7 @@ def test_profit_handle( msg_mock.reset_mock() # Create some test data - create_trade(0.001) + create_trade(0.001,1) trade = Trade.query.first() # Simulate fulfilled LIMIT_BUY order for trade @@ -224,7 +224,7 @@ def test_forcesell_handle(default_conf, update, ticker, ticker_sell_up, mocker): init(default_conf, create_engine('sqlite://')) # Create some test data - create_trade(0.001) + create_trade(0.001,1) trade = Trade.query.first() assert trade @@ -261,7 +261,7 @@ def test_forcesell_down_handle(default_conf, update, ticker, ticker_sell_down, m init(default_conf, create_engine('sqlite://')) # Create some test data - create_trade(0.001) + create_trade(0.001,1) # Decrease the price and sell it mocker.patch.multiple('freqtrade.main.exchange', @@ -323,7 +323,7 @@ def test_forcesell_all_handle(default_conf, update, ticker, mocker): # Create some test data for _ in range(4): - create_trade(0.001) + create_trade(0.001, 1) rpc_mock.reset_mock() update.message.text = '/forcesell all' @@ -388,7 +388,7 @@ def test_performance_handle( init(default_conf, create_engine('sqlite://')) # Create some test data - create_trade(0.001) + create_trade(0.001,1) trade = Trade.query.first() assert trade @@ -426,7 +426,7 @@ def test_daily_handle( init(default_conf, create_engine('sqlite://')) # Create some test data - create_trade(0.001) + create_trade(0.001,1) trade = Trade.query.first() assert trade @@ -479,7 +479,7 @@ def test_count_handle(default_conf, update, ticker, mocker): update_state(State.RUNNING) # Create some test data - create_trade(0.001) + create_trade(0.001,1) msg_mock.reset_mock() _count(bot=MagicMock(), update=update) From ce13a706723634227e9e2b9125af5158076f0237 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste LE STANG Date: Fri, 29 Dec 2017 23:41:22 +0100 Subject: [PATCH 2/8] Add unittest for auto_stake_amount use cases --- freqtrade/tests/test_main.py | 55 ++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/freqtrade/tests/test_main.py b/freqtrade/tests/test_main.py index fa8480897..cf1264175 100644 --- a/freqtrade/tests/test_main.py +++ b/freqtrade/tests/test_main.py @@ -164,6 +164,61 @@ def test_create_trade_no_stake_amount(default_conf, ticker, mocker): create_trade(default_conf['stake_amount'], default_conf['stake_amount'] - 0.0001) +def test_create_trade_dynamic_stake_amount_under_maximum(default_conf, ticker, mocker): + mocker.patch.dict('freqtrade.main._CONF', default_conf) + mocker.patch('freqtrade.main.get_signal', side_effect=lambda s, t: True) + mocker.patch.multiple('freqtrade.rpc', init=MagicMock(), send_msg=MagicMock()) + mocker.patch.multiple('freqtrade.main.exchange', + validate_pairs=MagicMock(), + get_ticker=ticker, + buy=MagicMock(return_value='mocked_limit_buy'), + get_balance=MagicMock(return_value=0.05)) + init(default_conf, create_engine('sqlite://')) + + trades = Trade.query.filter(Trade.is_open.is_(True)).all() + assert not trades + + result = _process() + assert result is True + + trades = Trade.query.filter(Trade.is_open.is_(True)).all() + assert len(trades) == 1 + trade = trades[0] + assert trade is not None + assert trade.stake_amount == min(float(0.05)/default_conf['max_open_trades'], default_conf['stake_amount']) + assert trade.is_open + assert trade.open_date is not None + assert trade.exchange == Exchanges.BITTREX.name + assert trade.open_rate == 0.00001099 + +def test_create_trade_dynamic_stake_amount_over_maximum(default_conf, ticker, mocker): + mocker.patch.dict('freqtrade.main._CONF', default_conf) + mocker.patch('freqtrade.main.get_signal', side_effect=lambda s, t: True) + mocker.patch.multiple('freqtrade.rpc', init=MagicMock(), send_msg=MagicMock()) + mocker.patch.multiple('freqtrade.main.exchange', + validate_pairs=MagicMock(), + get_ticker=ticker, + buy=MagicMock(return_value='mocked_limit_buy'), + get_balance=MagicMock(return_value=10)) + init(default_conf, create_engine('sqlite://')) + + trades = Trade.query.filter(Trade.is_open.is_(True)).all() + assert not trades + + result = _process() + assert result is True + + trades = Trade.query.filter(Trade.is_open.is_(True)).all() + assert len(trades) == 1 + trade = trades[0] + assert trade is not None + assert trade.stake_amount == min(float(10)/default_conf['max_open_trades'], default_conf['stake_amount']) + assert trade.is_open + assert trade.open_date is not None + assert trade.exchange == Exchanges.BITTREX.name + assert trade.open_rate == 0.00001099 + + def test_create_trade_no_pairs(default_conf, ticker, mocker): mocker.patch.dict('freqtrade.main._CONF', default_conf) mocker.patch('freqtrade.main.get_signal', side_effect=lambda s, t: True) From 2c8f3858deece344a6eb212eda71f9ee3b575263 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste LE STANG Date: Fri, 29 Dec 2017 23:42:02 +0100 Subject: [PATCH 3/8] fix config.json.example --- config.json.example | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.json.example b/config.json.example index 33672ef5d..0e0880a1b 100644 --- a/config.json.example +++ b/config.json.example @@ -32,7 +32,7 @@ ] }, "experimental": { - "use_sell_signal": false + "use_sell_signal": false, "auto_stake_amount": false }, "telegram": { From 6cce072d4bd829187ff27a2636a0233dec47666b Mon Sep 17 00:00:00 2001 From: Jean-Baptiste LE STANG Date: Sat, 30 Dec 2017 00:05:12 +0100 Subject: [PATCH 4/8] UnitTest with the real test --- freqtrade/main.py | 2 ++ freqtrade/tests/test_main.py | 22 ++++++++++------------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/freqtrade/main.py b/freqtrade/main.py index 7b747b71b..f4e0043a5 100755 --- a/freqtrade/main.py +++ b/freqtrade/main.py @@ -77,8 +77,10 @@ def _process(dynamic_whitelist: Optional[int] = 0) -> bool: if _CONF.get('experimental', {}).get('auto_stake_amount'): #Numbers of trading slots available nb_trades_left = float(_CONF['max_open_trades'] - len (trades)) + print("nb_trades_left "+str(nb_trades_left)) #stake_amount in the conf is being used as the max value authorized stake_amount = min(_CONF['stake_amount'], balance / nb_trades_left) + print("stake amount "+str(_CONF['stake_amount'])+" "+str(balance)) # Create entity and execute trade state_changed = create_trade(stake_amount, balance) if not state_changed: diff --git a/freqtrade/tests/test_main.py b/freqtrade/tests/test_main.py index cf1264175..420825392 100644 --- a/freqtrade/tests/test_main.py +++ b/freqtrade/tests/test_main.py @@ -165,6 +165,8 @@ def test_create_trade_no_stake_amount(default_conf, ticker, mocker): def test_create_trade_dynamic_stake_amount_under_maximum(default_conf, ticker, mocker): + default_conf.update({'experimental': {'auto_stake_amount': True}}) + default_conf.update({'max_open_trades': 2}) mocker.patch.dict('freqtrade.main._CONF', default_conf) mocker.patch('freqtrade.main.get_signal', side_effect=lambda s, t: True) mocker.patch.multiple('freqtrade.rpc', init=MagicMock(), send_msg=MagicMock()) @@ -172,7 +174,7 @@ def test_create_trade_dynamic_stake_amount_under_maximum(default_conf, ticker, m validate_pairs=MagicMock(), get_ticker=ticker, buy=MagicMock(return_value='mocked_limit_buy'), - get_balance=MagicMock(return_value=0.05)) + get_balance=MagicMock(return_value=0.0015)) init(default_conf, create_engine('sqlite://')) trades = Trade.query.filter(Trade.is_open.is_(True)).all() @@ -185,13 +187,12 @@ def test_create_trade_dynamic_stake_amount_under_maximum(default_conf, ticker, m assert len(trades) == 1 trade = trades[0] assert trade is not None - assert trade.stake_amount == min(float(0.05)/default_conf['max_open_trades'], default_conf['stake_amount']) + assert trade.stake_amount == float(0.0015)/default_conf['max_open_trades'] assert trade.is_open - assert trade.open_date is not None - assert trade.exchange == Exchanges.BITTREX.name - assert trade.open_rate == 0.00001099 -def test_create_trade_dynamic_stake_amount_over_maximum(default_conf, ticker, mocker): +def test_create_trade_dynamic_dynamic_stake_amount_over_maximum(default_conf, ticker, mocker): + default_conf.update({'experimental': {'auto_stake_amount': True}}) + default_conf.update({'max_open_trades': 2}) mocker.patch.dict('freqtrade.main._CONF', default_conf) mocker.patch('freqtrade.main.get_signal', side_effect=lambda s, t: True) mocker.patch.multiple('freqtrade.rpc', init=MagicMock(), send_msg=MagicMock()) @@ -199,7 +200,7 @@ def test_create_trade_dynamic_stake_amount_over_maximum(default_conf, ticker, mo validate_pairs=MagicMock(), get_ticker=ticker, buy=MagicMock(return_value='mocked_limit_buy'), - get_balance=MagicMock(return_value=10)) + get_balance=MagicMock(return_value=1)) init(default_conf, create_engine('sqlite://')) trades = Trade.query.filter(Trade.is_open.is_(True)).all() @@ -207,16 +208,13 @@ def test_create_trade_dynamic_stake_amount_over_maximum(default_conf, ticker, mo result = _process() assert result is True - + print(default_conf['max_open_trades']) trades = Trade.query.filter(Trade.is_open.is_(True)).all() assert len(trades) == 1 trade = trades[0] assert trade is not None - assert trade.stake_amount == min(float(10)/default_conf['max_open_trades'], default_conf['stake_amount']) + assert trade.stake_amount == default_conf['stake_amount'] assert trade.is_open - assert trade.open_date is not None - assert trade.exchange == Exchanges.BITTREX.name - assert trade.open_rate == 0.00001099 def test_create_trade_no_pairs(default_conf, ticker, mocker): From c252ea4d14e808361b51acb892b88443ca59dbed Mon Sep 17 00:00:00 2001 From: Jean-Baptiste LE STANG Date: Sat, 30 Dec 2017 00:13:20 +0100 Subject: [PATCH 5/8] auto_stake_amount to false by default --- freqtrade/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/freqtrade/main.py b/freqtrade/main.py index f4e0043a5..620ca6171 100755 --- a/freqtrade/main.py +++ b/freqtrade/main.py @@ -74,7 +74,7 @@ def _process(dynamic_whitelist: Optional[int] = 0) -> bool: try: balance = exchange.get_balance(_CONF['stake_currency']) stake_amount = float(_CONF['stake_amount']) - if _CONF.get('experimental', {}).get('auto_stake_amount'): + if _CONF.get('experimental', {}).get('auto_stake_amount', False): #Numbers of trading slots available nb_trades_left = float(_CONF['max_open_trades'] - len (trades)) print("nb_trades_left "+str(nb_trades_left)) From 585681c8aeed55d6d1c2f3efb6443a7def4ce0d6 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste LE STANG Date: Sat, 30 Dec 2017 00:18:29 +0100 Subject: [PATCH 6/8] fix flake8 code review --- freqtrade/main.py | 4 ++-- freqtrade/tests/test_main.py | 10 +++++----- freqtrade/tests/test_rpc_telegram.py | 16 ++++++++-------- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/freqtrade/main.py b/freqtrade/main.py index 620ca6171..7b91720d7 100755 --- a/freqtrade/main.py +++ b/freqtrade/main.py @@ -75,10 +75,10 @@ def _process(dynamic_whitelist: Optional[int] = 0) -> bool: balance = exchange.get_balance(_CONF['stake_currency']) stake_amount = float(_CONF['stake_amount']) if _CONF.get('experimental', {}).get('auto_stake_amount', False): - #Numbers of trading slots available + # Numbers of trading slots available nb_trades_left = float(_CONF['max_open_trades'] - len (trades)) print("nb_trades_left "+str(nb_trades_left)) - #stake_amount in the conf is being used as the max value authorized + # Stake_amount in the conf is being used as the max value authorized stake_amount = min(_CONF['stake_amount'], balance / nb_trades_left) print("stake amount "+str(_CONF['stake_amount'])+" "+str(balance)) # Create entity and execute trade diff --git a/freqtrade/tests/test_main.py b/freqtrade/tests/test_main.py index 420825392..ab4f6e33e 100644 --- a/freqtrade/tests/test_main.py +++ b/freqtrade/tests/test_main.py @@ -116,7 +116,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,1) + create_trade(0.001, 1) trade = Trade.query.first() assert trade is not None @@ -250,7 +250,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,1) + create_trade(0.001, 1) trade = Trade.query.first() assert trade @@ -283,7 +283,7 @@ def test_handle_trade_roi(default_conf, ticker, limit_buy_order, mocker, caplog) mocker.patch('freqtrade.main.min_roi_reached', return_value=True) init(default_conf, create_engine('sqlite://')) - create_trade(0.001,1) + create_trade(0.001, 1) trade = Trade.query.first() trade.is_open = True @@ -315,7 +315,7 @@ def test_handle_trade_experimental(default_conf, ticker, limit_buy_order, mocker mocker.patch('freqtrade.main.min_roi_reached', return_value=False) init(default_conf, create_engine('sqlite://')) - create_trade(0.001,1) + create_trade(0.001, 1) trade = Trade.query.first() trade.is_open = True @@ -341,7 +341,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,1) + create_trade(0.001, 1) trade = Trade.query.first() assert trade diff --git a/freqtrade/tests/test_rpc_telegram.py b/freqtrade/tests/test_rpc_telegram.py index 8a701b29b..3b37968f2 100644 --- a/freqtrade/tests/test_rpc_telegram.py +++ b/freqtrade/tests/test_rpc_telegram.py @@ -102,7 +102,7 @@ def test_status_handle(default_conf, update, ticker, mocker): msg_mock.reset_mock() # Create some test data - create_trade(0.001,1) + create_trade(0.001, 1) # Trigger status while we have a fulfilled order for the open trade _status(bot=MagicMock(), update=update) @@ -138,7 +138,7 @@ def test_status_table_handle(default_conf, update, ticker, mocker): msg_mock.reset_mock() # Create some test data - create_trade(15.0,15.0) + create_trade(15.0, 15.0) _status_table(bot=MagicMock(), update=update) @@ -175,7 +175,7 @@ def test_profit_handle( msg_mock.reset_mock() # Create some test data - create_trade(0.001,1) + create_trade(0.001, 1) trade = Trade.query.first() # Simulate fulfilled LIMIT_BUY order for trade @@ -224,7 +224,7 @@ def test_forcesell_handle(default_conf, update, ticker, ticker_sell_up, mocker): init(default_conf, create_engine('sqlite://')) # Create some test data - create_trade(0.001,1) + create_trade(0.001, 1) trade = Trade.query.first() assert trade @@ -261,7 +261,7 @@ def test_forcesell_down_handle(default_conf, update, ticker, ticker_sell_down, m init(default_conf, create_engine('sqlite://')) # Create some test data - create_trade(0.001,1) + create_trade(0.001, 1) # Decrease the price and sell it mocker.patch.multiple('freqtrade.main.exchange', @@ -388,7 +388,7 @@ def test_performance_handle( init(default_conf, create_engine('sqlite://')) # Create some test data - create_trade(0.001,1) + create_trade(0.001, 1) trade = Trade.query.first() assert trade @@ -426,7 +426,7 @@ def test_daily_handle( init(default_conf, create_engine('sqlite://')) # Create some test data - create_trade(0.001,1) + create_trade(0.001, 1) trade = Trade.query.first() assert trade @@ -479,7 +479,7 @@ def test_count_handle(default_conf, update, ticker, mocker): update_state(State.RUNNING) # Create some test data - create_trade(0.001,1) + create_trade(0.001, 1) msg_mock.reset_mock() _count(bot=MagicMock(), update=update) From 50089b7f01257def76218648fc749d7ff2db4fd9 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste LE STANG Date: Sat, 30 Dec 2017 00:25:23 +0100 Subject: [PATCH 7/8] more flake8 complaints --- freqtrade/main.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/freqtrade/main.py b/freqtrade/main.py index 7b91720d7..6680e526a 100755 --- a/freqtrade/main.py +++ b/freqtrade/main.py @@ -76,11 +76,9 @@ def _process(dynamic_whitelist: Optional[int] = 0) -> bool: stake_amount = float(_CONF['stake_amount']) if _CONF.get('experimental', {}).get('auto_stake_amount', False): # Numbers of trading slots available - nb_trades_left = float(_CONF['max_open_trades'] - len (trades)) - print("nb_trades_left "+str(nb_trades_left)) - # Stake_amount in the conf is being used as the max value authorized + nb_trades_left = float(_CONF['max_open_trades'] - len(trades)) + # Stake_amount in the conf is being used as the max value authorized stake_amount = min(_CONF['stake_amount'], balance / nb_trades_left) - print("stake amount "+str(_CONF['stake_amount'])+" "+str(balance)) # Create entity and execute trade state_changed = create_trade(stake_amount, balance) if not state_changed: From 51f6b4d655883b73e750c4c3b630fd0679dc3455 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste LE STANG Date: Sat, 30 Dec 2017 00:29:41 +0100 Subject: [PATCH 8/8] one more flake8 complaints --- freqtrade/tests/test_main.py | 1 + 1 file changed, 1 insertion(+) diff --git a/freqtrade/tests/test_main.py b/freqtrade/tests/test_main.py index ab4f6e33e..6106edacc 100644 --- a/freqtrade/tests/test_main.py +++ b/freqtrade/tests/test_main.py @@ -190,6 +190,7 @@ def test_create_trade_dynamic_stake_amount_under_maximum(default_conf, ticker, m assert trade.stake_amount == float(0.0015)/default_conf['max_open_trades'] assert trade.is_open + def test_create_trade_dynamic_dynamic_stake_amount_over_maximum(default_conf, ticker, mocker): default_conf.update({'experimental': {'auto_stake_amount': True}}) default_conf.update({'max_open_trades': 2})