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

base position on stake amount instead of total capital

This commit is contained in:
misagh 2018-11-10 18:22:34 +01:00
parent 7dd74c374a
commit d613553306
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
freqtrade/edge/__init__.py
View File

@ -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

8
freqtrade/tests/test_freqtradebot.py
View File

@ -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: