CTYPTO/freqtrade
1
0
Fork 0
mirror of https://github.com/freqtrade/freqtrade.git synced 2025-12-16 12:51:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: use exchange.markets to avoid loading ccxt markets

Browse Source
This commit is contained in:
Meng Xiangzhuo
2024-11-13 12:36:18 +08:00
parent 7ca39a5c38
commit 03033a0684
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
freqtrade/exchange/binance.py
View File

@@ -176,6 +176,7 @@ class Binance(Exchange):
timeframe=timeframe, timeframe=timeframe,
since_ms=since_ms, since_ms=since_ms,
until_ms=until_ms, until_ms=until_ms,
markets=self.markets,
) )
) )
if df.empty: if df.empty:

12
tests/exchange/test_binance.py
View File

@@ -1,6 +1,6 @@
from datetime import datetime, timedelta from datetime import datetime, timedelta
from random import randint from random import randint
from unittest.mock import AsyncMock, MagicMock, PropertyMock from unittest.mock import MagicMock, PropertyMock
import ccxt import ccxt
import pandas as pd import pandas as pd
@@ -763,12 +763,13 @@ def patch_ohlcv(mocker, start, archive_end, api_end, timeframe):
until = dt_from_ts(until_ms) if until_ms else api_end + timedelta(seconds=1) until = dt_from_ts(until_ms) if until_ms else api_end + timedelta(seconds=1)
return api_storage.loc[(api_storage["date"] >= since) & (api_storage["date"] < until)] return api_storage.loc[(api_storage["date"] >= since) & (api_storage["date"] < until)]
def fetch_ohlcv( async def fetch_ohlcv(
candle_type, candle_type,
pair, pair,
timeframe, timeframe,
since_ms, since_ms,
until_ms, until_ms,
markets=None,
stop_on_404=False, stop_on_404=False,
): ):
since = dt_from_ts(since_ms) since = dt_from_ts(since_ms)
@@ -783,10 +784,10 @@ def patch_ohlcv(mocker, start, archive_end, api_end, timeframe):
"freqtrade.exchange.Exchange._async_get_candle_history", return_value=candle_history "freqtrade.exchange.Exchange._async_get_candle_history", return_value=candle_history
) )
api_mock = mocker.patch( api_mock = mocker.patch(
"freqtrade.exchange.Exchange.get_historic_ohlcv", MagicMock(wraps=get_historic_ohlcv) "freqtrade.exchange.Exchange.get_historic_ohlcv", side_effect=get_historic_ohlcv
) )
archive_mock = mocker.patch( archive_mock = mocker.patch(
"freqtrade.exchange.binance_public_data.fetch_ohlcv", AsyncMock(wraps=fetch_ohlcv) "freqtrade.exchange.binance_public_data.fetch_ohlcv", side_effect=fetch_ohlcv
) )
return candle_mock, api_mock, archive_mock return candle_mock, api_mock, archive_mock
@@ -957,6 +958,9 @@ def test_get_historic_ohlcv_binance(
since_ms = dt_ts(since) since_ms = dt_ts(since)
until_ms = dt_ts(until) until_ms = dt_ts(until)
mocker.patch("ccxt.binance.binance")
mocker.patch("ccxt.binance.binance.markets", {"BTC/USDT": {"id": "BTCUSDT"}})
df = exchange.get_historic_ohlcv(pair, timeframe, since_ms, candle_type, is_new_pair, until_ms) df = exchange.get_historic_ohlcv(pair, timeframe, since_ms, candle_type, is_new_pair, until_ms)
if df.empty: if df.empty: