resolve merge conflict

Author: ubuntu

example/src/test_order_latency/main.cpp

@@ -145,6 +145,20 @@ int main(int argc, char** argv) {
   const auto& byWebsocket = UtilSystem::getEnvAsBool("BY_WEBSOCKET");
   SessionOptions sessionOptions;
   SessionConfigs sessionConfigs;
+
+  const auto& okx_rest_fast_url = ccapi::UtilSystem::getEnvAsString("OKX_REST_FAST_URL");
+  const auto& okx_websocket_fast_url = ccapi::UtilSystem::getEnvAsString("OKX_WEBSOCKET_FAST_URL");
+  auto url_rest_base = sessionConfigs.getUrlRestBase();
+  if (!okx_rest_fast_url.empty()) {
+    url_rest_base.at("okx") = okx_rest_fast_url;
+  }
+  sessionConfigs.setUrlRestBase(url_rest_base);
+  std::map<std::string, std::string> url_websocket_base = sessionConfigs.getUrlWebsocketBase();
+  if (!okx_websocket_fast_url.empty()) {
+    url_websocket_base.at("okx") = okx_websocket_fast_url;
+  }
+  sessionConfigs.setUrlWebsocketBase(url_websocket_base);
+
   std::string websocketOrderEntrySubscriptionCorrelationId("any");
   MyEventHandler eventHandler(symbol, side, quantity, price, clientOrderIdLength, cancelByClientOrderId, numOrders, byWebsocket,
                               websocketOrderEntrySubscriptionCorrelationId);

test/test_build/CMakeLists.txt

@@ -7,68 +7,43 @@ set(SERVICE_LIST "MARKET_DATA" "EXECUTION_MANAGEMENT" "FIX")
 
 set(MARKET_DATA_EXCHANGE_LIST
     "COINBASE"
-    # "GEMINI"
-    # "KRAKEN"
-    # "KRAKEN_FUTURES"
-    # "BITSTAMP"
-    # "BITFINEX"
-    # "BITMEX"
+    # "GEMINI" "KRAKEN" "KRAKEN_FUTURES" "BITSTAMP" "BITFINEX" "BITMEX"
     # "BINANCE_US"
     "BINANCE"
     "BINANCE_USDS_FUTURES"
     "BINANCE_COIN_FUTURES"
-    # "HUOBI"
-    # "HUOBI_USDT_SWAP"
-    # "HUOBI_COIN_SWAP"
+    # "HUOBI" "HUOBI_USDT_SWAP" "HUOBI_COIN_SWAP"
     "OKX"
-    # "ERISX"
-    # "KUCOIN"
-    # "KUCOIN_FUTURES"
-    # "DERIBIT"
+    # "ERISX" "KUCOIN" "KUCOIN_FUTURES" "DERIBIT"
     "GATEIO"
     "GATEIO_PERPETUAL_FUTURES"
     "CRYPTOCOM"
     # "ASCENDEX"
     "BYBIT"
     "BITGET"
     "BITGET_FUTURES"
-    # "BITMART"
-    # "MEXC"
-    # "MEXC_FUTURES"
-    # "WHITEBIT"
-    )
+    # "BITMART" "MEXC" "MEXC_FUTURES" "WHITEBIT"
+)
 
 set(EXECUTION_MANAGEMENT_EXCHANGE_LIST
     "COINBASE"
-    # "GEMINI"
-    # "KRAKEN"
-    # "KRAKEN_FUTURES"
-    # "BITSTAMP"
-    # "BITFINEX"
-    # "BITMEX"
+    # "GEMINI" "KRAKEN" "KRAKEN_FUTURES" "BITSTAMP" "BITFINEX" "BITMEX"
     # "BINANCE_US"
     "BINANCE"
     "BINANCE_USDS_FUTURES"
     "BINANCE_COIN_FUTURES"
-    # "HUOBI"
-    # "HUOBI_USDT_SWAP"
-    # "HUOBI_COIN_SWAP"
+    # "HUOBI" "HUOBI_USDT_SWAP" "HUOBI_COIN_SWAP"
     "OKX"
-    # "ERISX"
-    # "KUCOIN"
-    # "KUCOIN_FUTURES"
-    # "DERIBIT"
+    # "ERISX" "KUCOIN" "KUCOIN_FUTURES" "DERIBIT"
     "GATEIO"
     "GATEIO_PERPETUAL_FUTURES"
     "CRYPTOCOM"
     # "ASCENDEX"
     "BYBIT"
     "BITGET"
     "BITGET_FUTURES"
-    # "BITMART"
-    # "MEXC"
-    # "WHITEBIT"
-    )
+    # "BITMART" "MEXC" "WHITEBIT"
+)
 
 set(FIX_EXCHANGE_LIST "COINBASE" "GEMINI")