diff --git a/src/server/sparkd/main.cpp b/src/server/sparkd/main.cpp index 123d28116..2c1fdba27 100644 --- a/src/server/sparkd/main.cpp +++ b/src/server/sparkd/main.cpp @@ -1,4 +1,3 @@ -#include "lib/md/cme/CMEActivSession.h" #include "lib/testing/catch_test_runner.h" #include "lib/utils/init_spark_lib.h" #include "server/sparkd/cmds/AdminReport.h" @@ -9,8 +8,9 @@ #include "server/sparkd/cmds/Run.h" #include "server/sparkd/cmds/Web.h" #include "server/sparkd/cmds/crypto/CryptoCmd.h" -#include +#include "server/sparkd/md/cme/CMEActivSession.h" +#include #include #include diff --git a/src/server/sparkd/md/MarketDataGateway.cpp b/src/server/sparkd/md/MarketDataGateway.cpp index e610033e6..a6f9f14cf 100644 --- a/src/server/sparkd/md/MarketDataGateway.cpp +++ b/src/server/sparkd/md/MarketDataGateway.cpp @@ -14,7 +14,6 @@ #include "lib/md/GeneralMarketDataListener.h" #include "lib/md/GeneralSecurityIndex.h" #include "lib/md/MDProducer.h" -#include "lib/md/cme/CMEActivSession.h" #include "lib/persistence/IDGenerator.h" #include "lib/utils/bts_assert.h" #include "lib/utils/bts_fatal.h" @@ -27,6 +26,7 @@ #include "server/sparkd/md/binance/BinanceSubscription.h" #include "server/sparkd/md/binance_us/BinanceUsSubscription.h" #include "server/sparkd/md/binance_usds_futures/BinanceUsdsFuturesSubscription.h" +#include "server/sparkd/md/cme/CMEActivSession.h" #include "server/sparkd/md/coinbase/CoinbaseSubscription.h" #include "server/sparkd/md/deribit/DeribitSubscription.h" #include "server/sparkd/md/emumba/EmumbaDeribitData.h" diff --git a/src/lib/md/cme/CMEActiveQueryHandler.h b/src/server/sparkd/md/cme/CMEActivQueryHandler.h similarity index 97% rename from src/lib/md/cme/CMEActiveQueryHandler.h rename to src/server/sparkd/md/cme/CMEActivQueryHandler.h index c91c82ff5..77bf416f5 100644 --- a/src/lib/md/cme/CMEActiveQueryHandler.h +++ b/src/server/sparkd/md/cme/CMEActivQueryHandler.h @@ -1,9 +1,11 @@ #pragma once -#include "lib/md/cme/CMEActivSubscriptionHandler.h" + +#include "server/sparkd/md/cme/CMEActivSubscriptionHandler.h" #include "lib/md/GeneralMarketDataListener.h" #include #define UNUSED(x) (void)(x) #include "ActivOneApi/OneApi.h" + namespace bts::md::cme { class CMEActivQueryHandler : public Activ::OneApi::ITopicQueryHandler { class TopicDetails { @@ -105,4 +107,4 @@ class CMEActivQueryHandler : public Activ::OneApi::ITopicQueryHandler { UNUSED(context); } }; -} // namespace bts::md::cme \ No newline at end of file +} // namespace bts::md::cme diff --git a/src/lib/md/cme/CMEActivSession.cpp b/src/server/sparkd/md/cme/CMEActivSession.cpp similarity index 93% rename from src/lib/md/cme/CMEActivSession.cpp rename to src/server/sparkd/md/cme/CMEActivSession.cpp index 3e2d4d98f..7aa0f0063 100644 --- a/src/lib/md/cme/CMEActivSession.cpp +++ b/src/server/sparkd/md/cme/CMEActivSession.cpp @@ -1,17 +1,18 @@ #include "CMEActivSession.h" #include "lib/logging/logging.h" #include "lib/md/GeneralMarketDataListener.h" -#include "lib/md/cme/CMEActivSessionHandler.h" -#include "lib/md/cme/CMEActivSubscriptionHandler.h" -#include "lib/md/cme/CMEActiveQueryHandler.h" -#include "lib/md/cme/CMEActiveSnapshotHandler.h" +#include "server/sparkd/md/cme/CMEActivQueryHandler.h" +#include "server/sparkd/md/cme/CMEActivSessionHandler.h" +#include "server/sparkd/md/cme/CMEActivSnapshotHandler.h" +#include "server/sparkd/md/cme/CMEActivSubscriptionHandler.h" + #include #include #include +#include #include #include #include -#include namespace bts::md::cme { diff --git a/src/lib/md/cme/CMEActivSession.h b/src/server/sparkd/md/cme/CMEActivSession.h similarity index 100% rename from src/lib/md/cme/CMEActivSession.h rename to src/server/sparkd/md/cme/CMEActivSession.h diff --git a/src/lib/md/cme/CMEActivSessionHandler.cpp b/src/server/sparkd/md/cme/CMEActivSessionHandler.cpp similarity index 100% rename from src/lib/md/cme/CMEActivSessionHandler.cpp rename to src/server/sparkd/md/cme/CMEActivSessionHandler.cpp diff --git a/src/lib/md/cme/CMEActivSessionHandler.h b/src/server/sparkd/md/cme/CMEActivSessionHandler.h similarity index 100% rename from src/lib/md/cme/CMEActivSessionHandler.h rename to src/server/sparkd/md/cme/CMEActivSessionHandler.h diff --git a/src/lib/md/cme/CMEActiveSnapshotHandler.h b/src/server/sparkd/md/cme/CMEActivSnapshotHandler.h similarity index 100% rename from src/lib/md/cme/CMEActiveSnapshotHandler.h rename to src/server/sparkd/md/cme/CMEActivSnapshotHandler.h diff --git a/src/lib/md/cme/CMEActivSubscriptionHandler.h b/src/server/sparkd/md/cme/CMEActivSubscriptionHandler.h similarity index 99% rename from src/lib/md/cme/CMEActivSubscriptionHandler.h rename to src/server/sparkd/md/cme/CMEActivSubscriptionHandler.h index 1a696b3ef..632faa1d2 100644 --- a/src/lib/md/cme/CMEActivSubscriptionHandler.h +++ b/src/server/sparkd/md/cme/CMEActivSubscriptionHandler.h @@ -9,10 +9,10 @@ #include "lib/domain/Side.h" #include "lib/domain/TradeRecord.h" #include "lib/md/GeneralMarketDataListener.h" -#include "lib/md/MarketDataGateway.h" #include "lib/orderman/orderman_utils/Book.h" #include "lib/persistence/IDGenerator.h" #include "lib/utils/bts_assert.h" +#include "server/sparkd/md/MarketDataGateway.h" #include #include #include