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

Revert "Attempt to use and setup a proxy for CI"

Browse Source 
This reverts commit 48ae248d2d.
This commit is contained in:
Matthias 2023-01-16 21:14:46 +01:00
parent 48ae248d2d
commit 394a973bbb
2 changed files with 10 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/ci.yml vendored
View File

@ -360,8 +360,6 @@ jobs:
pip install -e . pip install -e .
- name: Tests incl. ccxt compatibility tests - name: Tests incl. ccxt compatibility tests
env:
CI_WEB_PROXY: http://152.67.78.211:13128
run: | run: |
pytest --random-order --cov=freqtrade --cov-config=.coveragerc --longrun pytest --random-order --cov=freqtrade --cov-config=.coveragerc --longrun

38
tests/exchange/test_ccxt_compat.py
View File

@ -12,7 +12,6 @@ from typing import Tuple
import pytest import pytest
from freqtrade.constants import Config
from freqtrade.enums import CandleType from freqtrade.enums import CandleType
from freqtrade.exchange import timeframe_to_minutes, timeframe_to_prev_date from freqtrade.exchange import timeframe_to_minutes, timeframe_to_prev_date
from freqtrade.exchange.exchange import Exchange, timeframe_to_msecs from freqtrade.exchange.exchange import Exchange, timeframe_to_msecs
@ -32,17 +31,16 @@ EXCHANGES = {
'leverage_tiers_public': False, 'leverage_tiers_public': False,
'leverage_in_spot_market': False, 'leverage_in_spot_market': False,
}, },
'binance': { # 'binance': {
'pair': 'BTC/USDT', # 'pair': 'BTC/USDT',
'stake_currency': 'USDT', # 'stake_currency': 'USDT',
'use_ci_proxy': True, # 'hasQuoteVolume': True,
'hasQuoteVolume': True, # 'timeframe': '5m',
'timeframe': '5m', # 'futures': True,
'futures': True, # 'futures_pair': 'BTC/USDT:USDT',
'futures_pair': 'BTC/USDT:USDT', # 'leverage_tiers_public': False,
'leverage_tiers_public': False, # 'leverage_in_spot_market': False,
'leverage_in_spot_market': False, # },
},
'kraken': { 'kraken': {
'pair': 'BTC/USDT', 'pair': 'BTC/USDT',
'stake_currency': 'USDT', 'stake_currency': 'USDT',
@ -109,23 +107,8 @@ def exchange_conf():
return config return config
def set_test_proxy(config: Config, use_proxy: bool) -> Config:
# Set proxy to test in CI.
import os
if use_proxy and (proxy := os.environ.get('CI_WEB_PROXY')):
config['exchange']['ccxt_config'] = {
'proxies': {
'https': proxy,
'http': proxy,
}
}
return config
@pytest.fixture(params=EXCHANGES, scope="class") @pytest.fixture(params=EXCHANGES, scope="class")
def exchange(request, exchange_conf): def exchange(request, exchange_conf):
set_test_proxy(exchange_conf, EXCHANGES[request.param].get('use_ci_proxy', False))
exchange_conf['exchange']['name'] = request.param exchange_conf['exchange']['name'] = request.param
exchange_conf['stake_currency'] = EXCHANGES[request.param]['stake_currency'] exchange_conf['stake_currency'] = EXCHANGES[request.param]['stake_currency']
exchange = ExchangeResolver.load_exchange(request.param, exchange_conf, validate=True) exchange = ExchangeResolver.load_exchange(request.param, exchange_conf, validate=True)
@ -138,7 +121,6 @@ def exchange_futures(request, exchange_conf, class_mocker):
if not EXCHANGES[request.param].get('futures') is True: if not EXCHANGES[request.param].get('futures') is True:
yield None, request.param yield None, request.param
else: else:
set_test_proxy(exchange_conf, EXCHANGES[request.param].get('use_ci_proxy', False))
exchange_conf = deepcopy(exchange_conf) exchange_conf = deepcopy(exchange_conf)
exchange_conf['exchange']['name'] = request.param exchange_conf['exchange']['name'] = request.param
exchange_conf['trading_mode'] = 'futures' exchange_conf['trading_mode'] = 'futures'