From d61355330679a8e45949c141b739261ba426440b Mon Sep 17 00:00:00 2001 From: misagh Date: Sat, 10 Nov 2018 18:22:34 +0100 Subject: [PATCH] base position on stake amount instead of total capital --- freqtrade/edge/__init__.py | 2 +- freqtrade/tests/test_freqtradebot.py | 8 ++------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/freqtrade/edge/__init__.py b/freqtrade/edge/__init__.py index a468a76a3..31d70add1 100644 --- a/freqtrade/edge/__init__.py +++ b/freqtrade/edge/__init__.py @@ -49,7 +49,7 @@ class Edge(): self.edge_config = self.config.get('edge', {}) self._cached_pairs: Dict[str, Any] = {} # Keeps a list of pairs - self._total_capital: float = self.edge_config.get('total_capital_in_stake_currency') + self._total_capital: float = self.config.get('stake_amount') self._allowed_risk: float = self.edge_config.get('allowed_risk') self._since_number_of_days: int = self.edge_config.get('calculate_since_number_of_days', 14) self._last_updated: int = 0 # Timestamp of pairs last updated time diff --git a/freqtrade/tests/test_freqtradebot.py b/freqtrade/tests/test_freqtradebot.py index 66c5d6a1c..4cba9e308 100644 --- a/freqtrade/tests/test_freqtradebot.py +++ b/freqtrade/tests/test_freqtradebot.py @@ -267,12 +267,8 @@ def test_edge_overrides_stake_amount(mocker, edge_conf) -> None: patch_edge(mocker) freqtrade = FreqtradeBot(edge_conf) - # strategy stoploss should be ignored - freqtrade.strategy.stoploss = -0.05 - - assert 'ETH/BTC' not in freqtrade.edge._cached_pairs - assert freqtrade._get_trade_stake_amount('NEO/BTC') == 0.025 - assert freqtrade._get_trade_stake_amount('LTC/BTC') == 0.02381 + assert freqtrade._get_trade_stake_amount('NEO/BTC') == (0.001 * 0.01) / 0.20 + assert freqtrade._get_trade_stake_amount('LTC/BTC') == (0.001 * 0.01) / 0.20 def test_edge_overrides_stoploss(limit_buy_order, fee, markets, caplog, mocker, edge_conf) -> None: