diff --git a/src/app_sparkd/CMakeLists.txt b/src/app_sparkd/CMakeLists.txt index e3cff52ff..10fbb6828 100644 --- a/src/app_sparkd/CMakeLists.txt +++ b/src/app_sparkd/CMakeLists.txt @@ -20,7 +20,16 @@ file( *.cpp *.c) update_deps_file("${Protos};${Sparkd_Sources}") -protobuf_generate_cpp(Proto_Srcs PROTO_HDRS ${Protos}) +protobuf_generate_cpp( + CXX_SOURCES Proto_Srcs + CXX_HEADERS PROTO_HDRS + CXX_OUT_DIR ${CMAKE_CURRENT_BINARY_DIR} + PROTO_INCLUDE_DIRS + ${EXTERNALS_INCLUDE} + ${CMAKE_SOURCE_DIR}/src/lib_spark + ${CMAKE_CURRENT_SOURCE_DIR} + PROTO_SOURCES + ${Protos}) add_executable(sparkd ${Sparkd_Sources} ${Proto_Srcs}) # include paths diff --git a/src/app_sparkd/sparkd/analytics/AnalyticsServiceServer.cpp b/src/app_sparkd/sparkd/analytics/AnalyticsServiceServer.cpp index 10d6ec376..434fffdfe 100644 --- a/src/app_sparkd/sparkd/analytics/AnalyticsServiceServer.cpp +++ b/src/app_sparkd/sparkd/analytics/AnalyticsServiceServer.cpp @@ -2,20 +2,18 @@ #include "spark/api/apicore.pb.h" #include "spark/api/services/AnalyticsService.pb.h" #include "spark/api/services/AnalyticsService.server.pb.h" -#include "spark/api/services/ShellLatencyService.pb.h" #include "spark/logging/logging.h" #include "spark/persistence/IStore.h" #include "spark/persistence/SqliteStore.h" #include "spark/utils/PBUtils.h" -#include "spark/utils/Puid.h" #include "spark/utils/TimeStamp.h" #include "spark/utils/bts_assert.h" -#include "server/sparkd/algo/AlgoDefinitionServiceServer.h" +#include "sparkd/algo/AlgoDefinitionServiceServer.h" + #include #include #include #include -#include #include #include #include diff --git a/src/app_sparkd/sparkd/cmds/FIXSim.cpp b/src/app_sparkd/sparkd/cmds/FIXSim.cpp index 5f6715e92..9e0352154 100644 --- a/src/app_sparkd/sparkd/cmds/FIXSim.cpp +++ b/src/app_sparkd/sparkd/cmds/FIXSim.cpp @@ -1,5 +1,5 @@ -#include "server/sparkd/cmds/FIXSim.h" -#include "server/sparkd/exchange_sim/ExchangeSim.h" +#include "sparkd/cmds/FIXSim.h" +#include "sparkd/exchange_sim/ExchangeSim.h" namespace bts::cmds { diff --git a/src/app_sparkd/sparkd/cmds/PrintHedgeOrders.cpp b/src/app_sparkd/sparkd/cmds/PrintHedgeOrders.cpp index 82f97dbd8..2500ce82f 100644 --- a/src/app_sparkd/sparkd/cmds/PrintHedgeOrders.cpp +++ b/src/app_sparkd/sparkd/cmds/PrintHedgeOrders.cpp @@ -1,4 +1,4 @@ -#include "server/sparkd/cmds/PrintHedgeOrders.h" +#include "PrintHedgeOrders.h" #include "spark/api/services/OrderService.pb.h" #include "spark/persistence/SqliteStore.h" #include "spark/utils/PBUtils.h" diff --git a/src/app_sparkd/sparkd/cmds/Run.cpp b/src/app_sparkd/sparkd/cmds/Run.cpp index 9c0e2895f..7ec9617b7 100644 --- a/src/app_sparkd/sparkd/cmds/Run.cpp +++ b/src/app_sparkd/sparkd/cmds/Run.cpp @@ -3,7 +3,6 @@ #include "spark/config/config.h" #include "spark/config/protos/ports.pb.h" #include "spark/config/protos/quickbus_cfg.pb.h" -#include "spark/config/protos/toggles.pb.h" #include "spark/logging/logging.h" #include "spark/md/MBOProcessor.h" #include "spark/md/MBOServiceServer.h" @@ -14,36 +13,30 @@ #include "spark/metrics/metrics.h" #include "spark/metrics/system_metrics.h" #include "spark/orderman/OrderServiceServer.h" -#include "spark/orderman/gateways/sim/SimExecutionGatewayFactory.h" +#include "spark/orderman/events/TradeSummarySignalDispatcher.h" #include "spark/orderman/order_factory/DynamicOrderRegistry.h" -#include "spark/orderman/orders/algo/algo_orders/ProRataAlgo.h" -#include "spark/orderman/orders/algo/algo_orders/ScratchAlgo.h" -#include "spark/os/os.h" #include "spark/persistence/PersistenceServiceServer.h" #include "spark/plugin/SparkServices.h" #include "spark/plugin/plugin.h" -#include "spark/quickbus/quickbus.h" +#include "spark/quickbus/core/Quickbus.h" #include "spark/tracing/PerfLog.h" #include "spark/utils/Dispatcher.h" -#include "spark/utils/thread_manager.h" #include "md/cmds/Run.h" -#include "server/sparkd/algo/AlgoDefinitionServiceServer.h" -#include "server/sparkd/analytics/AnalyticsServiceServer.h" -#include "server/sparkd/http/WebServer.h" -#include "server/sparkd/md/MarketDataAuxiliaryServiceServer.h" -#include "server/sparkd/md/platforms/mdp3_onixs/TradeSummarySignalDispatcher.h" -#include "server/sparkd/md/recording/MDRecorder.h" -#include "server/sparkd/position/MarginServiceServer.h" -#include "server/sparkd/position/PositionServiceServer.h" -#include "server/sparkd/position/import/BasePositionServiceServer.h" -#include "server/sparkd/position/import/MoneyFileServiceServer.h" -#include "server/sparkd/subprocess/SubProcessRunner.h" -#include "server/sparkd/support/ErrorReportService.h" -#include "server/sparkd/support/ShellLatencyServer.h" -#include "server/sparkd/user/AdminServiceServer.h" -#include "server/sparkd/user/AuthServiceServer.h" +#include "sparkd/algo/AlgoDefinitionServiceServer.h" +#include "sparkd/analytics/AnalyticsServiceServer.h" +#include "sparkd/http/WebServer.h" +#include "sparkd/md/MarketDataAuxiliaryServiceServer.h" +#include "sparkd/md/recording/MDRecorder.h" +#include "sparkd/position/MarginServiceServer.h" +#include "sparkd/position/PositionServiceServer.h" +#include "sparkd/position/import/BasePositionServiceServer.h" +#include "sparkd/position/import/MoneyFileServiceServer.h" +#include "sparkd/subprocess/SubProcessRunner.h" +#include "sparkd/support/ErrorReportService.h" +#include "sparkd/support/ShellLatencyServer.h" +#include "sparkd/user/AdminServiceServer.h" +#include "sparkd/user/AuthServiceServer.h" -#include namespace bts::cmds { diff --git a/src/app_sparkd/sparkd/cmds/Span.cpp b/src/app_sparkd/sparkd/cmds/Span.cpp index a14ce45c8..69a7e080e 100644 --- a/src/app_sparkd/sparkd/cmds/Span.cpp +++ b/src/app_sparkd/sparkd/cmds/Span.cpp @@ -1,8 +1,8 @@ #include "Span.h" -#include "server/sparkd/position/MarginServiceCore.h" -#include "server/sparkd/position/Position.h" -#include "server/sparkd/position/PositionAggregator.h" +#include "sparkd/position/MarginServiceCore.h" +#include "sparkd/position/Position.h" +#include "sparkd/position/PositionAggregator.h" #include "spark/orderman/orderman_utils/orderman_common.h" diff --git a/src/app_sparkd/sparkd/cmds/Web.cpp b/src/app_sparkd/sparkd/cmds/Web.cpp index 1f6f96d2e..14add1290 100644 --- a/src/app_sparkd/sparkd/cmds/Web.cpp +++ b/src/app_sparkd/sparkd/cmds/Web.cpp @@ -18,11 +18,10 @@ #include "spark/utils/thread_manager.h" #include "md/cmds/Cleanup.h" #include "md/cmds/Run.h" -#include "server/sparkd/exchange_sim/ExchangeSim.h" -#include "server/sparkd/http/WebServer.h" -#include "server/sparkd/md/platforms/mdp3_onixs/TradeSummarySignalDispatcher.h" -#include "server/sparkd/user/AdminServiceServer.h" -#include "server/sparkd/user/AuthServiceServer.h" +#include "sparkd/exchange_sim/ExchangeSim.h" +#include "sparkd/http/WebServer.h" +#include "sparkd/user/AdminServiceServer.h" +#include "sparkd/user/AuthServiceServer.h" #include #include #include diff --git a/src/app_sparkd/sparkd/cmds/crypto/DeribitDemo.cpp b/src/app_sparkd/sparkd/cmds/crypto/DeribitDemo.cpp index 571e61cb6..bddc12bfa 100644 --- a/src/app_sparkd/sparkd/cmds/crypto/DeribitDemo.cpp +++ b/src/app_sparkd/sparkd/cmds/crypto/DeribitDemo.cpp @@ -1,13 +1,12 @@ #include "DeribitDemo.h" -#include "DeribitDemoConfiguration.h" #include "spark/logging/logging.h" -#include "server/sparkd/cmds/crypto/DeribitDemoListener.h" +#include "sparkd/cmds/crypto/DeribitDemoListener.h" + #include #include #include #include #include -#include namespace bts::cmds { diff --git a/src/app_sparkd/sparkd/cmds/crypto/DeribitDemoListener.cpp b/src/app_sparkd/sparkd/cmds/crypto/DeribitDemoListener.cpp index a9f94d1ac..d8aca8873 100644 --- a/src/app_sparkd/sparkd/cmds/crypto/DeribitDemoListener.cpp +++ b/src/app_sparkd/sparkd/cmds/crypto/DeribitDemoListener.cpp @@ -5,8 +5,8 @@ // #include "rapidjson/ostreamwrapper.h" // #include "rapidjson/stringbuffer.h" // #include "rapidjson/writer.h" -// #include "server/sparkd/cmds/crypto/DeribitDemoConfiguration.h" -// #include "server/sparkd/cmds/spartan/utils/FileUtils.h" +// #include "sparkd/cmds/crypto/DeribitDemoConfiguration.h" +// #include "sparkd/cmds/spartan/utils/FileUtils.h" // #include // #include // #include diff --git a/src/app_sparkd/sparkd/cmds/crypto/LiveLadderDemo.cpp b/src/app_sparkd/sparkd/cmds/crypto/LiveLadderDemo.cpp index 0b9c061ed..3bbb73646 100644 --- a/src/app_sparkd/sparkd/cmds/crypto/LiveLadderDemo.cpp +++ b/src/app_sparkd/sparkd/cmds/crypto/LiveLadderDemo.cpp @@ -1,9 +1,9 @@ #include "LiveLadderDemo.h" #include "spark/api/md/MarketDataConfig.pb.h" -#include "server/sparkd/md/MarketDataGateway.h" -#include "server/sparkd/md/MarketDataRegistration.h" -#include "server/sparkd/md/listeners/LiveLadderPrinter.h" -#include +#include "sparkd/md/MarketDataGateway.h" +#include "sparkd/md/listeners/LiveLadderPrinter.h" + +#include namespace bts::cmds { diff --git a/src/app_sparkd/sparkd/cmds/crypto/LiveLadderDemoCmd.cpp b/src/app_sparkd/sparkd/cmds/crypto/LiveLadderDemoCmd.cpp index 6a116ffc2..ab586f247 100644 --- a/src/app_sparkd/sparkd/cmds/crypto/LiveLadderDemoCmd.cpp +++ b/src/app_sparkd/sparkd/cmds/crypto/LiveLadderDemoCmd.cpp @@ -4,8 +4,8 @@ #include "spark/api/md/MarketDataConfig.pb.h" #include "spark/io/ProtoReader.h" #include "spark/logging/logging.h" -#include "server/sparkd/cmds/common/Validators.h" -#include "server/sparkd/cmds/crypto/LiveLadderDemo.h" +#include "sparkd/cmds/common/Validators.h" +#include "sparkd/cmds/crypto/LiveLadderDemo.h" #include #include diff --git a/src/app_sparkd/sparkd/cmds/md/cmds/Run.cpp b/src/app_sparkd/sparkd/cmds/md/cmds/Run.cpp index d3eedca9b..3717dd89a 100644 --- a/src/app_sparkd/sparkd/cmds/md/cmds/Run.cpp +++ b/src/app_sparkd/sparkd/cmds/md/cmds/Run.cpp @@ -9,10 +9,10 @@ #include "spark/os/os.h" #include "spark/utils/bts_assert.h" #include "spark/utils/thread_manager.h" -#include "server/sparkd/md/MarketDataGateway.h" -#include "server/sparkd/md/platforms/IMDPlatform.h" -#include "server/sparkd/md/platforms/ice_onixs/ICEMain.h" -#include "server/sparkd/md/platforms/mdp3_onixs/MDP3Main.h" +#include "sparkd/md/MarketDataGateway.h" +#include "sparkd/md/platforms/IMDPlatform.h" +#include "sparkd/md/platforms/ice_onixs/ICEMain.h" +#include "sparkd/md/platforms/mdp3_onixs/MDP3Main.h" #include namespace bts::cmds::md::cmds { diff --git a/src/app_sparkd/sparkd/cmds/md/cmds/Run.h b/src/app_sparkd/sparkd/cmds/md/cmds/Run.h index e3a573d02..169a0c68a 100644 --- a/src/app_sparkd/sparkd/cmds/md/cmds/Run.h +++ b/src/app_sparkd/sparkd/cmds/md/cmds/Run.h @@ -1,6 +1,5 @@ #pragma once -#include "spark/md/MBOProcessor.h" -#include "server/sparkd/md/platforms/mdp3_onixs/TradeSummarySignalDispatcher.h" + #include namespace bts::cmds::md::cmds { diff --git a/src/app_sparkd/sparkd/exchange_sim/ExchangeSimApplication.cpp b/src/app_sparkd/sparkd/exchange_sim/ExchangeSimApplication.cpp index 9338de191..0abc5bbf2 100644 --- a/src/app_sparkd/sparkd/exchange_sim/ExchangeSimApplication.cpp +++ b/src/app_sparkd/sparkd/exchange_sim/ExchangeSimApplication.cpp @@ -14,9 +14,9 @@ #include "spark/persistence/SqliteStore.h" #include "spark/utils/Dispatcher.h" #include "spark/utils/datetime.h" -#include "server/sparkd/exchange_sim/book/Order.h" -#include "server/sparkd/exchange_sim/book/OrderMatcher.h" -#include "server/sparkd/exchange_sim/book/book_transform.h" +#include "sparkd/exchange_sim/book/Order.h" +#include "sparkd/exchange_sim/book/OrderMatcher.h" +#include "sparkd/exchange_sim/book/book_transform.h" #include #include diff --git a/src/app_sparkd/sparkd/exchange_sim/ExchangeSimApplication.h b/src/app_sparkd/sparkd/exchange_sim/ExchangeSimApplication.h index 638158628..204271444 100644 --- a/src/app_sparkd/sparkd/exchange_sim/ExchangeSimApplication.h +++ b/src/app_sparkd/sparkd/exchange_sim/ExchangeSimApplication.h @@ -38,7 +38,7 @@ GCC_DIAG_OFF("-Wignored-qualifiers") #include #include "spark/domain_model/Security.pb.h" -#include "server/sparkd/exchange_sim/IMDPlayerObserver.h" +#include "sparkd/exchange_sim/IMDPlayerObserver.h" #include #include diff --git a/src/app_sparkd/sparkd/exchange_sim/book/Book.h b/src/app_sparkd/sparkd/exchange_sim/book/Book.h index 1ba4cf882..85e308698 100644 --- a/src/app_sparkd/sparkd/exchange_sim/book/Book.h +++ b/src/app_sparkd/sparkd/exchange_sim/book/Book.h @@ -3,7 +3,7 @@ #include "spark/core/FMT_IMPL.h" #include "spark/domain_model/Security.pb.h" #include "spark/orderman/orderman_utils/orderman_common.h" -#include "server/sparkd/exchange_sim/book/Order.h" +#include "sparkd/exchange_sim/book/Order.h" #include #include diff --git a/src/app_sparkd/sparkd/exchange_sim/book/ExchangeSim.proto b/src/app_sparkd/sparkd/exchange_sim/book/ExchangeSim.proto index 877f2352c..bc0bafd0d 100644 --- a/src/app_sparkd/sparkd/exchange_sim/book/ExchangeSim.proto +++ b/src/app_sparkd/sparkd/exchange_sim/book/ExchangeSim.proto @@ -1,9 +1,9 @@ syntax="proto3"; package bts.ex_sim; -import "lib/domain_model/Security.proto"; +import "spark/domain_model/Security.proto"; import "google/protobuf/timestamp.proto"; -import "lib/api/services/OrderService.proto"; +import "spark/api/services/OrderService.proto"; message Order { string clordid = 1; diff --git a/src/app_sparkd/sparkd/exchange_sim/book/Order.h b/src/app_sparkd/sparkd/exchange_sim/book/Order.h index bc1d07c7a..841847fcf 100644 --- a/src/app_sparkd/sparkd/exchange_sim/book/Order.h +++ b/src/app_sparkd/sparkd/exchange_sim/book/Order.h @@ -6,7 +6,7 @@ #include "spark/orderman/orderman_utils/orderman_common.h" #include "spark/utils/PBUtils.h" #include "spark/utils/bts_chrono.h" -#include "server/sparkd/exchange_sim/book/ExchangeSim.pb.h" +#include "sparkd/exchange_sim/book/ExchangeSim.pb.h" #include namespace bts { diff --git a/src/app_sparkd/sparkd/exchange_sim/book/OrderMatcher.cpp b/src/app_sparkd/sparkd/exchange_sim/book/OrderMatcher.cpp index 8086c3432..9f8b084c6 100644 --- a/src/app_sparkd/sparkd/exchange_sim/book/OrderMatcher.cpp +++ b/src/app_sparkd/sparkd/exchange_sim/book/OrderMatcher.cpp @@ -2,8 +2,8 @@ #include "spark/config/config.h" #include "spark/config/protos/exchange_sim_cfg.pb.h" #include "spark/utils/bts_assert.h" -#include "server/sparkd/exchange_sim/book/Book.h" -#include "server/sparkd/exchange_sim/book/Order.h" +#include "sparkd/exchange_sim/book/Book.h" +#include "sparkd/exchange_sim/book/Order.h" #include diff --git a/src/app_sparkd/sparkd/exchange_sim/book/OrderMatcher.h b/src/app_sparkd/sparkd/exchange_sim/book/OrderMatcher.h index c44941549..736831761 100644 --- a/src/app_sparkd/sparkd/exchange_sim/book/OrderMatcher.h +++ b/src/app_sparkd/sparkd/exchange_sim/book/OrderMatcher.h @@ -3,9 +3,9 @@ #include "spark/api/services/OrderService.pb.h" #include "spark/domain_model/Security.pb.h" #include "spark/orderman/orderman_utils/orderman_common.h" -#include "server/sparkd/exchange_sim/book/Book.h" -#include "server/sparkd/exchange_sim/book/ExchangeSim.pb.h" -#include "server/sparkd/exchange_sim/book/Order.h" +#include "sparkd/exchange_sim/book/Book.h" +#include "sparkd/exchange_sim/book/ExchangeSim.pb.h" +#include "sparkd/exchange_sim/book/Order.h" #include #include diff --git a/src/app_sparkd/sparkd/exchange_sim/book/book_transform.h b/src/app_sparkd/sparkd/exchange_sim/book/book_transform.h index 10bb77128..feef74e73 100644 --- a/src/app_sparkd/sparkd/exchange_sim/book/book_transform.h +++ b/src/app_sparkd/sparkd/exchange_sim/book/book_transform.h @@ -1,6 +1,6 @@ #pragma once -#include "server/sparkd/exchange_sim/book/Book.h" +#include "sparkd/exchange_sim/book/Book.h" #include namespace bts { diff --git a/src/app_sparkd/sparkd/exchange_sim/tests/test_book_transform.cpp b/src/app_sparkd/sparkd/exchange_sim/tests/test_book_transform.cpp index 094c430d3..5ac5c5c96 100644 --- a/src/app_sparkd/sparkd/exchange_sim/tests/test_book_transform.cpp +++ b/src/app_sparkd/sparkd/exchange_sim/tests/test_book_transform.cpp @@ -1,4 +1,4 @@ -#include "server/sparkd/exchange_sim/book/book_transform.h" +#include "sparkd/exchange_sim/book/book_transform.h" #include #include diff --git a/src/app_sparkd/sparkd/execution/EMExecutionGateway.cpp b/src/app_sparkd/sparkd/execution/EMExecutionGateway.cpp index 335cfd91b..b72808f0f 100644 --- a/src/app_sparkd/sparkd/execution/EMExecutionGateway.cpp +++ b/src/app_sparkd/sparkd/execution/EMExecutionGateway.cpp @@ -25,8 +25,8 @@ #include "spark/utils/bts_assert.h" #include "spark/utils/datetime.h" //#include "spark/utils/helper_macros.h" -#include "server/sparkd/md/platforms/emumba/EmMDListener.h" -#include "server/sparkd/md/platforms/emumba/IEMOrderMuxer.h" +#include "sparkd/md/platforms/emumba/EmMDListener.h" +#include "sparkd/md/platforms/emumba/IEMOrderMuxer.h" #include "spark/api/service_helpers/AdminServiceUtils.h" #include "spark/config/config.h" diff --git a/src/app_sparkd/sparkd/main.cpp b/src/app_sparkd/sparkd/main.cpp index 40a23e86a..be88dbbf9 100644 --- a/src/app_sparkd/sparkd/main.cpp +++ b/src/app_sparkd/sparkd/main.cpp @@ -1,13 +1,14 @@ #include "spark/testing/catch_test_runner.h" #include "spark/utils/init_spark_lib.h" -#include "server/sparkd/cmds/AdminReport.h" -#include "server/sparkd/cmds/ConfigCmd.h" -#include "server/sparkd/cmds/KeyCmd.h" -#include "server/sparkd/cmds/Md.h" -#include "server/sparkd/cmds/QuickTest.h" -#include "server/sparkd/cmds/Run.h" -#include "server/sparkd/cmds/Web.h" -#include "server/sparkd/cmds/crypto/CryptoCmd.h" +#include "sparkd/cmds/AdminReport.h" +#include "sparkd/cmds/ConfigCmd.h" +#include "sparkd/cmds/KeyCmd.h" +#include "sparkd/cmds/Md.h" +#include "sparkd/cmds/QuickTest.h" +#include "sparkd/cmds/Run.h" +#include "sparkd/cmds/Web.h" +#include "sparkd/cmds/crypto/CryptoCmd.h" +#include "sparkd/md/MarketDataGateway.h" #include using namespace bts; diff --git a/src/app_sparkd/sparkd/md/MarketDataGateway.cpp b/src/app_sparkd/sparkd/md/MarketDataGateway.cpp index 640c2837f..88e36bf9b 100644 --- a/src/app_sparkd/sparkd/md/MarketDataGateway.cpp +++ b/src/app_sparkd/sparkd/md/MarketDataGateway.cpp @@ -18,21 +18,21 @@ #include "spark/utils/bts_assert.h" #include "spark/utils/bts_fatal.h" #include "spark/utils/thread_manager.h" -#include "server/sparkd/md/MarketDataListenerID.h" -#include "server/sparkd/md/MarketDataRegistration.h" -#include "server/sparkd/md/MarketDataRegistrationError.h" -#include "server/sparkd/md/MarketDataRegistrationFactory.h" -#include "server/sparkd/md/MarketDataSubscription.h" -#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/coinbase/CoinbaseSubscription.h" -#include "server/sparkd/md/deribit/DeribitSubscription.h" -#include "server/sparkd/md/emumba/EmumbaDeribitData.h" -#include "server/sparkd/md/ftx/FTXSubscription.h" -#include "server/sparkd/md/okx/OkxSubscription.h" -#include "server/sparkd/md/platforms/mdp3_onixs/MDP3Main.h" -#include "server/sparkd/md/recording/MDReplayer.h" +#include "sparkd/md/MarketDataListenerID.h" +#include "sparkd/md/MarketDataRegistration.h" +#include "sparkd/md/MarketDataRegistrationError.h" +#include "sparkd/md/MarketDataRegistrationFactory.h" +#include "sparkd/md/MarketDataSubscription.h" +#include "sparkd/md/binance/BinanceSubscription.h" +#include "sparkd/md/binance_us/BinanceUsSubscription.h" +#include "sparkd/md/binance_usds_futures/BinanceUsdsFuturesSubscription.h" +#include "sparkd/md/coinbase/CoinbaseSubscription.h" +#include "sparkd/md/deribit/DeribitSubscription.h" +#include "sparkd/md/emumba/EmumbaDeribitData.h" +#include "sparkd/md/ftx/FTXSubscription.h" +#include "sparkd/md/okx/OkxSubscription.h" +#include "sparkd/md/platforms/mdp3_onixs/MDP3Main.h" +#include "sparkd/md/recording/MDReplayer.h" #include #include diff --git a/src/app_sparkd/sparkd/md/MarketDataGateway.h b/src/app_sparkd/sparkd/md/MarketDataGateway.h index 38c51687f..e7a3d161a 100644 --- a/src/app_sparkd/sparkd/md/MarketDataGateway.h +++ b/src/app_sparkd/sparkd/md/MarketDataGateway.h @@ -1,7 +1,7 @@ #pragma once #include "spark/api/md/GlbxMarketDataConfig.pb.h" -#include "server/sparkd/md/MarketDataListenerID.h" +#include "sparkd/md/MarketDataListenerID.h" #include diff --git a/src/app_sparkd/sparkd/md/MarketDataListener.h b/src/app_sparkd/sparkd/md/MarketDataListener.h index 0114aade2..5347a2d73 100644 --- a/src/app_sparkd/sparkd/md/MarketDataListener.h +++ b/src/app_sparkd/sparkd/md/MarketDataListener.h @@ -6,7 +6,7 @@ #include "spark/domain/SecurityMarketDataStatistics.h" #include "spark/domain/SecurityState.h" #include "spark/domain/TradeRecord.h" -#include "server/sparkd/md/MarketDataError.h" +#include "sparkd/md/MarketDataError.h" namespace bts::md { diff --git a/src/app_sparkd/sparkd/md/MarketDataSubscription.cpp b/src/app_sparkd/sparkd/md/MarketDataSubscription.cpp index a56383367..6ec34a995 100644 --- a/src/app_sparkd/sparkd/md/MarketDataSubscription.cpp +++ b/src/app_sparkd/sparkd/md/MarketDataSubscription.cpp @@ -1,11 +1,11 @@ #include "MarketDataSubscription.h" -#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/coinbase/CoinbaseSubscription.h" -#include "server/sparkd/md/deribit/DeribitSubscription.h" -#include "server/sparkd/md/ftx/FTXSubscription.h" -#include "server/sparkd/md/okx/OkxSubscription.h" +#include "sparkd/md/binance/BinanceSubscription.h" +#include "sparkd/md/binance_us/BinanceUsSubscription.h" +#include "sparkd/md/binance_usds_futures/BinanceUsdsFuturesSubscription.h" +#include "sparkd/md/coinbase/CoinbaseSubscription.h" +#include "sparkd/md/deribit/DeribitSubscription.h" +#include "sparkd/md/ftx/FTXSubscription.h" +#include "sparkd/md/okx/OkxSubscription.h" #include diff --git a/src/app_sparkd/sparkd/md/binance/BinanceFilterTuple.h b/src/app_sparkd/sparkd/md/binance/BinanceFilterTuple.h index c38a07be4..20abddaa6 100644 --- a/src/app_sparkd/sparkd/md/binance/BinanceFilterTuple.h +++ b/src/app_sparkd/sparkd/md/binance/BinanceFilterTuple.h @@ -2,19 +2,19 @@ #include "spark/io/JsonDumper.h" #include "spark/io/JsonReader.h" -#include "server/sparkd/md/binance/BinanceFilterType.h" -#include "server/sparkd/md/binance/BinanceIcebergPartsFilter.h" -#include "server/sparkd/md/binance/BinanceLotSizeFilter.h" -#include "server/sparkd/md/binance/BinanceMarketLotSizeFilter.h" -#include "server/sparkd/md/binance/BinanceMaxNumAlgoOrdersFilter.h" -#include "server/sparkd/md/binance/BinanceMaxNumOrdersFilter.h" -#include "server/sparkd/md/binance/BinanceMaxPositionFilter.h" -#include "server/sparkd/md/binance/BinanceMinNotionalFilter.h" -#include "server/sparkd/md/binance/BinanceNotionalFilter.h" -#include "server/sparkd/md/binance/BinancePercentPriceBySideFilter.h" -#include "server/sparkd/md/binance/BinancePercentPriceFilter.h" -#include "server/sparkd/md/binance/BinancePriceFilter.h" -#include "server/sparkd/md/binance/BinanceTrailingDeltaFilter.h" +#include "sparkd/md/binance/BinanceFilterType.h" +#include "sparkd/md/binance/BinanceIcebergPartsFilter.h" +#include "sparkd/md/binance/BinanceLotSizeFilter.h" +#include "sparkd/md/binance/BinanceMarketLotSizeFilter.h" +#include "sparkd/md/binance/BinanceMaxNumAlgoOrdersFilter.h" +#include "sparkd/md/binance/BinanceMaxNumOrdersFilter.h" +#include "sparkd/md/binance/BinanceMaxPositionFilter.h" +#include "sparkd/md/binance/BinanceMinNotionalFilter.h" +#include "sparkd/md/binance/BinanceNotionalFilter.h" +#include "sparkd/md/binance/BinancePercentPriceBySideFilter.h" +#include "sparkd/md/binance/BinancePercentPriceFilter.h" +#include "sparkd/md/binance/BinancePriceFilter.h" +#include "sparkd/md/binance/BinanceTrailingDeltaFilter.h" #include #include diff --git a/src/app_sparkd/sparkd/md/binance/BinanceIcebergPartsFilter.h b/src/app_sparkd/sparkd/md/binance/BinanceIcebergPartsFilter.h index dd85bd802..ac9473144 100644 --- a/src/app_sparkd/sparkd/md/binance/BinanceIcebergPartsFilter.h +++ b/src/app_sparkd/sparkd/md/binance/BinanceIcebergPartsFilter.h @@ -2,7 +2,7 @@ #include "spark/io/JsonMacros.h" #include "spark/io/JsonReader.h" -#include "server/sparkd/md/binance/BinanceFilterType.h" +#include "sparkd/md/binance/BinanceFilterType.h" #include #include diff --git a/src/app_sparkd/sparkd/md/binance/BinanceLotSizeFilter.h b/src/app_sparkd/sparkd/md/binance/BinanceLotSizeFilter.h index 88e5e0014..fbad53527 100644 --- a/src/app_sparkd/sparkd/md/binance/BinanceLotSizeFilter.h +++ b/src/app_sparkd/sparkd/md/binance/BinanceLotSizeFilter.h @@ -1,7 +1,7 @@ #pragma once #include "spark/io/JsonReader.h" -#include "server/sparkd/md/binance/BinanceFilterType.h" +#include "sparkd/md/binance/BinanceFilterType.h" #include #include diff --git a/src/app_sparkd/sparkd/md/binance/BinanceMarketLotSizeFilter.h b/src/app_sparkd/sparkd/md/binance/BinanceMarketLotSizeFilter.h index 4cda1107f..c6ac0098b 100644 --- a/src/app_sparkd/sparkd/md/binance/BinanceMarketLotSizeFilter.h +++ b/src/app_sparkd/sparkd/md/binance/BinanceMarketLotSizeFilter.h @@ -1,7 +1,7 @@ #pragma once #include "spark/io/JsonReader.h" -#include "server/sparkd/md/binance/BinanceFilterType.h" +#include "sparkd/md/binance/BinanceFilterType.h" #include diff --git a/src/app_sparkd/sparkd/md/binance/BinanceMaxNumAlgoOrdersFilter.h b/src/app_sparkd/sparkd/md/binance/BinanceMaxNumAlgoOrdersFilter.h index 438e0d5d7..5897885b8 100644 --- a/src/app_sparkd/sparkd/md/binance/BinanceMaxNumAlgoOrdersFilter.h +++ b/src/app_sparkd/sparkd/md/binance/BinanceMaxNumAlgoOrdersFilter.h @@ -1,7 +1,7 @@ #pragma once #include "spark/io/JsonReader.h" -#include "server/sparkd/md/binance/BinanceFilterType.h" +#include "sparkd/md/binance/BinanceFilterType.h" #include #include diff --git a/src/app_sparkd/sparkd/md/binance/BinanceMaxNumOrdersFilter.h b/src/app_sparkd/sparkd/md/binance/BinanceMaxNumOrdersFilter.h index ad52ece24..ab5f2e56c 100644 --- a/src/app_sparkd/sparkd/md/binance/BinanceMaxNumOrdersFilter.h +++ b/src/app_sparkd/sparkd/md/binance/BinanceMaxNumOrdersFilter.h @@ -1,7 +1,7 @@ #pragma once #include "spark/io/JsonReader.h" -#include "server/sparkd/md/binance/BinanceFilterType.h" +#include "sparkd/md/binance/BinanceFilterType.h" #include #include diff --git a/src/app_sparkd/sparkd/md/binance/BinanceMaxPositionFilter.h b/src/app_sparkd/sparkd/md/binance/BinanceMaxPositionFilter.h index 86552a42d..c393cade1 100644 --- a/src/app_sparkd/sparkd/md/binance/BinanceMaxPositionFilter.h +++ b/src/app_sparkd/sparkd/md/binance/BinanceMaxPositionFilter.h @@ -1,7 +1,7 @@ #pragma once #include "spark/io/JsonReader.h" -#include "server/sparkd/md/binance/BinanceFilterType.h" +#include "sparkd/md/binance/BinanceFilterType.h" #include diff --git a/src/app_sparkd/sparkd/md/binance/BinanceMinNotionalFilter.h b/src/app_sparkd/sparkd/md/binance/BinanceMinNotionalFilter.h index 77db0258a..18a8bc36c 100644 --- a/src/app_sparkd/sparkd/md/binance/BinanceMinNotionalFilter.h +++ b/src/app_sparkd/sparkd/md/binance/BinanceMinNotionalFilter.h @@ -2,7 +2,7 @@ #include "spark/io/JsonMacros.h" #include "spark/io/JsonReader.h" -#include "server/sparkd/md/binance/BinanceFilterType.h" +#include "sparkd/md/binance/BinanceFilterType.h" #include #include diff --git a/src/app_sparkd/sparkd/md/binance/BinanceMiniTickerAdaptor.cpp b/src/app_sparkd/sparkd/md/binance/BinanceMiniTickerAdaptor.cpp index 5b9ec7750..92f1847db 100644 --- a/src/app_sparkd/sparkd/md/binance/BinanceMiniTickerAdaptor.cpp +++ b/src/app_sparkd/sparkd/md/binance/BinanceMiniTickerAdaptor.cpp @@ -1,6 +1,6 @@ #include "BinanceMiniTickerAdaptor.h" #include "spark/md/IMarketDataListener.h" -#include "server/sparkd/md/binance/BinanceMiniTickerUpdate.h" +#include "sparkd/md/binance/BinanceMiniTickerUpdate.h" #include #include diff --git a/src/app_sparkd/sparkd/md/binance/BinanceMiniTickerAdaptor.h b/src/app_sparkd/sparkd/md/binance/BinanceMiniTickerAdaptor.h index e9bc184dd..0946703e8 100644 --- a/src/app_sparkd/sparkd/md/binance/BinanceMiniTickerAdaptor.h +++ b/src/app_sparkd/sparkd/md/binance/BinanceMiniTickerAdaptor.h @@ -1,7 +1,7 @@ #pragma once #include "spark/domain/SecurityID.h" -#include "server/sparkd/md/ccapi/ICCApiMessageHandler.h" +#include "sparkd/md/ccapi/ICCApiMessageHandler.h" namespace bts::md { class IMarketDataListener; diff --git a/src/app_sparkd/sparkd/md/binance/BinanceMiniTickerUpdate.cpp b/src/app_sparkd/sparkd/md/binance/BinanceMiniTickerUpdate.cpp index bdcee4c5c..55cd40519 100644 --- a/src/app_sparkd/sparkd/md/binance/BinanceMiniTickerUpdate.cpp +++ b/src/app_sparkd/sparkd/md/binance/BinanceMiniTickerUpdate.cpp @@ -6,7 +6,7 @@ #include "spark/domain/SecurityMarketDataStatistics.h" #include "spark/io/JsonDumper.h" #include "spark/io/JsonReader.h" -#include "server/sparkd/md/ccapi/CCApiReader.h" +#include "sparkd/md/ccapi/CCApiReader.h" #include #include diff --git a/src/app_sparkd/sparkd/md/binance/BinanceMiniTickerUpdate.h b/src/app_sparkd/sparkd/md/binance/BinanceMiniTickerUpdate.h index 9f2c7656f..b9dd5133e 100644 --- a/src/app_sparkd/sparkd/md/binance/BinanceMiniTickerUpdate.h +++ b/src/app_sparkd/sparkd/md/binance/BinanceMiniTickerUpdate.h @@ -2,7 +2,7 @@ #include "spark/core/TimeStamp.h" #include "spark/domain/SecurityMarketDataStatistics.h" -#include "server/sparkd/md/binance/BinanceMiniTickerEventType.h" +#include "sparkd/md/binance/BinanceMiniTickerEventType.h" #include #include diff --git a/src/app_sparkd/sparkd/md/binance/BinanceNotionalFilter.h b/src/app_sparkd/sparkd/md/binance/BinanceNotionalFilter.h index c8a265710..f7fd2b93b 100644 --- a/src/app_sparkd/sparkd/md/binance/BinanceNotionalFilter.h +++ b/src/app_sparkd/sparkd/md/binance/BinanceNotionalFilter.h @@ -2,7 +2,7 @@ #include "spark/io/JsonMacros.h" #include "spark/io/JsonReader.h" -#include "server/sparkd/md/binance/BinanceFilterType.h" +#include "sparkd/md/binance/BinanceFilterType.h" #include #include diff --git a/src/app_sparkd/sparkd/md/binance/BinancePercentPriceBySideFilter.h b/src/app_sparkd/sparkd/md/binance/BinancePercentPriceBySideFilter.h index 069086f3a..aeda9ec39 100644 --- a/src/app_sparkd/sparkd/md/binance/BinancePercentPriceBySideFilter.h +++ b/src/app_sparkd/sparkd/md/binance/BinancePercentPriceBySideFilter.h @@ -2,7 +2,7 @@ #include "spark/io/JsonDumper.h" #include "spark/io/JsonReader.h" -#include "server/sparkd/md/binance/BinanceFilterType.h" +#include "sparkd/md/binance/BinanceFilterType.h" #include #include diff --git a/src/app_sparkd/sparkd/md/binance/BinancePercentPriceFilter.h b/src/app_sparkd/sparkd/md/binance/BinancePercentPriceFilter.h index 798502a78..7a7a39a40 100644 --- a/src/app_sparkd/sparkd/md/binance/BinancePercentPriceFilter.h +++ b/src/app_sparkd/sparkd/md/binance/BinancePercentPriceFilter.h @@ -1,7 +1,7 @@ #pragma once #include "spark/io/JsonReader.h" -#include "server/sparkd/md/binance/BinanceFilterType.h" +#include "sparkd/md/binance/BinanceFilterType.h" #include #include diff --git a/src/app_sparkd/sparkd/md/binance/BinancePriceFilter.h b/src/app_sparkd/sparkd/md/binance/BinancePriceFilter.h index 854fdde8e..16d3dc53f 100644 --- a/src/app_sparkd/sparkd/md/binance/BinancePriceFilter.h +++ b/src/app_sparkd/sparkd/md/binance/BinancePriceFilter.h @@ -2,7 +2,7 @@ #include "spark/io/JsonDumper.h" #include "spark/io/JsonReader.h" -#include "server/sparkd/md/binance/BinanceFilterType.h" +#include "sparkd/md/binance/BinanceFilterType.h" #include #include diff --git a/src/app_sparkd/sparkd/md/binance/BinancePriceStatistics.cpp b/src/app_sparkd/sparkd/md/binance/BinancePriceStatistics.cpp index 02cb73309..a38bcc3c8 100644 --- a/src/app_sparkd/sparkd/md/binance/BinancePriceStatistics.cpp +++ b/src/app_sparkd/sparkd/md/binance/BinancePriceStatistics.cpp @@ -5,7 +5,7 @@ #include "spark/domain/SecurityMarketDataStatistics.h" #include "spark/io/JsonDumper.h" #include "spark/io/JsonReader.h" -#include "server/sparkd/md/ccapi/CCApiReader.h" +#include "sparkd/md/ccapi/CCApiReader.h" #include #include diff --git a/src/app_sparkd/sparkd/md/binance/BinancePriceStatisticsAdaptor.cpp b/src/app_sparkd/sparkd/md/binance/BinancePriceStatisticsAdaptor.cpp index 15772960a..924a03ace 100644 --- a/src/app_sparkd/sparkd/md/binance/BinancePriceStatisticsAdaptor.cpp +++ b/src/app_sparkd/sparkd/md/binance/BinancePriceStatisticsAdaptor.cpp @@ -3,7 +3,7 @@ #include "spark/domain/SecurityMarketDataStatistics.h" #include "spark/md/IMarketDataListener.h" #include "spark/utils/bts_fatal.h" -#include "server/sparkd/md/binance/BinancePriceStatistics.h" +#include "sparkd/md/binance/BinancePriceStatistics.h" #include #include diff --git a/src/app_sparkd/sparkd/md/binance/BinancePriceStatisticsAdaptor.h b/src/app_sparkd/sparkd/md/binance/BinancePriceStatisticsAdaptor.h index 5cba149f9..c8883990e 100644 --- a/src/app_sparkd/sparkd/md/binance/BinancePriceStatisticsAdaptor.h +++ b/src/app_sparkd/sparkd/md/binance/BinancePriceStatisticsAdaptor.h @@ -1,7 +1,7 @@ #pragma once #include "spark/domain/SecurityID.h" -#include "server/sparkd/md/ccapi/ICCApiMessageHandler.h" +#include "sparkd/md/ccapi/ICCApiMessageHandler.h" #include #include diff --git a/src/app_sparkd/sparkd/md/binance/BinanceSecurityRequestor.cpp b/src/app_sparkd/sparkd/md/binance/BinanceSecurityRequestor.cpp index 354ae2835..80ca2a8f7 100644 --- a/src/app_sparkd/sparkd/md/binance/BinanceSecurityRequestor.cpp +++ b/src/app_sparkd/sparkd/md/binance/BinanceSecurityRequestor.cpp @@ -8,12 +8,12 @@ #include "spark/logging/logging.h" #include "spark/persistence/IDGenerator.h" #include "spark/utils/bts_fatal.h" -#include "server/sparkd/md/binance/BinanceMessageType.h" -#include "server/sparkd/md/binance/BinanceSpot.h" -#include "server/sparkd/md/ccapi/CCApiCorrelationID.h" -#include "server/sparkd/md/ccapi/CCApiMessageHandler.h" -#include "server/sparkd/md/ccapi/CCApiSession.h" -#include "server/sparkd/md/ccapi/ICCApiMessageHandler.h" +#include "sparkd/md/binance/BinanceMessageType.h" +#include "sparkd/md/binance/BinanceSpot.h" +#include "sparkd/md/ccapi/CCApiCorrelationID.h" +#include "sparkd/md/ccapi/CCApiMessageHandler.h" +#include "sparkd/md/ccapi/CCApiSession.h" +#include "sparkd/md/ccapi/ICCApiMessageHandler.h" #include #include diff --git a/src/app_sparkd/sparkd/md/binance/BinanceSpot.h b/src/app_sparkd/sparkd/md/binance/BinanceSpot.h index b0a1aea13..0721b3434 100644 --- a/src/app_sparkd/sparkd/md/binance/BinanceSpot.h +++ b/src/app_sparkd/sparkd/md/binance/BinanceSpot.h @@ -3,11 +3,11 @@ #include "spark/api/domain/Venue.h" #include "spark/core/FMT_IMPL.h" #include "spark/io/JsonMacros.h" -#include "server/sparkd/md/binance/BinanceFilterTuple.h" -#include "server/sparkd/md/binance/BinanceInstrumentStatus.h" -#include "server/sparkd/md/binance/BinanceOrderType.h" -#include "server/sparkd/md/binance/BinancePermission.h" -#include "server/sparkd/md/binance/BinanceQuoteAsset.h" +#include "sparkd/md/binance/BinanceFilterTuple.h" +#include "sparkd/md/binance/BinanceInstrumentStatus.h" +#include "sparkd/md/binance/BinanceOrderType.h" +#include "sparkd/md/binance/BinancePermission.h" +#include "sparkd/md/binance/BinanceQuoteAsset.h" #include #include diff --git a/src/app_sparkd/sparkd/md/binance/BinanceSubscription.cpp b/src/app_sparkd/sparkd/md/binance/BinanceSubscription.cpp index 7f2466889..4a43385ab 100644 --- a/src/app_sparkd/sparkd/md/binance/BinanceSubscription.cpp +++ b/src/app_sparkd/sparkd/md/binance/BinanceSubscription.cpp @@ -10,15 +10,15 @@ #include "spark/logging/logging.h" #include "spark/md/IMarketDataListener.h" #include "spark/persistence/IDGenerator.h" -#include "server/sparkd/md/binance/BinanceMessageType.h" -#include "server/sparkd/md/binance/BinancePriceStatistics.h" -#include "server/sparkd/md/binance/BinancePriceStatisticsAdaptor.h" -#include "server/sparkd/md/binance/BinanceSecurityRequestor.h" -#include "server/sparkd/md/ccapi/CCApiCorrelationID.h" -#include "server/sparkd/md/ccapi/CCApiMarketDepthAdaptor.h" -#include "server/sparkd/md/ccapi/CCApiMessageLogger.h" -#include "server/sparkd/md/ccapi/CCApiSession.h" -#include "server/sparkd/md/ccapi/CCApiTradeAdaptor.h" +#include "sparkd/md/binance/BinanceMessageType.h" +#include "sparkd/md/binance/BinancePriceStatistics.h" +#include "sparkd/md/binance/BinancePriceStatisticsAdaptor.h" +#include "sparkd/md/binance/BinanceSecurityRequestor.h" +#include "sparkd/md/ccapi/CCApiCorrelationID.h" +#include "sparkd/md/ccapi/CCApiMarketDepthAdaptor.h" +#include "sparkd/md/ccapi/CCApiMessageLogger.h" +#include "sparkd/md/ccapi/CCApiSession.h" +#include "sparkd/md/ccapi/CCApiTradeAdaptor.h" #include #include diff --git a/src/app_sparkd/sparkd/md/binance/BinanceTrailingDeltaFilter.h b/src/app_sparkd/sparkd/md/binance/BinanceTrailingDeltaFilter.h index 0651a01f0..6278e043a 100644 --- a/src/app_sparkd/sparkd/md/binance/BinanceTrailingDeltaFilter.h +++ b/src/app_sparkd/sparkd/md/binance/BinanceTrailingDeltaFilter.h @@ -2,7 +2,7 @@ #include "spark/io/JsonDumper.h" #include "spark/io/JsonReader.h" -#include "server/sparkd/md/binance/BinanceFilterType.h" +#include "sparkd/md/binance/BinanceFilterType.h" #include diff --git a/src/app_sparkd/sparkd/md/binance_us/BinanceUsPriceStatistics.cpp b/src/app_sparkd/sparkd/md/binance_us/BinanceUsPriceStatistics.cpp index 30b732beb..acdc20d1e 100644 --- a/src/app_sparkd/sparkd/md/binance_us/BinanceUsPriceStatistics.cpp +++ b/src/app_sparkd/sparkd/md/binance_us/BinanceUsPriceStatistics.cpp @@ -5,7 +5,7 @@ #include "spark/domain/SecurityMarketDataStatistics.h" #include "spark/io/JsonDumper.h" #include "spark/io/JsonReader.h" -#include "server/sparkd/md/ccapi/CCApiReader.h" +#include "sparkd/md/ccapi/CCApiReader.h" #include #include diff --git a/src/app_sparkd/sparkd/md/binance_us/BinanceUsPriceStatisticsAdaptor.cpp b/src/app_sparkd/sparkd/md/binance_us/BinanceUsPriceStatisticsAdaptor.cpp index 3929b43fb..c2f2f28d0 100644 --- a/src/app_sparkd/sparkd/md/binance_us/BinanceUsPriceStatisticsAdaptor.cpp +++ b/src/app_sparkd/sparkd/md/binance_us/BinanceUsPriceStatisticsAdaptor.cpp @@ -3,7 +3,7 @@ #include "spark/domain/SecurityMarketDataStatistics.h" #include "spark/md/IMarketDataListener.h" #include "spark/utils/bts_fatal.h" -#include "server/sparkd/md/binance_us/BinanceUsPriceStatistics.h" +#include "sparkd/md/binance_us/BinanceUsPriceStatistics.h" #include #include diff --git a/src/app_sparkd/sparkd/md/binance_us/BinanceUsPriceStatisticsAdaptor.h b/src/app_sparkd/sparkd/md/binance_us/BinanceUsPriceStatisticsAdaptor.h index cee0da1d7..6ec518da5 100644 --- a/src/app_sparkd/sparkd/md/binance_us/BinanceUsPriceStatisticsAdaptor.h +++ b/src/app_sparkd/sparkd/md/binance_us/BinanceUsPriceStatisticsAdaptor.h @@ -1,7 +1,7 @@ #pragma once #include "spark/domain/SecurityID.h" -#include "server/sparkd/md/ccapi/ICCApiMessageHandler.h" +#include "sparkd/md/ccapi/ICCApiMessageHandler.h" #include #include diff --git a/src/app_sparkd/sparkd/md/binance_us/BinanceUsSecurityRequestor.cpp b/src/app_sparkd/sparkd/md/binance_us/BinanceUsSecurityRequestor.cpp index a3a01391c..8e3dcfc62 100644 --- a/src/app_sparkd/sparkd/md/binance_us/BinanceUsSecurityRequestor.cpp +++ b/src/app_sparkd/sparkd/md/binance_us/BinanceUsSecurityRequestor.cpp @@ -7,12 +7,12 @@ #include "spark/domain/SecurityCriteria.h" #include "spark/logging/logging.h" #include "spark/persistence/IDGenerator.h" -#include "server/sparkd/md/binance_us/BinanceUsMessageType.h" -#include "server/sparkd/md/binance_us/BinanceUsSpot.h" -#include "server/sparkd/md/ccapi/CCApiCorrelationID.h" -#include "server/sparkd/md/ccapi/CCApiMessageHandler.h" -#include "server/sparkd/md/ccapi/CCApiSession.h" -#include "server/sparkd/md/ccapi/ICCApiMessageHandler.h" +#include "sparkd/md/binance_us/BinanceUsMessageType.h" +#include "sparkd/md/binance_us/BinanceUsSpot.h" +#include "sparkd/md/ccapi/CCApiCorrelationID.h" +#include "sparkd/md/ccapi/CCApiMessageHandler.h" +#include "sparkd/md/ccapi/CCApiSession.h" +#include "sparkd/md/ccapi/ICCApiMessageHandler.h" #include #include diff --git a/src/app_sparkd/sparkd/md/binance_us/BinanceUsSpot.h b/src/app_sparkd/sparkd/md/binance_us/BinanceUsSpot.h index a5232b0b2..383b54b4f 100644 --- a/src/app_sparkd/sparkd/md/binance_us/BinanceUsSpot.h +++ b/src/app_sparkd/sparkd/md/binance_us/BinanceUsSpot.h @@ -1,6 +1,6 @@ #pragma once -#include "server/sparkd/md/binance/BinanceSpot.h" +#include "sparkd/md/binance/BinanceSpot.h" namespace bts::md::binance_us { diff --git a/src/app_sparkd/sparkd/md/binance_us/BinanceUsSubscription.cpp b/src/app_sparkd/sparkd/md/binance_us/BinanceUsSubscription.cpp index e5dbfb402..e88d06754 100644 --- a/src/app_sparkd/sparkd/md/binance_us/BinanceUsSubscription.cpp +++ b/src/app_sparkd/sparkd/md/binance_us/BinanceUsSubscription.cpp @@ -10,16 +10,16 @@ #include "spark/logging/logging.h" #include "spark/md/IMarketDataListener.h" #include "spark/persistence/IDGenerator.h" -#include "server/sparkd/md/binance/BinanceSpot.h" -#include "server/sparkd/md/binance_us/BinanceUsMessageType.h" -#include "server/sparkd/md/binance_us/BinanceUsPriceStatistics.h" -#include "server/sparkd/md/binance_us/BinanceUsPriceStatisticsAdaptor.h" -#include "server/sparkd/md/binance_us/BinanceUsSecurityRequestor.h" -#include "server/sparkd/md/ccapi/CCApiCorrelationID.h" -#include "server/sparkd/md/ccapi/CCApiMarketDepthAdaptor.h" -#include "server/sparkd/md/ccapi/CCApiMessageLogger.h" -#include "server/sparkd/md/ccapi/CCApiSession.h" -#include "server/sparkd/md/ccapi/CCApiTradeAdaptor.h" +#include "sparkd/md/binance/BinanceSpot.h" +#include "sparkd/md/binance_us/BinanceUsMessageType.h" +#include "sparkd/md/binance_us/BinanceUsPriceStatistics.h" +#include "sparkd/md/binance_us/BinanceUsPriceStatisticsAdaptor.h" +#include "sparkd/md/binance_us/BinanceUsSecurityRequestor.h" +#include "sparkd/md/ccapi/CCApiCorrelationID.h" +#include "sparkd/md/ccapi/CCApiMarketDepthAdaptor.h" +#include "sparkd/md/ccapi/CCApiMessageLogger.h" +#include "sparkd/md/ccapi/CCApiSession.h" +#include "sparkd/md/ccapi/CCApiTradeAdaptor.h" #include #include diff --git a/src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuture.h b/src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuture.h index 459f8057a..1075cf878 100644 --- a/src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuture.h +++ b/src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuture.h @@ -1,9 +1,9 @@ #pragma once -#include "server/sparkd/md/binance/BinanceInstrumentStatus.h" -#include "server/sparkd/md/binance/BinanceQuoteAsset.h" -#include "server/sparkd/md/binance_usds_futures/BinanceUsdsFuturesContractType.h" -#include "server/sparkd/md/binance_usds_futures/BinanceUsdsFuturesFilterTuple.h" +#include "sparkd/md/binance/BinanceInstrumentStatus.h" +#include "sparkd/md/binance/BinanceQuoteAsset.h" +#include "sparkd/md/binance_usds_futures/BinanceUsdsFuturesContractType.h" +#include "sparkd/md/binance_usds_futures/BinanceUsdsFuturesFilterTuple.h" #include #include diff --git a/src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuturesFilterTuple.h b/src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuturesFilterTuple.h index 0b1bc4e70..0c780b8d1 100644 --- a/src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuturesFilterTuple.h +++ b/src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuturesFilterTuple.h @@ -2,18 +2,18 @@ #include "spark/io/JsonDumper.h" #include "spark/io/JsonReader.h" -#include "server/sparkd/md/binance/BinanceFilterType.h" -#include "server/sparkd/md/binance/BinanceIcebergPartsFilter.h" -#include "server/sparkd/md/binance/BinanceLotSizeFilter.h" -#include "server/sparkd/md/binance/BinanceMarketLotSizeFilter.h" -#include "server/sparkd/md/binance/BinanceMaxPositionFilter.h" -#include "server/sparkd/md/binance/BinanceMinNotionalFilter.h" -#include "server/sparkd/md/binance/BinancePercentPriceBySideFilter.h" -#include "server/sparkd/md/binance/BinancePriceFilter.h" -#include "server/sparkd/md/binance/BinanceTrailingDeltaFilter.h" -#include "server/sparkd/md/binance_usds_futures/BinanceUsdsFuturesMaxNumAlgoOrdersFilter.h" -#include "server/sparkd/md/binance_usds_futures/BinanceUsdsFuturesMaxNumOrdersFilter.h" -#include "server/sparkd/md/binance_usds_futures/BinanceUsdsFuturesPercentPriceFilter.h" +#include "sparkd/md/binance/BinanceFilterType.h" +#include "sparkd/md/binance/BinanceIcebergPartsFilter.h" +#include "sparkd/md/binance/BinanceLotSizeFilter.h" +#include "sparkd/md/binance/BinanceMarketLotSizeFilter.h" +#include "sparkd/md/binance/BinanceMaxPositionFilter.h" +#include "sparkd/md/binance/BinanceMinNotionalFilter.h" +#include "sparkd/md/binance/BinancePercentPriceBySideFilter.h" +#include "sparkd/md/binance/BinancePriceFilter.h" +#include "sparkd/md/binance/BinanceTrailingDeltaFilter.h" +#include "sparkd/md/binance_usds_futures/BinanceUsdsFuturesMaxNumAlgoOrdersFilter.h" +#include "sparkd/md/binance_usds_futures/BinanceUsdsFuturesMaxNumOrdersFilter.h" +#include "sparkd/md/binance_usds_futures/BinanceUsdsFuturesPercentPriceFilter.h" #include #include diff --git a/src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuturesMaxNumAlgoOrdersFilter.h b/src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuturesMaxNumAlgoOrdersFilter.h index b4649f018..ce32ad820 100644 --- a/src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuturesMaxNumAlgoOrdersFilter.h +++ b/src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuturesMaxNumAlgoOrdersFilter.h @@ -2,7 +2,7 @@ #include "spark/io/JsonDumper.h" #include "spark/io/JsonReader.h" -#include "server/sparkd/md/binance/BinanceFilterType.h" +#include "sparkd/md/binance/BinanceFilterType.h" #include #include diff --git a/src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuturesMaxNumOrdersFilter.h b/src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuturesMaxNumOrdersFilter.h index f9271b693..85bff3366 100644 --- a/src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuturesMaxNumOrdersFilter.h +++ b/src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuturesMaxNumOrdersFilter.h @@ -2,7 +2,7 @@ #include "spark/io/JsonDumper.h" #include "spark/io/JsonReader.h" -#include "server/sparkd/md/binance/BinanceFilterType.h" +#include "sparkd/md/binance/BinanceFilterType.h" #include #include diff --git a/src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuturesPercentPriceFilter.h b/src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuturesPercentPriceFilter.h index e44cac123..176b6c4d6 100644 --- a/src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuturesPercentPriceFilter.h +++ b/src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuturesPercentPriceFilter.h @@ -2,7 +2,7 @@ #include "spark/io/JsonDumper.h" #include "spark/io/JsonReader.h" -#include "server/sparkd/md/binance/BinanceFilterType.h" +#include "sparkd/md/binance/BinanceFilterType.h" #include #include diff --git a/src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuturesPriceStatistics.cpp b/src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuturesPriceStatistics.cpp index c3e9ddc00..659096a85 100644 --- a/src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuturesPriceStatistics.cpp +++ b/src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuturesPriceStatistics.cpp @@ -3,7 +3,7 @@ #include "spark/domain/Quantity.h" #include "spark/domain/SecurityMarketDataStatistics.h" #include "spark/io/JsonReader.h" -#include "server/sparkd/md/ccapi/CCApiReader.h" +#include "sparkd/md/ccapi/CCApiReader.h" #include #include diff --git a/src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuturesPriceStatisticsAdaptor.cpp b/src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuturesPriceStatisticsAdaptor.cpp index 689fab660..a546ce3b0 100644 --- a/src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuturesPriceStatisticsAdaptor.cpp +++ b/src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuturesPriceStatisticsAdaptor.cpp @@ -3,7 +3,7 @@ #include "spark/domain/SecurityMarketDataStatistics.h" #include "spark/md/IMarketDataListener.h" #include "spark/utils/bts_fatal.h" -#include "server/sparkd/md/binance_usds_futures/BinanceUsdsFuturesPriceStatistics.h" +#include "sparkd/md/binance_usds_futures/BinanceUsdsFuturesPriceStatistics.h" #include #include diff --git a/src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuturesPriceStatisticsAdaptor.h b/src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuturesPriceStatisticsAdaptor.h index c2057e8ba..fa88154fa 100644 --- a/src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuturesPriceStatisticsAdaptor.h +++ b/src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuturesPriceStatisticsAdaptor.h @@ -1,7 +1,7 @@ #pragma once #include "spark/domain/SecurityID.h" -#include "server/sparkd/md/ccapi/ICCApiMessageHandler.h" +#include "sparkd/md/ccapi/ICCApiMessageHandler.h" #include diff --git a/src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuturesSecurityRequestor.cpp b/src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuturesSecurityRequestor.cpp index dcf7f891e..0a4053e3d 100644 --- a/src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuturesSecurityRequestor.cpp +++ b/src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuturesSecurityRequestor.cpp @@ -9,11 +9,11 @@ #include "spark/logging/logging.h" #include "spark/persistence/IDGenerator.h" #include "spark/utils/bts_fatal.h" -#include "server/sparkd/md/binance_usds_futures/BinanceUsdsFuture.h" -#include "server/sparkd/md/binance_usds_futures/BinanceUsdsFuturesMessageType.h" -#include "server/sparkd/md/ccapi/CCApiCorrelationID.h" -#include "server/sparkd/md/ccapi/CCApiMessageHandler.h" -#include "server/sparkd/md/ccapi/CCApiSession.h" +#include "sparkd/md/binance_usds_futures/BinanceUsdsFuture.h" +#include "sparkd/md/binance_usds_futures/BinanceUsdsFuturesMessageType.h" +#include "sparkd/md/ccapi/CCApiCorrelationID.h" +#include "sparkd/md/ccapi/CCApiMessageHandler.h" +#include "sparkd/md/ccapi/CCApiSession.h" #include #include diff --git a/src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuturesSubscription.cpp b/src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuturesSubscription.cpp index 8b43116c6..5113682e2 100644 --- a/src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuturesSubscription.cpp +++ b/src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuturesSubscription.cpp @@ -10,13 +10,13 @@ #include "spark/logging/logging.h" #include "spark/md/IMarketDataListener.h" #include "spark/persistence/IDGenerator.h" -#include "server/sparkd/md/binance_usds_futures/BinanceUsdsFuturesMessageType.h" -#include "server/sparkd/md/binance_usds_futures/BinanceUsdsFuturesPriceStatisticsAdaptor.h" -#include "server/sparkd/md/binance_usds_futures/BinanceUsdsFuturesSecurityRequestor.h" -#include "server/sparkd/md/ccapi/CCApiCorrelationID.h" -#include "server/sparkd/md/ccapi/CCApiMarketDepthAdaptor.h" -#include "server/sparkd/md/ccapi/CCApiSession.h" -#include "server/sparkd/md/ccapi/CCApiTradeAdaptor.h" +#include "sparkd/md/binance_usds_futures/BinanceUsdsFuturesMessageType.h" +#include "sparkd/md/binance_usds_futures/BinanceUsdsFuturesPriceStatisticsAdaptor.h" +#include "sparkd/md/binance_usds_futures/BinanceUsdsFuturesSecurityRequestor.h" +#include "sparkd/md/ccapi/CCApiCorrelationID.h" +#include "sparkd/md/ccapi/CCApiMarketDepthAdaptor.h" +#include "sparkd/md/ccapi/CCApiSession.h" +#include "sparkd/md/ccapi/CCApiTradeAdaptor.h" #include #include diff --git a/src/app_sparkd/sparkd/md/ccapi/CCApiCompositeMessageHandler.h b/src/app_sparkd/sparkd/md/ccapi/CCApiCompositeMessageHandler.h index 373ddcda8..fb70cefcc 100644 --- a/src/app_sparkd/sparkd/md/ccapi/CCApiCompositeMessageHandler.h +++ b/src/app_sparkd/sparkd/md/ccapi/CCApiCompositeMessageHandler.h @@ -1,6 +1,6 @@ #pragma once -#include "server/sparkd/md/ccapi/ICCApiMessageHandler.h" +#include "sparkd/md/ccapi/ICCApiMessageHandler.h" #include #include diff --git a/src/app_sparkd/sparkd/md/ccapi/CCApiEventDemuxer.cpp b/src/app_sparkd/sparkd/md/ccapi/CCApiEventDemuxer.cpp index 8d4732a04..0441c4d3e 100644 --- a/src/app_sparkd/sparkd/md/ccapi/CCApiEventDemuxer.cpp +++ b/src/app_sparkd/sparkd/md/ccapi/CCApiEventDemuxer.cpp @@ -1,8 +1,8 @@ #include "CCApiEventDemuxer.h" #include "spark/collections/DiscreteValuesFilter.h" #include "spark/collections/Find.h" -#include "server/sparkd/md/ccapi/CCApiCorrelationID.h" -#include "server/sparkd/md/ccapi/ICCApiMessageHandler.h" +#include "sparkd/md/ccapi/CCApiCorrelationID.h" +#include "sparkd/md/ccapi/ICCApiMessageHandler.h" #include "spark/utils/helper_macros.h" #include diff --git a/src/app_sparkd/sparkd/md/ccapi/CCApiEventDemuxer.h b/src/app_sparkd/sparkd/md/ccapi/CCApiEventDemuxer.h index 59b8dbcaf..43276976c 100644 --- a/src/app_sparkd/sparkd/md/ccapi/CCApiEventDemuxer.h +++ b/src/app_sparkd/sparkd/md/ccapi/CCApiEventDemuxer.h @@ -1,6 +1,6 @@ #pragma once -#include "server/sparkd/md/ccapi/ICCApiMessageHandler.h" +#include "sparkd/md/ccapi/ICCApiMessageHandler.h" #include #include diff --git a/src/app_sparkd/sparkd/md/ccapi/CCApiJsonRpcRequest.h b/src/app_sparkd/sparkd/md/ccapi/CCApiJsonRpcRequest.h index 487d0a458..b6494975e 100644 --- a/src/app_sparkd/sparkd/md/ccapi/CCApiJsonRpcRequest.h +++ b/src/app_sparkd/sparkd/md/ccapi/CCApiJsonRpcRequest.h @@ -1,7 +1,7 @@ #pragma once #include "spark/io/websocket/JsonRpcRequest.h" -#include "server/sparkd/md/ccapi/CCApiCorrelationID.h" +#include "sparkd/md/ccapi/CCApiCorrelationID.h" #include diff --git a/src/app_sparkd/sparkd/md/ccapi/CCApiJsonRpcRouter.cpp b/src/app_sparkd/sparkd/md/ccapi/CCApiJsonRpcRouter.cpp index 54808c966..f9fa0cf28 100644 --- a/src/app_sparkd/sparkd/md/ccapi/CCApiJsonRpcRouter.cpp +++ b/src/app_sparkd/sparkd/md/ccapi/CCApiJsonRpcRouter.cpp @@ -2,7 +2,7 @@ #include "spark/algorithm/TryCatch.h" #include "spark/io/websocket/JsonRpcHandler.h" #include "spark/utils/bts_fatal.h" -#include "server/sparkd/md/ccapi/CCApiReader.h" +#include "sparkd/md/ccapi/CCApiReader.h" #include #include diff --git a/src/app_sparkd/sparkd/md/ccapi/CCApiJsonRpcRouter.h b/src/app_sparkd/sparkd/md/ccapi/CCApiJsonRpcRouter.h index 7a5f7ed05..324c74c4d 100644 --- a/src/app_sparkd/sparkd/md/ccapi/CCApiJsonRpcRouter.h +++ b/src/app_sparkd/sparkd/md/ccapi/CCApiJsonRpcRouter.h @@ -2,7 +2,7 @@ #include "spark/io/websocket/JsonRpcHandler.h" #include "spark/io/websocket/JsonRpcRouter.h" -#include "server/sparkd/md/ccapi/ICCApiMessageHandler.h" +#include "sparkd/md/ccapi/ICCApiMessageHandler.h" #include #include diff --git a/src/app_sparkd/sparkd/md/ccapi/CCApiMarketDepthAdaptor.cpp b/src/app_sparkd/sparkd/md/ccapi/CCApiMarketDepthAdaptor.cpp index 941b93182..fa14b1759 100644 --- a/src/app_sparkd/sparkd/md/ccapi/CCApiMarketDepthAdaptor.cpp +++ b/src/app_sparkd/sparkd/md/ccapi/CCApiMarketDepthAdaptor.cpp @@ -1,9 +1,9 @@ #include "CCApiMarketDepthAdaptor.h" #include "spark/domain/BUY_SELL.h" #include "spark/domain/Book.h" -#include "server/sparkd/md/ccapi/CCApiCorrelationID.h" -#include "server/sparkd/md/ccapi/CCApiDepthWalker.h" -#include "server/sparkd/md/ccapi/ICCApiMessageHandler.h" +#include "sparkd/md/ccapi/CCApiCorrelationID.h" +#include "sparkd/md/ccapi/CCApiDepthWalker.h" +#include "sparkd/md/ccapi/ICCApiMessageHandler.h" #include #include diff --git a/src/app_sparkd/sparkd/md/ccapi/CCApiMarketDepthAdaptor.h b/src/app_sparkd/sparkd/md/ccapi/CCApiMarketDepthAdaptor.h index bfc995106..9390fa388 100644 --- a/src/app_sparkd/sparkd/md/ccapi/CCApiMarketDepthAdaptor.h +++ b/src/app_sparkd/sparkd/md/ccapi/CCApiMarketDepthAdaptor.h @@ -2,7 +2,7 @@ #include "spark/domain/Book.h" #include "spark/md/IMarketDataListener.h" -#include "server/sparkd/md/ccapi/ICCApiMessageHandler.h" +#include "sparkd/md/ccapi/ICCApiMessageHandler.h" #include diff --git a/src/app_sparkd/sparkd/md/ccapi/CCApiMessageHandler.h b/src/app_sparkd/sparkd/md/ccapi/CCApiMessageHandler.h index 7ecc2b51d..8427196d0 100644 --- a/src/app_sparkd/sparkd/md/ccapi/CCApiMessageHandler.h +++ b/src/app_sparkd/sparkd/md/ccapi/CCApiMessageHandler.h @@ -1,7 +1,7 @@ #pragma once -#include "server/sparkd/md/ccapi/CCApiCorrelationID.h" -#include "server/sparkd/md/ccapi/ICCApiMessageHandler.h" +#include "sparkd/md/ccapi/CCApiCorrelationID.h" +#include "sparkd/md/ccapi/ICCApiMessageHandler.h" #include "spark/utils/Delegate.h" #include diff --git a/src/app_sparkd/sparkd/md/ccapi/CCApiMessageLogger.h b/src/app_sparkd/sparkd/md/ccapi/CCApiMessageLogger.h index ec87b758b..cf737866c 100644 --- a/src/app_sparkd/sparkd/md/ccapi/CCApiMessageLogger.h +++ b/src/app_sparkd/sparkd/md/ccapi/CCApiMessageLogger.h @@ -1,6 +1,6 @@ #pragma once -#include "server/sparkd/md/ccapi/ICCApiMessageHandler.h" +#include "sparkd/md/ccapi/ICCApiMessageHandler.h" #include diff --git a/src/app_sparkd/sparkd/md/ccapi/CCApiSession.cpp b/src/app_sparkd/sparkd/md/ccapi/CCApiSession.cpp index a89dbba1a..25fb49b81 100644 --- a/src/app_sparkd/sparkd/md/ccapi/CCApiSession.cpp +++ b/src/app_sparkd/sparkd/md/ccapi/CCApiSession.cpp @@ -1,8 +1,8 @@ #include "CCApiSession.h" #include "spark/logging/logging.h" -#include "server/sparkd/md/ccapi/CCApiCorrelationID.h" -#include "server/sparkd/md/ccapi/CCApiEventDemuxer.h" -#include "server/sparkd/md/ccapi/ICCApiMessageHandler.h" +#include "sparkd/md/ccapi/CCApiCorrelationID.h" +#include "sparkd/md/ccapi/CCApiEventDemuxer.h" +#include "sparkd/md/ccapi/ICCApiMessageHandler.h" #include #include diff --git a/src/app_sparkd/sparkd/md/ccapi/CCApiSession.h b/src/app_sparkd/sparkd/md/ccapi/CCApiSession.h index c9d92f718..4cca12e1f 100644 --- a/src/app_sparkd/sparkd/md/ccapi/CCApiSession.h +++ b/src/app_sparkd/sparkd/md/ccapi/CCApiSession.h @@ -1,8 +1,8 @@ #pragma once #include "spark/utils/Delegate.h" -#include "server/sparkd/md/ccapi/CCApiCorrelationID.h" -#include "server/sparkd/md/ccapi/ICCApiMessageHandler.h" +#include "sparkd/md/ccapi/CCApiCorrelationID.h" +#include "sparkd/md/ccapi/ICCApiMessageHandler.h" #include #include diff --git a/src/app_sparkd/sparkd/md/ccapi/CCApiTradeAdaptor.cpp b/src/app_sparkd/sparkd/md/ccapi/CCApiTradeAdaptor.cpp index 168468a0b..dd441e3af 100644 --- a/src/app_sparkd/sparkd/md/ccapi/CCApiTradeAdaptor.cpp +++ b/src/app_sparkd/sparkd/md/ccapi/CCApiTradeAdaptor.cpp @@ -3,9 +3,9 @@ #include "spark/domain/SecurityID.h" #include "spark/domain/TradeRecord.h" #include "spark/utils/bts_fatal.h" -#include "server/sparkd/md/ccapi/CCApiCorrelationID.h" -#include "server/sparkd/md/ccapi/CCApiTradeRecord.h" -#include "server/sparkd/md/ccapi/ICCApiMessageHandler.h" +#include "sparkd/md/ccapi/CCApiCorrelationID.h" +#include "sparkd/md/ccapi/CCApiTradeRecord.h" +#include "sparkd/md/ccapi/ICCApiMessageHandler.h" #include #include diff --git a/src/app_sparkd/sparkd/md/ccapi/CCApiTradeAdaptor.h b/src/app_sparkd/sparkd/md/ccapi/CCApiTradeAdaptor.h index 836640d26..90245c717 100644 --- a/src/app_sparkd/sparkd/md/ccapi/CCApiTradeAdaptor.h +++ b/src/app_sparkd/sparkd/md/ccapi/CCApiTradeAdaptor.h @@ -1,8 +1,8 @@ #pragma once #include "spark/domain/SecurityID.h" -#include "server/sparkd/md/ccapi/CCApiTradeRecord.h" -#include "server/sparkd/md/ccapi/ICCApiMessageHandler.h" +#include "sparkd/md/ccapi/CCApiTradeRecord.h" +#include "sparkd/md/ccapi/ICCApiMessageHandler.h" #include "spark/md/IMarketDataListener.h" #include diff --git a/src/app_sparkd/sparkd/md/ccapi/CCApiTradeRecord.cpp b/src/app_sparkd/sparkd/md/ccapi/CCApiTradeRecord.cpp index 244b3d95d..cabfbfc23 100644 --- a/src/app_sparkd/sparkd/md/ccapi/CCApiTradeRecord.cpp +++ b/src/app_sparkd/sparkd/md/ccapi/CCApiTradeRecord.cpp @@ -7,7 +7,7 @@ #include "spark/io/JsonReader.h" #include "spark/utils/bts_chrono.h" #include "spark/utils/datetime.h" -#include "server/sparkd/md/ccapi/CCApiReader.h" +#include "sparkd/md/ccapi/CCApiReader.h" #include #include diff --git a/src/app_sparkd/sparkd/md/ccapi/CCDemoListener.cpp b/src/app_sparkd/sparkd/md/ccapi/CCDemoListener.cpp index 172256cda..a23d072c4 100644 --- a/src/app_sparkd/sparkd/md/ccapi/CCDemoListener.cpp +++ b/src/app_sparkd/sparkd/md/ccapi/CCDemoListener.cpp @@ -1,6 +1,6 @@ #include "CCDemoListener.h" #include "spark/logging/logging.h" -#include "server/sparkd/md/MarketDataError.h" +#include "sparkd/md/MarketDataError.h" #include #include diff --git a/src/app_sparkd/sparkd/md/ccapi/ICCApiMessageHandler.cpp b/src/app_sparkd/sparkd/md/ccapi/ICCApiMessageHandler.cpp index 594b156fc..24ca70a7b 100644 --- a/src/app_sparkd/sparkd/md/ccapi/ICCApiMessageHandler.cpp +++ b/src/app_sparkd/sparkd/md/ccapi/ICCApiMessageHandler.cpp @@ -1,5 +1,5 @@ #include "ICCApiMessageHandler.h" -#include "server/sparkd/md/ccapi/ICCApiMessageHandler.h" +#include "sparkd/md/ccapi/ICCApiMessageHandler.h" namespace bts::md { diff --git a/src/app_sparkd/sparkd/md/ccapi/ICCApiMessageHandler.h b/src/app_sparkd/sparkd/md/ccapi/ICCApiMessageHandler.h index 7e805d287..549741fe5 100644 --- a/src/app_sparkd/sparkd/md/ccapi/ICCApiMessageHandler.h +++ b/src/app_sparkd/sparkd/md/ccapi/ICCApiMessageHandler.h @@ -1,6 +1,6 @@ #pragma once -#include "server/sparkd/md/ccapi/CCApiCorrelationID.h" +#include "sparkd/md/ccapi/CCApiCorrelationID.h" #include #include diff --git a/src/app_sparkd/sparkd/md/coinbase/CoinbasePriceStatistics.cpp b/src/app_sparkd/sparkd/md/coinbase/CoinbasePriceStatistics.cpp index 605874ebe..0c53e56b5 100644 --- a/src/app_sparkd/sparkd/md/coinbase/CoinbasePriceStatistics.cpp +++ b/src/app_sparkd/sparkd/md/coinbase/CoinbasePriceStatistics.cpp @@ -5,7 +5,7 @@ #include "spark/domain/SecurityMarketDataStatistics.h" #include "spark/io/JsonDumper.h" #include "spark/io/JsonReader.h" -#include "server/sparkd/md/ccapi/CCApiReader.h" +#include "sparkd/md/ccapi/CCApiReader.h" #include #include diff --git a/src/app_sparkd/sparkd/md/coinbase/CoinbasePriceStatisticsAdaptor.cpp b/src/app_sparkd/sparkd/md/coinbase/CoinbasePriceStatisticsAdaptor.cpp index 30e2733b3..9f349c3f4 100644 --- a/src/app_sparkd/sparkd/md/coinbase/CoinbasePriceStatisticsAdaptor.cpp +++ b/src/app_sparkd/sparkd/md/coinbase/CoinbasePriceStatisticsAdaptor.cpp @@ -2,7 +2,7 @@ #include "spark/domain/SecurityID.h" #include "spark/domain/SecurityMarketDataStatistics.h" #include "spark/md/IMarketDataListener.h" -#include "server/sparkd/md/coinbase/CoinbasePriceStatistics.h" +#include "sparkd/md/coinbase/CoinbasePriceStatistics.h" #include #include diff --git a/src/app_sparkd/sparkd/md/coinbase/CoinbasePriceStatisticsAdaptor.h b/src/app_sparkd/sparkd/md/coinbase/CoinbasePriceStatisticsAdaptor.h index 6fba29f1d..abac72b2f 100644 --- a/src/app_sparkd/sparkd/md/coinbase/CoinbasePriceStatisticsAdaptor.h +++ b/src/app_sparkd/sparkd/md/coinbase/CoinbasePriceStatisticsAdaptor.h @@ -1,7 +1,7 @@ #pragma once #include "spark/domain/SecurityID.h" -#include "server/sparkd/md/ccapi/ICCApiMessageHandler.h" +#include "sparkd/md/ccapi/ICCApiMessageHandler.h" #include diff --git a/src/app_sparkd/sparkd/md/coinbase/CoinbaseSecurityRequestor.cpp b/src/app_sparkd/sparkd/md/coinbase/CoinbaseSecurityRequestor.cpp index 7734fbff2..764be7798 100644 --- a/src/app_sparkd/sparkd/md/coinbase/CoinbaseSecurityRequestor.cpp +++ b/src/app_sparkd/sparkd/md/coinbase/CoinbaseSecurityRequestor.cpp @@ -7,11 +7,11 @@ #include "spark/domain/SecurityCriteria.h" #include "spark/logging/logging.h" #include "spark/persistence/IDGenerator.h" -#include "server/sparkd/md/ccapi/CCApiCorrelationID.h" -#include "server/sparkd/md/ccapi/CCApiMessageHandler.h" -#include "server/sparkd/md/ccapi/CCApiSession.h" -#include "server/sparkd/md/ccapi/ICCApiMessageHandler.h" -#include "server/sparkd/md/coinbase/CoinbaseSpot.h" +#include "sparkd/md/ccapi/CCApiCorrelationID.h" +#include "sparkd/md/ccapi/CCApiMessageHandler.h" +#include "sparkd/md/ccapi/CCApiSession.h" +#include "sparkd/md/ccapi/ICCApiMessageHandler.h" +#include "sparkd/md/coinbase/CoinbaseSpot.h" #include #include diff --git a/src/app_sparkd/sparkd/md/coinbase/CoinbaseSubscription.cpp b/src/app_sparkd/sparkd/md/coinbase/CoinbaseSubscription.cpp index 1cd2943d9..18e611041 100644 --- a/src/app_sparkd/sparkd/md/coinbase/CoinbaseSubscription.cpp +++ b/src/app_sparkd/sparkd/md/coinbase/CoinbaseSubscription.cpp @@ -7,12 +7,12 @@ #include "spark/io/QueryParams.h" #include "spark/md/common.h" #include "spark/persistence/IDGenerator.h" -#include "server/sparkd/md/ccapi/CCApiMarketDepthAdaptor.h" -#include "server/sparkd/md/ccapi/CCApiSession.h" -#include "server/sparkd/md/ccapi/CCApiTradeAdaptor.h" -#include "server/sparkd/md/coinbase/CoinbaseMessageType.h" -#include "server/sparkd/md/coinbase/CoinbasePriceStatisticsAdaptor.h" -#include "server/sparkd/md/coinbase/CoinbaseSecurityRequestor.h" +#include "sparkd/md/ccapi/CCApiMarketDepthAdaptor.h" +#include "sparkd/md/ccapi/CCApiSession.h" +#include "sparkd/md/ccapi/CCApiTradeAdaptor.h" +#include "sparkd/md/coinbase/CoinbaseMessageType.h" +#include "sparkd/md/coinbase/CoinbasePriceStatisticsAdaptor.h" +#include "sparkd/md/coinbase/CoinbaseSecurityRequestor.h" #include #include diff --git a/src/app_sparkd/sparkd/md/deribit/DeribitChannelDemuxer.cpp b/src/app_sparkd/sparkd/md/deribit/DeribitChannelDemuxer.cpp index a0d858100..66e0f6670 100644 --- a/src/app_sparkd/sparkd/md/deribit/DeribitChannelDemuxer.cpp +++ b/src/app_sparkd/sparkd/md/deribit/DeribitChannelDemuxer.cpp @@ -1,7 +1,7 @@ #include "DeribitChannelDemuxer.h" #include "spark/io/JsonReader.h" -#include "server/sparkd/md/ccapi/CCApiCorrelationID.h" -#include "server/sparkd/md/ccapi/CCApiReader.h" +#include "sparkd/md/ccapi/CCApiCorrelationID.h" +#include "sparkd/md/ccapi/CCApiReader.h" #include #include diff --git a/src/app_sparkd/sparkd/md/deribit/DeribitChannelDemuxer.h b/src/app_sparkd/sparkd/md/deribit/DeribitChannelDemuxer.h index d68667dbb..98251e62b 100644 --- a/src/app_sparkd/sparkd/md/deribit/DeribitChannelDemuxer.h +++ b/src/app_sparkd/sparkd/md/deribit/DeribitChannelDemuxer.h @@ -1,7 +1,7 @@ #pragma once #include "spark/utils/Delegate.h" -#include "server/sparkd/md/ccapi/ICCApiMessageHandler.h" +#include "sparkd/md/ccapi/ICCApiMessageHandler.h" #include #include diff --git a/src/app_sparkd/sparkd/md/deribit/DeribitCombo.h b/src/app_sparkd/sparkd/md/deribit/DeribitCombo.h index c9541e849..684204c12 100644 --- a/src/app_sparkd/sparkd/md/deribit/DeribitCombo.h +++ b/src/app_sparkd/sparkd/md/deribit/DeribitCombo.h @@ -1,7 +1,7 @@ #pragma once #include "spark/core/TimeStamp.h" -#include "server/sparkd/md/deribit/DeribitComboLeg.h" +#include "sparkd/md/deribit/DeribitComboLeg.h" #include #include diff --git a/src/app_sparkd/sparkd/md/deribit/DeribitCurrency.h b/src/app_sparkd/sparkd/md/deribit/DeribitCurrency.h index 4ced535ae..f19a8225c 100644 --- a/src/app_sparkd/sparkd/md/deribit/DeribitCurrency.h +++ b/src/app_sparkd/sparkd/md/deribit/DeribitCurrency.h @@ -1,6 +1,6 @@ #pragma once -#include "server/sparkd/md/deribit/DeribitWithdrawalPriority.h" +#include "sparkd/md/deribit/DeribitWithdrawalPriority.h" #include #include diff --git a/src/app_sparkd/sparkd/md/deribit/DeribitInstrument.h b/src/app_sparkd/sparkd/md/deribit/DeribitInstrument.h index 62431b625..8de2c2f0a 100644 --- a/src/app_sparkd/sparkd/md/deribit/DeribitInstrument.h +++ b/src/app_sparkd/sparkd/md/deribit/DeribitInstrument.h @@ -1,7 +1,7 @@ #pragma once #include "spark/core/TimeStamp.h" -#include "server/sparkd/md/deribit/DeribitInstrumentKind.h" +#include "sparkd/md/deribit/DeribitInstrumentKind.h" #include #include diff --git a/src/app_sparkd/sparkd/md/deribit/DeribitInstrumentRequest.h b/src/app_sparkd/sparkd/md/deribit/DeribitInstrumentRequest.h index c4338e1ed..e6f035ac6 100644 --- a/src/app_sparkd/sparkd/md/deribit/DeribitInstrumentRequest.h +++ b/src/app_sparkd/sparkd/md/deribit/DeribitInstrumentRequest.h @@ -5,7 +5,7 @@ #include "spark/core/FMT_IMPL.h" #include "spark/domain/SecurityCriteria.h" #include "spark/domain/SecurityCriteriaClause.h" -#include "server/sparkd/md/deribit/DeribitInstrumentKind.h" +#include "sparkd/md/deribit/DeribitInstrumentKind.h" #include #include diff --git a/src/app_sparkd/sparkd/md/deribit/DeribitInstrumentState.h b/src/app_sparkd/sparkd/md/deribit/DeribitInstrumentState.h index 2c49124a1..b1aa5ab40 100644 --- a/src/app_sparkd/sparkd/md/deribit/DeribitInstrumentState.h +++ b/src/app_sparkd/sparkd/md/deribit/DeribitInstrumentState.h @@ -2,7 +2,7 @@ #include "spark/core/FMT_IMPL.h" #include "spark/core/TimeStamp.h" -#include "server/sparkd/md/deribit/DeribitInstrumentStateType.h" +#include "sparkd/md/deribit/DeribitInstrumentStateType.h" #include #include diff --git a/src/app_sparkd/sparkd/md/deribit/DeribitInstrumentStore.cpp b/src/app_sparkd/sparkd/md/deribit/DeribitInstrumentStore.cpp index 45f0fc035..ee09ab4c1 100644 --- a/src/app_sparkd/sparkd/md/deribit/DeribitInstrumentStore.cpp +++ b/src/app_sparkd/sparkd/md/deribit/DeribitInstrumentStore.cpp @@ -7,8 +7,8 @@ #include "spark/logging/logging.h" #include "spark/persistence/IDGenerator.h" #include "spark/utils/bts_fatal.h" -#include "server/sparkd/md/deribit/DeribitCombo.h" -#include "server/sparkd/md/deribit/DeribitInstrument.h" +#include "sparkd/md/deribit/DeribitCombo.h" +#include "sparkd/md/deribit/DeribitInstrument.h" #include #include diff --git a/src/app_sparkd/sparkd/md/deribit/DeribitSecurityRequestor.cpp b/src/app_sparkd/sparkd/md/deribit/DeribitSecurityRequestor.cpp index 15fadab6d..820358c51 100644 --- a/src/app_sparkd/sparkd/md/deribit/DeribitSecurityRequestor.cpp +++ b/src/app_sparkd/sparkd/md/deribit/DeribitSecurityRequestor.cpp @@ -64,18 +64,18 @@ #include "spark/io/websocket/JsonRpcHandler.h" #include "spark/io/websocket/JsonRpcRequest.h" #include "spark/logging/logging.h" -#include "server/sparkd/md/ccapi/CCApiCorrelationID.h" -#include "server/sparkd/md/ccapi/CCApiJsonRpcRequest.h" -#include "server/sparkd/md/ccapi/CCApiJsonRpcRouter.h" -#include "server/sparkd/md/ccapi/CCApiReader.h" -#include "server/sparkd/md/ccapi/CCApiSession.h" -#include "server/sparkd/md/deribit/DeribitCombo.h" -#include "server/sparkd/md/deribit/DeribitCurrency.h" -#include "server/sparkd/md/deribit/DeribitInstrument.h" -#include "server/sparkd/md/deribit/DeribitInstrumentKind.h" -#include "server/sparkd/md/deribit/DeribitInstrumentRequest.h" -#include "server/sparkd/md/deribit/DeribitInstrumentStore.h" -#include "server/sparkd/md/deribit/DeribitMessageType.h" +#include "sparkd/md/ccapi/CCApiCorrelationID.h" +#include "sparkd/md/ccapi/CCApiJsonRpcRequest.h" +#include "sparkd/md/ccapi/CCApiJsonRpcRouter.h" +#include "sparkd/md/ccapi/CCApiReader.h" +#include "sparkd/md/ccapi/CCApiSession.h" +#include "sparkd/md/deribit/DeribitCombo.h" +#include "sparkd/md/deribit/DeribitCurrency.h" +#include "sparkd/md/deribit/DeribitInstrument.h" +#include "sparkd/md/deribit/DeribitInstrumentKind.h" +#include "sparkd/md/deribit/DeribitInstrumentRequest.h" +#include "sparkd/md/deribit/DeribitInstrumentStore.h" +#include "sparkd/md/deribit/DeribitMessageType.h" #include #include diff --git a/src/app_sparkd/sparkd/md/deribit/DeribitSubscription.cpp b/src/app_sparkd/sparkd/md/deribit/DeribitSubscription.cpp index 62c72ff0f..62a92e9fc 100644 --- a/src/app_sparkd/sparkd/md/deribit/DeribitSubscription.cpp +++ b/src/app_sparkd/sparkd/md/deribit/DeribitSubscription.cpp @@ -16,17 +16,17 @@ #include "spark/logging/logging.h" #include "spark/md/IMarketDataListener.h" #include "spark/persistence/IDGenerator.h" -#include "server/sparkd/md/ccapi/CCApiCorrelationID.h" -#include "server/sparkd/md/ccapi/CCApiSession.h" -#include "server/sparkd/md/deribit/DeribitChannelDemuxer.h" -#include "server/sparkd/md/deribit/DeribitDepthAdaptor.h" -#include "server/sparkd/md/deribit/DeribitInstrumentRequest.h" -#include "server/sparkd/md/deribit/DeribitInstrumentState.h" -#include "server/sparkd/md/deribit/DeribitInstrumentStore.h" -#include "server/sparkd/md/deribit/DeribitMessageType.h" -#include "server/sparkd/md/deribit/DeribitSecurityRequestor.h" -#include "server/sparkd/md/deribit/DeribitTickerAdaptor.h" -#include "server/sparkd/md/deribit/DeribitTradeAdaptor.h" +#include "sparkd/md/ccapi/CCApiCorrelationID.h" +#include "sparkd/md/ccapi/CCApiSession.h" +#include "sparkd/md/deribit/DeribitChannelDemuxer.h" +#include "sparkd/md/deribit/DeribitDepthAdaptor.h" +#include "sparkd/md/deribit/DeribitInstrumentRequest.h" +#include "sparkd/md/deribit/DeribitInstrumentState.h" +#include "sparkd/md/deribit/DeribitInstrumentStore.h" +#include "sparkd/md/deribit/DeribitMessageType.h" +#include "sparkd/md/deribit/DeribitSecurityRequestor.h" +#include "sparkd/md/deribit/DeribitTickerAdaptor.h" +#include "sparkd/md/deribit/DeribitTradeAdaptor.h" #include #include diff --git a/src/app_sparkd/sparkd/md/deribit/DeribitSubscriptionFactory.h b/src/app_sparkd/sparkd/md/deribit/DeribitSubscriptionFactory.h index ba667af19..c6ee3779d 100644 --- a/src/app_sparkd/sparkd/md/deribit/DeribitSubscriptionFactory.h +++ b/src/app_sparkd/sparkd/md/deribit/DeribitSubscriptionFactory.h @@ -1,6 +1,6 @@ // #pragma once -// #include "server/sparkd/md/deribit/DeribitInstrumentKind.h" +// #include "sparkd/md/deribit/DeribitInstrumentKind.h" // #include // #include diff --git a/src/app_sparkd/sparkd/md/emumba/EmumbaDeribitData.h b/src/app_sparkd/sparkd/md/emumba/EmumbaDeribitData.h index 288261c10..45ec10353 100644 --- a/src/app_sparkd/sparkd/md/emumba/EmumbaDeribitData.h +++ b/src/app_sparkd/sparkd/md/emumba/EmumbaDeribitData.h @@ -3,8 +3,8 @@ #include "spark/md/GeneralSecurityIndex.h" #include "spark/md/MDProducer.h" #include "spark/md/SecurityIDRecorder.h" -#include "server/sparkd/md/platforms/emumba/EMTradingSession.h" -#include "server/sparkd/md/platforms/emumba/EmMDListener.h" +#include "sparkd/md/platforms/emumba/EMTradingSession.h" +#include "sparkd/md/platforms/emumba/EmMDListener.h" #include namespace bts::md { diff --git a/src/app_sparkd/sparkd/md/ftx/FTXFuture.h b/src/app_sparkd/sparkd/md/ftx/FTXFuture.h index 30e758d21..22a21cdcc 100644 --- a/src/app_sparkd/sparkd/md/ftx/FTXFuture.h +++ b/src/app_sparkd/sparkd/md/ftx/FTXFuture.h @@ -1,7 +1,7 @@ #pragma once #include "spark/core/TimeStamp.h" -#include "server/sparkd/md/ftx/FTXSecurityType.h" +#include "sparkd/md/ftx/FTXSecurityType.h" #include #include diff --git a/src/app_sparkd/sparkd/md/ftx/FTXHistoricalPriceAdaptor.cpp b/src/app_sparkd/sparkd/md/ftx/FTXHistoricalPriceAdaptor.cpp index 461ec0e23..dc8621e9f 100644 --- a/src/app_sparkd/sparkd/md/ftx/FTXHistoricalPriceAdaptor.cpp +++ b/src/app_sparkd/sparkd/md/ftx/FTXHistoricalPriceAdaptor.cpp @@ -1,7 +1,7 @@ #include "FTXHistoricalPriceAdaptor.h" #include "spark/domain/SecurityMarketDataStatistics.h" #include "spark/md/IMarketDataListener.h" -#include "server/sparkd/md/ftx/FTXHistoricalPriceRecord.h" +#include "sparkd/md/ftx/FTXHistoricalPriceRecord.h" #include #include diff --git a/src/app_sparkd/sparkd/md/ftx/FTXHistoricalPriceAdaptor.h b/src/app_sparkd/sparkd/md/ftx/FTXHistoricalPriceAdaptor.h index 10abfdfb5..553c15b4c 100644 --- a/src/app_sparkd/sparkd/md/ftx/FTXHistoricalPriceAdaptor.h +++ b/src/app_sparkd/sparkd/md/ftx/FTXHistoricalPriceAdaptor.h @@ -1,7 +1,7 @@ #pragma once #include "spark/domain/SecurityID.h" -#include "server/sparkd/md/ccapi/ICCApiMessageHandler.h" +#include "sparkd/md/ccapi/ICCApiMessageHandler.h" namespace bts::md { class IMarketDataListener; diff --git a/src/app_sparkd/sparkd/md/ftx/FTXHistoricalPriceRecord.cpp b/src/app_sparkd/sparkd/md/ftx/FTXHistoricalPriceRecord.cpp index e0fd28251..062eb78c3 100644 --- a/src/app_sparkd/sparkd/md/ftx/FTXHistoricalPriceRecord.cpp +++ b/src/app_sparkd/sparkd/md/ftx/FTXHistoricalPriceRecord.cpp @@ -2,7 +2,7 @@ #include "spark/domain/Price.h" #include "spark/domain/SecurityMarketDataStatistics.h" #include "spark/io/JsonReader.h" -#include "server/sparkd/md/ccapi/CCApiReader.h" +#include "sparkd/md/ccapi/CCApiReader.h" #include #include diff --git a/src/app_sparkd/sparkd/md/ftx/FTXMarket.cpp b/src/app_sparkd/sparkd/md/ftx/FTXMarket.cpp index 5a444052d..48ec4374b 100644 --- a/src/app_sparkd/sparkd/md/ftx/FTXMarket.cpp +++ b/src/app_sparkd/sparkd/md/ftx/FTXMarket.cpp @@ -6,7 +6,7 @@ #include "spark/io/JsonReader.h" #include "spark/logging/logging.h" #include "spark/utils/bts_fatal.h" -#include "server/sparkd/md/ftx/FTXSecurityType.h" +#include "sparkd/md/ftx/FTXSecurityType.h" #include #include diff --git a/src/app_sparkd/sparkd/md/ftx/FTXMarket.h b/src/app_sparkd/sparkd/md/ftx/FTXMarket.h index f0a23c6e6..3f3220302 100644 --- a/src/app_sparkd/sparkd/md/ftx/FTXMarket.h +++ b/src/app_sparkd/sparkd/md/ftx/FTXMarket.h @@ -1,6 +1,6 @@ #pragma once -#include "server/sparkd/md/ftx/FTXSecurityType.h" +#include "sparkd/md/ftx/FTXSecurityType.h" #include #include diff --git a/src/app_sparkd/sparkd/md/ftx/FTXSecurityRequestor.cpp b/src/app_sparkd/sparkd/md/ftx/FTXSecurityRequestor.cpp index dc430a86a..2c833ff18 100644 --- a/src/app_sparkd/sparkd/md/ftx/FTXSecurityRequestor.cpp +++ b/src/app_sparkd/sparkd/md/ftx/FTXSecurityRequestor.cpp @@ -7,13 +7,13 @@ #include "spark/domain/SecurityCriteria.h" #include "spark/logging/logging.h" #include "spark/persistence/IDGenerator.h" -#include "server/sparkd/md/ccapi/CCApiCorrelationID.h" -#include "server/sparkd/md/ccapi/CCApiMessageHandler.h" -#include "server/sparkd/md/ccapi/CCApiSession.h" -#include "server/sparkd/md/ccapi/ICCApiMessageHandler.h" -#include "server/sparkd/md/ftx/FTXFuture.h" -#include "server/sparkd/md/ftx/FTXMarket.h" -#include "server/sparkd/md/ftx/FTXMessageType.h" +#include "sparkd/md/ccapi/CCApiCorrelationID.h" +#include "sparkd/md/ccapi/CCApiMessageHandler.h" +#include "sparkd/md/ccapi/CCApiSession.h" +#include "sparkd/md/ccapi/ICCApiMessageHandler.h" +#include "sparkd/md/ftx/FTXFuture.h" +#include "sparkd/md/ftx/FTXMarket.h" +#include "sparkd/md/ftx/FTXMessageType.h" #include #include diff --git a/src/app_sparkd/sparkd/md/ftx/FTXSubscription.cpp b/src/app_sparkd/sparkd/md/ftx/FTXSubscription.cpp index 1f3f5c6cb..1bf3500d0 100644 --- a/src/app_sparkd/sparkd/md/ftx/FTXSubscription.cpp +++ b/src/app_sparkd/sparkd/md/ftx/FTXSubscription.cpp @@ -7,15 +7,15 @@ #include "spark/logging/logging.h" #include "spark/md/IMarketDataListener.h" #include "spark/persistence/IDGenerator.h" -#include "server/sparkd/md/ccapi/CCApiCorrelationID.h" -#include "server/sparkd/md/ccapi/CCApiMarketDepthAdaptor.h" -#include "server/sparkd/md/ccapi/CCApiMessageLogger.h" -#include "server/sparkd/md/ccapi/CCApiSession.h" -#include "server/sparkd/md/ccapi/CCApiTradeAdaptor.h" -#include "server/sparkd/md/ftx/FTXHistoricalPriceAdaptor.h" -#include "server/sparkd/md/ftx/FTXHistoricalPriceRecord.h" -#include "server/sparkd/md/ftx/FTXMessageType.h" -#include "server/sparkd/md/ftx/FTXSecurityRequestor.h" +#include "sparkd/md/ccapi/CCApiCorrelationID.h" +#include "sparkd/md/ccapi/CCApiMarketDepthAdaptor.h" +#include "sparkd/md/ccapi/CCApiMessageLogger.h" +#include "sparkd/md/ccapi/CCApiSession.h" +#include "sparkd/md/ccapi/CCApiTradeAdaptor.h" +#include "sparkd/md/ftx/FTXHistoricalPriceAdaptor.h" +#include "sparkd/md/ftx/FTXHistoricalPriceRecord.h" +#include "sparkd/md/ftx/FTXMessageType.h" +#include "sparkd/md/ftx/FTXSecurityRequestor.h" #include #include diff --git a/src/app_sparkd/sparkd/md/listeners/LiveLadderPrinter.cpp b/src/app_sparkd/sparkd/md/listeners/LiveLadderPrinter.cpp index 3e5689903..655e3c55c 100644 --- a/src/app_sparkd/sparkd/md/listeners/LiveLadderPrinter.cpp +++ b/src/app_sparkd/sparkd/md/listeners/LiveLadderPrinter.cpp @@ -1,5 +1,5 @@ #include "LiveLadderPrinter.h" -#include "server/sparkd/md/MarketDataError.h" +#include "sparkd/md/MarketDataError.h" #include #include diff --git a/src/app_sparkd/sparkd/md/listeners/LiveLadderPrinter.h b/src/app_sparkd/sparkd/md/listeners/LiveLadderPrinter.h index d09243986..312290c91 100644 --- a/src/app_sparkd/sparkd/md/listeners/LiveLadderPrinter.h +++ b/src/app_sparkd/sparkd/md/listeners/LiveLadderPrinter.h @@ -1,7 +1,7 @@ #pragma once -#include "server/sparkd/md/MarketDataError.h" -#include "server/sparkd/md/MarketDataListener.h" +#include "sparkd/md/MarketDataError.h" +#include "sparkd/md/MarketDataListener.h" #include #include diff --git a/src/app_sparkd/sparkd/md/okx/OkxChannel.h b/src/app_sparkd/sparkd/md/okx/OkxChannel.h index 2baa41d67..ad3be1486 100644 --- a/src/app_sparkd/sparkd/md/okx/OkxChannel.h +++ b/src/app_sparkd/sparkd/md/okx/OkxChannel.h @@ -3,7 +3,7 @@ #include "spark/collections/HASH_IMPL.h" #include "spark/core/FMT_IMPL.h" #include "spark/io/JsonOptional.h" -#include "server/sparkd/md/okx/OkxInstrumentType.h" +#include "sparkd/md/okx/OkxInstrumentType.h" #include #include diff --git a/src/app_sparkd/sparkd/md/okx/OkxChannelDemuxer.cpp b/src/app_sparkd/sparkd/md/okx/OkxChannelDemuxer.cpp index cf867cc40..59def83f1 100644 --- a/src/app_sparkd/sparkd/md/okx/OkxChannelDemuxer.cpp +++ b/src/app_sparkd/sparkd/md/okx/OkxChannelDemuxer.cpp @@ -1,9 +1,9 @@ #include "OkxChannelDemuxer.h" #include "spark/api/domain/Venue.h" #include "spark/io/JsonReader.h" -#include "server/sparkd/md/ccapi/CCApiCorrelationID.h" -#include "server/sparkd/md/ccapi/CCApiReader.h" -#include "server/sparkd/md/okx/OkxChannel.h" +#include "sparkd/md/ccapi/CCApiCorrelationID.h" +#include "sparkd/md/ccapi/CCApiReader.h" +#include "sparkd/md/okx/OkxChannel.h" #include #include diff --git a/src/app_sparkd/sparkd/md/okx/OkxChannelDemuxer.h b/src/app_sparkd/sparkd/md/okx/OkxChannelDemuxer.h index 19d9166a4..052df0390 100644 --- a/src/app_sparkd/sparkd/md/okx/OkxChannelDemuxer.h +++ b/src/app_sparkd/sparkd/md/okx/OkxChannelDemuxer.h @@ -1,8 +1,8 @@ #pragma once #include "spark/utils/Delegate.h" -#include "server/sparkd/md/ccapi/CCApiCorrelationID.h" -#include "server/sparkd/md/ccapi/ICCApiMessageHandler.h" +#include "sparkd/md/ccapi/CCApiCorrelationID.h" +#include "sparkd/md/ccapi/ICCApiMessageHandler.h" #include diff --git a/src/app_sparkd/sparkd/md/okx/OkxDepthAdaptor.cpp b/src/app_sparkd/sparkd/md/okx/OkxDepthAdaptor.cpp index c6aef7b72..9ea5d4ce0 100644 --- a/src/app_sparkd/sparkd/md/okx/OkxDepthAdaptor.cpp +++ b/src/app_sparkd/sparkd/md/okx/OkxDepthAdaptor.cpp @@ -5,7 +5,7 @@ #include "spark/io/JsonReader.h" #include "spark/logging/logging.h" #include "spark/md/IMarketDataListener.h" -#include "server/sparkd/md/ccapi/CCApiCorrelationID.h" +#include "sparkd/md/ccapi/CCApiCorrelationID.h" #include #include diff --git a/src/app_sparkd/sparkd/md/okx/OkxInstrument.h b/src/app_sparkd/sparkd/md/okx/OkxInstrument.h index 7cba5ed3f..3b15f9031 100644 --- a/src/app_sparkd/sparkd/md/okx/OkxInstrument.h +++ b/src/app_sparkd/sparkd/md/okx/OkxInstrument.h @@ -1,8 +1,8 @@ #pragma once #include "spark/core/TimeStamp.h" -#include "server/sparkd/md/okx/OkxInstrumentStatus.h" -#include "server/sparkd/md/okx/OkxInstrumentType.h" +#include "sparkd/md/okx/OkxInstrumentStatus.h" +#include "sparkd/md/okx/OkxInstrumentType.h" #include #include diff --git a/src/app_sparkd/sparkd/md/okx/OkxInstrumentStore.cpp b/src/app_sparkd/sparkd/md/okx/OkxInstrumentStore.cpp index 247892e26..69a3ea38f 100644 --- a/src/app_sparkd/sparkd/md/okx/OkxInstrumentStore.cpp +++ b/src/app_sparkd/sparkd/md/okx/OkxInstrumentStore.cpp @@ -4,7 +4,7 @@ #include "spark/logging/logging.h" #include "spark/persistence/IDGenerator.h" #include "spark/utils/bts_fatal.h" -#include "server/sparkd/md/okx/OkxInstrument.h" +#include "sparkd/md/okx/OkxInstrument.h" #include #include diff --git a/src/app_sparkd/sparkd/md/okx/OkxRequest.h b/src/app_sparkd/sparkd/md/okx/OkxRequest.h index 32b84342d..c0835cfeb 100644 --- a/src/app_sparkd/sparkd/md/okx/OkxRequest.h +++ b/src/app_sparkd/sparkd/md/okx/OkxRequest.h @@ -1,6 +1,6 @@ #pragma once -#include "server/sparkd/md/okx/OkxChannel.h" +#include "sparkd/md/okx/OkxChannel.h" #include #include diff --git a/src/app_sparkd/sparkd/md/okx/OkxResponse.h b/src/app_sparkd/sparkd/md/okx/OkxResponse.h index 9028af6e8..0fb44d517 100644 --- a/src/app_sparkd/sparkd/md/okx/OkxResponse.h +++ b/src/app_sparkd/sparkd/md/okx/OkxResponse.h @@ -1,6 +1,6 @@ #pragma once -#include "server/sparkd/md/okx/OkxChannel.h" +#include "sparkd/md/okx/OkxChannel.h" #include #include diff --git a/src/app_sparkd/sparkd/md/okx/OkxSecuritySubscription.cpp b/src/app_sparkd/sparkd/md/okx/OkxSecuritySubscription.cpp index 7395bddce..ad6467c18 100644 --- a/src/app_sparkd/sparkd/md/okx/OkxSecuritySubscription.cpp +++ b/src/app_sparkd/sparkd/md/okx/OkxSecuritySubscription.cpp @@ -3,19 +3,19 @@ #include "spark/collections/Remove.h" #include "spark/domain/SecurityCriteria.h" #include "spark/io/JsonReader.h" -#include "server/sparkd/md/ccapi/CCApiCorrelationID.h" -#include "server/sparkd/md/ccapi/CCApiHttpParams.h" -#include "server/sparkd/md/ccapi/CCApiMessageHandler.h" -#include "server/sparkd/md/ccapi/CCApiReader.h" -#include "server/sparkd/md/ccapi/CCApiSession.h" -#include "server/sparkd/md/ccapi/ICCApiMessageHandler.h" -#include "server/sparkd/md/okx/OkxChannel.h" -#include "server/sparkd/md/okx/OkxChannelDemuxer.h" -#include "server/sparkd/md/okx/OkxInstrument.h" -#include "server/sparkd/md/okx/OkxInstrumentStore.h" -#include "server/sparkd/md/okx/OkxInstrumentType.h" -#include "server/sparkd/md/okx/OkxMessageType.h" -#include "server/sparkd/md/okx/OkxRequest.h" +#include "sparkd/md/ccapi/CCApiCorrelationID.h" +#include "sparkd/md/ccapi/CCApiHttpParams.h" +#include "sparkd/md/ccapi/CCApiMessageHandler.h" +#include "sparkd/md/ccapi/CCApiReader.h" +#include "sparkd/md/ccapi/CCApiSession.h" +#include "sparkd/md/ccapi/ICCApiMessageHandler.h" +#include "sparkd/md/okx/OkxChannel.h" +#include "sparkd/md/okx/OkxChannelDemuxer.h" +#include "sparkd/md/okx/OkxInstrument.h" +#include "sparkd/md/okx/OkxInstrumentStore.h" +#include "sparkd/md/okx/OkxInstrumentType.h" +#include "sparkd/md/okx/OkxMessageType.h" +#include "sparkd/md/okx/OkxRequest.h" #include #include diff --git a/src/app_sparkd/sparkd/md/okx/OkxSubscription.cpp b/src/app_sparkd/sparkd/md/okx/OkxSubscription.cpp index 03722dea7..ec51d3da2 100644 --- a/src/app_sparkd/sparkd/md/okx/OkxSubscription.cpp +++ b/src/app_sparkd/sparkd/md/okx/OkxSubscription.cpp @@ -11,15 +11,15 @@ #include "spark/logging/logging.h" #include "spark/md/IMarketDataListener.h" #include "spark/persistence/IDGenerator.h" -#include "server/sparkd/md/ccapi/CCApiSession.h" -#include "server/sparkd/md/okx/OkxChannel.h" -#include "server/sparkd/md/okx/OkxChannelDemuxer.h" -#include "server/sparkd/md/okx/OkxDepthAdaptor.h" -#include "server/sparkd/md/okx/OkxInstrumentStore.h" -#include "server/sparkd/md/okx/OkxRequest.h" -#include "server/sparkd/md/okx/OkxSecuritySubscription.h" -#include "server/sparkd/md/okx/OkxTickerAdaptor.h" -#include "server/sparkd/md/okx/OkxTradeAdaptor.h" +#include "sparkd/md/ccapi/CCApiSession.h" +#include "sparkd/md/okx/OkxChannel.h" +#include "sparkd/md/okx/OkxChannelDemuxer.h" +#include "sparkd/md/okx/OkxDepthAdaptor.h" +#include "sparkd/md/okx/OkxInstrumentStore.h" +#include "sparkd/md/okx/OkxRequest.h" +#include "sparkd/md/okx/OkxSecuritySubscription.h" +#include "sparkd/md/okx/OkxTickerAdaptor.h" +#include "sparkd/md/okx/OkxTradeAdaptor.h" #include #include diff --git a/src/app_sparkd/sparkd/md/okx/OkxTicker.h b/src/app_sparkd/sparkd/md/okx/OkxTicker.h index aba566d05..581d2af78 100644 --- a/src/app_sparkd/sparkd/md/okx/OkxTicker.h +++ b/src/app_sparkd/sparkd/md/okx/OkxTicker.h @@ -3,7 +3,7 @@ #include "spark/core/TimeStamp.h" #include "spark/domain/Price.h" #include "spark/domain/Quantity.h" -#include "server/sparkd/md/okx/OkxInstrumentType.h" +#include "sparkd/md/okx/OkxInstrumentType.h" #include #include diff --git a/src/app_sparkd/sparkd/md/okx/OkxTickerAdaptor.cpp b/src/app_sparkd/sparkd/md/okx/OkxTickerAdaptor.cpp index a6e1889f1..7fd3dc318 100644 --- a/src/app_sparkd/sparkd/md/okx/OkxTickerAdaptor.cpp +++ b/src/app_sparkd/sparkd/md/okx/OkxTickerAdaptor.cpp @@ -4,8 +4,8 @@ #include "spark/domain/SecurityMarketDataStatistics.h" #include "spark/io/JsonReader.h" #include "spark/md/IMarketDataListener.h" -#include "server/sparkd/md/ccapi/CCApiCorrelationID.h" -#include "server/sparkd/md/okx/OkxTicker.h" +#include "sparkd/md/ccapi/CCApiCorrelationID.h" +#include "sparkd/md/okx/OkxTicker.h" #include #include diff --git a/src/app_sparkd/sparkd/md/okx/OkxTrade.h b/src/app_sparkd/sparkd/md/okx/OkxTrade.h index 59658448b..52cd11881 100644 --- a/src/app_sparkd/sparkd/md/okx/OkxTrade.h +++ b/src/app_sparkd/sparkd/md/okx/OkxTrade.h @@ -3,7 +3,7 @@ #include "spark/core/TimeStamp.h" #include "spark/domain/Price.h" #include "spark/domain/Quantity.h" -#include "server/sparkd/md/okx/OkxSide.h" +#include "sparkd/md/okx/OkxSide.h" #include #include diff --git a/src/app_sparkd/sparkd/md/okx/OkxTradeAdaptor.cpp b/src/app_sparkd/sparkd/md/okx/OkxTradeAdaptor.cpp index 20b94fb3b..895e5db08 100644 --- a/src/app_sparkd/sparkd/md/okx/OkxTradeAdaptor.cpp +++ b/src/app_sparkd/sparkd/md/okx/OkxTradeAdaptor.cpp @@ -4,8 +4,8 @@ #include "spark/io/JsonReader.h" #include "spark/md/IMarketDataListener.h" #include "spark/utils/bts_fatal.h" -#include "server/sparkd/md/ccapi/CCApiCorrelationID.h" -#include "server/sparkd/md/okx/OkxTrade.h" +#include "sparkd/md/ccapi/CCApiCorrelationID.h" +#include "sparkd/md/okx/OkxTrade.h" #include #include diff --git a/src/app_sparkd/sparkd/md/platforms/emumba/EMTradingSession.h b/src/app_sparkd/sparkd/md/platforms/emumba/EMTradingSession.h index 4f85ea848..7be8c43ad 100644 --- a/src/app_sparkd/sparkd/md/platforms/emumba/EMTradingSession.h +++ b/src/app_sparkd/sparkd/md/platforms/emumba/EMTradingSession.h @@ -1,6 +1,6 @@ #pragma once -#include "server/sparkd/cmds/crypto/DeribitDemoConfiguration.h" +#include "sparkd/cmds/crypto/DeribitDemoConfiguration.h" #include #include #include diff --git a/src/app_sparkd/sparkd/md/platforms/emumba/EmMDListener.cpp b/src/app_sparkd/sparkd/md/platforms/emumba/EmMDListener.cpp index 5b125fdb6..e2307af00 100644 --- a/src/app_sparkd/sparkd/md/platforms/emumba/EmMDListener.cpp +++ b/src/app_sparkd/sparkd/md/platforms/emumba/EmMDListener.cpp @@ -20,8 +20,8 @@ #include "spark/utils/datetime.h" #include "spark/utils/overloaded.h" #include "spark/utils/stats.h" -#include "server/sparkd/md/platforms/emumba/EMTradingSession.h" -#include "server/sparkd/md/platforms/emumba/IEMOrderMuxer.h" +#include "sparkd/md/platforms/emumba/EMTradingSession.h" +#include "sparkd/md/platforms/emumba/IEMOrderMuxer.h" #include #include #include diff --git a/src/app_sparkd/sparkd/md/platforms/emumba/EmMDListener.h b/src/app_sparkd/sparkd/md/platforms/emumba/EmMDListener.h index e69903eac..6a81f9caf 100644 --- a/src/app_sparkd/sparkd/md/platforms/emumba/EmMDListener.h +++ b/src/app_sparkd/sparkd/md/platforms/emumba/EmMDListener.h @@ -5,7 +5,7 @@ #include "spark/domain_model/SecurityKey.h" #include "spark/md/GeneralSecurityIndex.h" #include "spark/md/common.h" -#include "server/sparkd/md/platforms/emumba/IEMOrderMuxer.h" +#include "sparkd/md/platforms/emumba/IEMOrderMuxer.h" #include #include #include diff --git a/src/app_sparkd/sparkd/md/platforms/emumba/EmumbaMain.cpp b/src/app_sparkd/sparkd/md/platforms/emumba/EmumbaMain.cpp index ba9f50a11..89cc6b589 100644 --- a/src/app_sparkd/sparkd/md/platforms/emumba/EmumbaMain.cpp +++ b/src/app_sparkd/sparkd/md/platforms/emumba/EmumbaMain.cpp @@ -16,7 +16,7 @@ #include "spark/utils/bts_chrono.h" #include "spark/utils/proto_helper.h" #include "spark/utils/thread_manager.h" -#include "server/sparkd/cmds/crypto/DeribitDemoConfiguration.h" +#include "sparkd/cmds/crypto/DeribitDemoConfiguration.h" #include #include diff --git a/src/app_sparkd/sparkd/md/platforms/emumba/EmumbaMain.h b/src/app_sparkd/sparkd/md/platforms/emumba/EmumbaMain.h index 70433e15c..5d5fc2b42 100644 --- a/src/app_sparkd/sparkd/md/platforms/emumba/EmumbaMain.h +++ b/src/app_sparkd/sparkd/md/platforms/emumba/EmumbaMain.h @@ -1,6 +1,6 @@ #pragma once -#include "server/sparkd/md/platforms/IMDPlatform.h" +#include "sparkd/md/platforms/IMDPlatform.h" #include namespace bts::md { diff --git a/src/app_sparkd/sparkd/md/platforms/ice_onixs/ICEMain.h b/src/app_sparkd/sparkd/md/platforms/ice_onixs/ICEMain.h index 74aac058a..4c0f5f986 100644 --- a/src/app_sparkd/sparkd/md/platforms/ice_onixs/ICEMain.h +++ b/src/app_sparkd/sparkd/md/platforms/ice_onixs/ICEMain.h @@ -5,7 +5,7 @@ #include "spark/md/coconut2.h" #include "spark/utils/bts_no_copy.h" #include "onixs.h" -#include "server/sparkd/md/platforms/IMDPlatform.h" +#include "sparkd/md/platforms/IMDPlatform.h" #include #include diff --git a/src/app_sparkd/sparkd/md/platforms/mdp3_onixs/MDP3Listener.h b/src/app_sparkd/sparkd/md/platforms/mdp3_onixs/MDP3Listener.h index c7333c59a..b16b59044 100644 --- a/src/app_sparkd/sparkd/md/platforms/mdp3_onixs/MDP3Listener.h +++ b/src/app_sparkd/sparkd/md/platforms/mdp3_onixs/MDP3Listener.h @@ -3,11 +3,11 @@ #include "CMESecurityIndex.h" #include "spark/md/MBOProcessor.h" #include "spark/md/coconut2.h" +#include "spark/orderman/events/TradeSummarySignalDispatcher.h" #include "spark/tracing/bts_trace.h" #include "spark/utils/bts_no_copy.h" #include "MDP3ListenerHelpers.h" -#include "TradeSummarySignalDispatcher.h" #include "onixs.h" #include #include diff --git a/src/app_sparkd/sparkd/md/platforms/mdp3_onixs/MDP3Main.h b/src/app_sparkd/sparkd/md/platforms/mdp3_onixs/MDP3Main.h index 3fd832a3b..449b49ad9 100644 --- a/src/app_sparkd/sparkd/md/platforms/mdp3_onixs/MDP3Main.h +++ b/src/app_sparkd/sparkd/md/platforms/mdp3_onixs/MDP3Main.h @@ -5,7 +5,7 @@ #include "spark/md/coconut2.h" #include "spark/utils/bts_no_copy.h" #include "onixs.h" -#include "server/sparkd/md/platforms/IMDPlatform.h" +#include "sparkd/md/platforms/IMDPlatform.h" #include #include diff --git a/src/app_sparkd/sparkd/md/recording/MDReplayer.cpp b/src/app_sparkd/sparkd/md/recording/MDReplayer.cpp index 08929d4a8..81a43e9d4 100644 --- a/src/app_sparkd/sparkd/md/recording/MDReplayer.cpp +++ b/src/app_sparkd/sparkd/md/recording/MDReplayer.cpp @@ -17,7 +17,7 @@ #include "spark/os/os.h" #include "spark/utils/PBUtils.h" #include "spark/utils/bts_assert.h" -#include "server/sparkd/md/recording/MDRecorder.h" +#include "sparkd/md/recording/MDRecorder.h" #include #include diff --git a/src/app_sparkd/sparkd/position/MarginServiceCore.h b/src/app_sparkd/sparkd/position/MarginServiceCore.h index 6cd1a9850..5852caf1f 100644 --- a/src/app_sparkd/sparkd/position/MarginServiceCore.h +++ b/src/app_sparkd/sparkd/position/MarginServiceCore.h @@ -3,7 +3,7 @@ #include "spark/api/services/MarginService.pb.h" #include "spark/domain_model/Security.pb.h" #include "spark/orderman/orderman_utils/orderman_common.h" -#include "server/sparkd/position/Position.h" +#include "sparkd/position/Position.h" #include diff --git a/src/app_sparkd/sparkd/position/import/BasePositionServiceServer.cpp b/src/app_sparkd/sparkd/position/import/BasePositionServiceServer.cpp index a10d67725..d4d0342ae 100644 --- a/src/app_sparkd/sparkd/position/import/BasePositionServiceServer.cpp +++ b/src/app_sparkd/sparkd/position/import/BasePositionServiceServer.cpp @@ -9,8 +9,8 @@ #include "spark/utils/PBUtils.h" #include "spark/utils/bts_assert.h" #include "spark/utils/datetime.h" -#include "server/sparkd/position/import/DownloadCommonStateMachine.h" -#include "server/sparkd/position/import/parsing/gmi_parser.h" +#include "sparkd/position/import/DownloadCommonStateMachine.h" +#include "sparkd/position/import/parsing/gmi_parser.h" #include #include diff --git a/src/app_sparkd/sparkd/position/import/DownloadCommonStateMachine.cpp b/src/app_sparkd/sparkd/position/import/DownloadCommonStateMachine.cpp index 32c21de15..62bd63c5e 100644 --- a/src/app_sparkd/sparkd/position/import/DownloadCommonStateMachine.cpp +++ b/src/app_sparkd/sparkd/position/import/DownloadCommonStateMachine.cpp @@ -5,7 +5,7 @@ #include "spark/utils/bts_assert.h" #include "spark/utils/datetime.h" #include "spark/utils/sftp.h" -#include "server/sparkd/position/import/DownloadWindow.h" +#include "sparkd/position/import/DownloadWindow.h" namespace bts { namespace position { diff --git a/src/app_sparkd/sparkd/position/import/DownloadWindow.cpp b/src/app_sparkd/sparkd/position/import/DownloadWindow.cpp index 16bfe1187..f51845353 100644 --- a/src/app_sparkd/sparkd/position/import/DownloadWindow.cpp +++ b/src/app_sparkd/sparkd/position/import/DownloadWindow.cpp @@ -1,4 +1,4 @@ -#include "server/sparkd/position/import/DownloadWindow.h" +#include "sparkd/position/import/DownloadWindow.h" #include "spark/config/config.h" #include "spark/config/protos/position_cfg.pb.h" #include "spark/utils/bts_assert.h" diff --git a/src/app_sparkd/sparkd/position/import/MoneyFileServiceServer.cpp b/src/app_sparkd/sparkd/position/import/MoneyFileServiceServer.cpp index 8207affb6..0dae1a34c 100644 --- a/src/app_sparkd/sparkd/position/import/MoneyFileServiceServer.cpp +++ b/src/app_sparkd/sparkd/position/import/MoneyFileServiceServer.cpp @@ -10,8 +10,8 @@ #include "spark/utils/PBUtils.h" #include "spark/utils/bts_assert.h" #include "spark/utils/datetime.h" -#include "server/sparkd/position/import/DownloadCommonStateMachine.h" -#include "server/sparkd/position/import/parsing/money_parser.h" +#include "sparkd/position/import/DownloadCommonStateMachine.h" +#include "sparkd/position/import/parsing/money_parser.h" #include #include diff --git a/src/app_sparkd/sparkd/position/import/parsing/gmi_parser.cpp b/src/app_sparkd/sparkd/position/import/parsing/gmi_parser.cpp index 92c94be46..5e8746785 100644 --- a/src/app_sparkd/sparkd/position/import/parsing/gmi_parser.cpp +++ b/src/app_sparkd/sparkd/position/import/parsing/gmi_parser.cpp @@ -8,7 +8,7 @@ #include "spark/os/os.h" #include "spark/utils/PBUtils.h" -#include "server/sparkd/position/import/parsing/parser_common.h" +#include "sparkd/position/import/parsing/parser_common.h" #include #include #include diff --git a/src/app_sparkd/sparkd/position/import/parsing/money_parser.cpp b/src/app_sparkd/sparkd/position/import/parsing/money_parser.cpp index f3f71650d..97dd20a21 100644 --- a/src/app_sparkd/sparkd/position/import/parsing/money_parser.cpp +++ b/src/app_sparkd/sparkd/position/import/parsing/money_parser.cpp @@ -1,7 +1,7 @@ -#include "server/sparkd/position/import/parsing/money_parser.h" +#include "sparkd/position/import/parsing/money_parser.h" #include "spark/api/service_helpers/AdminServiceUtils.h" #include "spark/logging/logging.h" -#include "server/sparkd/position/import/parsing/parser_common.h" +#include "sparkd/position/import/parsing/parser_common.h" #include #include diff --git a/src/app_sparkd/sparkd/position/import/parsing/parser_common.cpp b/src/app_sparkd/sparkd/position/import/parsing/parser_common.cpp index fc4c1d003..2eaea215d 100644 --- a/src/app_sparkd/sparkd/position/import/parsing/parser_common.cpp +++ b/src/app_sparkd/sparkd/position/import/parsing/parser_common.cpp @@ -1,4 +1,4 @@ -#include "server/sparkd/position/import/parsing/parser_common.h" +#include "sparkd/position/import/parsing/parser_common.h" #include diff --git a/src/app_sparkd/sparkd/position/tests/PositionTests.cpp b/src/app_sparkd/sparkd/position/tests/PositionTests.cpp index 13bfcaed7..6bd6cdcf8 100644 --- a/src/app_sparkd/sparkd/position/tests/PositionTests.cpp +++ b/src/app_sparkd/sparkd/position/tests/PositionTests.cpp @@ -7,7 +7,7 @@ #include #include -#include "server/sparkd/position/import/DownloadWindow.h" +#include "sparkd/position/import/DownloadWindow.h" namespace bts { namespace test { diff --git a/src/app_sparkd/sparkd/position/tests/position_tests_internal.cpp b/src/app_sparkd/sparkd/position/tests/position_tests_internal.cpp index 434a66201..499a1c0dc 100644 --- a/src/app_sparkd/sparkd/position/tests/position_tests_internal.cpp +++ b/src/app_sparkd/sparkd/position/tests/position_tests_internal.cpp @@ -2,7 +2,7 @@ #include "spark/orderman/actors/SODPosition.h" #include "spark/utils/datetime.h" -#include "server/sparkd/position/PositionMap.h" +#include "sparkd/position/PositionMap.h" #include #include diff --git a/src/app_sparkd/sparkd/user/AdminServiceDB.cpp b/src/app_sparkd/sparkd/user/AdminServiceDB.cpp index 35a7adf27..147ab42f6 100644 --- a/src/app_sparkd/sparkd/user/AdminServiceDB.cpp +++ b/src/app_sparkd/sparkd/user/AdminServiceDB.cpp @@ -1,4 +1,4 @@ -#include "server/sparkd/user/AdminServiceDB.h" +#include "sparkd/user/AdminServiceDB.h" #include "spark/api/services/AdminService.server.pb.h" #include "spark/logging/logging.h" diff --git a/src/app_sparkd/sparkd/user/AdminServiceServer.cpp b/src/app_sparkd/sparkd/user/AdminServiceServer.cpp index 0f97ede55..f555b3f0c 100644 --- a/src/app_sparkd/sparkd/user/AdminServiceServer.cpp +++ b/src/app_sparkd/sparkd/user/AdminServiceServer.cpp @@ -8,7 +8,7 @@ #include "spark/utils/PBUtils.h" #include "spark/utils/TimeStamp.h" #include "spark/utils/bts_assert.h" -#include "server/sparkd/user/AdminServiceDB.h" +#include "sparkd/user/AdminServiceDB.h" #include #include diff --git a/src/app_sparkd/sparkd/user/AdminServiceServer.h b/src/app_sparkd/sparkd/user/AdminServiceServer.h index d046861e4..b6797e6fc 100644 --- a/src/app_sparkd/sparkd/user/AdminServiceServer.h +++ b/src/app_sparkd/sparkd/user/AdminServiceServer.h @@ -5,7 +5,7 @@ #include "spark/api/services/OrderService.client.pb.h" #include "spark/api/services/OrderService.pb.h" #include "spark/utils/bts_no_copy.h" -#include "server/sparkd/user/AdminServiceDB.h" +#include "sparkd/user/AdminServiceDB.h" #include namespace bts { diff --git a/tools/py/build_admin_web_app.py b/tools/py/build_admin_web_app.py index 577f395b7..7c80ad157 100644 --- a/tools/py/build_admin_web_app.py +++ b/tools/py/build_admin_web_app.py @@ -86,12 +86,12 @@ def _gen_fs_pbufs( protos_rel = [os.path.relpath(p, src_path) for p in protos] protoc_path = root_path.joinpath('externals', 'linux', 'bin', 'protoc') plugin_script_path = root_path.joinpath( - 'src', 'lib', 'api', 'service_compiler', 'plugin.sh') + 'src', 'lib_spark', 'spark', 'api', 'service_compiler', 'plugin.sh') cmd_parts = [ f'{protoc_path}', f'--plugin=protoc-gen-service={plugin_script_path}', f'--service_out=lang=fs,strip_out_path=1:{out_path.joinpath("fable")}', - f'-I {os.path.relpath(root_path.joinpath("src"), os.curdir)}', + f'-I {os.path.relpath(root_path.joinpath("src", "lib_spark"), os.curdir)}', f'-I {os.path.relpath(str(root_path.joinpath("externals", "linux", "include")), os.curdir)}', ' '.join(protos_rel) ]