mohammadian7/freqtrade
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'freqtrade:develop' into feature/setup-win

Browse Source
This commit is contained in:
Simon Waiblinger
2024-05-24 20:47:21 +02:00
committed by GitHub
parent b9fd8d2ee7 2c740059d7
commit 9c816045f1
17 changed files with 286 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/conftest.py
+1 -1
View File
@@ -539,7 +539,7 @@ def patch_coingecko(mocker) -> None:
]
)
mocker.patch.multiple(
"freqtrade.rpc.fiat_convert.CoinGeckoAPI",
"freqtrade.rpc.fiat_convert.FtCoinGeckoApi",
get_price=tickermock,
get_coins_list=listmock,
)
tests/plugins/test_pairlist.py
+2 -2
View File
@@ -2306,7 +2306,7 @@ def test_MarketCapPairList_filter(
)
mocker.patch(
"freqtrade.plugins.pairlist.MarketCapPairList.CoinGeckoAPI.get_coins_markets",
"freqtrade.plugins.pairlist.MarketCapPairList.FtCoinGeckoApi.get_coins_markets",
return_value=test_value,
)
@@ -2344,7 +2344,7 @@ def test_MarketCapPairList_timing(mocker, default_conf_usdt, markets, time_machi
)
mocker.patch(
"freqtrade.plugins.pairlist.MarketCapPairList.CoinGeckoAPI.get_coins_markets",
"freqtrade.plugins.pairlist.MarketCapPairList.FtCoinGeckoApi.get_coins_markets",
return_value=test_value,
)
tests/rpc/test_fiat_convert.py
+49 -25
View File
@@ -8,11 +8,20 @@ import pytest
from requests.exceptions import RequestException
from freqtrade.rpc.fiat_convert import CryptoToFiatConverter
from freqtrade.util.coin_gecko import FtCoinGeckoApi
from tests.conftest import log_has, log_has_re
def test_fiat_convert_is_supported(mocker):
fiat_convert = CryptoToFiatConverter()
def test_fiat_convert_is_singleton():
fiat_convert = CryptoToFiatConverter({"a": 22})
fiat_convert2 = CryptoToFiatConverter({})
assert fiat_convert is fiat_convert2
assert id(fiat_convert) == id(fiat_convert2)
def test_fiat_convert_is_supported():
fiat_convert = CryptoToFiatConverter({})
assert fiat_convert._is_supported_fiat(fiat="USD") is True
assert fiat_convert._is_supported_fiat(fiat="usd") is True
assert fiat_convert._is_supported_fiat(fiat="abc") is False
@@ -20,7 +29,7 @@ def test_fiat_convert_is_supported(mocker):
def test_fiat_convert_find_price(mocker):
fiat_convert = CryptoToFiatConverter()
fiat_convert = CryptoToFiatConverter({})
fiat_convert._coinlistings = {}
fiat_convert._backoff = 0
@@ -48,7 +57,7 @@ def test_fiat_convert_find_price(mocker):
def test_fiat_convert_unsupported_crypto(mocker, caplog):
mocker.patch("freqtrade.rpc.fiat_convert.CryptoToFiatConverter._coinlistings", return_value=[])
fiat_convert = CryptoToFiatConverter()
fiat_convert = CryptoToFiatConverter({})
assert fiat_convert._find_price(crypto_symbol="CRYPTO_123", fiat_symbol="EUR") == 0.0
assert log_has("unsupported crypto-symbol CRYPTO_123 - returning 0.0", caplog)
@@ -58,7 +67,7 @@ def test_fiat_convert_get_price(mocker):
"freqtrade.rpc.fiat_convert.CryptoToFiatConverter._find_price", return_value=28000.0
)
fiat_convert = CryptoToFiatConverter()
fiat_convert = CryptoToFiatConverter({})
with pytest.raises(ValueError, match=r"The fiat us dollar is not supported."):
fiat_convert.get_price(crypto_symbol="btc", fiat_symbol="US Dollar")
@@ -77,20 +86,20 @@ def test_fiat_convert_get_price(mocker):
assert find_price.call_count == 1
def test_fiat_convert_same_currencies(mocker):
fiat_convert = CryptoToFiatConverter()
def test_fiat_convert_same_currencies():
fiat_convert = CryptoToFiatConverter({})
assert fiat_convert.get_price(crypto_symbol="USD", fiat_symbol="USD") == 1.0
def test_fiat_convert_two_FIAT(mocker):
fiat_convert = CryptoToFiatConverter()
def test_fiat_convert_two_FIAT():
fiat_convert = CryptoToFiatConverter({})
assert fiat_convert.get_price(crypto_symbol="USD", fiat_symbol="EUR") == 0.0
def test_loadcryptomap(mocker):
fiat_convert = CryptoToFiatConverter()
def test_loadcryptomap():
fiat_convert = CryptoToFiatConverter({})
assert len(fiat_convert._coinlistings) == 2
assert fiat_convert._get_gecko_id("btc") == "bitcoin"
@@ -100,28 +109,28 @@ def test_fiat_init_network_exception(mocker):
# Because CryptoToFiatConverter is a Singleton we reset the listings
listmock = MagicMock(side_effect=RequestException)
mocker.patch.multiple(
"freqtrade.rpc.fiat_convert.CoinGeckoAPI",
"freqtrade.rpc.fiat_convert.FtCoinGeckoApi",
get_coins_list=listmock,
)
# with pytest.raises(RequestEsxception):
fiat_convert = CryptoToFiatConverter()
fiat_convert = CryptoToFiatConverter({})
fiat_convert._coinlistings = {}
fiat_convert._load_cryptomap()
assert len(fiat_convert._coinlistings) == 0
def test_fiat_convert_without_network(mocker):
def test_fiat_convert_without_network():
# Because CryptoToFiatConverter is a Singleton we reset the value of _coingecko
fiat_convert = CryptoToFiatConverter()
fiat_convert = CryptoToFiatConverter({})
cmc_temp = CryptoToFiatConverter._coingecko
CryptoToFiatConverter._coingecko = None
cmc_temp = fiat_convert._coingecko
fiat_convert._coingecko = None
assert fiat_convert._coingecko is None
assert fiat_convert._find_price(crypto_symbol="btc", fiat_symbol="usd") == 0.0
CryptoToFiatConverter._coingecko = cmc_temp
fiat_convert._coingecko = cmc_temp
def test_fiat_too_many_requests_response(mocker, caplog):
@@ -129,11 +138,11 @@ def test_fiat_too_many_requests_response(mocker, caplog):
req_exception = "429 Too Many Requests"
listmock = MagicMock(return_value="{}", side_effect=RequestException(req_exception))
mocker.patch.multiple(
"freqtrade.rpc.fiat_convert.CoinGeckoAPI",
"freqtrade.rpc.fiat_convert.FtCoinGeckoApi",
get_coins_list=listmock,
)
# with pytest.raises(RequestEsxception):
fiat_convert = CryptoToFiatConverter()
fiat_convert = CryptoToFiatConverter({})
fiat_convert._coinlistings = {}
fiat_convert._load_cryptomap()
@@ -144,8 +153,8 @@ def test_fiat_too_many_requests_response(mocker, caplog):
)
def test_fiat_multiple_coins(mocker, caplog):
fiat_convert = CryptoToFiatConverter()
def test_fiat_multiple_coins(caplog):
fiat_convert = CryptoToFiatConverter({})
fiat_convert._coinlistings = [
{"id": "helium", "symbol": "hnt", "name": "Helium"},
{"id": "hymnode", "symbol": "hnt", "name": "Hymnode"},
@@ -165,11 +174,11 @@ def test_fiat_invalid_response(mocker, caplog):
# Because CryptoToFiatConverter is a Singleton we reset the listings
listmock = MagicMock(return_value=None)
mocker.patch.multiple(
"freqtrade.rpc.fiat_convert.CoinGeckoAPI",
"freqtrade.rpc.fiat_convert.FtCoinGeckoApi",
get_coins_list=listmock,
)
# with pytest.raises(RequestEsxception):
fiat_convert = CryptoToFiatConverter()
fiat_convert = CryptoToFiatConverter({})
fiat_convert._coinlistings = []
fiat_convert._load_cryptomap()
@@ -182,7 +191,7 @@ def test_fiat_invalid_response(mocker, caplog):
def test_convert_amount(mocker):
mocker.patch("freqtrade.rpc.fiat_convert.CryptoToFiatConverter.get_price", return_value=12345.0)
fiat_convert = CryptoToFiatConverter()
fiat_convert = CryptoToFiatConverter({})
result = fiat_convert.convert_amount(crypto_amount=1.23, crypto_symbol="BTC", fiat_symbol="USD")
assert result == 15184.35
@@ -193,3 +202,18 @@ def test_convert_amount(mocker):
crypto_amount="1.23", crypto_symbol="BTC", fiat_symbol="BTC"
)
assert result == 1.23
def test_FtCoinGeckoApi():
ftc = FtCoinGeckoApi()
assert ftc._api_key == ""
assert ftc.api_base_url == "https://api.coingecko.com/api/v3/"
# defaults to demo
ftc = FtCoinGeckoApi(api_key="123456")
assert ftc._api_key == "123456"
assert ftc.api_base_url == "https://api.coingecko.com/api/v3/"
ftc = FtCoinGeckoApi(api_key="123456", is_demo=False)
assert ftc._api_key == "123456"
assert ftc.api_base_url == "https://pro-api.coingecko.com/api/v3/"
tests/rpc/test_rpc.py
+9 -9
View File
@@ -225,7 +225,7 @@ def test_rpc_trade_status(default_conf, ticker, fee, mocker) -> None:
def test_rpc_status_table(default_conf, ticker, fee, mocker) -> None:
mocker.patch.multiple(
"freqtrade.rpc.fiat_convert.CoinGeckoAPI",
"freqtrade.rpc.fiat_convert.FtCoinGeckoApi",
get_price=MagicMock(return_value={"bitcoin": {"usd": 15000.0}}),
)
mocker.patch("freqtrade.rpc.rpc.CryptoToFiatConverter._find_price", return_value=15000.0)
@@ -266,7 +266,7 @@ def test_rpc_status_table(default_conf, ticker, fee, mocker) -> None:
assert "-0.00" == f"{fiat_profit_sum:.2f}"
# Test with fiat convert
rpc._fiat_converter = CryptoToFiatConverter()
rpc._fiat_converter = CryptoToFiatConverter({})
result, headers, fiat_profit_sum = rpc._rpc_status_table(default_conf["stake_currency"], "USD")
assert "Since" in headers
assert "Pair" in headers
@@ -312,7 +312,7 @@ def test__rpc_timeunit_profit(
fiat_display_currency = default_conf_usdt["fiat_display_currency"]
rpc = RPC(freqtradebot)
rpc._fiat_converter = CryptoToFiatConverter()
rpc._fiat_converter = CryptoToFiatConverter({})
# Try valid data
days = rpc._rpc_timeunit_profit(7, stake_currency, fiat_display_currency)
@@ -344,7 +344,7 @@ def test_rpc_trade_history(mocker, default_conf, markets, fee, is_short):
freqtradebot = get_patched_freqtradebot(mocker, default_conf)
create_mock_trades(fee, is_short)
rpc = RPC(freqtradebot)
rpc._fiat_converter = CryptoToFiatConverter()
rpc._fiat_converter = CryptoToFiatConverter({})
trades = rpc._rpc_trade_history(2)
assert len(trades["trades"]) == 2
assert trades["trades_count"] == 2
@@ -434,7 +434,7 @@ def test_rpc_trade_statistics(default_conf_usdt, ticker, fee, mocker) -> None:
fiat_display_currency = default_conf_usdt["fiat_display_currency"]
rpc = RPC(freqtradebot)
rpc._fiat_converter = CryptoToFiatConverter()
rpc._fiat_converter = CryptoToFiatConverter({})
res = rpc._rpc_trade_statistics(stake_currency, fiat_display_currency)
assert res["trade_count"] == 0
@@ -495,7 +495,7 @@ def test_rpc_balance_handle_error(default_conf, mocker):
# ETH will be skipped due to mocked Error below
mocker.patch.multiple(
"freqtrade.rpc.fiat_convert.CoinGeckoAPI",
"freqtrade.rpc.fiat_convert.FtCoinGeckoApi",
get_price=MagicMock(return_value={"bitcoin": {"usd": 15000.0}}),
)
mocker.patch("freqtrade.rpc.rpc.CryptoToFiatConverter._find_price", return_value=15000.0)
@@ -509,7 +509,7 @@ def test_rpc_balance_handle_error(default_conf, mocker):
freqtradebot = get_patched_freqtradebot(mocker, default_conf)
patch_get_signal(freqtradebot)
rpc = RPC(freqtradebot)
rpc._fiat_converter = CryptoToFiatConverter()
rpc._fiat_converter = CryptoToFiatConverter({})
with pytest.raises(RPCException, match="Error getting current tickers."):
rpc._rpc_balance(default_conf["stake_currency"], default_conf["fiat_display_currency"])
@@ -558,7 +558,7 @@ def test_rpc_balance_handle(default_conf_usdt, mocker, tickers):
]
mocker.patch.multiple(
"freqtrade.rpc.fiat_convert.CoinGeckoAPI",
"freqtrade.rpc.fiat_convert.FtCoinGeckoApi",
get_price=MagicMock(return_value={"bitcoin": {"usd": 1.2}}),
)
mocker.patch("freqtrade.rpc.rpc.CryptoToFiatConverter._find_price", return_value=1.2)
@@ -578,7 +578,7 @@ def test_rpc_balance_handle(default_conf_usdt, mocker, tickers):
freqtradebot = get_patched_freqtradebot(mocker, default_conf_usdt)
patch_get_signal(freqtradebot)
rpc = RPC(freqtradebot)
rpc._fiat_converter = CryptoToFiatConverter()
rpc._fiat_converter = CryptoToFiatConverter({})
result = rpc._rpc_balance(
default_conf_usdt["stake_currency"], default_conf_usdt["fiat_display_currency"]
tests/rpc/test_rpc_telegram.py
+6 -2
View File
@@ -2564,10 +2564,14 @@ def test_send_msg_buy_notification_no_fiat(
("Short", "short_signal_01", 2.0),
],
)
@pytest.mark.parametrize("fiat", ["", None])
def test_send_msg_exit_notification_no_fiat(
default_conf, mocker, direction, enter_signal, leverage, time_machine
default_conf, mocker, direction, enter_signal, leverage, time_machine, fiat
) -> None:
del default_conf["fiat_display_currency"]
if fiat is None:
del default_conf["fiat_display_currency"]
else:
default_conf["fiat_display_currency"] = fiat
time_machine.move_to("2022-05-02 00:00:00 +00:00", tick=False)
telegram, _, msg_mock = get_telegram_testobject(mocker, default_conf)
tests/test_configuration.py
+10
View File
@@ -659,6 +659,16 @@ def test_validate_default_conf(default_conf) -> None:
validate_config_schema(default_conf)
@pytest.mark.parametrize("fiat", ["EUR", "USD", "", None])
def test_validate_fiat_currency_options(default_conf, fiat) -> None:
# Validate via our validator - we allow setting defaults!
if fiat is not None:
default_conf["fiat_display_currency"] = fiat
else:
del default_conf["fiat_display_currency"]
validate_config_schema(default_conf)
def test_validate_max_open_trades(default_conf):
default_conf["max_open_trades"] = float("inf")
default_conf["stake_amount"] = "unlimited"