From 23a566b478ab020910903c525c335d8cdac02f15 Mon Sep 17 00:00:00 2001 From: Matthias Date: Wed, 10 Nov 2021 06:38:24 +0100 Subject: [PATCH] validate_stake_amount should not be a private method --- freqtrade/freqtradebot.py | 2 +- freqtrade/optimize/backtesting.py | 2 +- freqtrade/wallets.py | 4 ++-- tests/test_wallets.py | 6 +++--- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/freqtrade/freqtradebot.py b/freqtrade/freqtradebot.py index 11d79b775..4e004a6ab 100644 --- a/freqtrade/freqtradebot.py +++ b/freqtrade/freqtradebot.py @@ -501,7 +501,7 @@ class FreqtradeBot(LoggingMixin): pair=pair, current_time=datetime.now(timezone.utc), current_rate=enter_limit_requested, proposed_stake=stake_amount, min_stake=min_stake_amount, max_stake=max_stake_amount) - stake_amount = self.wallets._validate_stake_amount(pair, stake_amount, min_stake_amount) + stake_amount = self.wallets.validate_stake_amount(pair, stake_amount, min_stake_amount) if not stake_amount: return False diff --git a/freqtrade/optimize/backtesting.py b/freqtrade/optimize/backtesting.py index 014ec8afc..49957c2bb 100644 --- a/freqtrade/optimize/backtesting.py +++ b/freqtrade/optimize/backtesting.py @@ -431,7 +431,7 @@ class Backtesting: default_retval=stake_amount)( pair=pair, current_time=row[DATE_IDX].to_pydatetime(), current_rate=row[OPEN_IDX], proposed_stake=stake_amount, min_stake=min_stake_amount, max_stake=max_stake_amount) - stake_amount = self.wallets._validate_stake_amount(pair, stake_amount, min_stake_amount) + stake_amount = self.wallets.validate_stake_amount(pair, stake_amount, min_stake_amount) if not stake_amount: return None diff --git a/freqtrade/wallets.py b/freqtrade/wallets.py index 79dfe2544..4357f2a95 100644 --- a/freqtrade/wallets.py +++ b/freqtrade/wallets.py @@ -238,7 +238,7 @@ class Wallets: return self._check_available_stake_amount(stake_amount, available_amount) - def _validate_stake_amount(self, pair, stake_amount, min_stake_amount): + def validate_stake_amount(self, pair, stake_amount, min_stake_amount): if not stake_amount: logger.debug(f"Stake amount is {stake_amount}, ignoring possible trade for {pair}.") return 0 @@ -258,10 +258,10 @@ class Wallets: stake_amount = min_stake_amount if stake_amount > max_stake_amount: - stake_amount = max_stake_amount if self._log: logger.info( f"Stake amount for pair {pair} is too big " f"({stake_amount} > {max_stake_amount}), adjusting to {max_stake_amount}." ) + stake_amount = max_stake_amount return stake_amount diff --git a/tests/test_wallets.py b/tests/test_wallets.py index 53e3b758e..c223a9dd1 100644 --- a/tests/test_wallets.py +++ b/tests/test_wallets.py @@ -189,13 +189,13 @@ def test_get_trade_stake_amount_unlimited_amount(default_conf, ticker, balance_r (1, 15, 10, 0), # Below min stake and min_stake > max_stake ]) -def test__validate_stake_amount(mocker, default_conf, - stake_amount, min_stake_amount, max_stake_amount, expected): +def test_validate_stake_amount(mocker, default_conf, + stake_amount, min_stake_amount, max_stake_amount, expected): freqtrade = get_patched_freqtradebot(mocker, default_conf) mocker.patch("freqtrade.wallets.Wallets.get_available_stake_amount", return_value=max_stake_amount) - res = freqtrade.wallets._validate_stake_amount('XRP/USDT', stake_amount, min_stake_amount) + res = freqtrade.wallets.validate_stake_amount('XRP/USDT', stake_amount, min_stake_amount) assert res == expected