From a6d2c40ce7592f3a224defbf173504a5341fc4fa Mon Sep 17 00:00:00 2001 From: Calina Cenan Date: Tue, 21 Nov 2023 11:15:18 +0000 Subject: [PATCH] Enforce newer ccxt and accomodate changes. --- pdr_backend/trader/approach1/test/test_ccxt_exchanges.py | 2 +- pdr_backend/trader/approach1/test/test_trader_agent1.py | 4 ++-- pdr_backend/trader/approach1/trader_agent1.py | 2 +- pdr_backend/trader/approach1/trader_config1.py | 4 ++-- pdr_backend/trader/approach2/portfolio.py | 2 +- pdr_backend/trader/approach2/test/test_trader_agent2.py | 8 ++++---- pdr_backend/trader/approach2/trader_config2.py | 4 ++-- setup.py | 2 +- 8 files changed, 14 insertions(+), 14 deletions(-) diff --git a/pdr_backend/trader/approach1/test/test_ccxt_exchanges.py b/pdr_backend/trader/approach1/test/test_ccxt_exchanges.py index e735f0548..70bd809ed 100644 --- a/pdr_backend/trader/approach1/test/test_ccxt_exchanges.py +++ b/pdr_backend/trader/approach1/test/test_ccxt_exchanges.py @@ -4,7 +4,7 @@ @enforce_types def test_ccxt_mexc_pairs(): - exchange = ccxt.mexc3() + exchange = ccxt.mexc() markets = exchange.load_markets() # print(f"MEXC symbols: {[v.get('symbol','') for k,v in exchange.markets.items()]}") diff --git a/pdr_backend/trader/approach1/test/test_trader_agent1.py b/pdr_backend/trader/approach1/test/test_trader_agent1.py index 51d330740..ded735676 100644 --- a/pdr_backend/trader/approach1/test/test_trader_agent1.py +++ b/pdr_backend/trader/approach1/test/test_trader_agent1.py @@ -20,7 +20,7 @@ def mock_feed(): @patch.object(TraderAgent1, "check_subscriptions_and_subscribe") def test_new_agent(check_subscriptions_and_subscribe_mock, predictoor_contract): trader_config = Mock(spec=TraderConfig1) - trader_config.exchange_str = "mexc3" + trader_config.exchange_str = "mexc" trader_config.exchange_pair = "BTC/USDT" trader_config.timeframe = "5m" trader_config.size = 10.0 @@ -53,7 +53,7 @@ async def test_do_trade( web3_config, ): trader_config = Mock(spec=TraderConfig1) - trader_config.exchange_str = "mexc3" + trader_config.exchange_str = "mexc" trader_config.exchange_pair = "BTC/USDT" trader_config.timeframe = "5m" trader_config.size = 10.0 diff --git a/pdr_backend/trader/approach1/trader_agent1.py b/pdr_backend/trader/approach1/trader_agent1.py index f2b2ead78..94fe26d3e 100644 --- a/pdr_backend/trader/approach1/trader_agent1.py +++ b/pdr_backend/trader/approach1/trader_agent1.py @@ -77,7 +77,7 @@ async def do_trade(self, feed: Feed, prediction: Tuple[float, float]): if self.order is not None and isinstance(self.order, dict): # get existing long position amount = 0.0 - if self.config.exchange_str in ("mexc", "mexc3"): + if self.config.exchange_str in ("mexc"): amount = float(self.order["info"]["origQty"]) # close it diff --git a/pdr_backend/trader/approach1/trader_config1.py b/pdr_backend/trader/approach1/trader_config1.py index 5156b01c6..e762c69ae 100644 --- a/pdr_backend/trader/approach1/trader_config1.py +++ b/pdr_backend/trader/approach1/trader_config1.py @@ -4,7 +4,7 @@ from pdr_backend.trader.trader_config import TraderConfig -CAND_EXCHANGE = ["mexc3", "mexc"] +CAND_EXCHANGE = ["mexc"] CAND_PAIR = [ "BTC/USDT", "ETH/USDT", @@ -20,7 +20,7 @@ CAND_TIMEFRAME = ["5m", "1h"] -# Mexc3 does not support +# Mexc does not support @enforce_types class TraderConfig1(TraderConfig): def __init__(self): diff --git a/pdr_backend/trader/approach2/portfolio.py b/pdr_backend/trader/approach2/portfolio.py index af9fb6d9e..a2f2c6e30 100644 --- a/pdr_backend/trader/approach2/portfolio.py +++ b/pdr_backend/trader/approach2/portfolio.py @@ -55,7 +55,7 @@ def timestamp(self): def create_order(order: Dict, exchange: ccxt.Exchange) -> Order: - if exchange in ("mexc", "mexc3"): + if exchange in ("mexc"): return MEXCOrder(order) return Order(order) diff --git a/pdr_backend/trader/approach2/test/test_trader_agent2.py b/pdr_backend/trader/approach2/test/test_trader_agent2.py index 1a9538e25..9656f66b0 100644 --- a/pdr_backend/trader/approach2/test/test_trader_agent2.py +++ b/pdr_backend/trader/approach2/test/test_trader_agent2.py @@ -23,7 +23,7 @@ def mock_feed(): def test_new_agent(check_subscriptions_and_subscribe_mock, predictoor_contract): # Setting up the mock trader configuration trader_config = Mock(spec=TraderConfig2) - trader_config.exchange_str = "mexc3" + trader_config.exchange_str = "mexc" trader_config.exchange_pair = "BTC/USDT" trader_config.timeframe = "5m" trader_config.size = 10.0 @@ -60,7 +60,7 @@ async def test_do_trade( ): # Mocking the trader configuration trader_config = Mock(spec=TraderConfig2) - trader_config.exchange_str = "mexc3" + trader_config.exchange_str = "mexc" trader_config.exchange_pair = "BTC/USDT" trader_config.timeframe = "5m" trader_config.size = 10.0 @@ -113,7 +113,7 @@ def test_update_positions( web3_config, ): trader_config = Mock(spec=TraderConfig2) - trader_config.exchange_str = "mexc3" + trader_config.exchange_str = "mexc" trader_config.exchange_pair = "BTC/USDT" trader_config.timeframe = "5m" trader_config.size = 10.0 @@ -170,7 +170,7 @@ def test_should_close( web3_config, ): trader_config = Mock(spec=TraderConfig2) - trader_config.exchange_str = "mexc3" + trader_config.exchange_str = "mexc" trader_config.exchange_pair = "BTC/USDT" trader_config.timeframe = "5m" trader_config.size = 10.0 diff --git a/pdr_backend/trader/approach2/trader_config2.py b/pdr_backend/trader/approach2/trader_config2.py index 4efc98f40..05c2039ec 100644 --- a/pdr_backend/trader/approach2/trader_config2.py +++ b/pdr_backend/trader/approach2/trader_config2.py @@ -4,7 +4,7 @@ from pdr_backend.trader.trader_config import TraderConfig -CAND_EXCHANGE = ["mexc3", "mexc"] +CAND_EXCHANGE = ["mexc"] CAND_PAIR = [ "BTC/USDT", "ETH/USDT", @@ -20,7 +20,7 @@ CAND_TIMEFRAME = ["5m", "1h"] -# Mexc3 does not support +# Mexc does not support class TraderConfig2(TraderConfig): @enforce_types def __init__(self): diff --git a/setup.py b/setup.py index 81425b418..249a2dfc7 100644 --- a/setup.py +++ b/setup.py @@ -10,7 +10,7 @@ # or pip install -e . install_requirements = [ "bumpversion", - "ccxt", + "ccxt>=4.1.59", "coverage", "enforce_typing", "eth-account",