From 21cf5fc6798a54dff38f22bbab48d027e09715f1 Mon Sep 17 00:00:00 2001 From: Matthias Date: Mon, 14 Aug 2023 09:11:50 +0200 Subject: [PATCH] Fix use of string.format() --- tests/exchange/test_binance.py | 2 +- tests/exchange/test_exchange.py | 12 ++++++------ tests/exchange/test_huobi.py | 2 +- tests/exchange/test_kraken.py | 6 +++--- tests/exchange/test_kucoin.py | 4 ++-- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/tests/exchange/test_binance.py b/tests/exchange/test_binance.py index 9018d2db9..c4e657ad9 100644 --- a/tests/exchange/test_binance.py +++ b/tests/exchange/test_binance.py @@ -35,7 +35,7 @@ def test__get_params_binance(default_conf, mocker, side, type, time_in_force, ex ]) def test_create_stoploss_order_binance(default_conf, mocker, limitratio, expected, side, trademode): api_mock = MagicMock() - order_id = 'test_prod_buy_{}'.format(randint(0, 10 ** 6)) + order_id = f'test_prod_buy_{randint(0, 10 ** 6)}' order_type = 'stop_loss_limit' if trademode == TradingMode.SPOT else 'stop' api_mock.create_order = MagicMock(return_value={ diff --git a/tests/exchange/test_exchange.py b/tests/exchange/test_exchange.py index 236576747..84b525cff 100644 --- a/tests/exchange/test_exchange.py +++ b/tests/exchange/test_exchange.py @@ -1337,7 +1337,7 @@ def test_create_dry_run_order_market_fill(default_conf, mocker, side, rate, amou @pytest.mark.parametrize("exchange_name", EXCHANGES) def test_create_order(default_conf, mocker, side, ordertype, rate, marketprice, exchange_name): api_mock = MagicMock() - order_id = 'test_prod_{}_{}'.format(side, randint(0, 10 ** 6)) + order_id = f'test_prod_{side}_{randint(0, 10 ** 6)}' api_mock.options = {} if not marketprice else {"createMarketBuyOrderRequiresPrice": True} api_mock.create_order = MagicMock(return_value={ 'id': order_id, @@ -1417,7 +1417,7 @@ def test_buy_dry_run(default_conf, mocker, exchange_name): @pytest.mark.parametrize("exchange_name", EXCHANGES) def test_buy_prod(default_conf, mocker, exchange_name): api_mock = MagicMock() - order_id = 'test_prod_buy_{}'.format(randint(0, 10 ** 6)) + order_id = f'test_prod_buy_{randint(0, 10 ** 6)}' order_type = 'market' time_in_force = 'gtc' api_mock.options = {} @@ -1506,7 +1506,7 @@ def test_buy_prod(default_conf, mocker, exchange_name): @pytest.mark.parametrize("exchange_name", EXCHANGES) def test_buy_considers_time_in_force(default_conf, mocker, exchange_name): api_mock = MagicMock() - order_id = 'test_prod_buy_{}'.format(randint(0, 10 ** 6)) + order_id = f'test_prod_buy_{randint(0, 10 ** 6)}' api_mock.options = {} api_mock.create_order = MagicMock(return_value={ 'id': order_id, @@ -1573,7 +1573,7 @@ def test_sell_dry_run(default_conf, mocker): @pytest.mark.parametrize("exchange_name", EXCHANGES) def test_sell_prod(default_conf, mocker, exchange_name): api_mock = MagicMock() - order_id = 'test_prod_sell_{}'.format(randint(0, 10 ** 6)) + order_id = f'test_prod_sell_{randint(0, 10 ** 6)}' order_type = 'market' api_mock.options = {} api_mock.create_order = MagicMock(return_value={ @@ -1651,7 +1651,7 @@ def test_sell_prod(default_conf, mocker, exchange_name): @pytest.mark.parametrize("exchange_name", EXCHANGES) def test_sell_considers_time_in_force(default_conf, mocker, exchange_name): api_mock = MagicMock() - order_id = 'test_prod_sell_{}'.format(randint(0, 10 ** 6)) + order_id = f'test_prod_sell_{randint(0, 10 ** 6)}' api_mock.create_order = MagicMock(return_value={ 'id': order_id, 'symbol': 'ETH/BTC', @@ -5357,7 +5357,7 @@ def test_get_liquidation_price( ]) def test_stoploss_contract_size(mocker, default_conf, contract_size, order_amount): api_mock = MagicMock() - order_id = 'test_prod_buy_{}'.format(randint(0, 10 ** 6)) + order_id = f'test_prod_buy_{randint(0, 10 ** 6)}' api_mock.create_order = MagicMock(return_value={ 'id': order_id, diff --git a/tests/exchange/test_huobi.py b/tests/exchange/test_huobi.py index 8be8ef8b3..b3f3c0900 100644 --- a/tests/exchange/test_huobi.py +++ b/tests/exchange/test_huobi.py @@ -16,7 +16,7 @@ from tests.exchange.test_exchange import ccxt_exceptionhandlers ]) def test_create_stoploss_order_huobi(default_conf, mocker, limitratio, expected, side): api_mock = MagicMock() - order_id = 'test_prod_buy_{}'.format(randint(0, 10 ** 6)) + order_id = f'test_prod_buy_{randint(0, 10 ** 6)}' order_type = 'stop-limit' api_mock.create_order = MagicMock(return_value={ diff --git a/tests/exchange/test_kraken.py b/tests/exchange/test_kraken.py index 8fc23b94e..7db3eeeeb 100644 --- a/tests/exchange/test_kraken.py +++ b/tests/exchange/test_kraken.py @@ -15,7 +15,7 @@ STOPLOSS_LIMIT_ORDERTYPE = 'stop-loss-limit' def test_buy_kraken_trading_agreement(default_conf, mocker): api_mock = MagicMock() - order_id = 'test_prod_buy_{}'.format(randint(0, 10 ** 6)) + order_id = f'test_prod_buy_{randint(0, 10 ** 6)}' order_type = 'limit' time_in_force = 'ioc' api_mock.options = {} @@ -56,7 +56,7 @@ def test_buy_kraken_trading_agreement(default_conf, mocker): def test_sell_kraken_trading_agreement(default_conf, mocker): api_mock = MagicMock() - order_id = 'test_prod_sell_{}'.format(randint(0, 10 ** 6)) + order_id = f'test_prod_sell_{randint(0, 10 ** 6)}' order_type = 'market' api_mock.options = {} api_mock.create_order = MagicMock(return_value={ @@ -181,7 +181,7 @@ def test_get_balances_prod(default_conf, mocker): ]) def test_create_stoploss_order_kraken(default_conf, mocker, ordertype, side, adjustedprice): api_mock = MagicMock() - order_id = 'test_prod_buy_{}'.format(randint(0, 10 ** 6)) + order_id = f'test_prod_buy_{randint(0, 10 ** 6)}' api_mock.create_order = MagicMock(return_value={ 'id': order_id, diff --git a/tests/exchange/test_kucoin.py b/tests/exchange/test_kucoin.py index 741ee27be..a74b77859 100644 --- a/tests/exchange/test_kucoin.py +++ b/tests/exchange/test_kucoin.py @@ -17,7 +17,7 @@ from tests.exchange.test_exchange import ccxt_exceptionhandlers ]) def test_create_stoploss_order_kucoin(default_conf, mocker, limitratio, expected, side, order_type): api_mock = MagicMock() - order_id = 'test_prod_buy_{}'.format(randint(0, 10 ** 6)) + order_id = f'test_prod_buy_{randint(0, 10 ** 6)}' api_mock.create_order = MagicMock(return_value={ 'id': order_id, @@ -136,7 +136,7 @@ def test_stoploss_adjust_kucoin(mocker, default_conf): ]) def test_kucoin_create_order(default_conf, mocker, side, ordertype, rate): api_mock = MagicMock() - order_id = 'test_prod_{}_{}'.format(side, randint(0, 10 ** 6)) + order_id = f'test_prod_{side}_{randint(0, 10 ** 6)}' api_mock.create_order = MagicMock(return_value={ 'id': order_id, 'info': {