Drakkar-Software#734 fixed order_type into enum only

fixed commit split

interfaces/web/controllers/trading.py

@@ -102,7 +102,7 @@ def utility_processor():
  def convert_timestamp(str_time):
  return datetime.datetime.fromtimestamp(str_time).strftime('%Y-%m-%d %H:%M:%S')
 
- def convert_type(str_type):
- return str(str_type).replace("TraderOrderType.", "")
+ def convert_type(order_type):
+ return order_type.name
 
  return dict(convert_timestamp=convert_timestamp, convert_type=convert_type)

tests/unit_tests/trading_tests/test_exchange_simulator.py

@@ -23,7 +23,6 @@
 from tests.test_utils.config import load_test_config
 from trading.exchanges.exchange_manager import ExchangeManager
 from trading.trader.trader_simulator import TraderSimulator
-from trading.trader.order import OrderConstants
 
 
 # All test coroutines will be treated as marked.
@@ -107,23 +106,19 @@ async def test_get_trade_fee(self):
  CONFIG_SIMULATOR_FEES_TAKER: 0.1
  }
 
- buy_market_fee = exchange_inst.get_trade_fee("BTC/USD",
- OrderConstants.TraderOrderTypeClasses[TraderOrderType.BUY_MARKET],
+ buy_market_fee = exchange_inst.get_trade_fee("BTC/USD", TraderOrderType.BUY_MARKET,
  10, 100, ExchangeConstantsMarketPropertyColumns.TAKER.value)
  self._assert_fee(buy_market_fee, "BTC", 0.01, 0.001, ExchangeConstantsMarketPropertyColumns.TAKER.value)
 
  sell_market_fee = exchange_inst.get_trade_fee(
- "BTC/USD", OrderConstants.TraderOrderTypeClasses[TraderOrderType.SELL_MARKET],
- 10, 100, ExchangeConstantsMarketPropertyColumns.TAKER.value)
+ "BTC/USD", TraderOrderType.SELL_MARKET, 10, 100, ExchangeConstantsMarketPropertyColumns.TAKER.value)
  self._assert_fee(sell_market_fee, "USD", 1, 0.001, ExchangeConstantsMarketPropertyColumns.TAKER.value)
 
- buy_limit_fee = exchange_inst.get_trade_fee("BTC/USD",
- OrderConstants.TraderOrderTypeClasses[TraderOrderType.BUY_LIMIT],
+ buy_limit_fee = exchange_inst.get_trade_fee("BTC/USD", TraderOrderType.BUY_LIMIT,
  10, 100, ExchangeConstantsMarketPropertyColumns.MAKER.value)
  self._assert_fee(buy_limit_fee, "BTC", 0.005, 0.0005, ExchangeConstantsMarketPropertyColumns.MAKER.value)
 
- sell_limit_fee = exchange_inst.get_trade_fee("BTC/USD",
- OrderConstants.TraderOrderTypeClasses[TraderOrderType.SELL_LIMIT],
+ sell_limit_fee = exchange_inst.get_trade_fee("BTC/USD", TraderOrderType.SELL_LIMIT,
  10, 100, ExchangeConstantsMarketPropertyColumns.TAKER.value)
  self._assert_fee(sell_limit_fee, "USD", 1, 0.001, ExchangeConstantsMarketPropertyColumns.TAKER.value)
 

tests/unit_tests/trading_tests/test_order.py

@@ -23,7 +23,7 @@
 from trading.exchanges.exchange_manager import ExchangeManager
 from config import TradeOrderSide, SIMULATOR_LAST_PRICES_TO_CHECK, TraderOrderType, OrderStatus
 from tests.test_utils.config import load_test_config
-from trading.trader.order import Order, OrderConstants
+from trading.trader.order import Order
 from trading.trader.trader_simulator import TraderSimulator
 
 
@@ -151,15 +151,15 @@ async def test_new(self):
  config, order_inst, trader_inst, exchange_inst = await self.init_default()
 
  # with real trader
- order_inst.new(OrderConstants.TraderOrderTypeClasses[TraderOrderType.BUY_MARKET],
+ order_inst.new(TraderOrderType.BUY_MARKET,
  "BTC/USDT",
  10000,
  1,
  price=None,
  stop_price=None,
  order_notifier=None)
 
- assert order_inst.get_order_type() == OrderConstants.TraderOrderTypeClasses[TraderOrderType.BUY_MARKET]
+ assert order_inst.get_order_type() == TraderOrderType.BUY_MARKET
  assert order_inst.get_order_symbol() == "BTC/USDT"
  assert order_inst.get_create_last_price() == 10000
  assert order_inst.get_origin_quantity() == 1
@@ -168,7 +168,7 @@ async def test_new(self):
  assert order_inst.get_side() is None
  assert order_inst.get_status() == OrderStatus.OPEN
 
- order_inst.new(OrderConstants.TraderOrderTypeClasses[TraderOrderType.STOP_LOSS_LIMIT],
+ order_inst.new(TraderOrderType.STOP_LOSS_LIMIT,
  "ETH/BTC",
  0.1,
  5.2,
@@ -183,7 +183,7 @@ async def test_new(self):
  trader_sim_inst = TraderSimulator(config, exchange_inst, 1)
  order_sim_inst = Order(trader_sim_inst)
 
- order_sim_inst.new(OrderConstants.TraderOrderTypeClasses[TraderOrderType.SELL_MARKET],
+ order_sim_inst.new(TraderOrderType.SELL_MARKET,
  "LTC/USDT",
  100,
  3.22,