From 5163ca4cae9f1cb813e8a4d3ea74923a91b5c386 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Wed, 7 Aug 2024 04:07:32 +0000 Subject: [PATCH] refactor: Organize libspark proj w/ stuttering include This new structure provides several benefits: * Allows us to install multiple CMake projects in the same destination dir (without include path conflicts). - This makes shipping the trading algo sdk a trivial excercise. Simply copy the lib and include dirs from the install dest. That's it! * Puts us in a position to break up the monolithic libspark into smaller modules, which are easier to manage. Windows specific notes: * Get rid of unnecessary script vs_filters.cmake * Define WebsocketConnectionGateway directly in cs (instead of proto) - The proto would no longer be in the include path passed to protoc. Moving it to c# because there wasn't a compelling reason for it to be a proto in the first place. * Set spark output prefix to "lib" on windows - So we get "libspark.dll" instead of "spark.dll", which conflicts with the csharp lib, "Spark.dll". * Copy libspark.dll to net8.0 & net8.0-windows in a single cmake build target fix build: Copy libspark to both dirs net8.0, net8.0-windows --- .vscode/launch.json | 128 +-- CMakeLists.txt | 45 +- CMakePresets.json | 22 +- cmake/ExportToParent.cmake | 7 + cmake/InitLibrary.cmake | 142 ++++ cmake/InstallBasic.cmake | 39 + cmake/PackBasic.cmake | 44 + cmake/Protobuf.cmake | 141 +-- cmake/ProtobufGenerateFs.cmake | 4 +- cmake/SetFirstDefined.cmake | 10 + cmake/vs_filters.cmake | 24 - compose.yaml | 4 +- .../client/getting-started/services.md | 4 +- doc/api/content/client/services/marketdata.md | 6 +- .../DataStreamCore/DataStreamCore.csproj | 4 +- src/Directory.Build.props | 2 +- src/Directory.Build.targets | 4 +- src/Spark.Admin.WebApp/CMakeLists.txt | 19 +- src/app_sparkd/CMakeLists.txt | 161 ++++ src/app_sparkd/Config.cmake.in | 5 + src/{server/sparkd => app_sparkd}/Dockerfile | 4 +- .../cmake_modules/rapidjsonConfig.cmake | 0 src/{server/sparkd => app_sparkd}/spark.conf | 0 .../algo/AlgoDefinitionServiceServer.cpp | 2 +- .../sparkd/algo/AlgoDefinitionServiceServer.h | 16 +- .../analytics/AnalyticsServiceServer.cpp | 20 +- .../sparkd/analytics/AnalyticsServiceServer.h | 3 +- .../sparkd/cmds/AdminReport.cpp | 14 +- .../sparkd/cmds/AdminReport.h | 0 .../sparkd/cmds/AutoCert.cpp | 12 +- .../sparkd/cmds/AutoCert.h | 0 .../sparkd/cmds/CMECert.cpp | 18 +- .../sparkd/cmds/CMECert.h | 0 .../sparkd/cmds/ConfigCmd.cpp | 4 +- .../sparkd/cmds/ConfigCmd.h | 0 .../sparkd/cmds/FIXSim.cpp | 4 +- .../sparkd/cmds/FIXSim.h | 0 .../sparkd/cmds/KeyCmd.cpp | 26 +- .../sparkd/cmds/KeyCmd.h | 0 src/{server => app_sparkd}/sparkd/cmds/Md.cpp | 0 src/{server => app_sparkd}/sparkd/cmds/Md.h | 0 .../sparkd/cmds/ParseHistoricalFIX.cpp | 12 +- .../sparkd/cmds/ParseHistoricalFIX.h | 0 .../sparkd/cmds/PrintHedgeOrders.cpp | 8 +- .../sparkd/cmds/PrintHedgeOrders.h | 0 .../sparkd/cmds/QuickTest.cpp | 2 +- .../sparkd/cmds/QuickTest.h | 0 src/app_sparkd/sparkd/cmds/Run.cpp | 159 ++++ src/{server => app_sparkd}/sparkd/cmds/Run.h | 0 .../sparkd/cmds/Span.cpp | 20 +- src/{server => app_sparkd}/sparkd/cmds/Span.h | 0 .../sparkd/cmds/Web.cpp | 43 +- src/{server => app_sparkd}/sparkd/cmds/Web.h | 0 .../sparkd/cmds/common/EnumOptionNames.h | 0 .../sparkd/cmds/common/Validators.cpp | 2 +- .../sparkd/cmds/common/Validators.h | 0 .../sparkd/cmds/crypto/CryptoCmd.cpp | 0 .../sparkd/cmds/crypto/CryptoCmd.h | 0 .../sparkd/cmds/crypto/DeribitDemo.cpp | 7 +- .../sparkd/cmds/crypto/DeribitDemo.h | 0 .../sparkd/cmds/crypto/DeribitDemoCmd.cpp | 4 +- .../sparkd/cmds/crypto/DeribitDemoCmd.h | 0 .../cmds/crypto/DeribitDemoConfiguration.cpp | 2 +- .../cmds/crypto/DeribitDemoConfiguration.h | 2 +- .../cmds/crypto/DeribitDemoListener.cpp | 8 +- .../sparkd/cmds/crypto/DeribitDemoListener.h | 0 .../sparkd/cmds/crypto/LiveLadderDemo.cpp | 9 +- .../sparkd/cmds/crypto/LiveLadderDemo.h | 0 .../sparkd/cmds/crypto/LiveLadderDemoCmd.cpp | 10 +- .../sparkd/cmds/crypto/LiveLadderDemoCmd.h | 0 .../sparkd/cmds/crypto/RapidJsonReader.h | 2 +- .../sparkd/cmds/crypto/UserInstrumentData.cpp | 0 .../sparkd/cmds/crypto/UserInstrumentData.h | 0 .../cmds/crypto/deribit_demo_config.json | 0 .../sparkd/cmds/md/cmds/Channels.cpp | 2 +- .../sparkd/cmds/md/cmds/Channels.h | 0 .../sparkd/cmds/md/cmds/Cleanup.cpp | 10 +- .../sparkd/cmds/md/cmds/Cleanup.h | 0 .../sparkd/cmds/md/cmds/Dump.cpp | 12 +- .../sparkd/cmds/md/cmds/Dump.h | 0 .../sparkd/cmds/md/cmds/DumpSecurity.cpp | 21 +- .../sparkd/cmds/md/cmds/DumpSecurity.h | 0 .../sparkd/cmds/md/cmds/RecTool.cpp | 0 .../sparkd/cmds/md/cmds/RecTool.h | 0 .../sparkd/cmds/md/cmds/Record.cpp | 2 +- .../sparkd/cmds/md/cmds/Record.h | 0 .../sparkd/cmds/md/cmds/Relay.cpp | 2 +- .../sparkd/cmds/md/cmds/Relay.h | 0 .../sparkd/cmds/md/cmds/Replay.cpp | 2 +- .../sparkd/cmds/md/cmds/Replay.h | 0 .../sparkd/cmds/md/cmds/Run.cpp | 31 +- .../sparkd/cmds/md/cmds/Run.h | 3 +- .../sparkd/cmds/md/cmds/Tail.cpp | 16 +- .../sparkd/cmds/md/cmds/Tail.h | 0 .../cmds/md/cmds/rec_tool/cmds/Print.cpp | 2 +- .../sparkd/cmds/md/cmds/rec_tool/cmds/Print.h | 0 .../cmds/md/cmds/rec_tool/cmds/Trace.cpp | 2 +- .../sparkd/cmds/md/cmds/rec_tool/cmds/Trace.h | 0 .../cmds/md/cmds/rec_tool/cmds/Unprint.cpp | 2 +- .../cmds/md/cmds/rec_tool/cmds/Unprint.h | 0 .../cmds/md/common/SecurityTypeOption.cpp | 0 .../cmds/md/common/SecurityTypeOption.h | 2 +- .../sparkd/cmds/md/common/VenueOption.cpp | 2 +- .../sparkd/cmds/md/common/VenueOption.h | 2 +- .../sparkd/exchange_sim/ExchangeSim.cpp | 28 +- .../sparkd/exchange_sim/ExchangeSim.h | 2 +- .../exchange_sim/ExchangeSimApplication.cpp | 32 +- .../exchange_sim/ExchangeSimApplication.h | 6 +- .../sparkd/exchange_sim/IDGenerator.h | 0 .../sparkd/exchange_sim/IMDPlayerObserver.h | 4 +- .../sparkd/exchange_sim/book/Book.cpp | 0 .../sparkd/exchange_sim/book/Book.h | 8 +- .../exchange_sim/book/ExchangeSim.proto | 4 +- .../sparkd/exchange_sim/book/Order.cpp | 0 .../sparkd/exchange_sim/book/Order.h | 14 +- .../sparkd/exchange_sim/book/OrderMatcher.cpp | 10 +- .../sparkd/exchange_sim/book/OrderMatcher.h | 12 +- .../exchange_sim/book/book_transform.cpp | 4 +- .../sparkd/exchange_sim/book/book_transform.h | 2 +- .../tests/test_book_transform.cpp | 3 +- .../sparkd/execution/EMExecutionGateway.cpp | 66 +- .../sparkd/execution/EMExecutionGateway.h | 12 +- .../execution/execution_gateway_provider.cpp | 28 +- .../execution/execution_gateway_provider.h | 2 +- .../sparkd/http/ApiGateway.cpp | 12 +- .../sparkd/http/ApiGateway.h | 4 +- .../sparkd/http/MultipartFormDecoder.cpp | 2 +- .../sparkd/http/MultipartFormDecoder.h | 0 .../sparkd/http/WebServer.cpp | 16 +- .../sparkd/http/WebServer.h | 4 +- .../sparkd/http/tests/MultiPartFormTests.cpp | 0 src/{server => app_sparkd}/sparkd/main.cpp | 22 +- .../sparkd/md/ChannelVolume.cpp | 4 +- .../sparkd/md/ChannelVolume.h | 2 +- .../md/MarketDataAuxiliaryServiceServer.cpp | 16 +- .../md/MarketDataAuxiliaryServiceServer.h | 2 +- .../sparkd/md/MarketDataError.cpp | 0 .../sparkd/md/MarketDataError.h | 2 +- .../sparkd/md/MarketDataGateway.cpp | 50 +- .../sparkd/md/MarketDataGateway.h | 0 .../sparkd/md/MarketDataListener.h | 14 +- .../sparkd/md/MarketDataListenerID.h | 4 +- .../sparkd/md/MarketDataRegistration.h | 0 .../sparkd/md/MarketDataRegistrationError.h | 0 .../md/MarketDataRegistrationFactory.cpp | 0 .../sparkd/md/MarketDataRegistrationFactory.h | 0 .../sparkd/md/OnixsMarketDataProvider.cpp | 6 +- .../sparkd/md/OnixsMarketDataProvider.h | 6 +- .../sparkd/md/ReplayMarketDataProvider.cpp | 14 +- .../sparkd/md/ReplayMarketDataProvider.h | 6 +- .../md/ReplayMarketDataSubscription.cpp | 14 +- .../sparkd/md/ReplayMarketDataSubscription.h | 6 +- .../sparkd/md/VolumeAtPriceState.cpp | 4 +- .../sparkd/md/VolumeAtPriceState.h | 6 +- .../sparkd/md/binance/BinanceContractType.h | 4 +- .../sparkd/md/binance/BinanceFilterTuple.h | 30 +- .../sparkd/md/binance/BinanceFilterType.h | 4 +- .../md/binance/BinanceIcebergPartsFilter.cpp | 4 +- .../md/binance/BinanceIcebergPartsFilter.h | 2 +- .../md/binance/BinanceInstrumentStatus.h | 4 +- .../sparkd/md/binance/BinanceLotSizeFilter.h | 4 +- .../md/binance/BinanceMarketLotSizeFilter.h | 4 +- .../binance/BinanceMaxNumAlgoOrdersFilter.h | 4 +- .../md/binance/BinanceMaxNumOrdersFilter.h | 4 +- .../md/binance/BinanceMaxPositionFilter.h | 4 +- .../sparkd/md/binance/BinanceMessageType.h | 4 +- .../md/binance/BinanceMinNotionalFilter.cpp | 4 +- .../md/binance/BinanceMinNotionalFilter.h | 2 +- .../md/binance/BinanceMiniTickerAdaptor.cpp | 4 +- .../md/binance/BinanceMiniTickerAdaptor.h | 4 +- .../md/binance/BinanceMiniTickerEventType.h | 2 +- .../md/binance/BinanceMiniTickerUpdate.cpp | 14 +- .../md/binance/BinanceMiniTickerUpdate.h | 6 +- .../md/binance/BinanceNotionalFilter.cpp | 4 +- .../sparkd/md/binance/BinanceNotionalFilter.h | 2 +- .../sparkd/md/binance/BinanceOrderType.h | 4 +- .../binance/BinancePercentPriceBySideFilter.h | 6 +- .../md/binance/BinancePercentPriceFilter.h | 4 +- .../sparkd/md/binance/BinancePermission.h | 4 +- .../sparkd/md/binance/BinancePriceFilter.h | 6 +- .../md/binance/BinancePriceStatistics.cpp | 14 +- .../md/binance/BinancePriceStatistics.h | 2 +- .../binance/BinancePriceStatisticsAdaptor.cpp | 10 +- .../binance/BinancePriceStatisticsAdaptor.h | 6 +- .../sparkd/md/binance/BinanceQuoteAsset.h | 6 +- .../md/binance/BinanceSecurityRequestor.cpp | 30 +- .../md/binance/BinanceSecurityRequestor.h | 2 +- .../sparkd/md/binance/BinanceSpot.cpp | 10 +- .../sparkd/md/binance/BinanceSpot.h | 15 +- .../sparkd/md/binance/BinanceSubscription.cpp | 50 +- .../sparkd/md/binance/BinanceSubscription.h | 2 +- .../md/binance/BinanceTrailingDeltaFilter.h | 6 +- .../binance_coin_future.cpp | 12 +- .../binance_coin_future.h | 8 +- .../binance_coin_futures_contract_type.h | 4 +- .../binance_coin_futures_filter_tuple.h | 16 +- ...nance_coin_futures_max_num_orders_filter.h | 6 +- .../binance_coin_futures_message_type.h | 4 +- ...inance_coin_futures_percent_price_filter.h | 6 +- .../binance_coin_futures_price_statistics.cpp | 12 +- .../binance_coin_futures_price_statistics.h | 0 ..._coin_futures_price_statistics_adaptor.cpp | 10 +- ...ce_coin_futures_price_statistics_adaptor.h | 4 +- ...inance_coin_futures_security_requestor.cpp | 30 +- .../binance_coin_futures_security_requestor.h | 2 +- .../binance_coin_futures_subscription.cpp | 36 +- .../binance_coin_futures_subscription.h | 2 +- .../md/binance_us/BinanceUsMessageType.h | 4 +- .../binance_us/BinanceUsPriceStatistics.cpp | 14 +- .../md/binance_us/BinanceUsPriceStatistics.h | 2 +- .../BinanceUsPriceStatisticsAdaptor.cpp | 10 +- .../BinanceUsPriceStatisticsAdaptor.h | 6 +- .../binance_us/BinanceUsSecurityRequestor.cpp | 28 +- .../binance_us/BinanceUsSecurityRequestor.h | 2 +- .../sparkd/md/binance_us/BinanceUsSpot.h | 2 +- .../md/binance_us/BinanceUsSubscription.cpp | 42 +- .../md/binance_us/BinanceUsSubscription.h | 2 +- .../BinanceUsdsFuture.cpp | 14 +- .../binance_usds_futures/BinanceUsdsFuture.h | 11 +- .../BinanceUsdsFuturesContractType.h | 4 +- .../BinanceUsdsFuturesFilterTuple.cpp | 6 +- .../BinanceUsdsFuturesFilterTuple.h | 22 +- ...BinanceUsdsFuturesMaxNumAlgoOrdersFilter.h | 6 +- .../BinanceUsdsFuturesMaxNumOrdersFilter.h | 6 +- .../BinanceUsdsFuturesMessageType.h | 4 +- .../BinanceUsdsFuturesMinNotionalFilter.cpp | 4 +- .../BinanceUsdsFuturesMinNotionalFilter.h | 2 +- .../BinanceUsdsFuturesPercentPriceFilter.h | 6 +- .../BinanceUsdsFuturesPriceStatistics.cpp | 12 +- .../BinanceUsdsFuturesPriceStatistics.h | 0 ...nanceUsdsFuturesPriceStatisticsAdaptor.cpp | 10 +- ...BinanceUsdsFuturesPriceStatisticsAdaptor.h | 4 +- .../BinanceUsdsFuturesSecurityRequestor.cpp | 30 +- .../BinanceUsdsFuturesSecurityRequestor.h | 2 +- .../BinanceUsdsFuturesSubscription.cpp | 46 +- .../BinanceUsdsFuturesSubscription.h | 2 +- .../sparkd/md/cboe/CboeMarketDataHandler.cpp | 13 +- .../sparkd/md/cboe/CboeMarketDataHandler.h | 10 +- .../md/ccapi/CCApiCompositeMessageHandler.cpp | 2 +- .../md/ccapi/CCApiCompositeMessageHandler.h | 2 +- .../sparkd/md/ccapi/CCApiCorrelationID.h | 8 +- .../sparkd/md/ccapi/CCApiDepthWalker.cpp | 2 +- .../sparkd/md/ccapi/CCApiDepthWalker.h | 2 +- .../sparkd/md/ccapi/CCApiEventDemuxer.cpp | 10 +- .../sparkd/md/ccapi/CCApiEventDemuxer.h | 2 +- .../sparkd/md/ccapi/CCApiEventLogger.h | 2 +- .../sparkd/md/ccapi/CCApiHttpParams.cpp | 2 +- .../sparkd/md/ccapi/CCApiHttpParams.h | 6 +- .../sparkd/md/ccapi/CCApiJsonRpcRequest.h | 4 +- .../sparkd/md/ccapi/CCApiJsonRpcRouter.cpp | 8 +- .../sparkd/md/ccapi/CCApiJsonRpcRouter.h | 6 +- .../md/ccapi/CCApiMarketDataProvider.cpp | 32 +- .../sparkd/md/ccapi/CCApiMarketDataProvider.h | 6 +- .../md/ccapi/CCApiMarketDepthAdaptor.cpp | 12 +- .../sparkd/md/ccapi/CCApiMarketDepthAdaptor.h | 6 +- .../sparkd/md/ccapi/CCApiMessageHandler.h | 6 +- .../sparkd/md/ccapi/CCApiMessageLogger.cpp | 4 +- .../sparkd/md/ccapi/CCApiMessageLogger.h | 2 +- .../sparkd/md/ccapi/CCApiReader.cpp | 0 .../sparkd/md/ccapi/CCApiReader.h | 2 +- .../sparkd/md/ccapi/CCApiSession.cpp | 8 +- .../sparkd/md/ccapi/CCApiSession.h | 6 +- .../sparkd/md/ccapi/CCApiTradeAdaptor.cpp | 14 +- .../sparkd/md/ccapi/CCApiTradeAdaptor.h | 8 +- .../sparkd/md/ccapi/CCApiTradeRecord.cpp | 18 +- .../sparkd/md/ccapi/CCApiTradeRecord.h | 2 +- .../sparkd/md/ccapi/CCDemoListener.cpp | 4 +- .../sparkd/md/ccapi/CCDemoListener.h | 2 +- .../sparkd/md/ccapi/CCSecurityIDFactory.h | 2 +- .../sparkd/md/ccapi/ICCApiMessageHandler.cpp | 2 +- .../sparkd/md/ccapi/ICCApiMessageHandler.h | 2 +- .../sparkd/md/coinbase/CoinbaseMessageType.h | 4 +- .../md/coinbase/CoinbasePriceStatistics.cpp | 14 +- .../md/coinbase/CoinbasePriceStatistics.h | 2 +- .../CoinbasePriceStatisticsAdaptor.cpp | 8 +- .../coinbase/CoinbasePriceStatisticsAdaptor.h | 4 +- .../md/coinbase/CoinbaseSecurityRequestor.cpp | 26 +- .../md/coinbase/CoinbaseSecurityRequestor.h | 2 +- .../sparkd/md/coinbase/CoinbaseSpot.cpp | 10 +- .../sparkd/md/coinbase/CoinbaseSpot.h | 2 +- .../md/coinbase/CoinbaseSubscription.cpp | 30 +- .../sparkd/md/coinbase/CoinbaseSubscription.h | 2 +- .../md/databento/DatabentoDataHandler.cpp | 40 +- .../md/databento/DatabentoDataHandler.h | 9 +- .../databento/DatabentoMarketDataProvider.cpp | 12 +- .../databento/DatabentoMarketDataProvider.h | 2 +- .../md/deribit/DeribitChannelDemuxer.cpp | 6 +- .../sparkd/md/deribit/DeribitChannelDemuxer.h | 4 +- .../sparkd/md/deribit/DeribitCombo.cpp | 4 +- .../sparkd/md/deribit/DeribitCombo.h | 4 +- .../sparkd/md/deribit/DeribitComboLeg.cpp | 0 .../sparkd/md/deribit/DeribitComboLeg.h | 2 +- .../sparkd/md/deribit/DeribitComboRequest.h | 6 +- .../sparkd/md/deribit/DeribitCurrency.h | 2 +- .../sparkd/md/deribit/DeribitDepthAdaptor.cpp | 10 +- .../sparkd/md/deribit/DeribitDepthAdaptor.h | 2 +- .../sparkd/md/deribit/DeribitInstrument.cpp | 2 +- .../sparkd/md/deribit/DeribitInstrument.h | 4 +- .../sparkd/md/deribit/DeribitInstrumentKind.h | 12 +- .../md/deribit/DeribitInstrumentRequest.h | 12 +- .../md/deribit/DeribitInstrumentState.h | 6 +- .../md/deribit/DeribitInstrumentStateType.h | 4 +- .../md/deribit/DeribitInstrumentStore.cpp | 20 +- .../md/deribit/DeribitInstrumentStore.h | 6 +- .../sparkd/md/deribit/DeribitMessageType.h | 4 +- .../md/deribit/DeribitSecurityRequestor.cpp | 40 +- .../md/deribit/DeribitSecurityRequestor.h | 2 +- .../sparkd/md/deribit/DeribitSubscription.cpp | 56 +- .../sparkd/md/deribit/DeribitSubscription.h | 2 +- .../md/deribit/DeribitSubscriptionFactory.h | 2 +- .../md/deribit/DeribitTickerAdaptor.cpp | 8 +- .../sparkd/md/deribit/DeribitTickerAdaptor.h | 2 +- .../sparkd/md/deribit/DeribitTradeAdaptor.cpp | 12 +- .../sparkd/md/deribit/DeribitTradeAdaptor.h | 2 +- .../md/deribit/DeribitWithdrawalPriority.h | 0 .../sparkd/md/emumba/EmumbaDeribitData.h | 11 +- .../md/emumba/EmumbaDeribitSubscription.cpp | 8 +- .../md/emumba/EmumbaDeribitSubscription.h | 4 +- .../md/emumba/EmumbaMarketDataProvider.cpp | 8 +- .../md/emumba/EmumbaMarketDataProvider.h | 4 +- .../sparkd/md/ftx/FTXFuture.cpp | 14 +- .../sparkd/md/ftx/FTXFuture.h | 4 +- .../md/ftx/FTXHistoricalPriceAdaptor.cpp | 6 +- .../sparkd/md/ftx/FTXHistoricalPriceAdaptor.h | 4 +- .../md/ftx/FTXHistoricalPriceRecord.cpp | 8 +- .../sparkd/md/ftx/FTXHistoricalPriceRecord.h | 4 +- .../sparkd/md/ftx/FTXMarket.cpp | 16 +- .../sparkd/md/ftx/FTXMarket.h | 2 +- .../sparkd/md/ftx/FTXMessageType.h | 4 +- .../sparkd/md/ftx/FTXSecurityRequestor.cpp | 30 +- .../sparkd/md/ftx/FTXSecurityRequestor.h | 2 +- .../sparkd/md/ftx/FTXSecurityType.h | 6 +- .../sparkd/md/ftx/FTXSubscription.cpp | 34 +- .../sparkd/md/ftx/FTXSubscription.h | 2 +- .../md/glbx/DatabentoGlbxSubscription.cpp | 8 +- .../md/glbx/DatabentoGlbxSubscription.h | 2 +- .../sparkd/md/glbx/GlbxMarketDataHandler.cpp | 16 +- .../sparkd/md/glbx/GlbxMarketDataHandler.h | 10 +- .../sparkd/md/glbx/OnixsGlbxSubscription.cpp | 20 +- .../sparkd/md/glbx/OnixsGlbxSubscription.h | 2 +- .../sparkd/md/listeners/LiveLadderPrinter.cpp | 2 +- .../sparkd/md/listeners/LiveLadderPrinter.h | 4 +- .../sparkd/md/okx/OkxChannel.h | 8 +- .../sparkd/md/okx/OkxChannelDemuxer.cpp | 10 +- .../sparkd/md/okx/OkxChannelDemuxer.h | 6 +- .../sparkd/md/okx/OkxDepthAdaptor.cpp | 14 +- .../sparkd/md/okx/OkxDepthAdaptor.h | 2 +- .../sparkd/md/okx/OkxInstrument.cpp | 2 +- .../sparkd/md/okx/OkxInstrument.h | 6 +- .../sparkd/md/okx/OkxInstrumentStatus.h | 6 +- .../sparkd/md/okx/OkxInstrumentStore.cpp | 20 +- .../sparkd/md/okx/OkxInstrumentStore.h | 6 +- .../sparkd/md/okx/OkxInstrumentType.h | 4 +- .../sparkd/md/okx/OkxMessageType.h | 2 +- .../sparkd/md/okx/OkxRequest.h | 2 +- .../sparkd/md/okx/OkxResponse.h | 2 +- .../sparkd/md/okx/OkxSecuritySubscription.cpp | 34 +- .../sparkd/md/okx/OkxSecuritySubscription.h | 0 .../sparkd/md/okx/OkxSide.h | 8 +- .../sparkd/md/okx/OkxSubscription.cpp | 42 +- .../sparkd/md/okx/OkxSubscription.h | 2 +- .../sparkd/md/okx/OkxTicker.cpp | 2 +- .../sparkd/md/okx/OkxTicker.h | 8 +- .../sparkd/md/okx/OkxTickerAdaptor.cpp | 14 +- .../sparkd/md/okx/OkxTickerAdaptor.h | 2 +- .../sparkd/md/okx/OkxTrade.cpp | 2 +- .../sparkd/md/okx/OkxTrade.h | 8 +- .../sparkd/md/okx/OkxTradeAdaptor.cpp | 14 +- .../sparkd/md/okx/OkxTradeAdaptor.h | 2 +- .../sparkd/md/platforms/IMDPlatform.cpp | 0 .../sparkd/md/platforms/IMDPlatform.h | 0 .../md/platforms/emumba/EMTradingSession.h | 2 +- .../md/platforms/emumba/EmMDListener.cpp | 47 +- .../sparkd/md/platforms/emumba/EmMDListener.h | 12 +- .../sparkd/md/platforms/emumba/EmumbaMain.cpp | 32 +- .../sparkd/md/platforms/emumba/EmumbaMain.h | 2 +- .../md/platforms/ice_onixs/ICEListener.cpp | 8 +- .../md/platforms/ice_onixs/ICEListener.h | 6 +- .../platforms/ice_onixs/ICEListenerHelpers.h | 8 +- .../sparkd/md/platforms/ice_onixs/ICEMain.cpp | 22 +- .../sparkd/md/platforms/ice_onixs/ICEMain.h | 6 +- .../md/platforms/ice_onixs/ICESecurityIndex.h | 2 +- .../sparkd/md/platforms/ice_onixs/onixs.h | 0 .../platforms/ice_onixs/tests/ice_tests.cpp | 4 +- .../platforms/mdp3_onixs/CMESecurityIndex.h | 4 +- .../md/platforms/mdp3_onixs/MDP3Listener.cpp | 8 +- .../md/platforms/mdp3_onixs/MDP3Listener.h | 10 +- .../mdp3_onixs/MDP3ListenerHelpers.h | 6 +- .../md/platforms/mdp3_onixs/MDP3Main.cpp | 26 +- .../sparkd/md/platforms/mdp3_onixs/MDP3Main.h | 6 +- .../sparkd/md/platforms/mdp3_onixs/onixs.h | 0 .../platforms/mdp3_onixs/tests/mdp3_tests.cpp | 4 +- .../sparkd/md/recording/DbWriters.h | 15 +- .../sparkd/md/recording/MDBatchWriter.cpp | 4 +- .../sparkd/md/recording/MDBatchWriter.h | 4 +- .../sparkd/md/recording/MDRecorder.cpp | 47 +- .../sparkd/md/recording/MDRecorder.h | 9 +- .../sparkd/md/recording/MDReplayer.cpp | 38 +- .../sparkd/md/recording/MDReplayer.h | 6 +- .../sparkd/md/taifex/TaifexDataGateway.cpp | 34 +- .../sparkd/md/taifex/TaifexDataGateway.h | 3 +- .../sparkd/md/taifex/TaifexDataProcessors.h | 19 +- .../md/taifex/TaifexMarketDataProvider.cpp | 8 +- .../md/taifex/TaifexMarketDataProvider.h | 2 +- .../sparkd/md/taifex/TaifexMessages.h | 12 +- .../md/taifex/TaifexSecurityDetailsMapper.h | 9 +- .../sparkd/md/taifex/TaifexSubscription.cpp | 6 +- .../sparkd/md/taifex/TaifexSubscription.h | 2 +- .../sparkd/md/taifex/TaifexUtils.h | 13 +- .../sparkd/md/twse/TwseDataGateway.cpp | 20 +- .../sparkd/md/twse/TwseDataGateway.h | 5 +- .../sparkd/md/twse/TwseDataProcessors.h | 6 +- .../sparkd/md/twse/TwseMessages.h | 9 +- .../md/twse/TwseSecurityDetailsMapper.h | 0 .../sparkd/md/twse/TwseUtils.h | 0 .../sparkd/position/MarginServiceCore.cpp | 14 +- .../sparkd/position/MarginServiceCore.h | 6 +- .../sparkd/position/MarginServiceServer.cpp | 21 +- .../sparkd/position/MarginServiceServer.h | 16 +- .../sparkd/position/Position.h | 4 +- .../sparkd/position/PositionAggregator.cpp | 6 +- .../sparkd/position/PositionAggregator.h | 8 +- .../sparkd/position/PositionMap.cpp | 14 +- .../sparkd/position/PositionMap.h | 9 +- .../position/PositionServicePNLHelper.cpp | 14 +- .../position/PositionServicePNLHelper.h | 2 +- .../sparkd/position/PositionServiceServer.cpp | 24 +- .../sparkd/position/PositionServiceServer.h | 2 +- .../import/BasePositionServiceServer.cpp | 24 +- .../import/BasePositionServiceServer.h | 4 +- .../import/DownloadCommonStateMachine.cpp | 12 +- .../import/DownloadCommonStateMachine.h | 2 +- .../sparkd/position/import/DownloadWindow.cpp | 4 +- .../sparkd/position/import/DownloadWindow.h | 4 +- .../import/MoneyFileServiceServer.cpp | 20 +- .../position/import/MoneyFileServiceServer.h | 2 +- .../sftp_credentials_encrypted.txt.gpg | 0 .../btsmny_20190813.csv | Bin .../btspos_20190814.csv | 0 .../import/docs/download_state_machine.pdf | Bin .../sparkd/position/import/docs/import.org | 0 .../2019-07-08.File_Layout_Money.pdf | Bin .../2019-07-08.File_Layout_Positions.pdf | Bin .../reference/GMI Mapping spreadsheet.xlsx | Bin .../Gmail - Money and Position files.pdf | Bin .../import/docs/reference/adatmny.docx | Bin .../import/docs/reference/adatpos.docx | Bin .../import/docs/reference/btsmny_20190813.csv | Bin .../import/docs/reference/btspos_20190814.csv | 0 .../sftp_credentials_encrypted.txt.gpg | 0 .../position/import/parsing/gmi_parser.cpp | 20 +- .../position/import/parsing/gmi_parser.h | 2 +- .../position/import/parsing/money_parser.cpp | 8 +- .../position/import/parsing/money_parser.h | 2 +- .../position/import/parsing/parser_common.cpp | 2 +- .../position/import/parsing/parser_common.h | 0 .../sparkd/position/tests/PositionTests.cpp | 4 +- .../tests/position_tests_internal.cpp | 4 +- .../sparkd/subprocess/SubProcessRunner.cpp | 6 +- .../sparkd/subprocess/SubProcessRunner.h | 0 .../sparkd/support/ErrorReportService.cpp | 10 +- .../sparkd/support/ErrorReportService.h | 4 +- .../sparkd/support/ShellLatencyServer.cpp | 2 +- .../sparkd/support/ShellLatencyServer.h | 8 +- .../sparkd/user/AdminServiceDB.cpp | 8 +- .../sparkd/user/AdminServiceDB.h | 0 .../sparkd/user/AdminServiceServer.cpp | 14 +- .../sparkd/user/AdminServiceServer.h | 10 +- .../sparkd/user/AuthServiceServer.cpp | 8 +- .../sparkd/user/AuthServiceServer.h | 4 +- .../sparkd/user/tests/admin_service_tests.cpp | 11 +- src/client/spark/Spark.csproj | 2 +- src/client/spark_api/spark_api.csproj | 220 ++--- src/client/spark_core/spark_core.csproj | 6 +- src/client/spark_sdk/doc/Threading.md | 6 +- .../Core/WebsocketConnectionGateway.cs | 2 +- .../Core/WebsocketServerConfig.cs | 9 + .../spark_websocket/spark_websocket.csproj | 6 - src/lib/CMakeLists.txt | 128 --- src/lib/cmake/AddCopyBinariesTarget.cmake | 11 - src/lib/cmake/GetLinuxClientSources.cmake | 169 ---- src/lib/cmake/GetWindowsClientSources.cmake | 164 ---- src/lib/jetfix/jetfix.h | 5 - src/lib/orderman/events/TradeSignalEvent.cpp | 1 - .../events/TradeSummarySignalDispatcher.cpp | 1 - .../orderman/orders/algo/IAlgoServices.cpp | 1 - src/lib/quickbus/quickbus.h | 11 - src/lib/tracing/bts_trace.cpp | 1 - src/lib_binance_execution/CMakeLists.txt | 2 +- .../cross_margin/cross_margin_gateway.cpp | 40 +- .../cross_margin/cross_margin_gateway.h | 2 +- .../messages/cancel_order_request.cpp | 6 +- .../messages/cancel_order_response.cpp | 2 +- .../messages/create_order_request.cpp | 4 +- .../messages/create_order_response.h | 2 +- .../cross_margin/rest_api_client.cpp | 8 +- .../cross_margin/rest_api_client.h | 2 +- .../cross_margin/side_effect_type.h | 4 +- .../trade_data_stream/account_update.h | 2 +- .../trade_data_stream/balance_update.h | 2 +- .../trade_data_stream/event_type.h | 4 +- .../trade_data_stream/order_update.cpp | 12 +- .../trade_data_subscription.cpp | 8 +- .../trade_data_subscription.h | 2 +- .../binance_execution/enums/api_key_type.h | 4 +- .../enums/cancel_replace_mode.h | 4 +- .../enums/event_reason_type.h | 4 +- .../binance_execution/enums/execution_type.h | 4 +- .../enums/internal_order_ack_type.h | 4 +- .../enums/internal_order_status.h | 4 +- .../enums/new_order_response_type.h | 4 +- .../binance_execution/enums/op_success.h | 4 +- .../enums/order_cancel_restriction.h | 4 +- .../enums/order_rate_limit_exceeded_mode.h | 4 +- .../binance_execution/enums/order_status.h | 4 +- .../binance_execution/enums/order_type.h | 4 +- .../binance_execution/enums/position_side.h | 4 +- .../enums/price_match_mode.h | 4 +- .../enums/self_trade_prevention_mode.h | 4 +- .../binance_execution/enums/side.h | 4 +- .../binance_execution/enums/time_in_force.h | 4 +- .../binance_execution/enums/working_type.h | 4 +- .../execution_report_store.cpp | 8 +- .../execution_report_store.h | 6 +- .../binance_execution/gateway_config.h | 4 +- .../listen_key_requestor.cpp | 2 +- .../binance_execution/listen_key_requestor.h | 2 +- .../messages/refresh_listen_key_request.h | 2 +- .../messages/refresh_listen_key_response.h | 2 +- .../binance_execution/order_key_map.h | 6 +- .../binance_execution/order_store.cpp | 8 +- .../binance_execution/order_store.h | 6 +- .../binance_execution/order_transaction.cpp | 4 +- .../binance_execution/order_transaction.h | 4 +- .../order_transaction_chain.cpp | 8 +- .../order_transaction_chain.h | 2 +- .../binance_execution/position_calculator.cpp | 10 +- .../binance_execution/position_calculator.h | 2 +- .../simple_order_key_map.cpp | 6 +- .../binance_execution/simple_order_key_map.h | 2 +- .../spots/messages/cancel_order_request.cpp | 4 +- .../spots/messages/cancel_order_response.h | 2 +- .../spots/messages/create_order_request.cpp | 2 +- .../spots/messages/logon_request.cpp | 4 +- .../spots/messages/logon_request.h | 2 +- .../spots/messages/modify_order_request.cpp | 4 +- .../spots/messages/modify_order_request.h | 2 +- .../spots/messages/order_record.h | 2 +- .../spots/messages/position_info.h | 2 +- .../spots/rest_api_client.cpp | 10 +- .../binance_execution/spots/rest_api_client.h | 2 +- .../binance_execution/spots/signature_test.h | 6 +- .../binance_execution/spots/spots_gateway.cpp | 66 +- .../binance_execution/spots/spots_gateway.h | 2 +- .../spots/user_data_stream/account_update.h | 2 +- .../spots/user_data_stream/balance_update.h | 2 +- .../spots/user_data_stream/event_type.h | 4 +- .../spots/user_data_stream/order_update.cpp | 14 +- .../user_data_stream/order_update_log.cpp | 2 +- .../spots/user_data_stream/order_update_log.h | 2 +- .../user_data_subscription.cpp | 8 +- .../user_data_stream/user_data_subscription.h | 2 +- .../binance_execution/type_converters.h | 8 +- .../binance_execution/type_validators.h | 6 +- .../messages/cancel_order_request.cpp | 6 +- .../messages/cancel_order_response.h | 2 +- .../messages/create_order_request.cpp | 8 +- .../messages/create_order_response.h | 2 +- .../messages/modify_order_request.cpp | 4 +- .../messages/modify_order_response.h | 2 +- .../usds_futures/messages/position_info.h | 2 +- .../messages/position_info_request.cpp | 2 +- .../messages/position_info_request.h | 4 +- .../usds_futures/rest_api_client.cpp | 8 +- .../usds_futures/rest_api_client.h | 2 +- .../usds_futures/usds_futures_gateway.cpp | 72 +- .../usds_futures/usds_futures_gateway.h | 6 +- .../user_data_stream/account_update.h | 2 +- .../user_data_stream/order_update.cpp | 10 +- .../user_data_subscription.cpp | 6 +- .../user_data_stream/user_data_subscription.h | 2 +- .../websocket_api_request.cpp | 6 +- .../binance_execution/websocket_api_request.h | 4 +- .../websocket_api_response.h | 4 +- src/lib_spark/CMakeLists.txt | 161 ++++ src/lib_spark/Config.cmake.in | 5 + .../cmake/AddCopyBinariesTarget.cmake | 17 + .../cmake/GenerateConfigProfile.cmake | 62 ++ .../cmake/GenerateDefaultConfig.cmake | 5 +- .../cmake/GetLinuxClientLinkLibraries.cmake | 0 .../cmake/GetLinuxClientSources.cmake} | 33 +- .../cmake/GetLinuxServerLinkLibraries.cmake | 0 .../cmake/GetLinuxServerSources.cmake | 45 + .../cmake/GetWindowsClientLinkLibraries.cmake | 0 .../cmake/GetWindowsClientSources.cmake | 150 ++++ .../cmake/ProtobufGenerateCppService.cmake | 13 +- .../spark}/algorithm/PlusX.h | 0 .../spark}/algorithm/StringCaseConverter.h | 0 .../spark}/algorithm/TryCatch.h | 0 .../api/analytics/ExpirationDriver.proto | 4 +- .../TimeWeightedInterpolatedDriver.proto | 2 +- .../spark}/api/apicore.proto | 0 .../spark}/api/apigateway.proto | 4 +- .../spark}/api/apioptions.proto | 0 .../spark}/api/build_apioptions.sh | 0 .../spark}/api/core/ApiClientInterop.cpp | 18 +- .../spark}/api/core/ApiClientInterop.h | 0 .../spark}/api/core/ApiInteropCommon.h | 4 +- .../spark}/api/core/ApiServerInterop.cpp | 6 +- .../spark}/api/core/ApiServerInterop.h | 0 .../spark}/api/core/RegexFormatting.proto | 0 .../spark}/api/domain/CallPut.h | 8 +- .../spark}/api/domain/CallPut.proto | 0 .../spark}/api/domain/Currency.h | 8 +- .../spark}/api/domain/Currency.proto | 0 .../spark}/api/domain/SecurityCriteria.proto | 2 +- .../api/domain/SecurityCriteriaClause.proto | 4 +- .../api/domain/SecurityExpiration.proto | 4 +- .../spark}/api/domain/SecurityMetadata.proto | 4 +- .../domain/SecurityMetadataCollection.proto | 2 +- .../api/domain/SecurityMetadataItem.proto | 4 +- .../spark}/api/domain/SecurityType.h | 10 +- .../spark}/api/domain/SecurityType.proto | 0 .../spark}/api/domain/TickDisplayRule.proto | 2 +- .../api/domain/TickDisplaySettings.proto | 2 +- .../spark}/api/domain/TickFactors.proto | 0 .../spark}/api/domain/Venue.h | 10 +- .../spark}/api/domain/Venue.proto | 0 src/{lib => lib_spark/spark}/api/io/URL.proto | 0 .../BinanceCoinFuturesMarketDataConfig.proto | 4 +- .../api/md/BinanceMarketDataConfig.proto | 2 +- .../api/md/BinanceUsMarketDataConfig.proto | 2 +- .../BinanceUsdsFuturesMarketDataConfig.proto | 2 +- .../spark}/api/md/CboeMarketDataConfig.proto | 6 +- .../api/md/CoinbaseMarketDataConfig.proto | 2 +- .../api/md/DatabentoMarketDataConfig.proto | 0 .../api/md/DeribitMarketDataConfig.proto | 2 +- .../md/EmumbaDeribitMarketDataConfig.proto | 0 .../spark}/api/md/FTXMarketDataConfig.proto | 2 +- .../spark}/api/md/GlbxMarketDataConfig.proto | 5 +- .../spark}/api/md/MarketDataConfig.proto | 30 +- .../spark}/api/md/MarketDataConfigUtils.cpp | 6 +- .../spark}/api/md/MarketDataConfigUtils.h | 4 +- .../api/md/MarketDataRecordingConfig.proto | 2 +- .../api/md/MarketDataReplayConfig.proto | 2 +- .../spark}/api/md/OkxMarketDataConfig.proto | 2 +- .../api/md/TaifexMarketDataConfig.proto | 2 +- .../spark}/api/md/TwseMarketDataConfig.proto | 2 +- .../spark}/api/public/ApiException.h | 2 +- .../spark}/api/public/ApiServer.cpp | 0 .../spark}/api/public/ApiServer.h | 4 +- .../spark}/api/public/ApiUtils.h | 0 .../spark}/api/public/ClientChannel.cpp | 0 .../spark}/api/public/ClientChannel.h | 2 +- .../api/public/QuickbusClientChannel.cpp | 0 .../spark}/api/public/QuickbusClientChannel.h | 2 +- .../spark}/api/public/RawUpdate.h | 0 .../spark}/api/public/Result.h | 2 +- .../spark}/api/public/ServerChannel.cpp | 0 .../spark}/api/public/ServerChannel.h | 2 +- .../spark}/api/public/ServiceContext.cpp | 4 +- .../spark}/api/public/ServiceContext.h | 2 +- .../spark}/api/public/StatefulPublisher.h | 0 .../spark}/api/public/Update.h | 0 src/{lib => lib_spark/spark}/api/public/api.h | 0 .../api/service_compiler/apioptions_pb2.py | 0 .../spark}/api/service_compiler/plugin.cmd | 4 +- .../spark}/api/service_compiler/plugin.py | 0 .../spark}/api/service_compiler/plugin.sh | 2 +- .../templates/c#/client.pb.cs | 0 .../templates/c#/immutable.pb.cs | 378 ++++----- .../templates/c#/server.pb.cs | 418 ++++----- .../templates/cpp/client.pb.cc | 2 +- .../templates/cpp/client.pb.h | 10 +- .../templates/cpp/server.pb.cc | 6 +- .../templates/cpp/server.pb.h | 4 +- .../service_compiler/templates/fs/fable.fs | 0 .../api/service_compiler/templates/js/ts | 0 .../api/service_helpers/AdminServiceUtils.cpp | 20 +- .../api/service_helpers/AdminServiceUtils.h | 10 +- .../api/service_helpers/AlgoServiceUtils.cpp | 4 +- .../api/service_helpers/AlgoServiceUtils.h | 0 .../api/service_helpers/PositionUtilities.cpp | 8 +- .../api/service_helpers/PositionUtilities.h | 8 +- .../spark}/api/services/AdminService.proto | 10 +- .../api/services/AlgoDefinitionService.proto | 8 +- .../spark}/api/services/AlgoService.proto | 8 +- .../api/services/AnalyticsService.proto | 12 +- .../api/services/ApiUnitTestService.proto | 0 .../spark}/api/services/AuthService.proto | 4 +- .../api/services/BasePositionService.proto | 6 +- .../api/services/ErrorReportService.proto | 4 +- .../spark}/api/services/HelloService.proto | 2 +- .../spark}/api/services/MBOService.proto | 4 +- .../spark}/api/services/MarginService.proto | 8 +- .../services/MarketDataAuxiliaryService.proto | 4 +- .../spark}/api/services/MarketDataRelay.proto | 8 +- .../api/services/MarketDataService.proto | 8 +- .../api/services/MoneyFileService.proto | 6 +- .../spark}/api/services/OrderService.cpp | 2 +- .../spark}/api/services/OrderService.h | 18 +- .../spark}/api/services/OrderService.proto | 10 +- .../services/OutOfProcessURLListener.proto | 2 +- .../api/services/PersistenceService.proto | 2 +- .../spark}/api/services/PositionService.proto | 6 +- .../api/services/ShellDiagnosticService.proto | 4 +- .../api/services/ShellLatencyService.proto | 6 +- .../services/SyntheticSecurityService.proto | 8 +- .../spark}/api/services/native_order_type.h | 12 +- .../spark}/api/services/order_status.h | 12 +- .../spark}/api/services/time_in_force.h | 12 +- .../spark}/api/services/trigger_price_type.h | 12 +- .../spark}/api/test/ApiTests.cpp | 4 +- .../spark}/api/test/HelloServiceServer.cpp | 0 .../spark}/api/test/HelloServiceServer.h | 8 +- .../spark}/collections/AutoIncrementedIndex.h | 4 +- .../spark}/collections/Chunk.h | 0 .../spark}/collections/Contains.h | 0 .../spark}/collections/DiscreteValuesFilter.h | 0 .../spark}/collections/Find.h | 0 .../spark}/collections/FlatUnorderedMap.h | 0 .../spark}/collections/GeneratedKeyMap.h | 2 +- .../spark}/collections/HASH_IMPL.h | 2 +- .../spark}/collections/HashCombiner.h | 0 .../spark}/collections/Remove.h | 0 .../spark}/collections/Transform.h | 0 .../spark}/collections/UnorderedMapLookup.h | 0 .../spark}/collections/UnorderedSetFactory.h | 0 .../spark}/collections/UnorderedSetMap.h | 2 +- .../spark}/collections/concurrent_factory.h | 6 +- .../spark}/collections/concurrent_queue.h | 0 .../collections/concurrent_unordered_map.h | 2 +- .../concurrent_unordered_map_iterator.h | 0 .../tests/concurrent_unordered_map_tests.cpp | 4 +- .../tests/WebsocketSyncClientTests.cpp | 0 .../spark}/config/ConfigDownloader.cpp | 4 +- .../spark}/config/ConfigDownloader.h | 2 +- .../spark}/config/ConfigErrorCollector.cpp | 2 +- .../spark}/config/ConfigErrorCollector.h | 0 .../spark}/config/ConfigLog.h | 4 +- .../spark}/config/ConfigPropertyEvaluator.cpp | 6 +- .../spark}/config/ConfigPropertyEvaluator.h | 6 +- .../spark}/config/ConfigQuerier.cpp | 12 +- .../spark}/config/ConfigQuerier.h | 2 +- .../spark}/config/ConfigQueryErrors.h | 2 +- .../spark}/config/ConfigValueQueue.cpp | 2 +- .../spark}/config/ConfigValueQueue.h | 6 +- .../spark}/config/ConfigurationException.cpp | 0 .../spark}/config/ConfigurationException.h | 2 +- .../spark}/config/ConfigurationState.cpp | 28 +- .../spark}/config/ConfigurationState.h | 4 +- .../spark}/config/PreprocessInputStream.cpp | 0 .../spark}/config/PreprocessInputStream.h | 2 +- .../spark}/config/config.cpp | 2 +- src/{lib => lib_spark/spark}/config/config.h | 4 +- .../spark}/config/extensions/extensions.proto | 0 .../spark}/config/invalid/invalid.proto | 0 .../spark}/config/profiles/README.md | 0 .../data_stream/data_stream_config.conf | 0 .../default/SecurityMetadataCollection.conf | 0 .../profiles/default/cme_reference_data.conf | 0 .../profiles/default/deployment_type.conf | 0 .../profiles/default/exchange_sim_cfg.conf | 0 .../config/profiles/default/jetfix.conf | 0 .../config/profiles/default/keycode.conf | 0 .../config/profiles/default/logging.conf | 0 .../profiles/default/marex_fix_cfg.conf | 0 .../config/profiles/default/market_data.conf | 0 .../config/profiles/default/mercury_cfg.conf | 0 .../config/profiles/default/okx_exe_cfg.conf | 0 .../config/profiles/default/orderman_cfg.conf | 0 .../default/orders_fills_cleanup.conf | 0 .../spark}/config/profiles/default/ports.conf | 0 .../config/profiles/default/position_cfg.conf | 0 .../config/profiles/default/quickbus_cfg.conf | 0 .../spark}/config/profiles/default/span.conf | 0 .../config/profiles/default/spreader.conf | 0 .../config/profiles/default/symbols.conf | 0 .../default/taifex_reference_data.conf | 0 .../config/profiles/default/testkeys.conf | 0 .../config/profiles/default/threads.conf | 0 .../config/profiles/default/toggles.conf | 0 .../spark}/config/profiles/default/ui.conf | 0 .../profiles/md_dev/market_data_config.conf | 0 .../profiles/md_prod/market_data_config.conf | 0 .../spark}/config/protos/algo_types.proto | 0 .../config/protos/cme_reference_data.proto | 2 +- .../config/protos/data_stream_config.proto | 0 .../config/protos/deployment_type.proto | 0 .../config/protos/exchange_sim_cfg.proto | 0 .../spark}/config/protos/jetfix.proto | 2 +- .../spark}/config/protos/keycode.proto | 0 .../spark}/config/protos/logging.proto | 0 .../spark}/config/protos/marex_fix_cfg.proto | 0 .../spark}/config/protos/market_data.proto | 0 .../spark}/config/protos/mercury_cfg.proto | 0 .../spark}/config/protos/okx_exe_cfg.proto | 0 .../spark}/config/protos/orderman_cfg.proto | 0 .../config/protos/orders_fills_cleanup.proto | 0 .../spark}/config/protos/perflog_cfg.proto | 0 .../spark}/config/protos/ports.proto | 0 .../spark}/config/protos/position_cfg.proto | 2 +- .../spark}/config/protos/quickbus_cfg.proto | 0 .../spark}/config/protos/span.proto | 0 .../spark}/config/protos/spartan.proto | 0 .../spark}/config/protos/spreader.proto | 0 .../spark}/config/protos/subprocess.proto | 0 .../spark}/config/protos/symbols.proto | 0 .../spark}/config/protos/system_config.proto | 0 .../config/protos/taifex_reference_data.proto | 2 +- .../spark}/config/protos/testkeys.proto | 2 +- .../spark}/config/protos/threads.proto | 0 .../spark}/config/protos/toggles.proto | 2 +- .../spark}/config/protos/ui.proto | 0 .../spark}/config/tests/HTTPServer.cpp | 2 +- .../spark}/config/tests/HTTPServer.h | 0 .../spark}/config/tests/config_ref_tests.cpp | 10 +- .../spark}/config/tests/config_tests.cpp | 14 +- .../spark}/config/text_format/strutil.h | 0 .../spark}/config/text_format/text_format.cpp | 0 .../spark}/config/text_format/text_format.h | 0 .../spark}/core/AllSameType.h | 0 src/{lib => lib_spark/spark}/core/BoolName.h | 0 .../spark}/core/EnumMacros.h | 0 src/{lib => lib_spark/spark}/core/FMT.h | 0 src/{lib => lib_spark/spark}/core/FMT_IMPL.h | 0 .../spark}/core/HashPhaser.h | 0 .../spark}/core/LOCK_GUARD.h | 0 src/{lib => lib_spark/spark}/core/NaN.h | 0 .../spark}/core/StringContains.h | 0 .../spark}/core/StringFiller.h | 0 .../spark}/core/StringFinder.h | 0 .../spark}/core/StringJoiner.h | 0 .../spark}/core/TableFormatter.h | 0 .../spark}/core/TimeSpan.cpp | 0 src/{lib => lib_spark/spark}/core/TimeSpan.h | 6 +- .../spark}/core/TimeStamp.cpp | 2 +- src/{lib => lib_spark/spark}/core/TimeStamp.h | 8 +- .../spark}/core/ValueWrapper.h | 2 +- .../spark}/core/VectorAdapter.h | 0 .../spark}/core/start_stop_state_machine.cpp | 12 +- .../spark}/core/start_stop_state_machine.h | 4 +- .../spark}/datastreams/Tables/StreamData.h | 2 +- .../datastreams/Tables/tests/stream_tests.cpp | 13 +- .../spark}/domain/AccountID.h | 2 +- .../spark}/domain/AggressorSide.h | 4 +- .../spark}/domain/BUY_SELL.h | 2 +- src/{lib => lib_spark/spark}/domain/Book.h | 8 +- .../spark}/domain/BookLevel.h | 2 +- .../spark}/domain/BookLevelComp.h | 0 .../spark}/domain/BookSide.h | 12 +- .../domain/BookSide_PopulatedIterator.h | 0 .../spark}/domain/DomainSecurityUtils.cpp | 20 +- .../spark}/domain/DomainSecurityUtils.h | 14 +- .../spark}/domain/FTXSecurity.h | 0 .../spark}/domain/FutureSecurity.h | 4 +- .../spark}/domain/LegDefinition.h | 2 +- .../spark}/domain/NewBookSide.h | 0 .../spark}/domain/NewOrder.cpp | 0 .../spark}/domain/NewOrder.h | 0 .../spark}/domain/OptionSecurity.h | 8 +- .../spark}/domain/OrderDefinition.cpp | 0 .../spark}/domain/OrderDefinition.h | 14 +- .../spark}/domain/OrderKey.h | 2 +- .../spark}/domain/OrderState.h | 4 +- .../spark}/domain/OrderStatus.cpp | 0 .../spark}/domain/OrderStatus.h | 0 .../spark}/domain/OrderUpdate.cpp | 0 .../spark}/domain/OrderUpdate.h | 0 src/{lib => lib_spark/spark}/domain/Price.h | 10 +- .../spark}/domain/PriceComp.h | 0 .../spark}/domain/Quantity.h | 8 +- src/{lib => lib_spark/spark}/domain/RFQ.h | 0 .../spark}/domain/Security.cpp | 12 +- .../spark}/domain/Security.h | 6 +- .../spark}/domain/SecurityCommon.h | 14 +- .../spark}/domain/SecurityCriteria.cpp | 6 +- .../spark}/domain/SecurityCriteria.h | 10 +- .../spark}/domain/SecurityCriteriaClause.cpp | 16 +- .../spark}/domain/SecurityCriteriaClause.h | 8 +- .../spark}/domain/SecurityID.h | 4 +- .../domain/SecurityMarketDataStatistics.h | 14 +- .../spark}/domain/SecurityState.h | 0 src/{lib => lib_spark/spark}/domain/Side.cpp | 0 src/{lib => lib_spark/spark}/domain/Side.h | 2 +- src/{lib => lib_spark/spark}/domain/SideReq.h | 0 .../spark}/domain/SpotSecurity.h | 0 .../spark}/domain/SpreadSecurity.h | 2 +- .../spark}/domain/TimeInForce.cpp | 0 .../spark}/domain/TimeInForce.h | 0 .../spark}/domain/TradeRecord.h | 12 +- src/{lib => lib_spark/spark}/domain/UserID.h | 2 +- .../spark}/domain/book_side_consumer.h | 4 +- .../spark}/domain/cme/GlbxOrderDefinition.h | 0 .../spark}/domain/cme/GlbxOrderState.h | 0 .../domain/deribit/DeribitOrderDefinition.h | 0 .../spark}/domain/deribit/DeribitOrderState.h | 0 .../spark}/domain/synthetic_book_side.cpp | 2 +- .../spark}/domain/synthetic_book_side.h | 4 +- .../spark}/domain_model/PutOrCall.h | 12 +- .../spark}/domain_model/Security.cpp | 12 +- .../spark}/domain_model/Security.h | 14 +- .../spark}/domain_model/Security.proto | 2 +- .../spark}/domain_model/SecurityKey.h | 4 +- .../spark}/domain_model/SecurityTests.cpp | 0 .../spark}/domain_model/SecurityType.h | 12 +- .../spark}/domain_model/Side.h | 10 +- .../spark}/domain_model/Venue.h | 12 +- .../spark}/domain_model/common.cpp | 2 +- .../spark}/domain_model/common.h | 6 +- .../spark}/domain_model/sod.cpp | 4 +- .../spark}/domain_model/sod.h | 2 +- .../domain_model/tests/domain_tests.cpp | 11 +- .../spark}/expression/BooleanGrammar.cpp | 0 .../spark}/expression/BooleanGrammar.h | 2 +- .../spark}/expression/ExpressionEvaluator.cpp | 0 .../spark}/expression/ExpressionEvaluator.h | 0 .../spark}/expression/IPropertyEvaluator.h | 0 .../spark}/expression/ParserExceptions.cpp | 0 .../spark}/expression/ParserExceptions.h | 0 .../spark}/expression/RecursionGuard.h | 2 +- .../spark}/expression/Value.cpp | 0 .../spark}/expression/Value.h | 0 .../tests/expression_parser_tests.cpp | 0 src/{lib => lib_spark/spark}/io/JsonDumper.h | 0 src/{lib => lib_spark/spark}/io/JsonMacros.h | 0 .../spark}/io/JsonOptional.h | 0 .../spark}/io/JsonReader.cpp | 10 +- src/{lib => lib_spark/spark}/io/JsonReader.h | 2 +- src/{lib => lib_spark/spark}/io/JsonType.h | 2 +- .../spark}/io/ProtoPrinter.h | 0 src/{lib => lib_spark/spark}/io/ProtoReader.h | 0 .../spark}/io/QueryParams.cpp | 0 src/{lib => lib_spark/spark}/io/QueryParams.h | 2 +- src/{lib => lib_spark/spark}/io/URL.cpp | 2 +- src/{lib => lib_spark/spark}/io/URL.h | 2 +- .../spark}/io/http/HTTPHeaders.cpp | 2 +- .../spark}/io/http/HTTPHeaders.h | 2 +- .../spark}/io/http/HTTPResponse.cpp | 0 .../spark}/io/http/HTTPResponse.h | 2 +- .../spark}/io/http/HttpMethod.h | 4 +- .../spark}/io/http/HttpProtocol.h | 10 +- .../spark}/io/http/curl_headers.h | 0 .../spark}/io/http/curl_session.h | 2 +- .../spark}/io/http/http_client.cpp | 18 +- .../spark}/io/http/http_client.h | 4 +- .../spark}/io/http/http_request.h | 2 +- .../spark}/io/http/http_response.h | 4 +- .../spark}/io/http/i_http_response.h | 0 .../spark}/io/http/query_params.h | 2 +- .../spark}/io/json_formatter.h | 0 .../spark}/io/websocket/IJsonRpcHandler.cpp | 0 .../spark}/io/websocket/IJsonRpcHandler.h | 6 +- .../spark}/io/websocket/IWebsocketListener.h | 0 .../spark}/io/websocket/JsonRpcError.h | 2 +- .../spark}/io/websocket/JsonRpcHandler.cpp | 2 +- .../spark}/io/websocket/JsonRpcHandler.h | 12 +- .../spark}/io/websocket/JsonRpcId.h | 6 +- .../spark}/io/websocket/JsonRpcRequest.h | 6 +- .../spark}/io/websocket/JsonRpcResponse.h | 8 +- .../spark}/io/websocket/JsonRpcRouter.h | 12 +- .../spark}/io/websocket/WebsocketClient.cpp | 4 +- .../spark}/io/websocket/WebsocketClient.h | 0 .../WebsocketClientConfiguration.cpp | 2 +- .../websocket/WebsocketClientConfiguration.h | 0 .../spark}/io/websocket/WebsocketError.cpp | 0 .../spark}/io/websocket/WebsocketError.h | 0 .../spark}/io/websocket/WebsocketMessage.cpp | 0 .../spark}/io/websocket/WebsocketMessage.h | 0 .../websocket/WebsocketSSLClientInternal.cpp | 4 +- .../io/websocket/WebsocketSSLClientInternal.h | 2 +- .../websocket/tests/WebsocketClientTests.cpp | 10 +- .../spark}/io/websocket/websocket_client.cpp | 29 +- .../spark}/io/websocket/websocket_client.h | 4 +- .../io/websocket/websocket_client_config.h | 2 +- .../io/websocket/websocket_client_logger.h | 4 +- .../io/websocket/websocket_client_state.h | 4 +- .../io/websocket/websocket_close_status.h | 4 +- .../io/websocket/websocket_error_code.h | 2 +- .../websocketpp_exception_formatter.h | 2 +- .../spark}/jetfix/codec/FIXArray.cpp | 0 .../spark}/jetfix/codec/FIXArray.h | 2 +- .../spark}/jetfix/codec/FIXBuffer.h | 2 +- .../spark}/jetfix/codec/FIXEncodingStream.h | 12 +- .../spark}/jetfix/codec/FIXFragment.h | 6 +- .../spark}/jetfix/codec/FIXMsg.h | 16 +- .../spark}/jetfix/codec/FIXParser.h | 2 +- .../spark}/jetfix/codec/FIXWriter.h | 0 .../spark}/jetfix/codec/FieldDefinitions.h | 0 .../spark}/jetfix/codec/Fields.h | 14 +- .../spark}/jetfix/codec/Group.h | 4 +- .../spark}/jetfix/codec/IFIXMsg.h | 2 +- .../spark}/jetfix/codec/IFIXParser.h | 2 +- .../spark}/jetfix/codec/IFieldReader.h | 0 .../spark}/jetfix/codec/MessageDefinitions.h | 6 +- .../spark}/jetfix/codec/MessageTypes.h | 0 .../spark}/jetfix/codec/ReaderCursor.h | 2 +- .../spark}/jetfix/codec/WriterCursor.h | 6 +- .../spark}/jetfix/codec/f_toa.h | 2 +- .../spark}/jetfix/codec/i32_toa.h | 0 .../spark}/jetfix/codec/sum_bytes.h | 0 .../spark}/jetfix/common/InMsgBuffer.h | 6 +- .../spark}/jetfix/common/JetFIXError.h | 0 .../spark}/jetfix/common/OutFIX.cpp | 0 .../spark}/jetfix/common/OutFIX.h | 6 +- .../spark}/jetfix/common/OutFIXPtr.h | 0 .../spark}/jetfix/common/OutMsgVecPtr.h | 0 .../spark}/jetfix/connection/AsyncReader.cpp | 10 +- .../spark}/jetfix/connection/AsyncReader.h | 0 .../spark}/jetfix/connection/IConnection.cpp | 0 .../spark}/jetfix/connection/IConnection.h | 0 .../jetfix/connection/IConnectionObserver.h | 0 .../jetfix/connection/SocketConnection.cpp | 14 +- .../jetfix/connection/SocketConnection.h | 4 +- .../spark}/jetfix/gateway/CoreGateway.cpp | 26 +- .../spark}/jetfix/gateway/CoreGateway.h | 8 +- .../jetfix/gateway/ICoreGatewayEventSink.h | 2 +- .../jetfix/gateway/ICoreGatewayObserver.h | 2 +- .../spark}/jetfix/gateway/JetFIXGateway.cpp | 0 .../spark}/jetfix/gateway/JetFIXGateway.h | 16 +- .../spark}/jetfix/gateway/Session.cpp | 30 +- .../spark}/jetfix/gateway/Session.h | 14 +- src/lib_spark/spark/jetfix/jetfix.h | 5 + .../spark}/jetfix/store/FIXFileStore.cpp | 22 +- .../spark}/jetfix/store/FIXFileStore.h | 4 +- .../spark}/jetfix/store/IFIXStore.h | 2 +- .../spark}/jetfix/store/session_name.cpp | 4 +- .../spark}/jetfix/store/session_name.h | 4 +- .../jetfix/tests/async_reader_tests.cpp | 10 +- .../spark}/jetfix/tests/conv.py | 0 .../spark}/jetfix/tests/decoding_tests.cpp | 18 +- .../tests/fix_encoding_stream_tests.cpp | 2 +- .../jetfix/tests/fix_fragment_tests.cpp | 6 +- .../jetfix/tests/jetfix_performance_tests.cpp | 20 +- .../spark}/jetfix/tests/sample_fix.cpp | 0 .../spark}/jetfix/tests/sample_fix.dat | 0 .../spark}/jetfix/tests/sample_fix.h | 0 .../spark}/jetfix/tests/store_tests.cpp | 20 +- src/{lib => lib_spark/spark}/logging/Common.h | 2 +- src/{lib => lib_spark/spark}/logging/LogRec.h | 2 +- src/{lib => lib_spark/spark}/logging/Logger.h | 2 +- .../spark}/logging/LoggerHub.cpp | 8 +- .../spark}/logging/LoggerHub.h | 0 .../spark}/logging/LoggingConfig.h | 2 +- .../spark}/logging/MsgPacking.h | 0 src/{lib => lib_spark/spark}/logging/Sink.cpp | 10 +- src/{lib => lib_spark/spark}/logging/Sink.h | 2 +- .../spark}/logging/ccapi_logger.h | 9 +- .../spark}/logging/log_var.h | 2 +- .../spark}/logging/logging.cpp | 18 +- .../spark}/logging/logging.h | 4 +- .../spark}/logging/tests/logging_tests.cpp | 8 +- .../spark}/logging/trace_log.h | 0 .../spark}/logging/trace_log_var.h | 2 +- .../spark}/md/CompositeMarketDataListener.h | 0 .../spark}/md/Diag/MDPeriodicDumper.cpp | 14 +- .../spark}/md/Diag/MDPeriodicDumper.h | 2 +- .../spark}/md/Diag/ShmDumper.cpp | 8 +- .../spark}/md/Diag/ShmDumper.h | 6 +- .../spark}/md/ExchangeOrderKey.h | 2 +- .../spark}/md/ExchangeSecurityKey.h | 2 +- .../spark}/md/GeneralMarketDataListener.cpp | 74 +- .../spark}/md/GeneralMarketDataListener.h | 15 +- .../spark}/md/GeneralSecurityIndex.h | 2 +- .../spark}/md/IMarketDataListener.h | 6 +- .../spark}/md/IMarketDataProvider.cpp | 0 .../spark}/md/IMarketDataProvider.h | 4 +- .../spark}/md/IMarketDataSource.cpp | 0 .../spark}/md/IMarketDataSource.h | 0 .../spark}/md/ISyntheticSecurityService.h | 6 +- src/{lib => lib_spark/spark}/md/IntPrice.h | 6 +- .../spark}/md/MBOProcessor.cpp | 8 +- .../spark}/md/MBOProcessor.h | 11 +- .../spark}/md/MBOServiceServer.cpp | 16 +- .../spark}/md/MBOServiceServer.h | 4 +- src/{lib => lib_spark/spark}/md/MDClient.cpp | 6 +- src/{lib => lib_spark/spark}/md/MDClient.h | 14 +- .../spark}/md/MDConsumer.cpp | 18 +- src/{lib => lib_spark/spark}/md/MDConsumer.h | 12 +- .../spark}/md/MDConsumerHandle.cpp | 15 +- .../spark}/md/MDConsumerHandle.h | 10 +- .../spark}/md/MDConsumerInterop.cpp | 10 +- .../spark}/md/MDProducer.cpp | 20 +- src/{lib => lib_spark/spark}/md/MDProducer.h | 4 +- .../spark}/md/MDProducerChannel.h | 2 +- .../spark}/md/MDProducerHandle.cpp | 2 +- .../spark}/md/MDProducerHandle.h | 8 +- .../spark}/md/MemorySegmentUtils.cpp | 0 .../spark}/md/MemorySegmentUtils.h | 0 src/{lib => lib_spark/spark}/md/PriceSize.cpp | 2 +- src/{lib => lib_spark/spark}/md/PriceSize.h | 10 +- src/{lib => lib_spark/spark}/md/Product.cpp | 0 src/{lib => lib_spark/spark}/md/Product.h | 2 +- .../spark}/md/SecurityCache.cpp | 14 +- .../spark}/md/SecurityCache.h | 8 +- .../spark}/md/SecurityDB.cpp | 12 +- src/{lib => lib_spark/spark}/md/SecurityDB.h | 10 +- .../spark}/md/SecurityIDRecorder.cpp | 10 +- .../spark}/md/SecurityIDRecorder.h | 6 +- .../spark}/md/SecurityIndex.h | 8 +- .../spark}/md/SecurityMapper.cpp | 15 +- .../spark}/md/SecurityMapper.h | 0 .../spark}/md/SecurityMarketState.cpp | 0 .../spark}/md/SecurityMarketState.h | 0 .../spark}/md/SecurityOracle.cpp | 4 +- .../spark}/md/SecurityOracle.h | 6 +- src/{lib => lib_spark/spark}/md/SecurityPtr.h | 0 .../spark}/md/SecurityStore.cpp | 6 +- .../spark}/md/SecurityStore.h | 6 +- .../spark}/md/SettlementRecorder.cpp | 6 +- .../spark}/md/SettlementRecorder.h | 4 +- .../spark}/md/Shm/FixedSecurity.cpp | 6 +- .../spark}/md/Shm/FixedSecurity.h | 22 +- .../spark}/md/Shm/MDStructure.h | 12 +- .../spark}/md/Shm/readme.txt | 0 .../spark}/md/ShmSegmentName.h | 6 +- src/{lib => lib_spark/spark}/md/SizeTypes.h | 2 +- .../spark}/md/SymbolLoader.h | 12 +- .../spark}/md/SyntheticSecurityService.cpp | 16 +- .../spark}/md/SyntheticSecurityService.h | 8 +- src/{lib => lib_spark/spark}/md/UserSymbol.h | 5 +- .../spark}/md/cme/CMEChannel.h | 8 +- .../spark}/md/cme/CMEConnection.h | 2 +- .../md/cme/GlbxMarketDataSubscription.h | 0 .../spark}/md/cme/MDP3Utils.cpp | 22 +- .../spark}/md/cme/MDP3Utils.h | 8 +- .../spark}/md/cme/mdp3_data_directory.h | 2 +- src/{lib => lib_spark/spark}/md/coconut2.h | 0 src/{lib => lib_spark/spark}/md/common.cpp | 4 +- src/{lib => lib_spark/spark}/md/common.h | 10 +- .../ice/ConnectivityConfiguration.APITest.xml | 0 .../ConnectivityConfiguration.PerfTest.xml | 0 .../ConnectivityConfiguration.Production.xml | 0 .../spark}/md/ice/ICEUtils.cpp | 20 +- .../spark}/md/ice/ICEUtils.h | 2 +- .../spark}/md/protos/co2.proto | 2 +- src/{lib => lib_spark/spark}/md/readme.md | 0 .../spark}/md/relay/QueryServer.cpp | 42 +- .../spark}/md/relay/QueryServer.h | 10 +- .../spark}/md/relay/RelayClient.cpp | 26 +- .../spark}/md/relay/RelayClient.h | 8 +- .../spark}/md/relay/RelayRecorder.cpp | 18 +- .../spark}/md/relay/RelayRecorder.h | 2 +- .../spark}/md/security_type_index.h | 4 +- .../md/service/MarketDataServiceServer.cpp | 10 +- .../md/service/MarketDataServiceServer.h | 8 +- .../spark}/md/test/Co2ManagedTestHelper.cpp | 8 +- .../spark}/md/test/Co2TestInstrument.cpp | 4 +- .../spark}/md/test/Co2TestInstrument.h | 2 +- .../spark}/md/test/mbo_tests.cpp | 8 +- .../spark}/md/test/md2_tests.cpp | 22 +- .../spark}/md/test/md_test_utils.cpp | 0 .../spark}/md/test/md_test_utils.h | 4 +- .../md/test/synthetic_book_merge_tests.cpp | 2 +- .../spark}/md/vendor/OnixsUtils.cpp | 8 +- .../spark}/md/vendor/OnixsUtils.h | 0 src/{lib => lib_spark/spark}/md/venue_index.h | 4 +- .../spark}/mercury/actors/Actor.h | 16 +- .../spark}/mercury/actors/ActorBroker.h | 6 +- .../mercury/actors/ContentSubscription.h | 6 +- .../spark}/mercury/actors/IPollableActor.cpp | 0 .../spark}/mercury/actors/IPollableActor.h | 0 .../spark}/mercury/actors/PingPong.h | 14 +- .../spark}/mercury/actors/Timer.h | 8 +- .../spark}/mercury/broker/Broker.cpp | 12 +- .../spark}/mercury/broker/Broker.h | 2 +- .../spark}/mercury/broker/BrokerProxy.cpp | 6 +- .../spark}/mercury/broker/BrokerProxy.h | 12 +- .../spark}/mercury/broker/ILocalBroker.cpp | 2 +- .../spark}/mercury/broker/ILocalBroker.h | 2 +- .../spark}/mercury/broker/IRemoteBroker.cpp | 2 +- .../spark}/mercury/broker/IRemoteBroker.h | 4 +- .../spark}/mercury/common/FatWrapper.h | 2 +- .../spark}/mercury/common/mercury_common.cpp | 0 .../spark}/mercury/common/mercury_common.h | 6 +- .../spark}/mercury/events/Event.h | 8 +- .../spark}/mercury/events/Stream.h | 2 +- .../spark}/mercury/events/TimerEvent.cpp | 0 .../spark}/mercury/events/TimerEvent.h | 8 +- .../spark}/mercury/events/Update.h | 2 +- .../spark}/mercury/executor/Executor.cpp | 10 +- .../spark}/mercury/executor/Executor.h | 10 +- .../spark}/mercury/synopsis/CacheAll.h | 2 +- .../spark}/mercury/synopsis/CacheLast.h | 4 +- .../mercury/synopsis/ISynopsisBuilder.h | 2 +- .../spark}/mercury/synopsis/MergeByKey.h | 2 +- .../spark}/mercury/synopsis/NoSynopsis.h | 4 +- .../spark}/mercury/topics/ITopic.h | 2 +- .../spark}/mercury/topics/Topic.cpp | 0 .../spark}/mercury/topics/Topic.h | 8 +- .../spark}/metrics/metrics.cpp | 2 +- .../spark}/metrics/metrics.h | 0 .../spark}/metrics/system_metrics.cpp | 4 +- .../spark}/metrics/system_metrics.h | 0 .../spark}/orderman/CancelOrderMsg.cpp | 2 +- .../spark}/orderman/CancelOrderMsg.h | 6 +- .../spark}/orderman/CancelReplaceOrderMsg.h | 6 +- .../spark}/orderman/ChildOrder.cpp | 0 .../spark}/orderman/ChildOrder.h | 6 +- .../spark}/orderman/CreateOrderMsg.cpp | 4 +- .../spark}/orderman/CreateOrderMsg.h | 10 +- .../spark}/orderman/Governor.cpp | 0 .../spark}/orderman/Governor.h | 2 +- .../spark}/orderman/IOrderListener.h | 4 +- .../spark}/orderman/IOrderMux.h | 0 .../spark}/orderman/OrderBuilder.cpp | 0 .../spark}/orderman/OrderBuilder.h | 8 +- .../spark}/orderman/OrderGateway.h | 2 +- .../spark}/orderman/OrderMsg.h | 12 +- .../spark}/orderman/OrderRouter.cpp | 14 +- .../spark}/orderman/OrderRouter.h | 4 +- .../spark}/orderman/OrderServiceServer.cpp | 88 +- .../spark}/orderman/OrderServiceServer.h | 13 +- .../spark}/orderman/OrderServices.cpp | 4 +- .../spark}/orderman/OrderServices.h | 30 +- .../spark}/orderman/RFQMsg.h | 10 +- src/{lib => lib_spark/spark}/orderman/Trade.h | 6 +- .../spark}/orderman/TradeVector.h | 2 +- .../spark}/orderman/account_id.h | 2 +- .../spark}/orderman/account_name.h | 2 +- .../spark}/orderman/actors/AsyncFactory.cpp | 20 +- .../spark}/orderman/actors/AsyncFactory.h | 8 +- .../spark}/orderman/actors/FillStore.cpp | 44 +- .../spark}/orderman/actors/FillStore.h | 6 +- .../spark}/orderman/actors/MDSource.cpp | 4 +- .../spark}/orderman/actors/MDSource.h | 28 +- .../orderman/actors/MDSupplementarySource.cpp | 12 +- .../orderman/actors/MDSupplementarySource.h | 4 +- .../spark}/orderman/actors/OrderStore.cpp | 25 +- .../spark}/orderman/actors/OrderStore.h | 6 +- .../spark}/orderman/actors/SODPosition.cpp | 16 +- .../spark}/orderman/actors/SODPosition.h | 8 +- .../spark}/orderman/actors/SecuritySrc.cpp | 8 +- .../spark}/orderman/actors/SecuritySrc.h | 2 +- .../spark}/orderman/actors/ServiceBridge.cpp | 66 +- .../spark}/orderman/actors/ServiceBridge.h | 22 +- .../actors/order_manager/OrderManager.cpp | 65 +- .../actors/order_manager/OrderManager.h | 26 +- .../order_manager/OrderServicesData.cpp | 6 +- .../actors/order_manager/OrderServicesData.h | 82 +- .../actors/order_manager/PositionIndex.cpp | 4 +- .../actors/order_manager/PositionIndex.h | 0 .../actors/order_manager/SessionServices.h | 20 +- .../order_manager/order_gateway_definition.h | 4 +- .../order_manager/session_services_data.h | 24 +- .../spark}/orderman/audit/audit_cme.py | 0 .../orderman/calculations/ITheoCalculator.h | 0 .../orderman/calculations/TheoCalculator.cpp | 8 +- .../orderman/calculations/TheoCalculator.h | 0 .../orderman/ccapi/CCAPIConnectionConfig.h | 4 +- .../orderman/ccapi/CCAPIDeribitHelpers.cpp | 8 +- .../orderman/ccapi/CCAPIDeribitHelpers.h | 8 +- .../orderman/ccapi/CCAPIDeribitOrderMux.cpp | 32 +- .../orderman/ccapi/CCAPIDeribitOrderMux.h | 8 +- .../orderman/ccapi/CCAPIOrderCallbackMsgs.cpp | 4 +- .../orderman/ccapi/CCAPIOrderCallbackMsgs.h | 4 +- .../spark}/orderman/ccapi/CCAPIOrderState.cpp | 0 .../spark}/orderman/ccapi/CCAPIOrderState.h | 16 +- .../ccapi/CCAPISingleOrderManager.cpp | 14 +- .../orderman/ccapi/CCAPISingleOrderManager.h | 4 +- .../spark}/orderman/ccapi/ICCAPIOrderMux.h | 26 +- .../spark}/orderman/doc/attach_detach.org | 0 .../spark}/orderman/doc/event_flow.pdf | Bin .../spark}/orderman/doc/ilink3.org | 0 .../spark}/orderman/doc/order_man_notes.org | 0 .../orderman/events/AccountPnLUpdateEvent.h | 8 +- .../orderman/events/ActivateOrderEvent.h | 6 +- .../spark}/orderman/events/BookUpdateEvent.h | 8 +- .../spark}/orderman/events/CancelOrderEvent.h | 6 +- .../orderman/events/CancelRejectEvent.cpp | 0 .../orderman/events/CancelRejectEvent.h | 12 +- .../spark}/orderman/events/CrackOrderEvent.h | 6 +- .../events/CreateFIXBufferReplyEvent.h | 8 +- .../events/CreateFIXBufferRequestEvent.h | 6 +- .../orderman/events/CreateOrderReplyEvent.h | 6 +- .../orderman/events/CreateOrderRequestEvent.h | 6 +- .../spark}/orderman/events/DetachOrderEvent.h | 6 +- .../events/ExcessLiquidityUpdateEvent.h | 6 +- .../orderman/events/ExchangeOpenOrdersEvent.h | 10 +- .../orderman/events/ExchangePositionEvent.h | 10 +- .../orderman/events/FilledPositionEvent.cpp | 0 .../orderman/events/FilledPositionEvent.h | 8 +- .../events/GatewayStatusChangeEvent.h | 6 +- .../spark}/orderman/events/MDRequestEvent.h | 4 +- .../orderman/events/ManuallyBustFillsEvent.h | 4 +- .../orderman/events/NewAdminDataEvent.h | 8 +- .../events/NewExecutionReportEvent.cpp | 0 .../orderman/events/NewExecutionReportEvent.h | 16 +- .../orderman/events/NewSecuritiesEvent.h | 6 +- .../events/OrderDefinitionUpdateEvent.h | 6 +- .../orderman/events/OrderManagerReadyEvent.h | 2 +- .../orderman/events/OrderOpResultEvent.h | 6 +- .../orderman/events/OrderStateUpdateEvent.h | 14 +- .../spark}/orderman/events/RFQEvent.h | 10 +- .../orderman/events/SettlementRequestEvent.h | 4 +- .../orderman/events/SettlementUpdateEvent.h | 8 +- .../orderman/events/StatusUpdateEvent.h | 8 +- .../spark}/orderman/events/StoredFillEvent.h | 4 +- .../spark}/orderman/events/StoredOrderEvent.h | 6 +- .../spark}/orderman/events/TheoEvent.h | 8 +- .../orderman/events/TickerUpdateEvent.h | 4 +- .../spark}/orderman/events/TradeSignalEvent.h | 10 +- .../events/TradeSummarySignalDispatcher.h | 5 +- .../spark}/orderman/events/UpdateOrderEvent.h | 6 +- .../gateways/CCAPIExecutionGateway.cpp | 74 +- .../orderman/gateways/CCAPIExecutionGateway.h | 20 +- .../gateways/FakeExecutionGateway.cpp | 43 +- .../orderman/gateways/FakeExecutionGateway.h | 0 .../gateways/GLBXExecutionGateway.cpp | 26 +- .../orderman/gateways/GLBXExecutionGateway.h | 0 .../gateways/GLBXiLink3ExecutionGateway.cpp | 33 +- .../gateways/GLBXiLink3ExecutionGateway.h | 2 +- .../GLBXiLink3ExecutionGatewayState.h | 4 +- .../gateways/GeneralExecutionGateway.cpp | 13 +- .../gateways/GeneralExecutionGateway.h | 8 +- .../orderman/gateways/ICEExecutionGateway.cpp | 34 +- .../orderman/gateways/ICEExecutionGateway.h | 0 .../spark/orderman/gateways}/IEMOrderMuxer.h | 11 +- .../orderman/gateways/IExecutionGateway.cpp | 0 .../orderman/gateways/IExecutionGateway.h | 20 +- .../gateways/IExecutionGenericAdapter.cpp | 0 .../gateways/IExecutionGenericAdapter.h | 10 +- .../orderman/gateways/OkxExecutionGateway.cpp | 48 +- .../orderman/gateways/OkxExecutionGateway.h | 9 +- .../orderman/gateways/OnixFIXAdapter.cpp | 27 +- .../spark}/orderman/gateways/OnixFIXAdapter.h | 9 +- .../orderman/gateways/OnixFIXListener.cpp | 20 +- .../orderman/gateways/OnixFIXListener.h | 9 +- .../gateways/TrafixOrderStateHandler.cpp | 9 +- .../gateways/TrafixOrderStateHandler.h | 17 +- .../gateways/i_execution_gateway_provider.cpp | 0 .../gateways/i_execution_gateway_provider.h | 2 +- .../gateways/sim/SimExecutionGateway.cpp | 68 +- .../gateways/sim/SimExecutionGateway.h | 28 +- .../sim/SimExecutionGatewayFactory.cpp | 10 +- .../gateways/sim/SimExecutionGatewayFactory.h | 6 +- .../sim/SimExecutionGatewayUniqueWrapper.cpp | 4 +- .../sim/SimExecutionGatewayUniqueWrapper.h | 4 +- .../spark}/orderman/ilink3/IL3Connection.h | 2 +- .../orderman/ilink3/IL3ConnectionHandler.cpp | 0 .../orderman/ilink3/IL3ConnectionHandler.h | 0 .../spark}/orderman/ilink3/IL3Dispatcher.h | 0 .../spark}/orderman/ilink3/IL3GW.cpp | 12 +- .../spark}/orderman/ilink3/IL3GW.h | 27 +- .../spark}/orderman/ilink3/IL3GeneratedFull.h | 0 .../spark}/orderman/ilink3/IL3GeneratedFwd.h | 0 .../spark}/orderman/ilink3/IL3MessageFramer.h | 0 .../spark}/orderman/ilink3/IL3Parser.cpp | 14 +- .../spark}/orderman/ilink3/IL3Parser.h | 6 +- .../spark}/orderman/ilink3/IL3Reactor.cpp | 4 +- .../spark}/orderman/ilink3/IL3Reactor.h | 0 .../spark}/orderman/ilink3/IL3ReceiveBuffer.h | 2 +- .../spark}/orderman/ilink3/IL3SecDB.h | 8 +- .../spark}/orderman/ilink3/IL3State.h | 4 +- .../spark}/orderman/ilink3/ILink3Utils.cpp | 4 +- .../spark}/orderman/ilink3/ILink3Utils.h | 8 +- .../spark}/orderman/ilink3/RawMsg.h | 0 .../spark}/orderman/ilink3/SessionStore.cpp | 20 +- .../spark}/orderman/ilink3/SessionStore.h | 2 +- .../spark}/orderman/ilink3/TimeKeeper.h | 4 +- .../orderman/ilink3/generated/AvgPxInd.h | 0 .../orderman/ilink3/generated/BooleanFlag.h | 0 .../orderman/ilink3/generated/BooleanNULL.h | 0 .../ilink3/generated/BusinessReject521.h | 0 .../ilink3/generated/ClearingAcctType.h | 0 .../orderman/ilink3/generated/CmtaGiveUpCD.h | 0 .../ilink3/generated/CustOrdHandlInst.h | 0 .../ilink3/generated/CustOrderCapacity.h | 0 .../spark}/orderman/ilink3/generated/DATA.h | 0 .../orderman/ilink3/generated/DKReason.h | 0 .../orderman/ilink3/generated/Decimal32NULL.h | 0 .../orderman/ilink3/generated/Decimal64NULL.h | 0 .../orderman/ilink3/generated/Establish503.h | 0 .../ilink3/generated/EstablishmentAck504.h | 0 .../ilink3/generated/EstablishmentReject505.h | 0 .../orderman/ilink3/generated/ExecAckStatus.h | 0 .../orderman/ilink3/generated/ExecInst.h | 0 .../orderman/ilink3/generated/ExecMode.h | 0 .../orderman/ilink3/generated/ExecReason.h | 0 .../orderman/ilink3/generated/ExecTypTrdCxl.h | 0 .../ilink3/generated/ExecutionAck539.h | 0 .../generated/ExecutionReportCancel534.h | 0 .../generated/ExecutionReportElimination524.h | 0 .../generated/ExecutionReportModify531.h | 0 .../ilink3/generated/ExecutionReportNew522.h | 0 .../ExecutionReportPendingCancel564.h | 0 .../ExecutionReportPendingReplace565.h | 0 .../generated/ExecutionReportReject523.h | 0 .../generated/ExecutionReportStatus532.h | 0 .../ExecutionReportTradeAddendumOutright548.h | 0 .../ExecutionReportTradeAddendumSpread549.h | 0 ...ExecutionReportTradeAddendumSpreadLeg550.h | 0 .../ExecutionReportTradeOutright525.h | 0 .../generated/ExecutionReportTradeSpread526.h | 0 .../ExecutionReportTradeSpreadLeg527.h | 0 .../orderman/ilink3/generated/ExpCycle.h | 0 .../spark}/orderman/ilink3/generated/FTI.h | 0 .../orderman/ilink3/generated/GroupSize.h | 0 .../ilink3/generated/KeepAliveLapsed.h | 0 .../orderman/ilink3/generated/ListUpdAct.h | 0 .../orderman/ilink3/generated/ManualOrdInd.h | 0 .../ilink3/generated/ManualOrdIndReq.h | 0 .../ilink3/generated/MassActionOrdTyp.h | 0 .../ilink3/generated/MassActionResponse.h | 0 .../ilink3/generated/MassActionScope.h | 0 .../orderman/ilink3/generated/MassCancelTIF.h | 0 .../orderman/ilink3/generated/MassCxlReqTyp.h | 0 .../orderman/ilink3/generated/MassQuote517.h | 0 .../ilink3/generated/MassQuoteAck545.h | 0 .../ilink3/generated/MassStatusOrdTyp.h | 0 .../ilink3/generated/MassStatusReqTyp.h | 0 .../orderman/ilink3/generated/MassStatusTIF.h | 0 .../ilink3/generated/MaturityMonthYear.h | 0 .../orderman/ilink3/generated/MessageHeader.h | 0 .../orderman/ilink3/generated/Negotiate500.h | 0 .../ilink3/generated/NegotiationReject502.h | 0 .../ilink3/generated/NegotiationResponse501.h | 0 .../ilink3/generated/NewOrderCross544.h | 0 .../ilink3/generated/NewOrderSingle514.h | 0 .../orderman/ilink3/generated/NotApplied513.h | 0 .../ilink3/generated/OFMOverrideReq.h | 0 .../orderman/ilink3/generated/OrdStatusTrd.h | 0 .../ilink3/generated/OrdStatusTrdCxl.h | 0 .../ilink3/generated/OrderCancelReject535.h | 0 .../generated/OrderCancelReplaceReject536.h | 0 .../generated/OrderCancelReplaceRequest515.h | 0 .../ilink3/generated/OrderCancelRequest516.h | 0 .../ilink3/generated/OrderEventType.h | 0 .../generated/OrderMassActionReport562.h | 0 .../generated/OrderMassActionRequest529.h | 0 .../generated/OrderMassStatusRequest530.h | 0 .../orderman/ilink3/generated/OrderStatus.h | 0 .../ilink3/generated/OrderStatusRequest533.h | 0 .../orderman/ilink3/generated/OrderType.h | 0 .../orderman/ilink3/generated/OrderTypeReq.h | 0 .../spark}/orderman/ilink3/generated/PRICE9.h | 0 .../orderman/ilink3/generated/PRICENULL9.h | 0 .../ilink3/generated/PartyDetailRole.h | 0 .../PartyDetailsDefinitionRequest518.h | 0 .../PartyDetailsDefinitionRequestAck519.h | 0 .../generated/PartyDetailsListReport538.h | 0 .../generated/PartyDetailsListRequest537.h | 0 .../ilink3/generated/QuoteAckStatus.h | 0 .../ilink3/generated/QuoteCancel528.h | 0 .../ilink3/generated/QuoteCancelAck563.h | 0 .../ilink3/generated/QuoteCxlStatus.h | 0 .../orderman/ilink3/generated/QuoteCxlTyp.h | 0 .../orderman/ilink3/generated/QuoteTyp.h | 0 .../orderman/ilink3/generated/README.txt | 0 .../orderman/ilink3/generated/RFQSide.h | 0 .../orderman/ilink3/generated/ReqResult.h | 0 .../ilink3/generated/RequestForQuote543.h | 0 .../ilink3/generated/RequestForQuoteAck546.h | 0 .../ilink3/generated/Retransmission509.h | 0 .../ilink3/generated/RetransmitReject510.h | 0 .../ilink3/generated/RetransmitRequest508.h | 0 .../spark}/orderman/ilink3/generated/SLEDS.h | 0 .../spark}/orderman/ilink3/generated/SMPI.h | 0 .../orderman/ilink3/generated/SecRspTyp.h | 0 .../generated/SecurityDefinitionRequest560.h | 0 .../generated/SecurityDefinitionResponse561.h | 0 .../orderman/ilink3/generated/Sequence506.h | 0 .../orderman/ilink3/generated/ShortSaleType.h | 0 .../orderman/ilink3/generated/SideNULL.h | 0 .../orderman/ilink3/generated/SideReq.h | 0 .../ilink3/generated/SideTimeInForce.h | 0 .../orderman/ilink3/generated/SplitMsg.h | 0 .../orderman/ilink3/generated/Terminate507.h | 0 .../orderman/ilink3/generated/TimeInForce.h | 0 .../orderman/ilink3/generated/TradeAddendum.h | 0 .../orderman/ilink3/generated/generate.sh | 0 .../orderman/ilink3/generated/ilinkbinary.xml | 0 .../ilink3/generated/sbe-all-1.27.0.jar | Bin .../orderman/ilink3/test/IL3TestExchange.h | 0 .../orderman/ilink3/test/ILinkGWTests.cpp | 4 +- .../spark}/orderman/limiter/LimitStore.cpp | 0 .../spark}/orderman/limiter/LimitStore.h | 18 +- .../spark}/orderman/limiter/Limiter.cpp | 14 +- .../spark}/orderman/limiter/Limiter.h | 4 +- .../spark}/orderman/limiter/LimiterUtils.h | 2 +- .../orderman/limiter/ProductLimitNode.cpp | 0 .../orderman/limiter/ProductLimitNode.h | 10 +- .../orderman/limiter/ProductLimitTree.cpp | 0 .../orderman/limiter/ProductLimitTree.h | 10 +- .../orderman/limiter/SecurityLimitNode.cpp | 0 .../orderman/limiter/SecurityLimitNode.h | 16 +- .../orderman/limiter/SecurityLimitTree.cpp | 4 +- .../orderman/limiter/SecurityLimitTree.h | 10 +- .../orderman/limiter/tests/limit_tests.cpp | 16 +- .../log_messages/cancel_order_log.cpp | 2 +- .../orderman/log_messages/cancel_order_log.h | 8 +- .../log_messages/create_order_log.cpp | 2 +- .../orderman/log_messages/create_order_log.h | 9 +- .../log_messages/execution_report_log.cpp | 6 +- .../log_messages/execution_report_log.h | 8 +- .../log_messages/modify_order_log.cpp | 4 +- .../orderman/log_messages/modify_order_log.h | 6 +- .../spark}/orderman/order_desc.cpp | 2 +- .../spark}/orderman/order_desc.h | 0 .../order_factory/DynamicAlgoBuilder.h | 0 .../order_factory/DynamicOrderBuilder.h | 0 .../order_factory/DynamicOrderRegistry.cpp | 6 +- .../order_factory/DynamicOrderRegistry.h | 6 +- .../orderman/order_factory/IOrderFactory.h | 2 +- .../orderman/order_factory/OrderFactory.cpp | 64 +- .../orderman/order_factory/OrderFactory.h | 4 +- .../spark}/orderman/order_key.h | 2 +- .../spark}/orderman/orderman_utils/Book.h | 4 +- .../orderman/orderman_utils/BookUtils.cpp | 0 .../orderman/orderman_utils/BookUtils.h | 12 +- .../orderman/orderman_utils/CancelReject.h | 2 +- .../orderman/orderman_utils/EventStream.h | 2 +- .../orderman_utils/ExchangeOpenOrders.h | 12 +- .../orderman_utils/ExchangePosition.h | 8 +- .../orderman_utils/ExecutionReport.cpp | 8 +- .../orderman/orderman_utils/ExecutionReport.h | 4 +- .../orderman/orderman_utils/Formatter.h | 14 +- .../spark}/orderman/orderman_utils/OkxUtils.h | 18 +- .../orderman/orderman_utils/PriceComp.h | 10 +- .../orderman_utils/fix_order_codec.cpp | 0 .../orderman/orderman_utils/fix_order_codec.h | 10 +- .../orderman/orderman_utils/orderman_common.h | 22 +- .../orderman_utils/orderman_utils.cpp | 2 +- .../orderman/orderman_utils/orderman_utils.h | 2 +- .../spark}/orderman/orders/CompositeOrder.cpp | 14 +- .../spark}/orderman/orders/CompositeOrder.h | 2 +- .../spark}/orderman/orders/DynamicOrder.cpp | 4 +- .../spark}/orderman/orders/DynamicOrder.h | 4 +- .../spark}/orderman/orders/EMNativeOrder.cpp | 63 +- .../spark}/orderman/orders/EMNativeOrder.h | 13 +- .../orderman/orders/GLBXNativeOrder.cpp | 46 +- .../spark}/orderman/orders/GLBXNativeOrder.h | 6 +- .../spark}/orderman/orders/ICENativeOrder.cpp | 32 +- .../spark}/orderman/orders/ICENativeOrder.h | 4 +- .../spark}/orderman/orders/NativeOrderBase.h | 4 +- .../spark}/orderman/orders/Order.cpp | 2 +- .../spark}/orderman/orders/Order.h | 4 +- .../spark}/orderman/orders/OrderOpResult.h | 2 +- .../orders/PreActivationOrderServices.h | 2 +- .../spark}/orderman/orders/TimeBoxOrder.cpp | 6 +- .../spark}/orderman/orders/TimeBoxOrder.h | 4 +- .../spark}/orderman/orders/TriggerOrder.cpp | 18 +- .../spark}/orderman/orders/TriggerOrder.h | 8 +- .../orderman/orders/TriggerOrderCancelMode.h | 4 +- .../orderman/orders/TriggerOrderState.h | 4 +- .../orderman/orders/algo/AlgoWrapperOrder.cpp | 24 +- .../orderman/orders/algo/AlgoWrapperOrder.h | 4 +- .../orderman/orders/algo/ChildTemplate.h | 0 .../orderman/orders/algo/DynamicHelpers.cpp | 0 .../orderman/orders/algo/DynamicHelpers.h | 2 +- .../spark}/orderman/orders/algo/IAlgoOrder.h | 12 +- .../orderman/orders/algo/IAlgoServices.cpp | 1 + .../orderman/orders/algo/IAlgoServices.h | 6 +- .../orders/algo/IBeforeLaunchAlgoServices.cpp | 2 +- .../orders/algo/IBeforeLaunchAlgoServices.h | 8 +- .../orderman/orders/algo/PositionUpdate.cpp | 2 +- .../orderman/orders/algo/PositionUpdate.h | 4 +- .../orders/algo/algo_orders/CoverAlgo.cpp | 10 +- .../orders/algo/algo_orders/CoverAlgo.h | 2 +- .../algo/algo_orders/DeleteAndCoverAlgo.cpp | 18 +- .../algo/algo_orders/DeleteAndCoverAlgo.h | 2 +- .../orders/algo/algo_orders/DormanAlgo.cpp | 18 +- .../orders/algo/algo_orders/DormanAlgo.h | 2 +- .../orders/algo/algo_orders/IcebergAlgo.cpp | 19 +- .../orders/algo/algo_orders/IcebergAlgo.h | 2 +- .../orders/algo/algo_orders/JoinAlgo.cpp | 14 +- .../orders/algo/algo_orders/JoinAlgo.h | 2 +- .../orders/algo/algo_orders/LeanAlgo.cpp | 18 +- .../orders/algo/algo_orders/LeanAlgo.h | 6 +- .../algo/algo_orders/LimitCoverAlgo.cpp | 24 +- .../orders/algo/algo_orders/LimitCoverAlgo.h | 10 +- .../orders/algo/algo_orders/OffsetAlgo.cpp | 12 +- .../orders/algo/algo_orders/OffsetAlgo.h | 2 +- .../orders/algo/algo_orders/OnSignalAlgo.cpp | 22 +- .../orders/algo/algo_orders/OnSignalAlgo.h | 2 +- .../orders/algo/algo_orders/ProRataAlgo.cpp | 14 +- .../orders/algo/algo_orders/ProRataAlgo.h | 2 +- .../orders/algo/algo_orders/PyramidAlgo.cpp | 18 +- .../orders/algo/algo_orders/PyramidAlgo.h | 2 +- .../orders/algo/algo_orders/QuotingAlgo.cpp | 35 +- .../orders/algo/algo_orders/QuotingAlgo.h | 6 +- .../algo/algo_orders/RegisterDorman.cpp | 20 +- .../orders/algo/algo_orders/ScratchAlgo.cpp | 14 +- .../orders/algo/algo_orders/ScratchAlgo.h | 2 +- .../orders/algo/algo_orders/SniperAlgo.cpp | 28 +- .../orders/algo/algo_orders/SniperAlgo.h | 2 +- .../algo/algo_orders/SniperAlgoCommon.h | 26 +- .../orders/algo/algo_orders/SplitterAlgo.cpp | 12 +- .../orders/algo/algo_orders/SplitterAlgo.h | 2 +- .../orders/algo/algo_orders/TASAlgo.cpp | 20 +- .../orders/algo/algo_orders/TASAlgo.h | 2 +- .../algo/algo_orders/TASCounterAlgo.cpp | 22 +- .../orders/algo/algo_orders/TASCounterAlgo.h | 2 +- .../algo/algo_orders/TaskingEyeAlgo.cpp | 42 +- .../orders/algo/algo_orders/TaskingEyeAlgo.h | 8 +- .../orders/algo/algo_orders/TopAlgo.cpp | 16 +- .../orders/algo/algo_orders/TopAlgo.h | 2 +- .../orders/algo/algo_orders/VolAlgo.cpp | 44 +- .../orders/algo/algo_orders/VolAlgo.h | 8 +- .../limit_cover/LimitCoverAdapter.cpp | 6 +- .../limit_cover/LimitCoverAdapter.h | 4 +- .../limit_cover/LimitCoverDefinition.h | 6 +- .../algo_orders/limit_cover/LimitCoverGate.h | 6 +- .../algo/algo_orders/tests/AlgoTestDriver.cpp | 10 +- .../algo/algo_orders/tests/AlgoTestDriver.h | 10 +- .../algo_orders/tests/ExecutionTesterAlgo.h | 2 +- .../tests/ExecutiontTesterAlgo.cpp | 22 +- .../algo_orders/tests/LimitCoverTests.cpp | 31 +- .../algo/algo_orders/tests/dorman_tests.cpp | 10 +- .../tests/limit_cover/LimitCoverState.cpp | 16 +- .../tests/limit_cover/LimitCoverState.h | 14 +- .../tests/limit_cover/LimitCoverTestUtils.h | 8 +- .../tests/limit_cover/TestSteps.cpp | 8 +- .../algo_orders/tests/limit_cover/TestSteps.h | 5 +- .../algo/algo_orders/tests/splitter_tests.cpp | 14 +- .../orders/algo/doc/algo_wrapper_sm.png | Bin .../orders/algo/doc/state_machine.org | 0 .../orderman/orders/algo/utils/Accumulator.h | 2 +- .../orders/algo/utils/DynamicOrderAdapter.h | 8 +- .../orderman/orders/book_algos/BookAlgo.cpp | 8 +- .../orderman/orders/book_algos/BookAlgo.h | 6 +- .../orders/book_algos/BookOrderBase.cpp | 14 +- .../orders/book_algos/BookOrderBase.h | 8 +- .../orderman/orders/book_algos/OCOOrder.cpp | 8 +- .../orderman/orders/book_algos/OCOOrder.h | 2 +- .../orders/book_algos/PricerOrder.cpp | 6 +- .../orderman/orders/book_algos/PricerOrder.h | 2 +- .../orders/glbx/IGLBXOrderEncoder.cpp | 0 .../orderman/orders/glbx/IGLBXOrderEncoder.h | 2 +- .../orders/glbx/iLink2OrderEncoder.cpp | 16 +- .../orderman/orders/glbx/iLink2OrderEncoder.h | 2 +- .../orders/glbx/iLink3OrderEncoder.cpp | 10 +- .../orderman/orders/glbx/iLink3OrderEncoder.h | 2 +- .../IQueueHolderOrderStateWorker.h | 6 +- .../orders/queue_holder/QHOOrderManager.h | 6 +- .../orders/queue_holder/QueueHolderOrder.cpp | 16 +- .../orders/queue_holder/QueueHolderOrder.h | 22 +- .../queue_holder/QueueHolderOrderState.h | 0 .../state_workers/QHOEndStateWorker.cpp | 18 +- .../state_workers/QHOEndStateWorker.h | 2 +- .../state_workers/QHOStartStateWorker.cpp | 20 +- .../state_workers/QHOStartStateWorker.h | 2 +- .../QHOWaitingForAckStateWorker.cpp | 18 +- .../QHOWaitingForAckStateWorker.h | 2 +- .../QHOWaitingForCancelAllStateWorker.cpp | 18 +- .../QHOWaitingForCancelAllStateWorker.h | 2 +- .../state_workers/QHOWorkingStateWorker.cpp | 18 +- .../state_workers/QHOWorkingStateWorker.h | 2 +- .../spreader_orders/ISpreaderStateWorker.h | 14 +- .../orders/spreader_orders/SpreaderOrder.cpp | 34 +- .../orders/spreader_orders/SpreaderOrder.h | 43 +- .../spreader_orders/SpreaderOrderHeader.h | 0 .../spreader/ISpreaderManager.h | 16 +- .../spreader_orders/spreader/LegFillState.cpp | 0 .../spreader_orders/spreader/LegFillState.h | 2 +- .../spreader/LegPropertyData.cpp | 6 +- .../spreader/LegPropertyData.h | 8 +- .../spreader/NLegsHedgeRecompData.cpp | 4 +- .../spreader/NLegsHedgeRecompData.h | 4 +- .../spreader/QuoteLegPriceQuantityState.cpp | 0 .../spreader/QuoteLegPriceQuantityState.h | 10 +- .../spreader/SingleFillHedger.cpp | 0 .../spreader/SingleFillHedger.h | 20 +- .../spreader/SingleLegQuoter.cpp | 17 +- .../spreader/SingleLegQuoter.h | 32 +- .../spreader/SpreaderBookkeepingData.cpp | 16 +- .../spreader/SpreaderBookkeepingData.h | 32 +- .../spreader/SpreaderCacheWarmingState.h | 4 +- .../spreader/SpreaderChildOrderState.cpp | 0 .../spreader/SpreaderChildOrderState.h | 20 +- .../spreader/SpreaderFractionalQtyHelper.cpp | 32 +- .../spreader/SpreaderFractionalQtyHelper.h | 10 +- .../spreader/SpreaderLegData.cpp | 0 .../spreader/SpreaderLegData.h | 14 +- .../spreader/SpreaderUtils.cpp | 24 +- .../spreader_orders/spreader/SpreaderUtils.h | 37 +- .../IAlternateOrderGateway.h | 4 +- .../SpreaderOrderBuilder.cpp | 2 +- .../SpreaderOrderBuilder.h | 12 +- .../SpreaderOrderServices.cpp | 0 .../SpreaderOrderServices.h | 12 +- .../SpreaderPreActivationOrderServices.cpp | 2 +- .../SpreaderPreActivationOrderServices.h | 8 +- .../spreader/hedger/HedgePriceQuantityState.h | 4 +- .../spreader/hedger/HedgerManager.cpp | 0 .../spreader/hedger/HedgerManager.h | 2 +- .../spreader/hedger/IHedgerStateWorker.h | 8 +- .../spreader/hedger/UnhedgedDelta.cpp | 4 +- .../spreader/hedger/UnhedgedDelta.h | 0 .../hedger_states/HedgerEndStateWorker.cpp | 6 +- .../hedger_states/HedgerEndStateWorker.h | 2 +- .../hedger_states/HedgerStartStateWorker.cpp | 8 +- .../hedger_states/HedgerStartStateWorker.h | 2 +- .../hedger/hedger_states/HedgerState.h | 0 .../HedgerWaitingForCancelAckStateWorker.cpp | 6 +- .../HedgerWaitingForCancelAckStateWorker.h | 2 +- ...WaitingForFirstAckCancelledStateWorker.cpp | 8 +- ...erWaitingForFirstAckCancelledStateWorker.h | 2 +- .../HedgerWaitingForFirstAckStateWorker.cpp | 6 +- .../HedgerWaitingForFirstAckStateWorker.h | 2 +- .../HedgerWorkingStateWorker.cpp | 8 +- .../hedger_states/HedgerWorkingStateWorker.h | 2 +- .../spreader/quoter/IQuoterStateWorker.h | 6 +- .../spreader/quoter/QuoteDriverSet.cpp | 0 .../spreader/quoter/QuoteDriverSet.h | 0 .../spreader/quoter/QuoteDriverSetHistory.cpp | 2 +- .../spreader/quoter/QuoteDriverSetHistory.h | 0 .../spreader/quoter/QuoteLegDriver.cpp | 0 .../spreader/quoter/QuoteLegDriver.h | 2 +- .../quoter_states/QuoterEndStateWorker.cpp | 14 +- .../quoter_states/QuoterEndStateWorker.h | 8 +- .../quoter_states/QuoterStartStateWorker.cpp | 8 +- .../quoter_states/QuoterStartStateWorker.h | 8 +- .../quoter/quoter_states/QuoterState.h | 0 .../QuoterWaitingForCancelAckStateWorker.cpp | 8 +- .../QuoterWaitingForCancelAckStateWorker.h | 8 +- ...uoterWaitingForFirstAckCancelledWorker.cpp | 10 +- .../QuoterWaitingForFirstAckCancelledWorker.h | 8 +- .../QuoterWaitingForFirstAckWorker.cpp | 8 +- .../QuoterWaitingForFirstAckWorker.h | 8 +- .../QuoterWaitingForIOCWorker.cpp | 8 +- .../quoter_states/QuoterWaitingForIOCWorker.h | 8 +- .../QuoterWaitingForSizeStateWorker.cpp | 30 +- .../QuoterWaitingForSizeStateWorker.h | 8 +- .../QuoterWorkingStateWorker.cpp | 14 +- .../quoter_states/QuoterWorkingStateWorker.h | 8 +- .../SpreaderEndStateWorker.cpp | 2 +- .../spreader_states/SpreaderEndStateWorker.h | 2 +- .../SpreaderStartStateWorker.cpp | 14 +- .../SpreaderStartStateWorker.h | 2 +- .../spreader_states/SpreaderState.h | 0 ...SpreaderWaitingForCancelAllStateWorker.cpp | 2 +- .../SpreaderWaitingForCancelAllStateWorker.h | 2 +- ...readerWaitingForInitialDataStateWorker.cpp | 2 +- ...SpreaderWaitingForInitialDataStateWorker.h | 2 +- .../SpreaderWorkingStateWorker.cpp | 10 +- .../SpreaderWorkingStateWorker.h | 2 +- .../spreader_orders/tests/spreader_tests.cpp | 25 +- .../spreader_orders/tests/tests_common.h | 44 +- .../perf_analysis/obsolete/analyze_logs.py | 0 .../perf_analysis/obsolete/load_data.py | 0 .../obsolete/logs/latency_data/import.sql | 0 .../obsolete/logs/latency_data/trace.csv | 0 .../obsolete/logs/latency_data/trace.sqlite | Bin .../perf_analysis/obsolete/logs/load.sh | 0 .../obsolete/logs/parse_helper.py | 0 .../obsolete/logs/quick_stats.sh | 0 .../obsolete/logs/sync_to_bts-netx-dc3-01 | 0 .../perf_analysis/obsolete/lttng/load.sh | 0 .../perf_analysis/obsolete/lttng/parse.sh | 0 .../obsolete/lttng/parse_helper.py | 0 .../obsolete/lttng/sync_to_bts-host12 | 0 .../perf_analysis/obsolete/lttng/trace.sh | 0 .../spark}/orderman/perf_analysis/perf_log.sh | 0 .../spark}/orderman/securities/ISecurityDB.h | 2 +- .../orderman/securities/MapSecurityDB.h | 4 +- .../orderman/tests/CCApiExecutionTests.cpp | 17 +- .../orderman/tests/fat_wrapper_tests.cpp | 2 +- src/{lib => lib_spark/spark}/os/os.cpp | 12 +- src/{lib => lib_spark/spark}/os/os.h | 2 +- .../spark}/os/spark_data_directory.cpp | 10 +- .../spark}/os/spark_data_directory.h | 0 .../spark}/os/tests/os_tests.cpp | 0 .../spark}/persistence/IDGenerator.cpp | 6 +- .../spark}/persistence/IDGenerator.h | 4 +- .../spark}/persistence/IStore.cpp | 0 .../spark}/persistence/IStore.h | 2 +- .../persistence/PersistenceServiceServer.cpp | 10 +- .../persistence/PersistenceServiceServer.h | 2 +- .../spark}/persistence/SqliteStore.cpp | 22 +- .../spark}/persistence/SqliteStore.h | 6 +- .../spark}/persistence/persistence_utils.cpp | 10 +- .../spark}/persistence/persistence_utils.h | 0 .../spark}/persistence/store_row.h | 0 .../tests/PersistenceServiceTests.cpp | 12 +- .../spark}/plugin/SparkServices.cpp | 4 +- .../spark}/plugin/SparkServices.h | 2 +- .../spark}/plugin/plugin.cpp | 12 +- src/{lib => lib_spark/spark}/plugin/plugin.h | 0 .../spark}/quickbus/core/Advertisement.h | 2 +- .../spark}/quickbus/core/LocalNode.cpp | 10 +- .../spark}/quickbus/core/LocalNode.h | 4 +- .../spark}/quickbus/core/Quickbus.cpp | 16 +- .../spark}/quickbus/core/Quickbus.h | 14 +- .../quickbus/core/QuickbusThreadOptions.h | 4 +- .../spark}/quickbus/core/SubscriptionID.cpp | 0 .../spark}/quickbus/core/SubscriptionID.h | 2 +- .../spark}/quickbus/core/TableID.cpp | 2 +- .../spark}/quickbus/core/TableID.h | 2 +- .../spark}/quickbus/core/Topic.h | 2 +- .../spark}/quickbus/message_model/Change.h | 4 +- .../spark}/quickbus/message_model/Record.h | 2 +- .../spark}/quickbus/message_model/RecordKey.h | 2 +- .../quickbus/message_model/RecordValue.h | 0 .../spark}/quickbus/message_model/Update.cpp | 0 .../spark}/quickbus/message_model/Update.h | 2 +- .../quickbus/message_model/merge_updates.cpp | 2 +- .../quickbus/message_model/merge_updates.h | 6 +- .../spark}/quickbus/network/QBConnection.cpp | 20 +- .../spark}/quickbus/network/QBConnection.h | 4 +- .../quickbus/network/QBConnectionManager.cpp | 12 +- .../quickbus/network/QBConnectionManager.h | 0 .../quickbus/network/endpoint_description.cpp | 0 .../quickbus/network/endpoint_description.h | 0 .../quickbus/network/quickbus_msgs.proto | 0 .../spark}/quickbus/pubsub/TableEvent.h | 6 +- .../spark}/quickbus/pubsub/TableFilter.h | 2 +- .../spark}/quickbus/pubsub/TablePublisher.cpp | 12 +- .../spark}/quickbus/pubsub/TablePublisher.h | 4 +- .../quickbus/pubsub/TableSubscriber.cpp | 10 +- .../spark}/quickbus/pubsub/TableSubscriber.h | 6 +- .../quickbus/pubsub/tests/qb_pubsub_tests.cpp | 8 +- src/lib_spark/spark/quickbus/quickbus.h | 11 + .../spark}/quickbus/routing/INode.cpp | 2 +- .../spark}/quickbus/routing/INode.h | 10 +- .../spark}/quickbus/routing/INodePtr.h | 0 .../spark}/quickbus/routing/NodeID.cpp | 2 +- .../spark}/quickbus/routing/NodeID.h | 2 +- .../spark}/quickbus/routing/Router.cpp | 12 +- .../spark}/quickbus/routing/Router.h | 4 +- .../spark}/quickbus/rpc/OnRPCReply.h | 4 +- .../spark}/quickbus/rpc/OnRPCRequest.h | 4 +- .../spark}/quickbus/rpc/RPCClient.cpp | 22 +- .../spark}/quickbus/rpc/RPCClient.h | 8 +- .../spark}/quickbus/rpc/RPCError.h | 0 .../spark}/quickbus/rpc/RPCReply.h | 2 +- .../spark}/quickbus/rpc/RPCRequest.h | 2 +- .../spark}/quickbus/rpc/RPCServer.cpp | 12 +- .../spark}/quickbus/rpc/RPCServer.h | 10 +- .../spark}/quickbus/rpc/RPCServiceName.h | 2 +- .../spark}/quickbus/rpc/RPCSessionID.cpp | 2 +- .../spark}/quickbus/rpc/RPCSessionID.h | 2 +- .../spark}/quickbus/rpc/rpc_utils.cpp | 4 +- .../spark}/quickbus/rpc/rpc_utils.h | 8 +- .../quickbus/rpc/tests/qb_rpc_tests.cpp | 12 +- .../spark}/quickbus/tests/quickbus_tests.cpp | 4 +- .../spark}/sparkproto/SparkProtos.proto | 0 .../spark}/testing/catch_test_runner.cpp | 10 +- .../spark}/testing/catch_test_runner.h | 0 .../spark}/tracing/PerfLog.cpp | 18 +- .../spark}/tracing/PerfLog.h | 2 +- src/lib_spark/spark/tracing/bts_trace.cpp | 1 + .../spark}/tracing/bts_trace.h | 0 .../spark}/tracing/bts_trace_c.c | 0 .../spark}/tracing/bts_trace_c.h | 2 +- .../spark}/utils/AuthSessionManager.cpp | 24 +- .../spark}/utils/AuthSessionManager.h | 6 +- .../spark}/utils/AuthToken.cpp | 4 +- .../spark}/utils/AuthToken.h | 4 +- .../spark}/utils/CallTimer.h | 4 +- .../spark}/utils/ConcurrentAppendCollection.h | 0 .../spark}/utils/ConcurrentPool.h | 0 src/{lib => lib_spark/spark}/utils/Delegate.h | 0 .../spark}/utils/Dispatcher.cpp | 8 +- .../spark}/utils/Dispatcher.h | 4 +- src/{lib => lib_spark/spark}/utils/Event.h | 0 .../spark}/utils/FileUtils.cpp | 0 .../spark}/utils/FileUtils.h | 0 .../spark}/utils/GrowableSPSCQueue.cpp | 0 .../spark}/utils/GrowableSPSCQueue.h | 0 .../spark}/utils/HTTPStream.cpp | 6 +- .../spark}/utils/HTTPStream.h | 4 +- src/{lib => lib_spark/spark}/utils/LockBox.h | 0 .../spark}/utils/MapUtils.cc | 0 src/{lib => lib_spark/spark}/utils/MapUtils.h | 0 .../spark}/utils/MathUtils.cc | 0 .../spark}/utils/MathUtils.cpp | 0 .../spark}/utils/MathUtils.h | 0 .../spark}/utils/Optimistic.h | 0 .../spark}/utils/PBUtils.cpp | 0 src/{lib => lib_spark/spark}/utils/PBUtils.h | 4 +- src/{lib => lib_spark/spark}/utils/Puid.cpp | 4 +- src/{lib => lib_spark/spark}/utils/Puid.h | 2 +- .../spark}/utils/ReentrancyGuard.h | 0 .../spark}/utils/ResultEnum.h | 0 .../spark}/utils/SecureLogon.cpp | 10 +- .../spark}/utils/SecureLogon.h | 0 .../spark}/utils/SharedList.h | 18 +- .../spark}/utils/SharedMemory.cpp | 4 +- .../spark}/utils/SharedMemory.h | 4 +- src/{lib => lib_spark/spark}/utils/Shuffle.h | 0 src/{lib => lib_spark/spark}/utils/SpinLock.h | 0 .../spark}/utils/Sqlite_utils.cpp | 0 .../spark}/utils/Sqlite_utils.h | 2 +- .../spark}/utils/StringSplitter.h | 0 src/{lib => lib_spark/spark}/utils/TempDir.h | 2 +- src/{lib => lib_spark/spark}/utils/TempFile.h | 2 +- src/{lib => lib_spark/spark}/utils/ThrowIf.h | 0 .../spark}/utils/TimeStamp.h | 0 .../spark}/utils/UNUSED_PARAM.h | 0 src/{lib => lib_spark/spark}/utils/Uuid.cpp | 2 +- src/{lib => lib_spark/spark}/utils/Uuid.h | 0 .../spark}/utils/ValueWrapper.h | 0 .../spark}/utils/WaitFreeQueue.h | 2 +- .../spark}/utils/auto_init_shared_ptr.h | 0 src/{lib => lib_spark/spark}/utils/base62.h | 2 +- src/{lib => lib_spark/spark}/utils/base64.hpp | 0 .../spark}/utils/benchmarking_utils.h | 0 .../spark}/utils/bts_array_size.h | 0 .../spark}/utils/bts_assert.h | 4 +- .../spark}/utils/bts_chrono.h | 0 .../spark}/utils/bts_concat.h | 0 .../spark}/utils/bts_debugger.h | 0 .../spark}/utils/bts_export.h | 0 .../spark}/utils/bts_fatal.h | 4 +- .../spark}/utils/bts_lock_guard.h | 2 +- .../spark}/utils/bts_no_copy.h | 0 .../spark}/utils/checked_arithmetic.h | 0 .../spark}/utils/checked_cast.h | 0 .../spark}/utils/crypto/AlgoType.h | 0 .../spark}/utils/crypto/CipherType.cpp | 0 .../spark}/utils/crypto/CipherType.h | 0 .../spark}/utils/crypto/CryptoInit.cpp | 0 .../spark}/utils/crypto/CryptoInit.h | 2 +- .../spark}/utils/crypto/Digest.cpp | 2 +- .../spark}/utils/crypto/Digest.h | 2 +- .../spark}/utils/crypto/KeyCodeHelper.cpp | 10 +- .../spark}/utils/crypto/KeyCodeHelper.h | 0 .../spark}/utils/crypto/PasswordCallback.cpp | 0 .../spark}/utils/crypto/PasswordCallback.h | 2 +- .../spark}/utils/crypto/PrivateKey.cpp | 13 +- .../spark}/utils/crypto/PrivateKey.h | 2 +- .../spark}/utils/crypto/PublicKey.cpp | 14 +- .../spark}/utils/crypto/PublicKey.h | 2 +- .../spark}/utils/crypto/base64_chars.h | 0 .../spark}/utils/crypto/ed25519.cpp | 10 +- .../spark}/utils/crypto/ed25519.h | 0 .../spark}/utils/crypto/evp_md_ctx.h | 0 .../spark}/utils/crypto/evp_pkey.cpp | 2 +- .../spark}/utils/crypto/evp_pkey.h | 0 .../spark}/utils/crypto/file.h | 0 .../spark}/utils/crypto/hmac.cpp | 0 .../spark}/utils/crypto/hmac.h | 0 .../spark}/utils/crypto/iostreambio.cpp | 9 +- .../spark}/utils/crypto/iostreambio.h | 0 .../spark}/utils/crypto/openssl_compat.h | 0 .../spark}/utils/crypto/spark_private.pem | 0 .../spark}/utils/crypto/spark_public.pem | 0 .../spark}/utils/datetime.cpp | 0 src/{lib => lib_spark/spark}/utils/datetime.h | 0 src/{lib => lib_spark/spark}/utils/defer.h | 0 .../spark}/utils/download.cpp | 2 +- src/{lib => lib_spark/spark}/utils/download.h | 0 .../spark}/utils/file_utils.cpp | 2 +- .../spark}/utils/file_utils.h | 0 .../utils/formatters/error_code_formatter.h | 0 .../utils/formatters/exception_formatter.h | 0 .../spark}/utils/helper_macros.h | 0 .../spark}/utils/init_spark_lib.cpp | 6 +- .../spark}/utils/init_spark_lib.h | 0 .../spark}/utils/inplace_function.h | 0 .../spark}/utils/is_unittest_environment.cpp | 0 .../spark}/utils/is_unittest_environment.h | 2 +- src/{lib => lib_spark/spark}/utils/lazy.h | 0 .../spark}/utils/meta_programming.h | 0 .../spark}/utils/mpmc_bounded_queue.h | 2 +- .../spark}/utils/object_pool.h | 4 +- .../spark}/utils/observable_value_store.h | 2 +- .../spark}/utils/overloaded.h | 0 .../spark}/utils/parse_enum.h | 0 .../spark}/utils/pb_json_macros.h | 0 .../spark}/utils/proto_helper.h | 2 +- .../spark}/utils/sane_algorithm.h | 0 src/{lib => lib_spark/spark}/utils/sftp.cpp | 10 +- src/{lib => lib_spark/spark}/utils/sftp.h | 0 src/{lib => lib_spark/spark}/utils/stats.cpp | 6 +- src/{lib => lib_spark/spark}/utils/stats.h | 0 .../spark}/utils/stopwatch.h | 4 +- .../spark}/utils/string_utils.h | 0 .../spark}/utils/tests/AuthTokenTests.cpp | 4 +- .../spark}/utils/tests/IDGeneratorTests.cpp | 0 .../spark}/utils/tests/MathUtilsTests.cpp | 2 +- .../SingleWriterConcurrentVectorTests.cpp | 0 .../spark}/utils/thread_manager.cpp | 8 +- .../spark}/utils/thread_manager.h | 2 +- .../spark}/utils/type_name.h | 0 .../spark}/utils/warn_ctrl.h | 0 .../spark}/utils/windows_wrapper.h | 0 .../client_sdk/client_sdk_example.cpp | 10 +- src/server/sparkd/CMakeLists.txt | 109 --- src/server/sparkd/cmds/Run.cpp | 219 ----- src/server/sparkd/sparkd.vcxproj | 311 ------- src/server/sparkd/sparkd.vcxproj.filters | 801 ------------------ src/server/sparkd/sparkd.vcxproj.user | 13 - tools/sparkd.sh | 2 +- 1985 files changed, 7577 insertions(+), 8517 deletions(-) create mode 100644 cmake/ExportToParent.cmake create mode 100644 cmake/InitLibrary.cmake create mode 100644 cmake/InstallBasic.cmake create mode 100644 cmake/PackBasic.cmake create mode 100644 cmake/SetFirstDefined.cmake delete mode 100644 cmake/vs_filters.cmake create mode 100644 src/app_sparkd/CMakeLists.txt create mode 100644 src/app_sparkd/Config.cmake.in rename src/{server/sparkd => app_sparkd}/Dockerfile (91%) rename src/{server/sparkd => app_sparkd}/cmake_modules/rapidjsonConfig.cmake (100%) rename src/{server/sparkd => app_sparkd}/spark.conf (100%) rename src/{server => app_sparkd}/sparkd/algo/AlgoDefinitionServiceServer.cpp (96%) rename src/{server => app_sparkd}/sparkd/algo/AlgoDefinitionServiceServer.h (76%) rename src/{server => app_sparkd}/sparkd/analytics/AnalyticsServiceServer.cpp (98%) rename src/{server => app_sparkd}/sparkd/analytics/AnalyticsServiceServer.h (96%) rename src/{server => app_sparkd}/sparkd/cmds/AdminReport.cpp (91%) rename src/{server => app_sparkd}/sparkd/cmds/AdminReport.h (100%) rename src/{server => app_sparkd}/sparkd/cmds/AutoCert.cpp (99%) rename src/{server => app_sparkd}/sparkd/cmds/AutoCert.h (100%) rename src/{server => app_sparkd}/sparkd/cmds/CMECert.cpp (98%) rename src/{server => app_sparkd}/sparkd/cmds/CMECert.h (100%) rename src/{server => app_sparkd}/sparkd/cmds/ConfigCmd.cpp (92%) rename src/{server => app_sparkd}/sparkd/cmds/ConfigCmd.h (100%) rename src/{server => app_sparkd}/sparkd/cmds/FIXSim.cpp (69%) rename src/{server => app_sparkd}/sparkd/cmds/FIXSim.h (100%) rename src/{server => app_sparkd}/sparkd/cmds/KeyCmd.cpp (90%) rename src/{server => app_sparkd}/sparkd/cmds/KeyCmd.h (100%) rename src/{server => app_sparkd}/sparkd/cmds/Md.cpp (100%) rename src/{server => app_sparkd}/sparkd/cmds/Md.h (100%) rename src/{server => app_sparkd}/sparkd/cmds/ParseHistoricalFIX.cpp (98%) rename src/{server => app_sparkd}/sparkd/cmds/ParseHistoricalFIX.h (100%) rename src/{server => app_sparkd}/sparkd/cmds/PrintHedgeOrders.cpp (92%) rename src/{server => app_sparkd}/sparkd/cmds/PrintHedgeOrders.h (100%) rename src/{server => app_sparkd}/sparkd/cmds/QuickTest.cpp (92%) rename src/{server => app_sparkd}/sparkd/cmds/QuickTest.h (100%) create mode 100644 src/app_sparkd/sparkd/cmds/Run.cpp rename src/{server => app_sparkd}/sparkd/cmds/Run.h (100%) rename src/{server => app_sparkd}/sparkd/cmds/Span.cpp (72%) rename src/{server => app_sparkd}/sparkd/cmds/Span.h (100%) rename src/{server => app_sparkd}/sparkd/cmds/Web.cpp (58%) rename src/{server => app_sparkd}/sparkd/cmds/Web.h (100%) rename src/{server => app_sparkd}/sparkd/cmds/common/EnumOptionNames.h (100%) rename src/{server => app_sparkd}/sparkd/cmds/common/Validators.cpp (92%) rename src/{server => app_sparkd}/sparkd/cmds/common/Validators.h (100%) rename src/{server => app_sparkd}/sparkd/cmds/crypto/CryptoCmd.cpp (100%) rename src/{server => app_sparkd}/sparkd/cmds/crypto/CryptoCmd.h (100%) rename src/{server => app_sparkd}/sparkd/cmds/crypto/DeribitDemo.cpp (85%) rename src/{server => app_sparkd}/sparkd/cmds/crypto/DeribitDemo.h (100%) rename src/{server => app_sparkd}/sparkd/cmds/crypto/DeribitDemoCmd.cpp (92%) rename src/{server => app_sparkd}/sparkd/cmds/crypto/DeribitDemoCmd.h (100%) rename src/{server => app_sparkd}/sparkd/cmds/crypto/DeribitDemoConfiguration.cpp (99%) rename src/{server => app_sparkd}/sparkd/cmds/crypto/DeribitDemoConfiguration.h (98%) rename src/{server => app_sparkd}/sparkd/cmds/crypto/DeribitDemoListener.cpp (99%) rename src/{server => app_sparkd}/sparkd/cmds/crypto/DeribitDemoListener.h (100%) rename src/{server => app_sparkd}/sparkd/cmds/crypto/LiveLadderDemo.cpp (75%) rename src/{server => app_sparkd}/sparkd/cmds/crypto/LiveLadderDemo.h (100%) rename src/{server => app_sparkd}/sparkd/cmds/crypto/LiveLadderDemoCmd.cpp (84%) rename src/{server => app_sparkd}/sparkd/cmds/crypto/LiveLadderDemoCmd.h (100%) rename src/{server => app_sparkd}/sparkd/cmds/crypto/RapidJsonReader.h (98%) rename src/{server => app_sparkd}/sparkd/cmds/crypto/UserInstrumentData.cpp (100%) rename src/{server => app_sparkd}/sparkd/cmds/crypto/UserInstrumentData.h (100%) rename src/{server => app_sparkd}/sparkd/cmds/crypto/deribit_demo_config.json (100%) rename src/{server => app_sparkd}/sparkd/cmds/md/cmds/Channels.cpp (94%) rename src/{server => app_sparkd}/sparkd/cmds/md/cmds/Channels.h (100%) rename src/{server => app_sparkd}/sparkd/cmds/md/cmds/Cleanup.cpp (87%) rename src/{server => app_sparkd}/sparkd/cmds/md/cmds/Cleanup.h (100%) rename src/{server => app_sparkd}/sparkd/cmds/md/cmds/Dump.cpp (85%) rename src/{server => app_sparkd}/sparkd/cmds/md/cmds/Dump.h (100%) rename src/{server => app_sparkd}/sparkd/cmds/md/cmds/DumpSecurity.cpp (90%) rename src/{server => app_sparkd}/sparkd/cmds/md/cmds/DumpSecurity.h (100%) rename src/{server => app_sparkd}/sparkd/cmds/md/cmds/RecTool.cpp (100%) rename src/{server => app_sparkd}/sparkd/cmds/md/cmds/RecTool.h (100%) rename src/{server => app_sparkd}/sparkd/cmds/md/cmds/Record.cpp (92%) rename src/{server => app_sparkd}/sparkd/cmds/md/cmds/Record.h (100%) rename src/{server => app_sparkd}/sparkd/cmds/md/cmds/Relay.cpp (83%) rename src/{server => app_sparkd}/sparkd/cmds/md/cmds/Relay.h (100%) rename src/{server => app_sparkd}/sparkd/cmds/md/cmds/Replay.cpp (91%) rename src/{server => app_sparkd}/sparkd/cmds/md/cmds/Replay.h (100%) rename src/{server => app_sparkd}/sparkd/cmds/md/cmds/Run.cpp (86%) rename src/{server => app_sparkd}/sparkd/cmds/md/cmds/Run.h (77%) rename src/{server => app_sparkd}/sparkd/cmds/md/cmds/Tail.cpp (81%) rename src/{server => app_sparkd}/sparkd/cmds/md/cmds/Tail.h (100%) rename src/{server => app_sparkd}/sparkd/cmds/md/cmds/rec_tool/cmds/Print.cpp (91%) rename src/{server => app_sparkd}/sparkd/cmds/md/cmds/rec_tool/cmds/Print.h (100%) rename src/{server => app_sparkd}/sparkd/cmds/md/cmds/rec_tool/cmds/Trace.cpp (93%) rename src/{server => app_sparkd}/sparkd/cmds/md/cmds/rec_tool/cmds/Trace.h (100%) rename src/{server => app_sparkd}/sparkd/cmds/md/cmds/rec_tool/cmds/Unprint.cpp (93%) rename src/{server => app_sparkd}/sparkd/cmds/md/cmds/rec_tool/cmds/Unprint.h (100%) rename src/{server => app_sparkd}/sparkd/cmds/md/common/SecurityTypeOption.cpp (100%) rename src/{server => app_sparkd}/sparkd/cmds/md/common/SecurityTypeOption.h (86%) rename src/{server => app_sparkd}/sparkd/cmds/md/common/VenueOption.cpp (97%) rename src/{server => app_sparkd}/sparkd/cmds/md/common/VenueOption.h (85%) rename src/{server => app_sparkd}/sparkd/exchange_sim/ExchangeSim.cpp (92%) rename src/{server => app_sparkd}/sparkd/exchange_sim/ExchangeSim.h (81%) rename src/{server => app_sparkd}/sparkd/exchange_sim/ExchangeSimApplication.cpp (97%) rename src/{server => app_sparkd}/sparkd/exchange_sim/ExchangeSimApplication.h (97%) rename src/{server => app_sparkd}/sparkd/exchange_sim/IDGenerator.h (100%) rename src/{server => app_sparkd}/sparkd/exchange_sim/IMDPlayerObserver.h (92%) rename src/{server => app_sparkd}/sparkd/exchange_sim/book/Book.cpp (100%) rename src/{server => app_sparkd}/sparkd/exchange_sim/book/Book.h (95%) rename src/{server => app_sparkd}/sparkd/exchange_sim/book/ExchangeSim.proto (88%) rename src/{server => app_sparkd}/sparkd/exchange_sim/book/Order.cpp (100%) rename src/{server => app_sparkd}/sparkd/exchange_sim/book/Order.h (73%) rename src/{server => app_sparkd}/sparkd/exchange_sim/book/OrderMatcher.cpp (97%) rename src/{server => app_sparkd}/sparkd/exchange_sim/book/OrderMatcher.h (89%) rename src/{server => app_sparkd}/sparkd/exchange_sim/book/book_transform.cpp (96%) rename src/{server => app_sparkd}/sparkd/exchange_sim/book/book_transform.h (77%) rename src/{server => app_sparkd}/sparkd/exchange_sim/tests/test_book_transform.cpp (99%) rename src/{server => app_sparkd}/sparkd/execution/EMExecutionGateway.cpp (94%) rename src/{server => app_sparkd}/sparkd/execution/EMExecutionGateway.h (93%) rename src/{server => app_sparkd}/sparkd/execution/execution_gateway_provider.cpp (86%) rename src/{server => app_sparkd}/sparkd/execution/execution_gateway_provider.h (90%) rename src/{server => app_sparkd}/sparkd/http/ApiGateway.cpp (94%) rename src/{server => app_sparkd}/sparkd/http/ApiGateway.h (83%) rename src/{server => app_sparkd}/sparkd/http/MultipartFormDecoder.cpp (95%) rename src/{server => app_sparkd}/sparkd/http/MultipartFormDecoder.h (100%) rename src/{server => app_sparkd}/sparkd/http/WebServer.cpp (95%) rename src/{server => app_sparkd}/sparkd/http/WebServer.h (78%) rename src/{server => app_sparkd}/sparkd/http/tests/MultiPartFormTests.cpp (100%) rename src/{server => app_sparkd}/sparkd/main.cpp (72%) rename src/{server => app_sparkd}/sparkd/md/ChannelVolume.cpp (96%) rename src/{server => app_sparkd}/sparkd/md/ChannelVolume.h (94%) rename src/{server => app_sparkd}/sparkd/md/MarketDataAuxiliaryServiceServer.cpp (88%) rename src/{server => app_sparkd}/sparkd/md/MarketDataAuxiliaryServiceServer.h (89%) rename src/{server => app_sparkd}/sparkd/md/MarketDataError.cpp (100%) rename src/{server => app_sparkd}/sparkd/md/MarketDataError.h (95%) rename src/{server => app_sparkd}/sparkd/md/MarketDataGateway.cpp (79%) rename src/{server => app_sparkd}/sparkd/md/MarketDataGateway.h (100%) rename src/{server => app_sparkd}/sparkd/md/MarketDataListener.h (85%) rename src/{server => app_sparkd}/sparkd/md/MarketDataListenerID.h (77%) rename src/{server => app_sparkd}/sparkd/md/MarketDataRegistration.h (100%) rename src/{server => app_sparkd}/sparkd/md/MarketDataRegistrationError.h (100%) rename src/{server => app_sparkd}/sparkd/md/MarketDataRegistrationFactory.cpp (100%) rename src/{server => app_sparkd}/sparkd/md/MarketDataRegistrationFactory.h (100%) rename src/{server => app_sparkd}/sparkd/md/OnixsMarketDataProvider.cpp (89%) rename src/{server => app_sparkd}/sparkd/md/OnixsMarketDataProvider.h (78%) rename src/{server => app_sparkd}/sparkd/md/ReplayMarketDataProvider.cpp (83%) rename src/{server => app_sparkd}/sparkd/md/ReplayMarketDataProvider.h (80%) rename src/{server => app_sparkd}/sparkd/md/ReplayMarketDataSubscription.cpp (81%) rename src/{server => app_sparkd}/sparkd/md/ReplayMarketDataSubscription.h (76%) rename src/{server => app_sparkd}/sparkd/md/VolumeAtPriceState.cpp (94%) rename src/{server => app_sparkd}/sparkd/md/VolumeAtPriceState.h (87%) rename src/{server => app_sparkd}/sparkd/md/binance/BinanceContractType.h (89%) rename src/{server => app_sparkd}/sparkd/md/binance/BinanceFilterTuple.h (79%) rename src/{server => app_sparkd}/sparkd/md/binance/BinanceFilterType.h (96%) rename src/{server => app_sparkd}/sparkd/md/binance/BinanceIcebergPartsFilter.cpp (85%) rename src/{server => app_sparkd}/sparkd/md/binance/BinanceIcebergPartsFilter.h (88%) rename src/{server => app_sparkd}/sparkd/md/binance/BinanceInstrumentStatus.h (90%) rename src/{server => app_sparkd}/sparkd/md/binance/BinanceLotSizeFilter.h (94%) rename src/{server => app_sparkd}/sparkd/md/binance/BinanceMarketLotSizeFilter.h (95%) rename src/{server => app_sparkd}/sparkd/md/binance/BinanceMaxNumAlgoOrdersFilter.h (95%) rename src/{server => app_sparkd}/sparkd/md/binance/BinanceMaxNumOrdersFilter.h (94%) rename src/{server => app_sparkd}/sparkd/md/binance/BinanceMaxPositionFilter.h (94%) rename src/{server => app_sparkd}/sparkd/md/binance/BinanceMessageType.h (94%) rename src/{server => app_sparkd}/sparkd/md/binance/BinanceMinNotionalFilter.cpp (91%) rename src/{server => app_sparkd}/sparkd/md/binance/BinanceMinNotionalFilter.h (93%) rename src/{server => app_sparkd}/sparkd/md/binance/BinanceMiniTickerAdaptor.cpp (92%) rename src/{server => app_sparkd}/sparkd/md/binance/BinanceMiniTickerAdaptor.h (86%) rename src/{server => app_sparkd}/sparkd/md/binance/BinanceMiniTickerEventType.h (99%) rename src/{server => app_sparkd}/sparkd/md/binance/BinanceMiniTickerUpdate.cpp (91%) rename src/{server => app_sparkd}/sparkd/md/binance/BinanceMiniTickerUpdate.h (87%) rename src/{server => app_sparkd}/sparkd/md/binance/BinanceNotionalFilter.cpp (91%) rename src/{server => app_sparkd}/sparkd/md/binance/BinanceNotionalFilter.h (92%) rename src/{server => app_sparkd}/sparkd/md/binance/BinanceOrderType.h (94%) rename src/{server => app_sparkd}/sparkd/md/binance/BinancePercentPriceBySideFilter.h (95%) rename src/{server => app_sparkd}/sparkd/md/binance/BinancePercentPriceFilter.h (95%) rename src/{server => app_sparkd}/sparkd/md/binance/BinancePermission.h (93%) rename src/{server => app_sparkd}/sparkd/md/binance/BinancePriceFilter.h (93%) rename src/{server => app_sparkd}/sparkd/md/binance/BinancePriceStatistics.cpp (93%) rename src/{server => app_sparkd}/sparkd/md/binance/BinancePriceStatistics.h (97%) rename src/{server => app_sparkd}/sparkd/md/binance/BinancePriceStatisticsAdaptor.cpp (90%) rename src/{server => app_sparkd}/sparkd/md/binance/BinancePriceStatisticsAdaptor.h (85%) rename src/{server => app_sparkd}/sparkd/md/binance/BinanceQuoteAsset.h (97%) rename src/{server => app_sparkd}/sparkd/md/binance/BinanceSecurityRequestor.cpp (93%) rename src/{server => app_sparkd}/sparkd/md/binance/BinanceSecurityRequestor.h (98%) rename src/{server => app_sparkd}/sparkd/md/binance/BinanceSpot.cpp (95%) rename src/{server => app_sparkd}/sparkd/md/binance/BinanceSpot.h (80%) rename src/{server => app_sparkd}/sparkd/md/binance/BinanceSubscription.cpp (92%) rename src/{server => app_sparkd}/sparkd/md/binance/BinanceSubscription.h (96%) rename src/{server => app_sparkd}/sparkd/md/binance/BinanceTrailingDeltaFilter.h (94%) rename src/{server => app_sparkd}/sparkd/md/binance_coin_futures/binance_coin_future.cpp (96%) rename src/{server => app_sparkd}/sparkd/md/binance_coin_futures/binance_coin_future.h (83%) rename src/{server => app_sparkd}/sparkd/md/binance_coin_futures/binance_coin_futures_contract_type.h (92%) rename src/{server => app_sparkd}/sparkd/md/binance_coin_futures/binance_coin_futures_filter_tuple.h (81%) rename src/{server => app_sparkd}/sparkd/md/binance_coin_futures/binance_coin_futures_max_num_orders_filter.h (92%) rename src/{server => app_sparkd}/sparkd/md/binance_coin_futures/binance_coin_futures_message_type.h (95%) rename src/{server => app_sparkd}/sparkd/md/binance_coin_futures/binance_coin_futures_percent_price_filter.h (94%) rename src/{server => app_sparkd}/sparkd/md/binance_coin_futures/binance_coin_futures_price_statistics.cpp (93%) rename src/{server => app_sparkd}/sparkd/md/binance_coin_futures/binance_coin_futures_price_statistics.h (100%) rename src/{server => app_sparkd}/sparkd/md/binance_coin_futures/binance_coin_futures_price_statistics_adaptor.cpp (91%) rename src/{server => app_sparkd}/sparkd/md/binance_coin_futures/binance_coin_futures_price_statistics_adaptor.h (91%) rename src/{server => app_sparkd}/sparkd/md/binance_coin_futures/binance_coin_futures_security_requestor.cpp (92%) rename src/{server => app_sparkd}/sparkd/md/binance_coin_futures/binance_coin_futures_security_requestor.h (98%) rename src/{server => app_sparkd}/sparkd/md/binance_coin_futures/binance_coin_futures_subscription.cpp (92%) rename src/{server => app_sparkd}/sparkd/md/binance_coin_futures/binance_coin_futures_subscription.h (97%) rename src/{server => app_sparkd}/sparkd/md/binance_us/BinanceUsMessageType.h (94%) rename src/{server => app_sparkd}/sparkd/md/binance_us/BinanceUsPriceStatistics.cpp (93%) rename src/{server => app_sparkd}/sparkd/md/binance_us/BinanceUsPriceStatistics.h (97%) rename src/{server => app_sparkd}/sparkd/md/binance_us/BinanceUsPriceStatisticsAdaptor.cpp (90%) rename src/{server => app_sparkd}/sparkd/md/binance_us/BinanceUsPriceStatisticsAdaptor.h (88%) rename src/{server => app_sparkd}/sparkd/md/binance_us/BinanceUsSecurityRequestor.cpp (92%) rename src/{server => app_sparkd}/sparkd/md/binance_us/BinanceUsSecurityRequestor.h (98%) rename src/{server => app_sparkd}/sparkd/md/binance_us/BinanceUsSpot.h (73%) rename src/{server => app_sparkd}/sparkd/md/binance_us/BinanceUsSubscription.cpp (92%) rename src/{server => app_sparkd}/sparkd/md/binance_us/BinanceUsSubscription.h (96%) rename src/{server => app_sparkd}/sparkd/md/binance_usds_futures/BinanceUsdsFuture.cpp (96%) rename src/{server => app_sparkd}/sparkd/md/binance_usds_futures/BinanceUsdsFuture.h (83%) rename src/{server => app_sparkd}/sparkd/md/binance_usds_futures/BinanceUsdsFuturesContractType.h (92%) rename src/{server => app_sparkd}/sparkd/md/binance_usds_futures/BinanceUsdsFuturesFilterTuple.cpp (95%) rename src/{server => app_sparkd}/sparkd/md/binance_usds_futures/BinanceUsdsFuturesFilterTuple.h (56%) rename src/{server => app_sparkd}/sparkd/md/binance_usds_futures/BinanceUsdsFuturesMaxNumAlgoOrdersFilter.h (94%) rename src/{server => app_sparkd}/sparkd/md/binance_usds_futures/BinanceUsdsFuturesMaxNumOrdersFilter.h (92%) rename src/{server => app_sparkd}/sparkd/md/binance_usds_futures/BinanceUsdsFuturesMessageType.h (95%) rename src/{server => app_sparkd}/sparkd/md/binance_usds_futures/BinanceUsdsFuturesMinNotionalFilter.cpp (90%) rename src/{server => app_sparkd}/sparkd/md/binance_usds_futures/BinanceUsdsFuturesMinNotionalFilter.h (93%) rename src/{server => app_sparkd}/sparkd/md/binance_usds_futures/BinanceUsdsFuturesPercentPriceFilter.h (94%) rename src/{server => app_sparkd}/sparkd/md/binance_usds_futures/BinanceUsdsFuturesPriceStatistics.cpp (93%) rename src/{server => app_sparkd}/sparkd/md/binance_usds_futures/BinanceUsdsFuturesPriceStatistics.h (100%) rename src/{server => app_sparkd}/sparkd/md/binance_usds_futures/BinanceUsdsFuturesPriceStatisticsAdaptor.cpp (91%) rename src/{server => app_sparkd}/sparkd/md/binance_usds_futures/BinanceUsdsFuturesPriceStatisticsAdaptor.h (91%) rename src/{server => app_sparkd}/sparkd/md/binance_usds_futures/BinanceUsdsFuturesSecurityRequestor.cpp (92%) rename src/{server => app_sparkd}/sparkd/md/binance_usds_futures/BinanceUsdsFuturesSecurityRequestor.h (98%) rename src/{server => app_sparkd}/sparkd/md/binance_usds_futures/BinanceUsdsFuturesSubscription.cpp (92%) rename src/{server => app_sparkd}/sparkd/md/binance_usds_futures/BinanceUsdsFuturesSubscription.h (97%) rename src/{server => app_sparkd}/sparkd/md/cboe/CboeMarketDataHandler.cpp (83%) rename src/{server => app_sparkd}/sparkd/md/cboe/CboeMarketDataHandler.h (61%) rename src/{server => app_sparkd}/sparkd/md/ccapi/CCApiCompositeMessageHandler.cpp (96%) rename src/{server => app_sparkd}/sparkd/md/ccapi/CCApiCompositeMessageHandler.h (94%) rename src/{server => app_sparkd}/sparkd/md/ccapi/CCApiCorrelationID.h (98%) rename src/{server => app_sparkd}/sparkd/md/ccapi/CCApiDepthWalker.cpp (96%) rename src/{server => app_sparkd}/sparkd/md/ccapi/CCApiDepthWalker.h (90%) rename src/{server => app_sparkd}/sparkd/md/ccapi/CCApiEventDemuxer.cpp (95%) rename src/{server => app_sparkd}/sparkd/md/ccapi/CCApiEventDemuxer.h (97%) rename src/{server => app_sparkd}/sparkd/md/ccapi/CCApiEventLogger.h (91%) rename src/{server => app_sparkd}/sparkd/md/ccapi/CCApiHttpParams.cpp (96%) rename src/{server => app_sparkd}/sparkd/md/ccapi/CCApiHttpParams.h (81%) rename src/{server => app_sparkd}/sparkd/md/ccapi/CCApiJsonRpcRequest.h (93%) rename src/{server => app_sparkd}/sparkd/md/ccapi/CCApiJsonRpcRouter.cpp (88%) rename src/{server => app_sparkd}/sparkd/md/ccapi/CCApiJsonRpcRouter.h (92%) rename src/{server => app_sparkd}/sparkd/md/ccapi/CCApiMarketDataProvider.cpp (84%) rename src/{server => app_sparkd}/sparkd/md/ccapi/CCApiMarketDataProvider.h (79%) rename src/{server => app_sparkd}/sparkd/md/ccapi/CCApiMarketDepthAdaptor.cpp (91%) rename src/{server => app_sparkd}/sparkd/md/ccapi/CCApiMarketDepthAdaptor.h (87%) rename src/{server => app_sparkd}/sparkd/md/ccapi/CCApiMessageHandler.h (90%) rename src/{server => app_sparkd}/sparkd/md/ccapi/CCApiMessageLogger.cpp (92%) rename src/{server => app_sparkd}/sparkd/md/ccapi/CCApiMessageLogger.h (90%) rename src/{server => app_sparkd}/sparkd/md/ccapi/CCApiReader.cpp (100%) rename src/{server => app_sparkd}/sparkd/md/ccapi/CCApiReader.h (99%) rename src/{server => app_sparkd}/sparkd/md/ccapi/CCApiSession.cpp (96%) rename src/{server => app_sparkd}/sparkd/md/ccapi/CCApiSession.h (94%) rename src/{server => app_sparkd}/sparkd/md/ccapi/CCApiTradeAdaptor.cpp (86%) rename src/{server => app_sparkd}/sparkd/md/ccapi/CCApiTradeAdaptor.h (79%) rename src/{server => app_sparkd}/sparkd/md/ccapi/CCApiTradeRecord.cpp (91%) rename src/{server => app_sparkd}/sparkd/md/ccapi/CCApiTradeRecord.h (97%) rename src/{server => app_sparkd}/sparkd/md/ccapi/CCDemoListener.cpp (95%) rename src/{server => app_sparkd}/sparkd/md/ccapi/CCDemoListener.h (95%) rename src/{server => app_sparkd}/sparkd/md/ccapi/CCSecurityIDFactory.h (89%) rename src/{server => app_sparkd}/sparkd/md/ccapi/ICCApiMessageHandler.cpp (70%) rename src/{server => app_sparkd}/sparkd/md/ccapi/ICCApiMessageHandler.h (92%) rename src/{server => app_sparkd}/sparkd/md/coinbase/CoinbaseMessageType.h (94%) rename src/{server => app_sparkd}/sparkd/md/coinbase/CoinbasePriceStatistics.cpp (91%) rename src/{server => app_sparkd}/sparkd/md/coinbase/CoinbasePriceStatistics.h (97%) rename src/{server => app_sparkd}/sparkd/md/coinbase/CoinbasePriceStatisticsAdaptor.cpp (89%) rename src/{server => app_sparkd}/sparkd/md/coinbase/CoinbasePriceStatisticsAdaptor.h (90%) rename src/{server => app_sparkd}/sparkd/md/coinbase/CoinbaseSecurityRequestor.cpp (93%) rename src/{server => app_sparkd}/sparkd/md/coinbase/CoinbaseSecurityRequestor.h (98%) rename src/{server => app_sparkd}/sparkd/md/coinbase/CoinbaseSpot.cpp (90%) rename src/{server => app_sparkd}/sparkd/md/coinbase/CoinbaseSpot.h (96%) rename src/{server => app_sparkd}/sparkd/md/coinbase/CoinbaseSubscription.cpp (93%) rename src/{server => app_sparkd}/sparkd/md/coinbase/CoinbaseSubscription.h (96%) rename src/{server => app_sparkd}/sparkd/md/databento/DatabentoDataHandler.cpp (96%) rename src/{server => app_sparkd}/sparkd/md/databento/DatabentoDataHandler.h (83%) rename src/{server => app_sparkd}/sparkd/md/databento/DatabentoMarketDataProvider.cpp (83%) rename src/{server => app_sparkd}/sparkd/md/databento/DatabentoMarketDataProvider.h (93%) rename src/{server => app_sparkd}/sparkd/md/deribit/DeribitChannelDemuxer.cpp (97%) rename src/{server => app_sparkd}/sparkd/md/deribit/DeribitChannelDemuxer.h (94%) rename src/{server => app_sparkd}/sparkd/md/deribit/DeribitCombo.cpp (94%) rename src/{server => app_sparkd}/sparkd/md/deribit/DeribitCombo.h (88%) rename src/{server => app_sparkd}/sparkd/md/deribit/DeribitComboLeg.cpp (100%) rename src/{server => app_sparkd}/sparkd/md/deribit/DeribitComboLeg.h (96%) rename src/{server => app_sparkd}/sparkd/md/deribit/DeribitComboRequest.h (97%) rename src/{server => app_sparkd}/sparkd/md/deribit/DeribitCurrency.h (90%) rename src/{server => app_sparkd}/sparkd/md/deribit/DeribitDepthAdaptor.cpp (92%) rename src/{server => app_sparkd}/sparkd/md/deribit/DeribitDepthAdaptor.h (95%) rename src/{server => app_sparkd}/sparkd/md/deribit/DeribitInstrument.cpp (98%) rename src/{server => app_sparkd}/sparkd/md/deribit/DeribitInstrument.h (93%) rename src/{server => app_sparkd}/sparkd/md/deribit/DeribitInstrumentKind.h (94%) rename src/{server => app_sparkd}/sparkd/md/deribit/DeribitInstrumentRequest.h (96%) rename src/{server => app_sparkd}/sparkd/md/deribit/DeribitInstrumentState.h (92%) rename src/{server => app_sparkd}/sparkd/md/deribit/DeribitInstrumentStateType.h (96%) rename src/{server => app_sparkd}/sparkd/md/deribit/DeribitInstrumentStore.cpp (96%) rename src/{server => app_sparkd}/sparkd/md/deribit/DeribitInstrumentStore.h (93%) rename src/{server => app_sparkd}/sparkd/md/deribit/DeribitMessageType.h (95%) rename src/{server => app_sparkd}/sparkd/md/deribit/DeribitSecurityRequestor.cpp (94%) rename src/{server => app_sparkd}/sparkd/md/deribit/DeribitSecurityRequestor.h (97%) rename src/{server => app_sparkd}/sparkd/md/deribit/DeribitSubscription.cpp (89%) rename src/{server => app_sparkd}/sparkd/md/deribit/DeribitSubscription.h (96%) rename src/{server => app_sparkd}/sparkd/md/deribit/DeribitSubscriptionFactory.h (98%) rename src/{server => app_sparkd}/sparkd/md/deribit/DeribitTickerAdaptor.cpp (91%) rename src/{server => app_sparkd}/sparkd/md/deribit/DeribitTickerAdaptor.h (95%) rename src/{server => app_sparkd}/sparkd/md/deribit/DeribitTradeAdaptor.cpp (92%) rename src/{server => app_sparkd}/sparkd/md/deribit/DeribitTradeAdaptor.h (95%) rename src/{server => app_sparkd}/sparkd/md/deribit/DeribitWithdrawalPriority.h (100%) rename src/{server => app_sparkd}/sparkd/md/emumba/EmumbaDeribitData.h (77%) rename src/{server => app_sparkd}/sparkd/md/emumba/EmumbaDeribitSubscription.cpp (93%) rename src/{server => app_sparkd}/sparkd/md/emumba/EmumbaDeribitSubscription.h (81%) rename src/{server => app_sparkd}/sparkd/md/emumba/EmumbaMarketDataProvider.cpp (83%) rename src/{server => app_sparkd}/sparkd/md/emumba/EmumbaMarketDataProvider.h (84%) rename src/{server => app_sparkd}/sparkd/md/ftx/FTXFuture.cpp (96%) rename src/{server => app_sparkd}/sparkd/md/ftx/FTXFuture.h (94%) rename src/{server => app_sparkd}/sparkd/md/ftx/FTXHistoricalPriceAdaptor.cpp (90%) rename src/{server => app_sparkd}/sparkd/md/ftx/FTXHistoricalPriceAdaptor.h (86%) rename src/{server => app_sparkd}/sparkd/md/ftx/FTXHistoricalPriceRecord.cpp (93%) rename src/{server => app_sparkd}/sparkd/md/ftx/FTXHistoricalPriceRecord.h (91%) rename src/{server => app_sparkd}/sparkd/md/ftx/FTXMarket.cpp (96%) rename src/{server => app_sparkd}/sparkd/md/ftx/FTXMarket.h (95%) rename src/{server => app_sparkd}/sparkd/md/ftx/FTXMessageType.h (94%) rename src/{server => app_sparkd}/sparkd/md/ftx/FTXSecurityRequestor.cpp (93%) rename src/{server => app_sparkd}/sparkd/md/ftx/FTXSecurityRequestor.h (97%) rename src/{server => app_sparkd}/sparkd/md/ftx/FTXSecurityType.h (94%) rename src/{server => app_sparkd}/sparkd/md/ftx/FTXSubscription.cpp (91%) rename src/{server => app_sparkd}/sparkd/md/ftx/FTXSubscription.h (96%) rename src/{server => app_sparkd}/sparkd/md/glbx/DatabentoGlbxSubscription.cpp (85%) rename src/{server => app_sparkd}/sparkd/md/glbx/DatabentoGlbxSubscription.h (96%) rename src/{server => app_sparkd}/sparkd/md/glbx/GlbxMarketDataHandler.cpp (79%) rename src/{server => app_sparkd}/sparkd/md/glbx/GlbxMarketDataHandler.h (62%) rename src/{server => app_sparkd}/sparkd/md/glbx/OnixsGlbxSubscription.cpp (89%) rename src/{server => app_sparkd}/sparkd/md/glbx/OnixsGlbxSubscription.h (96%) rename src/{server => app_sparkd}/sparkd/md/listeners/LiveLadderPrinter.cpp (98%) rename src/{server => app_sparkd}/sparkd/md/listeners/LiveLadderPrinter.h (87%) rename src/{server => app_sparkd}/sparkd/md/okx/OkxChannel.h (94%) rename src/{server => app_sparkd}/sparkd/md/okx/OkxChannelDemuxer.cpp (95%) rename src/{server => app_sparkd}/sparkd/md/okx/OkxChannelDemuxer.h (91%) rename src/{server => app_sparkd}/sparkd/md/okx/OkxDepthAdaptor.cpp (90%) rename src/{server => app_sparkd}/sparkd/md/okx/OkxDepthAdaptor.h (95%) rename src/{server => app_sparkd}/sparkd/md/okx/OkxInstrument.cpp (98%) rename src/{server => app_sparkd}/sparkd/md/okx/OkxInstrument.h (91%) rename src/{server => app_sparkd}/sparkd/md/okx/OkxInstrumentStatus.h (93%) rename src/{server => app_sparkd}/sparkd/md/okx/OkxInstrumentStore.cpp (93%) rename src/{server => app_sparkd}/sparkd/md/okx/OkxInstrumentStore.h (92%) rename src/{server => app_sparkd}/sparkd/md/okx/OkxInstrumentType.h (95%) rename src/{server => app_sparkd}/sparkd/md/okx/OkxMessageType.h (95%) rename src/{server => app_sparkd}/sparkd/md/okx/OkxRequest.h (90%) rename src/{server => app_sparkd}/sparkd/md/okx/OkxResponse.h (96%) rename src/{server => app_sparkd}/sparkd/md/okx/OkxSecuritySubscription.cpp (93%) rename src/{server => app_sparkd}/sparkd/md/okx/OkxSecuritySubscription.h (100%) rename src/{server => app_sparkd}/sparkd/md/okx/OkxSide.h (93%) rename src/{server => app_sparkd}/sparkd/md/okx/OkxSubscription.cpp (91%) rename src/{server => app_sparkd}/sparkd/md/okx/OkxSubscription.h (96%) rename src/{server => app_sparkd}/sparkd/md/okx/OkxTicker.cpp (98%) rename src/{server => app_sparkd}/sparkd/md/okx/OkxTicker.h (85%) rename src/{server => app_sparkd}/sparkd/md/okx/OkxTickerAdaptor.cpp (88%) rename src/{server => app_sparkd}/sparkd/md/okx/OkxTickerAdaptor.h (95%) rename src/{server => app_sparkd}/sparkd/md/okx/OkxTrade.cpp (95%) rename src/{server => app_sparkd}/sparkd/md/okx/OkxTrade.h (80%) rename src/{server => app_sparkd}/sparkd/md/okx/OkxTradeAdaptor.cpp (88%) rename src/{server => app_sparkd}/sparkd/md/okx/OkxTradeAdaptor.h (95%) rename src/{server => app_sparkd}/sparkd/md/platforms/IMDPlatform.cpp (100%) rename src/{server => app_sparkd}/sparkd/md/platforms/IMDPlatform.h (100%) rename src/{server => app_sparkd}/sparkd/md/platforms/emumba/EMTradingSession.h (87%) rename src/{server => app_sparkd}/sparkd/md/platforms/emumba/EmMDListener.cpp (98%) rename src/{server => app_sparkd}/sparkd/md/platforms/emumba/EmMDListener.h (96%) rename src/{server => app_sparkd}/sparkd/md/platforms/emumba/EmumbaMain.cpp (83%) rename src/{server => app_sparkd}/sparkd/md/platforms/emumba/EmumbaMain.h (85%) rename src/{server => app_sparkd}/sparkd/md/platforms/ice_onixs/ICEListener.cpp (99%) rename src/{server => app_sparkd}/sparkd/md/platforms/ice_onixs/ICEListener.h (96%) rename src/{server => app_sparkd}/sparkd/md/platforms/ice_onixs/ICEListenerHelpers.h (86%) rename src/{server => app_sparkd}/sparkd/md/platforms/ice_onixs/ICEMain.cpp (94%) rename src/{server => app_sparkd}/sparkd/md/platforms/ice_onixs/ICEMain.h (86%) rename src/{server => app_sparkd}/sparkd/md/platforms/ice_onixs/ICESecurityIndex.h (90%) rename src/{server => app_sparkd}/sparkd/md/platforms/ice_onixs/onixs.h (100%) rename src/{server => app_sparkd}/sparkd/md/platforms/ice_onixs/tests/ice_tests.cpp (98%) rename src/{server => app_sparkd}/sparkd/md/platforms/mdp3_onixs/CMESecurityIndex.h (86%) rename src/{server => app_sparkd}/sparkd/md/platforms/mdp3_onixs/MDP3Listener.cpp (95%) rename src/{server => app_sparkd}/sparkd/md/platforms/mdp3_onixs/MDP3Listener.h (96%) rename src/{server => app_sparkd}/sparkd/md/platforms/mdp3_onixs/MDP3ListenerHelpers.h (90%) rename src/{server => app_sparkd}/sparkd/md/platforms/mdp3_onixs/MDP3Main.cpp (96%) rename src/{server => app_sparkd}/sparkd/md/platforms/mdp3_onixs/MDP3Main.h (92%) rename src/{server => app_sparkd}/sparkd/md/platforms/mdp3_onixs/onixs.h (100%) rename src/{server => app_sparkd}/sparkd/md/platforms/mdp3_onixs/tests/mdp3_tests.cpp (98%) rename src/{server => app_sparkd}/sparkd/md/recording/DbWriters.h (98%) rename src/{server => app_sparkd}/sparkd/md/recording/MDBatchWriter.cpp (98%) rename src/{server => app_sparkd}/sparkd/md/recording/MDBatchWriter.h (95%) rename src/{server => app_sparkd}/sparkd/md/recording/MDRecorder.cpp (95%) rename src/{server => app_sparkd}/sparkd/md/recording/MDRecorder.h (89%) rename src/{server => app_sparkd}/sparkd/md/recording/MDReplayer.cpp (89%) rename src/{server => app_sparkd}/sparkd/md/recording/MDReplayer.h (83%) rename src/{server => app_sparkd}/sparkd/md/taifex/TaifexDataGateway.cpp (98%) rename src/{server => app_sparkd}/sparkd/md/taifex/TaifexDataGateway.h (90%) rename src/{server => app_sparkd}/sparkd/md/taifex/TaifexDataProcessors.h (97%) rename src/{server => app_sparkd}/sparkd/md/taifex/TaifexMarketDataProvider.cpp (87%) rename src/{server => app_sparkd}/sparkd/md/taifex/TaifexMarketDataProvider.h (93%) rename src/{server => app_sparkd}/sparkd/md/taifex/TaifexMessages.h (99%) rename src/{server => app_sparkd}/sparkd/md/taifex/TaifexSecurityDetailsMapper.h (98%) rename src/{server => app_sparkd}/sparkd/md/taifex/TaifexSubscription.cpp (89%) rename src/{server => app_sparkd}/sparkd/md/taifex/TaifexSubscription.h (96%) rename src/{server => app_sparkd}/sparkd/md/taifex/TaifexUtils.h (98%) rename src/{server => app_sparkd}/sparkd/md/twse/TwseDataGateway.cpp (98%) rename src/{server => app_sparkd}/sparkd/md/twse/TwseDataGateway.h (89%) rename src/{server => app_sparkd}/sparkd/md/twse/TwseDataProcessors.h (88%) rename src/{server => app_sparkd}/sparkd/md/twse/TwseMessages.h (99%) rename src/{server => app_sparkd}/sparkd/md/twse/TwseSecurityDetailsMapper.h (100%) rename src/{server => app_sparkd}/sparkd/md/twse/TwseUtils.h (100%) rename src/{server => app_sparkd}/sparkd/position/MarginServiceCore.cpp (95%) rename src/{server => app_sparkd}/sparkd/position/MarginServiceCore.h (85%) rename src/{server => app_sparkd}/sparkd/position/MarginServiceServer.cpp (94%) rename src/{server => app_sparkd}/sparkd/position/MarginServiceServer.h (83%) rename src/{server => app_sparkd}/sparkd/position/Position.h (68%) rename src/{server => app_sparkd}/sparkd/position/PositionAggregator.cpp (94%) rename src/{server => app_sparkd}/sparkd/position/PositionAggregator.h (79%) rename src/{server => app_sparkd}/sparkd/position/PositionMap.cpp (96%) rename src/{server => app_sparkd}/sparkd/position/PositionMap.h (92%) rename src/{server => app_sparkd}/sparkd/position/PositionServicePNLHelper.cpp (97%) rename src/{server => app_sparkd}/sparkd/position/PositionServicePNLHelper.h (95%) rename src/{server => app_sparkd}/sparkd/position/PositionServiceServer.cpp (96%) rename src/{server => app_sparkd}/sparkd/position/PositionServiceServer.h (97%) rename src/{server => app_sparkd}/sparkd/position/import/BasePositionServiceServer.cpp (92%) rename src/{server => app_sparkd}/sparkd/position/import/BasePositionServiceServer.h (93%) rename src/{server => app_sparkd}/sparkd/position/import/DownloadCommonStateMachine.cpp (97%) rename src/{server => app_sparkd}/sparkd/position/import/DownloadCommonStateMachine.h (97%) rename src/{server => app_sparkd}/sparkd/position/import/DownloadWindow.cpp (96%) rename src/{server => app_sparkd}/sparkd/position/import/DownloadWindow.h (92%) rename src/{server => app_sparkd}/sparkd/position/import/MoneyFileServiceServer.cpp (92%) rename src/{server => app_sparkd}/sparkd/position/import/MoneyFileServiceServer.h (95%) rename src/{server => app_sparkd}/sparkd/position/import/docs/data/04/a77600-afc9-4929-ae2c-c68f32e137e7/sftp_credentials_encrypted.txt.gpg (100%) rename src/{server => app_sparkd}/sparkd/position/import/docs/data/e1/57ae24-efe5-4ea2-a997-a595a7a82eb9/btsmny_20190813.csv (100%) rename src/{server => app_sparkd}/sparkd/position/import/docs/data/e1/57ae24-efe5-4ea2-a997-a595a7a82eb9/btspos_20190814.csv (100%) rename src/{server => app_sparkd}/sparkd/position/import/docs/download_state_machine.pdf (100%) rename src/{server => app_sparkd}/sparkd/position/import/docs/import.org (100%) rename src/{server => app_sparkd}/sparkd/position/import/docs/reference/2019-07-08.File_Layout_Money.pdf (100%) rename src/{server => app_sparkd}/sparkd/position/import/docs/reference/2019-07-08.File_Layout_Positions.pdf (100%) rename src/{server => app_sparkd}/sparkd/position/import/docs/reference/GMI Mapping spreadsheet.xlsx (100%) rename src/{server => app_sparkd}/sparkd/position/import/docs/reference/Gmail - Money and Position files.pdf (100%) rename src/{server => app_sparkd}/sparkd/position/import/docs/reference/adatmny.docx (100%) rename src/{server => app_sparkd}/sparkd/position/import/docs/reference/adatpos.docx (100%) rename src/{server => app_sparkd}/sparkd/position/import/docs/reference/btsmny_20190813.csv (100%) rename src/{server => app_sparkd}/sparkd/position/import/docs/reference/btspos_20190814.csv (100%) rename src/{server => app_sparkd}/sparkd/position/import/docs/reference/sftp_credentials_encrypted.txt.gpg (100%) rename src/{server => app_sparkd}/sparkd/position/import/parsing/gmi_parser.cpp (96%) rename src/{server => app_sparkd}/sparkd/position/import/parsing/gmi_parser.h (93%) rename src/{server => app_sparkd}/sparkd/position/import/parsing/money_parser.cpp (94%) rename src/{server => app_sparkd}/sparkd/position/import/parsing/money_parser.h (90%) rename src/{server => app_sparkd}/sparkd/position/import/parsing/parser_common.cpp (92%) rename src/{server => app_sparkd}/sparkd/position/import/parsing/parser_common.h (100%) rename src/{server => app_sparkd}/sparkd/position/tests/PositionTests.cpp (96%) rename src/{server => app_sparkd}/sparkd/position/tests/position_tests_internal.cpp (99%) rename src/{server => app_sparkd}/sparkd/subprocess/SubProcessRunner.cpp (89%) rename src/{server => app_sparkd}/sparkd/subprocess/SubProcessRunner.h (100%) rename src/{server => app_sparkd}/sparkd/support/ErrorReportService.cpp (90%) rename src/{server => app_sparkd}/sparkd/support/ErrorReportService.h (72%) rename src/{server => app_sparkd}/sparkd/support/ShellLatencyServer.cpp (95%) rename src/{server => app_sparkd}/sparkd/support/ShellLatencyServer.h (78%) rename src/{server => app_sparkd}/sparkd/user/AdminServiceDB.cpp (86%) rename src/{server => app_sparkd}/sparkd/user/AdminServiceDB.h (100%) rename src/{server => app_sparkd}/sparkd/user/AdminServiceServer.cpp (98%) rename src/{server => app_sparkd}/sparkd/user/AdminServiceServer.h (93%) rename src/{server => app_sparkd}/sparkd/user/AuthServiceServer.cpp (95%) rename src/{server => app_sparkd}/sparkd/user/AuthServiceServer.h (90%) rename src/{server => app_sparkd}/sparkd/user/tests/admin_service_tests.cpp (98%) create mode 100644 src/client/spark_websocket/Core/WebsocketServerConfig.cs delete mode 100644 src/lib/CMakeLists.txt delete mode 100644 src/lib/cmake/AddCopyBinariesTarget.cmake delete mode 100644 src/lib/cmake/GetLinuxClientSources.cmake delete mode 100644 src/lib/cmake/GetWindowsClientSources.cmake delete mode 100644 src/lib/jetfix/jetfix.h delete mode 100644 src/lib/orderman/events/TradeSignalEvent.cpp delete mode 100644 src/lib/orderman/events/TradeSummarySignalDispatcher.cpp delete mode 100644 src/lib/orderman/orders/algo/IAlgoServices.cpp delete mode 100644 src/lib/quickbus/quickbus.h delete mode 100644 src/lib/tracing/bts_trace.cpp create mode 100644 src/lib_spark/CMakeLists.txt create mode 100644 src/lib_spark/Config.cmake.in create mode 100644 src/lib_spark/cmake/AddCopyBinariesTarget.cmake create mode 100644 src/lib_spark/cmake/GenerateConfigProfile.cmake rename src/{lib => lib_spark}/cmake/GenerateDefaultConfig.cmake (90%) rename src/{lib => lib_spark}/cmake/GetLinuxClientLinkLibraries.cmake (100%) rename src/{lib/cmake/GetLinuxServerSources.cmake => lib_spark/cmake/GetLinuxClientSources.cmake} (63%) rename src/{lib => lib_spark}/cmake/GetLinuxServerLinkLibraries.cmake (100%) create mode 100644 src/lib_spark/cmake/GetLinuxServerSources.cmake rename src/{lib => lib_spark}/cmake/GetWindowsClientLinkLibraries.cmake (100%) create mode 100644 src/lib_spark/cmake/GetWindowsClientSources.cmake rename src/{lib => lib_spark}/cmake/ProtobufGenerateCppService.cmake (87%) rename src/{lib => lib_spark/spark}/algorithm/PlusX.h (100%) rename src/{lib => lib_spark/spark}/algorithm/StringCaseConverter.h (100%) rename src/{lib => lib_spark/spark}/algorithm/TryCatch.h (100%) rename src/{lib => lib_spark/spark}/api/analytics/ExpirationDriver.proto (70%) rename src/{lib => lib_spark/spark}/api/analytics/TimeWeightedInterpolatedDriver.proto (80%) rename src/{lib => lib_spark/spark}/api/apicore.proto (100%) rename src/{lib => lib_spark/spark}/api/apigateway.proto (94%) rename src/{lib => lib_spark/spark}/api/apioptions.proto (100%) rename src/{lib => lib_spark/spark}/api/build_apioptions.sh (100%) rename src/{lib => lib_spark/spark}/api/core/ApiClientInterop.cpp (96%) rename src/{lib => lib_spark/spark}/api/core/ApiClientInterop.h (100%) rename src/{lib => lib_spark/spark}/api/core/ApiInteropCommon.h (86%) rename src/{lib => lib_spark/spark}/api/core/ApiServerInterop.cpp (94%) rename src/{lib => lib_spark/spark}/api/core/ApiServerInterop.h (100%) rename src/{lib => lib_spark/spark}/api/core/RegexFormatting.proto (100%) rename src/{lib => lib_spark/spark}/api/domain/CallPut.h (52%) rename src/{lib => lib_spark/spark}/api/domain/CallPut.proto (100%) rename src/{lib => lib_spark/spark}/api/domain/Currency.h (52%) rename src/{lib => lib_spark/spark}/api/domain/Currency.proto (100%) rename src/{lib => lib_spark/spark}/api/domain/SecurityCriteria.proto (76%) rename src/{lib => lib_spark/spark}/api/domain/SecurityCriteriaClause.proto (81%) rename src/{lib => lib_spark/spark}/api/domain/SecurityExpiration.proto (75%) rename src/{lib => lib_spark/spark}/api/domain/SecurityMetadata.proto (74%) rename src/{lib => lib_spark/spark}/api/domain/SecurityMetadataCollection.proto (77%) rename src/{lib => lib_spark/spark}/api/domain/SecurityMetadataItem.proto (68%) rename src/{lib => lib_spark/spark}/api/domain/SecurityType.h (73%) rename src/{lib => lib_spark/spark}/api/domain/SecurityType.proto (100%) rename src/{lib => lib_spark/spark}/api/domain/TickDisplayRule.proto (77%) rename src/{lib => lib_spark/spark}/api/domain/TickDisplaySettings.proto (88%) rename src/{lib => lib_spark/spark}/api/domain/TickFactors.proto (100%) rename src/{lib => lib_spark/spark}/api/domain/Venue.h (71%) rename src/{lib => lib_spark/spark}/api/domain/Venue.proto (100%) rename src/{lib => lib_spark/spark}/api/io/URL.proto (100%) rename src/{lib => lib_spark/spark}/api/md/BinanceCoinFuturesMarketDataConfig.proto (92%) rename src/{lib => lib_spark/spark}/api/md/BinanceMarketDataConfig.proto (92%) rename src/{lib => lib_spark/spark}/api/md/BinanceUsMarketDataConfig.proto (92%) rename src/{lib => lib_spark/spark}/api/md/BinanceUsdsFuturesMarketDataConfig.proto (94%) rename src/{lib => lib_spark/spark}/api/md/CboeMarketDataConfig.proto (67%) rename src/{lib => lib_spark/spark}/api/md/CoinbaseMarketDataConfig.proto (92%) rename src/{lib => lib_spark/spark}/api/md/DatabentoMarketDataConfig.proto (100%) rename src/{lib => lib_spark/spark}/api/md/DeribitMarketDataConfig.proto (88%) rename src/{lib => lib_spark/spark}/api/md/EmumbaDeribitMarketDataConfig.proto (100%) rename src/{lib => lib_spark/spark}/api/md/FTXMarketDataConfig.proto (82%) rename src/{lib => lib_spark/spark}/api/md/GlbxMarketDataConfig.proto (87%) rename src/{lib => lib_spark/spark}/api/md/MarketDataConfig.proto (54%) rename src/{lib => lib_spark/spark}/api/md/MarketDataConfigUtils.cpp (95%) rename src/{lib => lib_spark/spark}/api/md/MarketDataConfigUtils.h (90%) rename src/{lib => lib_spark/spark}/api/md/MarketDataRecordingConfig.proto (91%) rename src/{lib => lib_spark/spark}/api/md/MarketDataReplayConfig.proto (91%) rename src/{lib => lib_spark/spark}/api/md/OkxMarketDataConfig.proto (92%) rename src/{lib => lib_spark/spark}/api/md/TaifexMarketDataConfig.proto (93%) rename src/{lib => lib_spark/spark}/api/md/TwseMarketDataConfig.proto (88%) rename src/{lib => lib_spark/spark}/api/public/ApiException.h (90%) rename src/{lib => lib_spark/spark}/api/public/ApiServer.cpp (100%) rename src/{lib => lib_spark/spark}/api/public/ApiServer.h (93%) rename src/{lib => lib_spark/spark}/api/public/ApiUtils.h (100%) rename src/{lib => lib_spark/spark}/api/public/ClientChannel.cpp (100%) rename src/{lib => lib_spark/spark}/api/public/ClientChannel.h (99%) rename src/{lib => lib_spark/spark}/api/public/QuickbusClientChannel.cpp (100%) rename src/{lib => lib_spark/spark}/api/public/QuickbusClientChannel.h (95%) rename src/{lib => lib_spark/spark}/api/public/RawUpdate.h (100%) rename src/{lib => lib_spark/spark}/api/public/Result.h (97%) rename src/{lib => lib_spark/spark}/api/public/ServerChannel.cpp (100%) rename src/{lib => lib_spark/spark}/api/public/ServerChannel.h (91%) rename src/{lib => lib_spark/spark}/api/public/ServiceContext.cpp (96%) rename src/{lib => lib_spark/spark}/api/public/ServiceContext.h (97%) rename src/{lib => lib_spark/spark}/api/public/StatefulPublisher.h (100%) rename src/{lib => lib_spark/spark}/api/public/Update.h (100%) rename src/{lib => lib_spark/spark}/api/public/api.h (100%) rename src/{lib => lib_spark/spark}/api/service_compiler/apioptions_pb2.py (100%) rename src/{lib => lib_spark/spark}/api/service_compiler/plugin.cmd (94%) rename src/{lib => lib_spark/spark}/api/service_compiler/plugin.py (100%) rename src/{lib => lib_spark/spark}/api/service_compiler/plugin.sh (80%) rename src/{lib => lib_spark/spark}/api/service_compiler/templates/c#/client.pb.cs (100%) rename src/{lib => lib_spark/spark}/api/service_compiler/templates/c#/immutable.pb.cs (96%) rename src/{lib => lib_spark/spark}/api/service_compiler/templates/c#/server.pb.cs (97%) rename src/{lib => lib_spark/spark}/api/service_compiler/templates/cpp/client.pb.cc (98%) rename src/{lib => lib_spark/spark}/api/service_compiler/templates/cpp/client.pb.h (89%) rename src/{lib => lib_spark/spark}/api/service_compiler/templates/cpp/server.pb.cc (98%) rename src/{lib => lib_spark/spark}/api/service_compiler/templates/cpp/server.pb.h (94%) rename src/{lib => lib_spark/spark}/api/service_compiler/templates/fs/fable.fs (100%) rename src/{lib => lib_spark/spark}/api/service_compiler/templates/js/ts (100%) rename src/{lib => lib_spark/spark}/api/service_helpers/AdminServiceUtils.cpp (99%) rename src/{lib => lib_spark/spark}/api/service_helpers/AdminServiceUtils.h (96%) rename src/{lib => lib_spark/spark}/api/service_helpers/AlgoServiceUtils.cpp (82%) rename src/{lib => lib_spark/spark}/api/service_helpers/AlgoServiceUtils.h (100%) rename src/{lib => lib_spark/spark}/api/service_helpers/PositionUtilities.cpp (96%) rename src/{lib => lib_spark/spark}/api/service_helpers/PositionUtilities.h (87%) rename src/{lib => lib_spark/spark}/api/services/AdminService.proto (98%) rename src/{lib => lib_spark/spark}/api/services/AlgoDefinitionService.proto (89%) rename src/{lib => lib_spark/spark}/api/services/AlgoService.proto (91%) rename src/{lib => lib_spark/spark}/api/services/AnalyticsService.proto (94%) rename src/{lib => lib_spark/spark}/api/services/ApiUnitTestService.proto (100%) rename src/{lib => lib_spark/spark}/api/services/AuthService.proto (96%) rename src/{lib => lib_spark/spark}/api/services/BasePositionService.proto (85%) rename src/{lib => lib_spark/spark}/api/services/ErrorReportService.proto (90%) rename src/{lib => lib_spark/spark}/api/services/HelloService.proto (96%) rename src/{lib => lib_spark/spark}/api/services/MBOService.proto (86%) rename src/{lib => lib_spark/spark}/api/services/MarginService.proto (94%) rename src/{lib => lib_spark/spark}/api/services/MarketDataAuxiliaryService.proto (88%) rename src/{lib => lib_spark/spark}/api/services/MarketDataRelay.proto (81%) rename src/{lib => lib_spark/spark}/api/services/MarketDataService.proto (83%) rename src/{lib => lib_spark/spark}/api/services/MoneyFileService.proto (85%) rename src/{lib => lib_spark/spark}/api/services/OrderService.cpp (99%) rename src/{lib => lib_spark/spark}/api/services/OrderService.h (82%) rename src/{lib => lib_spark/spark}/api/services/OrderService.proto (99%) rename src/{lib => lib_spark/spark}/api/services/OutOfProcessURLListener.proto (86%) rename src/{lib => lib_spark/spark}/api/services/PersistenceService.proto (98%) rename src/{lib => lib_spark/spark}/api/services/PositionService.proto (97%) rename src/{lib => lib_spark/spark}/api/services/ShellDiagnosticService.proto (90%) rename src/{lib => lib_spark/spark}/api/services/ShellLatencyService.proto (84%) rename src/{lib => lib_spark/spark}/api/services/SyntheticSecurityService.proto (88%) rename src/{lib => lib_spark/spark}/api/services/native_order_type.h (86%) rename src/{lib => lib_spark/spark}/api/services/order_status.h (85%) rename src/{lib => lib_spark/spark}/api/services/time_in_force.h (85%) rename src/{lib => lib_spark/spark}/api/services/trigger_price_type.h (86%) rename src/{lib => lib_spark/spark}/api/test/ApiTests.cpp (92%) rename src/{lib => lib_spark/spark}/api/test/HelloServiceServer.cpp (100%) rename src/{lib => lib_spark/spark}/api/test/HelloServiceServer.h (82%) rename src/{lib => lib_spark/spark}/collections/AutoIncrementedIndex.h (77%) rename src/{lib => lib_spark/spark}/collections/Chunk.h (100%) rename src/{lib => lib_spark/spark}/collections/Contains.h (100%) rename src/{lib => lib_spark/spark}/collections/DiscreteValuesFilter.h (100%) rename src/{lib => lib_spark/spark}/collections/Find.h (100%) rename src/{lib => lib_spark/spark}/collections/FlatUnorderedMap.h (100%) rename src/{lib => lib_spark/spark}/collections/GeneratedKeyMap.h (97%) rename src/{lib => lib_spark/spark}/collections/HASH_IMPL.h (94%) rename src/{lib => lib_spark/spark}/collections/HashCombiner.h (100%) rename src/{lib => lib_spark/spark}/collections/Remove.h (100%) rename src/{lib => lib_spark/spark}/collections/Transform.h (100%) rename src/{lib => lib_spark/spark}/collections/UnorderedMapLookup.h (100%) rename src/{lib => lib_spark/spark}/collections/UnorderedSetFactory.h (100%) rename src/{lib => lib_spark/spark}/collections/UnorderedSetMap.h (98%) rename src/{lib => lib_spark/spark}/collections/concurrent_factory.h (97%) rename src/{lib => lib_spark/spark}/collections/concurrent_queue.h (100%) rename src/{lib => lib_spark/spark}/collections/concurrent_unordered_map.h (98%) rename src/{lib => lib_spark/spark}/collections/concurrent_unordered_map_iterator.h (100%) rename src/{lib => lib_spark/spark}/collections/tests/concurrent_unordered_map_tests.cpp (97%) rename src/{lib => lib_spark/spark}/communincation/websockets/tests/WebsocketSyncClientTests.cpp (100%) rename src/{lib => lib_spark/spark}/config/ConfigDownloader.cpp (96%) rename src/{lib => lib_spark/spark}/config/ConfigDownloader.h (92%) rename src/{lib => lib_spark/spark}/config/ConfigErrorCollector.cpp (98%) rename src/{lib => lib_spark/spark}/config/ConfigErrorCollector.h (100%) rename src/{lib => lib_spark/spark}/config/ConfigLog.h (97%) rename src/{lib => lib_spark/spark}/config/ConfigPropertyEvaluator.cpp (98%) rename src/{lib => lib_spark/spark}/config/ConfigPropertyEvaluator.h (85%) rename src/{lib => lib_spark/spark}/config/ConfigQuerier.cpp (92%) rename src/{lib => lib_spark/spark}/config/ConfigQuerier.h (89%) rename src/{lib => lib_spark/spark}/config/ConfigQueryErrors.h (83%) rename src/{lib => lib_spark/spark}/config/ConfigValueQueue.cpp (99%) rename src/{lib => lib_spark/spark}/config/ConfigValueQueue.h (95%) rename src/{lib => lib_spark/spark}/config/ConfigurationException.cpp (100%) rename src/{lib => lib_spark/spark}/config/ConfigurationException.h (98%) rename src/{lib => lib_spark/spark}/config/ConfigurationState.cpp (98%) rename src/{lib => lib_spark/spark}/config/ConfigurationState.h (98%) rename src/{lib => lib_spark/spark}/config/PreprocessInputStream.cpp (100%) rename src/{lib => lib_spark/spark}/config/PreprocessInputStream.h (95%) rename src/{lib => lib_spark/spark}/config/config.cpp (98%) rename src/{lib => lib_spark/spark}/config/config.h (97%) rename src/{lib => lib_spark/spark}/config/extensions/extensions.proto (100%) rename src/{lib => lib_spark/spark}/config/invalid/invalid.proto (100%) rename src/{lib => lib_spark/spark}/config/profiles/README.md (100%) rename src/{lib => lib_spark/spark}/config/profiles/data_stream/data_stream_config.conf (100%) rename src/{lib => lib_spark/spark}/config/profiles/default/SecurityMetadataCollection.conf (100%) rename src/{lib => lib_spark/spark}/config/profiles/default/cme_reference_data.conf (100%) rename src/{lib => lib_spark/spark}/config/profiles/default/deployment_type.conf (100%) rename src/{lib => lib_spark/spark}/config/profiles/default/exchange_sim_cfg.conf (100%) rename src/{lib => lib_spark/spark}/config/profiles/default/jetfix.conf (100%) rename src/{lib => lib_spark/spark}/config/profiles/default/keycode.conf (100%) rename src/{lib => lib_spark/spark}/config/profiles/default/logging.conf (100%) rename src/{lib => lib_spark/spark}/config/profiles/default/marex_fix_cfg.conf (100%) rename src/{lib => lib_spark/spark}/config/profiles/default/market_data.conf (100%) rename src/{lib => lib_spark/spark}/config/profiles/default/mercury_cfg.conf (100%) rename src/{lib => lib_spark/spark}/config/profiles/default/okx_exe_cfg.conf (100%) rename src/{lib => lib_spark/spark}/config/profiles/default/orderman_cfg.conf (100%) rename src/{lib => lib_spark/spark}/config/profiles/default/orders_fills_cleanup.conf (100%) rename src/{lib => lib_spark/spark}/config/profiles/default/ports.conf (100%) rename src/{lib => lib_spark/spark}/config/profiles/default/position_cfg.conf (100%) rename src/{lib => lib_spark/spark}/config/profiles/default/quickbus_cfg.conf (100%) rename src/{lib => lib_spark/spark}/config/profiles/default/span.conf (100%) rename src/{lib => lib_spark/spark}/config/profiles/default/spreader.conf (100%) rename src/{lib => lib_spark/spark}/config/profiles/default/symbols.conf (100%) rename src/{lib => lib_spark/spark}/config/profiles/default/taifex_reference_data.conf (100%) rename src/{lib => lib_spark/spark}/config/profiles/default/testkeys.conf (100%) rename src/{lib => lib_spark/spark}/config/profiles/default/threads.conf (100%) rename src/{lib => lib_spark/spark}/config/profiles/default/toggles.conf (100%) rename src/{lib => lib_spark/spark}/config/profiles/default/ui.conf (100%) rename src/{lib => lib_spark/spark}/config/profiles/md_dev/market_data_config.conf (100%) rename src/{lib => lib_spark/spark}/config/profiles/md_prod/market_data_config.conf (100%) rename src/{lib => lib_spark/spark}/config/protos/algo_types.proto (100%) rename src/{lib => lib_spark/spark}/config/protos/cme_reference_data.proto (82%) rename src/{lib => lib_spark/spark}/config/protos/data_stream_config.proto (100%) rename src/{lib => lib_spark/spark}/config/protos/deployment_type.proto (100%) rename src/{lib => lib_spark/spark}/config/protos/exchange_sim_cfg.proto (100%) rename src/{lib => lib_spark/spark}/config/protos/jetfix.proto (98%) rename src/{lib => lib_spark/spark}/config/protos/keycode.proto (100%) rename src/{lib => lib_spark/spark}/config/protos/logging.proto (100%) rename src/{lib => lib_spark/spark}/config/protos/marex_fix_cfg.proto (100%) rename src/{lib => lib_spark/spark}/config/protos/market_data.proto (100%) rename src/{lib => lib_spark/spark}/config/protos/mercury_cfg.proto (100%) rename src/{lib => lib_spark/spark}/config/protos/okx_exe_cfg.proto (100%) rename src/{lib => lib_spark/spark}/config/protos/orderman_cfg.proto (100%) rename src/{lib => lib_spark/spark}/config/protos/orders_fills_cleanup.proto (100%) rename src/{lib => lib_spark/spark}/config/protos/perflog_cfg.proto (100%) rename src/{lib => lib_spark/spark}/config/protos/ports.proto (100%) rename src/{lib => lib_spark/spark}/config/protos/position_cfg.proto (95%) rename src/{lib => lib_spark/spark}/config/protos/quickbus_cfg.proto (100%) rename src/{lib => lib_spark/spark}/config/protos/span.proto (100%) rename src/{lib => lib_spark/spark}/config/protos/spartan.proto (100%) rename src/{lib => lib_spark/spark}/config/protos/spreader.proto (100%) rename src/{lib => lib_spark/spark}/config/protos/subprocess.proto (100%) rename src/{lib => lib_spark/spark}/config/protos/symbols.proto (100%) rename src/{lib => lib_spark/spark}/config/protos/system_config.proto (100%) rename src/{lib => lib_spark/spark}/config/protos/taifex_reference_data.proto (76%) rename src/{lib => lib_spark/spark}/config/protos/testkeys.proto (96%) rename src/{lib => lib_spark/spark}/config/protos/threads.proto (100%) rename src/{lib => lib_spark/spark}/config/protos/toggles.proto (93%) rename src/{lib => lib_spark/spark}/config/protos/ui.proto (100%) rename src/{lib => lib_spark/spark}/config/tests/HTTPServer.cpp (98%) rename src/{lib => lib_spark/spark}/config/tests/HTTPServer.h (100%) rename src/{lib => lib_spark/spark}/config/tests/config_ref_tests.cpp (99%) rename src/{lib => lib_spark/spark}/config/tests/config_tests.cpp (98%) rename src/{lib => lib_spark/spark}/config/text_format/strutil.h (100%) rename src/{lib => lib_spark/spark}/config/text_format/text_format.cpp (100%) rename src/{lib => lib_spark/spark}/config/text_format/text_format.h (100%) rename src/{lib => lib_spark/spark}/core/AllSameType.h (100%) rename src/{lib => lib_spark/spark}/core/BoolName.h (100%) rename src/{lib => lib_spark/spark}/core/EnumMacros.h (100%) rename src/{lib => lib_spark/spark}/core/FMT.h (100%) rename src/{lib => lib_spark/spark}/core/FMT_IMPL.h (100%) rename src/{lib => lib_spark/spark}/core/HashPhaser.h (100%) rename src/{lib => lib_spark/spark}/core/LOCK_GUARD.h (100%) rename src/{lib => lib_spark/spark}/core/NaN.h (100%) rename src/{lib => lib_spark/spark}/core/StringContains.h (100%) rename src/{lib => lib_spark/spark}/core/StringFiller.h (100%) rename src/{lib => lib_spark/spark}/core/StringFinder.h (100%) rename src/{lib => lib_spark/spark}/core/StringJoiner.h (100%) rename src/{lib => lib_spark/spark}/core/TableFormatter.h (100%) rename src/{lib => lib_spark/spark}/core/TimeSpan.cpp (100%) rename src/{lib => lib_spark/spark}/core/TimeSpan.h (98%) rename src/{lib => lib_spark/spark}/core/TimeStamp.cpp (98%) rename src/{lib => lib_spark/spark}/core/TimeStamp.h (98%) rename src/{lib => lib_spark/spark}/core/ValueWrapper.h (80%) rename src/{lib => lib_spark/spark}/core/VectorAdapter.h (100%) rename src/{lib => lib_spark/spark}/core/start_stop_state_machine.cpp (95%) rename src/{lib => lib_spark/spark}/core/start_stop_state_machine.h (97%) rename src/{lib => lib_spark/spark}/datastreams/Tables/StreamData.h (99%) rename src/{lib => lib_spark/spark}/datastreams/Tables/tests/stream_tests.cpp (93%) rename src/{lib => lib_spark/spark}/domain/AccountID.h (80%) rename src/{lib => lib_spark/spark}/domain/AggressorSide.h (89%) rename src/{lib => lib_spark/spark}/domain/BUY_SELL.h (73%) rename src/{lib => lib_spark/spark}/domain/Book.h (97%) rename src/{lib => lib_spark/spark}/domain/BookLevel.h (98%) rename src/{lib => lib_spark/spark}/domain/BookLevelComp.h (100%) rename src/{lib => lib_spark/spark}/domain/BookSide.h (98%) rename src/{lib => lib_spark/spark}/domain/BookSide_PopulatedIterator.h (100%) rename src/{lib => lib_spark/spark}/domain/DomainSecurityUtils.cpp (96%) rename src/{lib => lib_spark/spark}/domain/DomainSecurityUtils.h (84%) rename src/{lib => lib_spark/spark}/domain/FTXSecurity.h (100%) rename src/{lib => lib_spark/spark}/domain/FutureSecurity.h (92%) rename src/{lib => lib_spark/spark}/domain/LegDefinition.h (97%) rename src/{lib => lib_spark/spark}/domain/NewBookSide.h (100%) rename src/{lib => lib_spark/spark}/domain/NewOrder.cpp (100%) rename src/{lib => lib_spark/spark}/domain/NewOrder.h (100%) rename src/{lib => lib_spark/spark}/domain/OptionSecurity.h (88%) rename src/{lib => lib_spark/spark}/domain/OrderDefinition.cpp (100%) rename src/{lib => lib_spark/spark}/domain/OrderDefinition.h (72%) rename src/{lib => lib_spark/spark}/domain/OrderKey.h (80%) rename src/{lib => lib_spark/spark}/domain/OrderState.h (79%) rename src/{lib => lib_spark/spark}/domain/OrderStatus.cpp (100%) rename src/{lib => lib_spark/spark}/domain/OrderStatus.h (100%) rename src/{lib => lib_spark/spark}/domain/OrderUpdate.cpp (100%) rename src/{lib => lib_spark/spark}/domain/OrderUpdate.h (100%) rename src/{lib => lib_spark/spark}/domain/Price.h (99%) rename src/{lib => lib_spark/spark}/domain/PriceComp.h (100%) rename src/{lib => lib_spark/spark}/domain/Quantity.h (97%) rename src/{lib => lib_spark/spark}/domain/RFQ.h (100%) rename src/{lib => lib_spark/spark}/domain/Security.cpp (90%) rename src/{lib => lib_spark/spark}/domain/Security.h (97%) rename src/{lib => lib_spark/spark}/domain/SecurityCommon.h (91%) rename src/{lib => lib_spark/spark}/domain/SecurityCriteria.cpp (94%) rename src/{lib => lib_spark/spark}/domain/SecurityCriteria.h (94%) rename src/{lib => lib_spark/spark}/domain/SecurityCriteriaClause.cpp (95%) rename src/{lib => lib_spark/spark}/domain/SecurityCriteriaClause.h (93%) rename src/{lib => lib_spark/spark}/domain/SecurityID.h (90%) rename src/{lib => lib_spark/spark}/domain/SecurityMarketDataStatistics.h (91%) rename src/{lib => lib_spark/spark}/domain/SecurityState.h (100%) rename src/{lib => lib_spark/spark}/domain/Side.cpp (100%) rename src/{lib => lib_spark/spark}/domain/Side.h (99%) rename src/{lib => lib_spark/spark}/domain/SideReq.h (100%) rename src/{lib => lib_spark/spark}/domain/SpotSecurity.h (100%) rename src/{lib => lib_spark/spark}/domain/SpreadSecurity.h (96%) rename src/{lib => lib_spark/spark}/domain/TimeInForce.cpp (100%) rename src/{lib => lib_spark/spark}/domain/TimeInForce.h (100%) rename src/{lib => lib_spark/spark}/domain/TradeRecord.h (85%) rename src/{lib => lib_spark/spark}/domain/UserID.h (80%) rename src/{lib => lib_spark/spark}/domain/book_side_consumer.h (97%) rename src/{lib => lib_spark/spark}/domain/cme/GlbxOrderDefinition.h (100%) rename src/{lib => lib_spark/spark}/domain/cme/GlbxOrderState.h (100%) rename src/{lib => lib_spark/spark}/domain/deribit/DeribitOrderDefinition.h (100%) rename src/{lib => lib_spark/spark}/domain/deribit/DeribitOrderState.h (100%) rename src/{lib => lib_spark/spark}/domain/synthetic_book_side.cpp (98%) rename src/{lib => lib_spark/spark}/domain/synthetic_book_side.h (97%) rename src/{lib => lib_spark/spark}/domain_model/PutOrCall.h (84%) rename src/{lib => lib_spark/spark}/domain_model/Security.cpp (98%) rename src/{lib => lib_spark/spark}/domain_model/Security.h (98%) rename src/{lib => lib_spark/spark}/domain_model/Security.proto (99%) rename src/{lib => lib_spark/spark}/domain_model/SecurityKey.h (70%) rename src/{lib => lib_spark/spark}/domain_model/SecurityTests.cpp (100%) rename src/{lib => lib_spark/spark}/domain_model/SecurityType.h (85%) rename src/{lib => lib_spark/spark}/domain_model/Side.h (52%) rename src/{lib => lib_spark/spark}/domain_model/Venue.h (83%) rename src/{lib => lib_spark/spark}/domain_model/common.cpp (96%) rename src/{lib => lib_spark/spark}/domain_model/common.h (94%) rename src/{lib => lib_spark/spark}/domain_model/sod.cpp (86%) rename src/{lib => lib_spark/spark}/domain_model/sod.h (87%) rename src/{lib => lib_spark/spark}/domain_model/tests/domain_tests.cpp (95%) rename src/{lib => lib_spark/spark}/expression/BooleanGrammar.cpp (100%) rename src/{lib => lib_spark/spark}/expression/BooleanGrammar.h (99%) rename src/{lib => lib_spark/spark}/expression/ExpressionEvaluator.cpp (100%) rename src/{lib => lib_spark/spark}/expression/ExpressionEvaluator.h (100%) rename src/{lib => lib_spark/spark}/expression/IPropertyEvaluator.h (100%) rename src/{lib => lib_spark/spark}/expression/ParserExceptions.cpp (100%) rename src/{lib => lib_spark/spark}/expression/ParserExceptions.h (100%) rename src/{lib => lib_spark/spark}/expression/RecursionGuard.h (97%) rename src/{lib => lib_spark/spark}/expression/Value.cpp (100%) rename src/{lib => lib_spark/spark}/expression/Value.h (100%) rename src/{lib => lib_spark/spark}/expression/tests/expression_parser_tests.cpp (100%) rename src/{lib => lib_spark/spark}/io/JsonDumper.h (100%) rename src/{lib => lib_spark/spark}/io/JsonMacros.h (100%) rename src/{lib => lib_spark/spark}/io/JsonOptional.h (100%) rename src/{lib => lib_spark/spark}/io/JsonReader.cpp (98%) rename src/{lib => lib_spark/spark}/io/JsonReader.h (99%) rename src/{lib => lib_spark/spark}/io/JsonType.h (97%) rename src/{lib => lib_spark/spark}/io/ProtoPrinter.h (100%) rename src/{lib => lib_spark/spark}/io/ProtoReader.h (100%) rename src/{lib => lib_spark/spark}/io/QueryParams.cpp (100%) rename src/{lib => lib_spark/spark}/io/QueryParams.h (81%) rename src/{lib => lib_spark/spark}/io/URL.cpp (99%) rename src/{lib => lib_spark/spark}/io/URL.h (98%) rename src/{lib => lib_spark/spark}/io/http/HTTPHeaders.cpp (95%) rename src/{lib => lib_spark/spark}/io/http/HTTPHeaders.h (92%) rename src/{lib => lib_spark/spark}/io/http/HTTPResponse.cpp (100%) rename src/{lib => lib_spark/spark}/io/http/HTTPResponse.h (95%) rename src/{lib => lib_spark/spark}/io/http/HttpMethod.h (92%) rename src/{lib => lib_spark/spark}/io/http/HttpProtocol.h (85%) rename src/{lib => lib_spark/spark}/io/http/curl_headers.h (100%) rename src/{lib => lib_spark/spark}/io/http/curl_session.h (94%) rename src/{lib => lib_spark/spark}/io/http/http_client.cpp (94%) rename src/{lib => lib_spark/spark}/io/http/http_client.h (94%) rename src/{lib => lib_spark/spark}/io/http/http_request.h (96%) rename src/{lib => lib_spark/spark}/io/http/http_response.h (96%) rename src/{lib => lib_spark/spark}/io/http/i_http_response.h (100%) rename src/{lib => lib_spark/spark}/io/http/query_params.h (97%) rename src/{lib => lib_spark/spark}/io/json_formatter.h (100%) rename src/{lib => lib_spark/spark}/io/websocket/IJsonRpcHandler.cpp (100%) rename src/{lib => lib_spark/spark}/io/websocket/IJsonRpcHandler.h (70%) rename src/{lib => lib_spark/spark}/io/websocket/IWebsocketListener.h (100%) rename src/{lib => lib_spark/spark}/io/websocket/JsonRpcError.h (97%) rename src/{lib => lib_spark/spark}/io/websocket/JsonRpcHandler.cpp (97%) rename src/{lib => lib_spark/spark}/io/websocket/JsonRpcHandler.h (94%) rename src/{lib => lib_spark/spark}/io/websocket/JsonRpcId.h (97%) rename src/{lib => lib_spark/spark}/io/websocket/JsonRpcRequest.h (97%) rename src/{lib => lib_spark/spark}/io/websocket/JsonRpcResponse.h (96%) rename src/{lib => lib_spark/spark}/io/websocket/JsonRpcRouter.h (83%) rename src/{lib => lib_spark/spark}/io/websocket/WebsocketClient.cpp (99%) rename src/{lib => lib_spark/spark}/io/websocket/WebsocketClient.h (100%) rename src/{lib => lib_spark/spark}/io/websocket/WebsocketClientConfiguration.cpp (92%) rename src/{lib => lib_spark/spark}/io/websocket/WebsocketClientConfiguration.h (100%) rename src/{lib => lib_spark/spark}/io/websocket/WebsocketError.cpp (100%) rename src/{lib => lib_spark/spark}/io/websocket/WebsocketError.h (100%) rename src/{lib => lib_spark/spark}/io/websocket/WebsocketMessage.cpp (100%) rename src/{lib => lib_spark/spark}/io/websocket/WebsocketMessage.h (100%) rename src/{lib => lib_spark/spark}/io/websocket/WebsocketSSLClientInternal.cpp (99%) rename src/{lib => lib_spark/spark}/io/websocket/WebsocketSSLClientInternal.h (98%) rename src/{lib => lib_spark/spark}/io/websocket/tests/WebsocketClientTests.cpp (98%) rename src/{lib => lib_spark/spark}/io/websocket/websocket_client.cpp (96%) rename src/{lib => lib_spark/spark}/io/websocket/websocket_client.h (93%) rename src/{lib => lib_spark/spark}/io/websocket/websocket_client_config.h (92%) rename src/{lib => lib_spark/spark}/io/websocket/websocket_client_logger.h (96%) rename src/{lib => lib_spark/spark}/io/websocket/websocket_client_state.h (89%) rename src/{lib => lib_spark/spark}/io/websocket/websocket_close_status.h (87%) rename src/{lib => lib_spark/spark}/io/websocket/websocket_error_code.h (79%) rename src/{lib => lib_spark/spark}/io/websocket/websocketpp_exception_formatter.h (77%) rename src/{lib => lib_spark/spark}/jetfix/codec/FIXArray.cpp (100%) rename src/{lib => lib_spark/spark}/jetfix/codec/FIXArray.h (93%) rename src/{lib => lib_spark/spark}/jetfix/codec/FIXBuffer.h (98%) rename src/{lib => lib_spark/spark}/jetfix/codec/FIXEncodingStream.h (96%) rename src/{lib => lib_spark/spark}/jetfix/codec/FIXFragment.h (97%) rename src/{lib => lib_spark/spark}/jetfix/codec/FIXMsg.h (87%) rename src/{lib => lib_spark/spark}/jetfix/codec/FIXParser.h (97%) rename src/{lib => lib_spark/spark}/jetfix/codec/FIXWriter.h (100%) rename src/{lib => lib_spark/spark}/jetfix/codec/FieldDefinitions.h (100%) rename src/{lib => lib_spark/spark}/jetfix/codec/Fields.h (95%) rename src/{lib => lib_spark/spark}/jetfix/codec/Group.h (97%) rename src/{lib => lib_spark/spark}/jetfix/codec/IFIXMsg.h (85%) rename src/{lib => lib_spark/spark}/jetfix/codec/IFIXParser.h (86%) rename src/{lib => lib_spark/spark}/jetfix/codec/IFieldReader.h (100%) rename src/{lib => lib_spark/spark}/jetfix/codec/MessageDefinitions.h (94%) rename src/{lib => lib_spark/spark}/jetfix/codec/MessageTypes.h (100%) rename src/{lib => lib_spark/spark}/jetfix/codec/ReaderCursor.h (97%) rename src/{lib => lib_spark/spark}/jetfix/codec/WriterCursor.h (96%) rename src/{lib => lib_spark/spark}/jetfix/codec/f_toa.h (98%) rename src/{lib => lib_spark/spark}/jetfix/codec/i32_toa.h (100%) rename src/{lib => lib_spark/spark}/jetfix/codec/sum_bytes.h (100%) rename src/{lib => lib_spark/spark}/jetfix/common/InMsgBuffer.h (97%) rename src/{lib => lib_spark/spark}/jetfix/common/JetFIXError.h (100%) rename src/{lib => lib_spark/spark}/jetfix/common/OutFIX.cpp (100%) rename src/{lib => lib_spark/spark}/jetfix/common/OutFIX.h (89%) rename src/{lib => lib_spark/spark}/jetfix/common/OutFIXPtr.h (100%) rename src/{lib => lib_spark/spark}/jetfix/common/OutMsgVecPtr.h (100%) rename src/{lib => lib_spark/spark}/jetfix/connection/AsyncReader.cpp (96%) rename src/{lib => lib_spark/spark}/jetfix/connection/AsyncReader.h (100%) rename src/{lib => lib_spark/spark}/jetfix/connection/IConnection.cpp (100%) rename src/{lib => lib_spark/spark}/jetfix/connection/IConnection.h (100%) rename src/{lib => lib_spark/spark}/jetfix/connection/IConnectionObserver.h (100%) rename src/{lib => lib_spark/spark}/jetfix/connection/SocketConnection.cpp (93%) rename src/{lib => lib_spark/spark}/jetfix/connection/SocketConnection.h (90%) rename src/{lib => lib_spark/spark}/jetfix/gateway/CoreGateway.cpp (96%) rename src/{lib => lib_spark/spark}/jetfix/gateway/CoreGateway.h (90%) rename src/{lib => lib_spark/spark}/jetfix/gateway/ICoreGatewayEventSink.h (90%) rename src/{lib => lib_spark/spark}/jetfix/gateway/ICoreGatewayObserver.h (89%) rename src/{lib => lib_spark/spark}/jetfix/gateway/JetFIXGateway.cpp (100%) rename src/{lib => lib_spark/spark}/jetfix/gateway/JetFIXGateway.h (90%) rename src/{lib => lib_spark/spark}/jetfix/gateway/Session.cpp (97%) rename src/{lib => lib_spark/spark}/jetfix/gateway/Session.h (87%) create mode 100644 src/lib_spark/spark/jetfix/jetfix.h rename src/{lib => lib_spark/spark}/jetfix/store/FIXFileStore.cpp (95%) rename src/{lib => lib_spark/spark}/jetfix/store/FIXFileStore.h (90%) rename src/{lib => lib_spark/spark}/jetfix/store/IFIXStore.h (93%) rename src/{lib => lib_spark/spark}/jetfix/store/session_name.cpp (98%) rename src/{lib => lib_spark/spark}/jetfix/store/session_name.h (95%) rename src/{lib => lib_spark/spark}/jetfix/tests/async_reader_tests.cpp (95%) rename src/{lib => lib_spark/spark}/jetfix/tests/conv.py (100%) rename src/{lib => lib_spark/spark}/jetfix/tests/decoding_tests.cpp (93%) rename src/{lib => lib_spark/spark}/jetfix/tests/fix_encoding_stream_tests.cpp (98%) rename src/{lib => lib_spark/spark}/jetfix/tests/fix_fragment_tests.cpp (97%) rename src/{lib => lib_spark/spark}/jetfix/tests/jetfix_performance_tests.cpp (95%) rename src/{lib => lib_spark/spark}/jetfix/tests/sample_fix.cpp (100%) rename src/{lib => lib_spark/spark}/jetfix/tests/sample_fix.dat (100%) rename src/{lib => lib_spark/spark}/jetfix/tests/sample_fix.h (100%) rename src/{lib => lib_spark/spark}/jetfix/tests/store_tests.cpp (96%) rename src/{lib => lib_spark/spark}/logging/Common.h (96%) rename src/{lib => lib_spark/spark}/logging/LogRec.h (96%) rename src/{lib => lib_spark/spark}/logging/Logger.h (99%) rename src/{lib => lib_spark/spark}/logging/LoggerHub.cpp (97%) rename src/{lib => lib_spark/spark}/logging/LoggerHub.h (100%) rename src/{lib => lib_spark/spark}/logging/LoggingConfig.h (93%) rename src/{lib => lib_spark/spark}/logging/MsgPacking.h (100%) rename src/{lib => lib_spark/spark}/logging/Sink.cpp (95%) rename src/{lib => lib_spark/spark}/logging/Sink.h (95%) rename src/{lib => lib_spark/spark}/logging/ccapi_logger.h (94%) rename src/{lib => lib_spark/spark}/logging/log_var.h (91%) rename src/{lib => lib_spark/spark}/logging/logging.cpp (94%) rename src/{lib => lib_spark/spark}/logging/logging.h (98%) rename src/{lib => lib_spark/spark}/logging/tests/logging_tests.cpp (94%) rename src/{lib => lib_spark/spark}/logging/trace_log.h (100%) rename src/{lib => lib_spark/spark}/logging/trace_log_var.h (96%) rename src/{lib => lib_spark/spark}/md/CompositeMarketDataListener.h (100%) rename src/{lib => lib_spark/spark}/md/Diag/MDPeriodicDumper.cpp (93%) rename src/{lib => lib_spark/spark}/md/Diag/MDPeriodicDumper.h (85%) rename src/{lib => lib_spark/spark}/md/Diag/ShmDumper.cpp (95%) rename src/{lib => lib_spark/spark}/md/Diag/ShmDumper.h (77%) rename src/{lib => lib_spark/spark}/md/ExchangeOrderKey.h (83%) rename src/{lib => lib_spark/spark}/md/ExchangeSecurityKey.h (81%) rename src/{lib => lib_spark/spark}/md/GeneralMarketDataListener.cpp (95%) rename src/{lib => lib_spark/spark}/md/GeneralMarketDataListener.h (88%) rename src/{lib => lib_spark/spark}/md/GeneralSecurityIndex.h (90%) rename src/{lib => lib_spark/spark}/md/IMarketDataListener.h (94%) rename src/{lib => lib_spark/spark}/md/IMarketDataProvider.cpp (100%) rename src/{lib => lib_spark/spark}/md/IMarketDataProvider.h (89%) rename src/{lib => lib_spark/spark}/md/IMarketDataSource.cpp (100%) rename src/{lib => lib_spark/spark}/md/IMarketDataSource.h (100%) rename src/{lib => lib_spark/spark}/md/ISyntheticSecurityService.h (74%) rename src/{lib => lib_spark/spark}/md/IntPrice.h (95%) rename src/{lib => lib_spark/spark}/md/MBOProcessor.cpp (95%) rename src/{lib => lib_spark/spark}/md/MBOProcessor.h (92%) rename src/{lib => lib_spark/spark}/md/MBOServiceServer.cpp (94%) rename src/{lib => lib_spark/spark}/md/MBOServiceServer.h (82%) rename src/{lib => lib_spark/spark}/md/MDClient.cpp (94%) rename src/{lib => lib_spark/spark}/md/MDClient.h (75%) rename src/{lib => lib_spark/spark}/md/MDConsumer.cpp (99%) rename src/{lib => lib_spark/spark}/md/MDConsumer.h (93%) rename src/{lib => lib_spark/spark}/md/MDConsumerHandle.cpp (97%) rename src/{lib => lib_spark/spark}/md/MDConsumerHandle.h (98%) rename src/{lib => lib_spark/spark}/md/MDConsumerInterop.cpp (97%) rename src/{lib => lib_spark/spark}/md/MDProducer.cpp (95%) rename src/{lib => lib_spark/spark}/md/MDProducer.h (96%) rename src/{lib => lib_spark/spark}/md/MDProducerChannel.h (93%) rename src/{lib => lib_spark/spark}/md/MDProducerHandle.cpp (99%) rename src/{lib => lib_spark/spark}/md/MDProducerHandle.h (97%) rename src/{lib => lib_spark/spark}/md/MemorySegmentUtils.cpp (100%) rename src/{lib => lib_spark/spark}/md/MemorySegmentUtils.h (100%) rename src/{lib => lib_spark/spark}/md/PriceSize.cpp (95%) rename src/{lib => lib_spark/spark}/md/PriceSize.h (96%) rename src/{lib => lib_spark/spark}/md/Product.cpp (100%) rename src/{lib => lib_spark/spark}/md/Product.h (81%) rename src/{lib => lib_spark/spark}/md/SecurityCache.cpp (94%) rename src/{lib => lib_spark/spark}/md/SecurityCache.h (88%) rename src/{lib => lib_spark/spark}/md/SecurityDB.cpp (93%) rename src/{lib => lib_spark/spark}/md/SecurityDB.h (78%) rename src/{lib => lib_spark/spark}/md/SecurityIDRecorder.cpp (98%) rename src/{lib => lib_spark/spark}/md/SecurityIDRecorder.h (93%) rename src/{lib => lib_spark/spark}/md/SecurityIndex.h (96%) rename src/{lib => lib_spark/spark}/md/SecurityMapper.cpp (87%) rename src/{lib => lib_spark/spark}/md/SecurityMapper.h (100%) rename src/{lib => lib_spark/spark}/md/SecurityMarketState.cpp (100%) rename src/{lib => lib_spark/spark}/md/SecurityMarketState.h (100%) rename src/{lib => lib_spark/spark}/md/SecurityOracle.cpp (92%) rename src/{lib => lib_spark/spark}/md/SecurityOracle.h (87%) rename src/{lib => lib_spark/spark}/md/SecurityPtr.h (100%) rename src/{lib => lib_spark/spark}/md/SecurityStore.cpp (97%) rename src/{lib => lib_spark/spark}/md/SecurityStore.h (89%) rename src/{lib => lib_spark/spark}/md/SettlementRecorder.cpp (97%) rename src/{lib => lib_spark/spark}/md/SettlementRecorder.h (88%) rename src/{lib => lib_spark/spark}/md/Shm/FixedSecurity.cpp (99%) rename src/{lib => lib_spark/spark}/md/Shm/FixedSecurity.h (96%) rename src/{lib => lib_spark/spark}/md/Shm/MDStructure.h (98%) rename src/{lib => lib_spark/spark}/md/Shm/readme.txt (100%) rename src/{lib => lib_spark/spark}/md/ShmSegmentName.h (93%) rename src/{lib => lib_spark/spark}/md/SizeTypes.h (77%) rename src/{lib => lib_spark/spark}/md/SymbolLoader.h (94%) rename src/{lib => lib_spark/spark}/md/SyntheticSecurityService.cpp (93%) rename src/{lib => lib_spark/spark}/md/SyntheticSecurityService.h (80%) rename src/{lib => lib_spark/spark}/md/UserSymbol.h (96%) rename src/{lib => lib_spark/spark}/md/cme/CMEChannel.h (86%) rename src/{lib => lib_spark/spark}/md/cme/CMEConnection.h (95%) rename src/{lib => lib_spark/spark}/md/cme/GlbxMarketDataSubscription.h (100%) rename src/{lib => lib_spark/spark}/md/cme/MDP3Utils.cpp (93%) rename src/{lib => lib_spark/spark}/md/cme/MDP3Utils.h (94%) rename src/{lib => lib_spark/spark}/md/cme/mdp3_data_directory.h (94%) rename src/{lib => lib_spark/spark}/md/coconut2.h (100%) rename src/{lib => lib_spark/spark}/md/common.cpp (80%) rename src/{lib => lib_spark/spark}/md/common.h (70%) rename src/{lib => lib_spark/spark}/md/ice/ConnectivityConfiguration.APITest.xml (100%) rename src/{lib => lib_spark/spark}/md/ice/ConnectivityConfiguration.PerfTest.xml (100%) rename src/{lib => lib_spark/spark}/md/ice/ConnectivityConfiguration.Production.xml (100%) rename src/{lib => lib_spark/spark}/md/ice/ICEUtils.cpp (90%) rename src/{lib => lib_spark/spark}/md/ice/ICEUtils.h (95%) rename src/{lib => lib_spark/spark}/md/protos/co2.proto (99%) rename src/{lib => lib_spark/spark}/md/readme.md (100%) rename src/{lib => lib_spark/spark}/md/relay/QueryServer.cpp (96%) rename src/{lib => lib_spark/spark}/md/relay/QueryServer.h (81%) rename src/{lib => lib_spark/spark}/md/relay/RelayClient.cpp (96%) rename src/{lib => lib_spark/spark}/md/relay/RelayClient.h (86%) rename src/{lib => lib_spark/spark}/md/relay/RelayRecorder.cpp (93%) rename src/{lib => lib_spark/spark}/md/relay/RelayRecorder.h (97%) rename src/{lib => lib_spark/spark}/md/security_type_index.h (95%) rename src/{lib => lib_spark/spark}/md/service/MarketDataServiceServer.cpp (91%) rename src/{lib => lib_spark/spark}/md/service/MarketDataServiceServer.h (83%) rename src/{lib => lib_spark/spark}/md/test/Co2ManagedTestHelper.cpp (94%) rename src/{lib => lib_spark/spark}/md/test/Co2TestInstrument.cpp (96%) rename src/{lib => lib_spark/spark}/md/test/Co2TestInstrument.h (94%) rename src/{lib => lib_spark/spark}/md/test/mbo_tests.cpp (95%) rename src/{lib => lib_spark/spark}/md/test/md2_tests.cpp (99%) rename src/{lib => lib_spark/spark}/md/test/md_test_utils.cpp (100%) rename src/{lib => lib_spark/spark}/md/test/md_test_utils.h (89%) rename src/{lib => lib_spark/spark}/md/test/synthetic_book_merge_tests.cpp (96%) rename src/{lib => lib_spark/spark}/md/vendor/OnixsUtils.cpp (90%) rename src/{lib => lib_spark/spark}/md/vendor/OnixsUtils.h (100%) rename src/{lib => lib_spark/spark}/md/venue_index.h (96%) rename src/{lib => lib_spark/spark}/mercury/actors/Actor.h (96%) rename src/{lib => lib_spark/spark}/mercury/actors/ActorBroker.h (93%) rename src/{lib => lib_spark/spark}/mercury/actors/ContentSubscription.h (98%) rename src/{lib => lib_spark/spark}/mercury/actors/IPollableActor.cpp (100%) rename src/{lib => lib_spark/spark}/mercury/actors/IPollableActor.h (100%) rename src/{lib => lib_spark/spark}/mercury/actors/PingPong.h (80%) rename src/{lib => lib_spark/spark}/mercury/actors/Timer.h (86%) rename src/{lib => lib_spark/spark}/mercury/broker/Broker.cpp (98%) rename src/{lib => lib_spark/spark}/mercury/broker/Broker.h (95%) rename src/{lib => lib_spark/spark}/mercury/broker/BrokerProxy.cpp (97%) rename src/{lib => lib_spark/spark}/mercury/broker/BrokerProxy.h (91%) rename src/{lib => lib_spark/spark}/mercury/broker/ILocalBroker.cpp (70%) rename src/{lib => lib_spark/spark}/mercury/broker/ILocalBroker.h (87%) rename src/{lib => lib_spark/spark}/mercury/broker/IRemoteBroker.cpp (70%) rename src/{lib => lib_spark/spark}/mercury/broker/IRemoteBroker.h (87%) rename src/{lib => lib_spark/spark}/mercury/common/FatWrapper.h (99%) rename src/{lib => lib_spark/spark}/mercury/common/mercury_common.cpp (100%) rename src/{lib => lib_spark/spark}/mercury/common/mercury_common.h (89%) rename src/{lib => lib_spark/spark}/mercury/events/Event.h (72%) rename src/{lib => lib_spark/spark}/mercury/events/Stream.h (78%) rename src/{lib => lib_spark/spark}/mercury/events/TimerEvent.cpp (100%) rename src/{lib => lib_spark/spark}/mercury/events/TimerEvent.h (69%) rename src/{lib => lib_spark/spark}/mercury/events/Update.h (86%) rename src/{lib => lib_spark/spark}/mercury/executor/Executor.cpp (80%) rename src/{lib => lib_spark/spark}/mercury/executor/Executor.h (83%) rename src/{lib => lib_spark/spark}/mercury/synopsis/CacheAll.h (94%) rename src/{lib => lib_spark/spark}/mercury/synopsis/CacheLast.h (85%) rename src/{lib => lib_spark/spark}/mercury/synopsis/ISynopsisBuilder.h (88%) rename src/{lib => lib_spark/spark}/mercury/synopsis/MergeByKey.h (96%) rename src/{lib => lib_spark/spark}/mercury/synopsis/NoSynopsis.h (77%) rename src/{lib => lib_spark/spark}/mercury/topics/ITopic.h (86%) rename src/{lib => lib_spark/spark}/mercury/topics/Topic.cpp (100%) rename src/{lib => lib_spark/spark}/mercury/topics/Topic.h (90%) rename src/{lib => lib_spark/spark}/metrics/metrics.cpp (93%) rename src/{lib => lib_spark/spark}/metrics/metrics.h (100%) rename src/{lib => lib_spark/spark}/metrics/system_metrics.cpp (93%) rename src/{lib => lib_spark/spark}/metrics/system_metrics.h (100%) rename src/{lib => lib_spark/spark}/orderman/CancelOrderMsg.cpp (93%) rename src/{lib => lib_spark/spark}/orderman/CancelOrderMsg.h (80%) rename src/{lib => lib_spark/spark}/orderman/CancelReplaceOrderMsg.h (77%) rename src/{lib => lib_spark/spark}/orderman/ChildOrder.cpp (100%) rename src/{lib => lib_spark/spark}/orderman/ChildOrder.h (96%) rename src/{lib => lib_spark/spark}/orderman/CreateOrderMsg.cpp (95%) rename src/{lib => lib_spark/spark}/orderman/CreateOrderMsg.h (77%) rename src/{lib => lib_spark/spark}/orderman/Governor.cpp (100%) rename src/{lib => lib_spark/spark}/orderman/Governor.h (93%) rename src/{lib => lib_spark/spark}/orderman/IOrderListener.h (78%) rename src/{lib => lib_spark/spark}/orderman/IOrderMux.h (100%) rename src/{lib => lib_spark/spark}/orderman/OrderBuilder.cpp (100%) rename src/{lib => lib_spark/spark}/orderman/OrderBuilder.h (81%) rename src/{lib => lib_spark/spark}/orderman/OrderGateway.h (96%) rename src/{lib => lib_spark/spark}/orderman/OrderMsg.h (87%) rename src/{lib => lib_spark/spark}/orderman/OrderRouter.cpp (88%) rename src/{lib => lib_spark/spark}/orderman/OrderRouter.h (92%) rename src/{lib => lib_spark/spark}/orderman/OrderServiceServer.cpp (92%) rename src/{lib => lib_spark/spark}/orderman/OrderServiceServer.h (88%) rename src/{lib => lib_spark/spark}/orderman/OrderServices.cpp (99%) rename src/{lib => lib_spark/spark}/orderman/OrderServices.h (94%) rename src/{lib => lib_spark/spark}/orderman/RFQMsg.h (54%) rename src/{lib => lib_spark/spark}/orderman/Trade.h (65%) rename src/{lib => lib_spark/spark}/orderman/TradeVector.h (84%) rename src/{lib => lib_spark/spark}/orderman/account_id.h (81%) rename src/{lib => lib_spark/spark}/orderman/account_name.h (82%) rename src/{lib => lib_spark/spark}/orderman/actors/AsyncFactory.cpp (78%) rename src/{lib => lib_spark/spark}/orderman/actors/AsyncFactory.h (70%) rename src/{lib => lib_spark/spark}/orderman/actors/FillStore.cpp (94%) rename src/{lib => lib_spark/spark}/orderman/actors/FillStore.h (88%) rename src/{lib => lib_spark/spark}/orderman/actors/MDSource.cpp (99%) rename src/{lib => lib_spark/spark}/orderman/actors/MDSource.h (78%) rename src/{lib => lib_spark/spark}/orderman/actors/MDSupplementarySource.cpp (90%) rename src/{lib => lib_spark/spark}/orderman/actors/MDSupplementarySource.h (89%) rename src/{lib => lib_spark/spark}/orderman/actors/OrderStore.cpp (92%) rename src/{lib => lib_spark/spark}/orderman/actors/OrderStore.h (87%) rename src/{lib => lib_spark/spark}/orderman/actors/SODPosition.cpp (94%) rename src/{lib => lib_spark/spark}/orderman/actors/SODPosition.h (88%) rename src/{lib => lib_spark/spark}/orderman/actors/SecuritySrc.cpp (86%) rename src/{lib => lib_spark/spark}/orderman/actors/SecuritySrc.h (93%) rename src/{lib => lib_spark/spark}/orderman/actors/ServiceBridge.cpp (90%) rename src/{lib => lib_spark/spark}/orderman/actors/ServiceBridge.h (85%) rename src/{lib => lib_spark/spark}/orderman/actors/order_manager/OrderManager.cpp (94%) rename src/{lib => lib_spark/spark}/orderman/actors/order_manager/OrderManager.h (83%) rename src/{lib => lib_spark/spark}/orderman/actors/order_manager/OrderServicesData.cpp (82%) rename src/{lib => lib_spark/spark}/orderman/actors/order_manager/OrderServicesData.h (52%) rename src/{lib => lib_spark/spark}/orderman/actors/order_manager/PositionIndex.cpp (88%) rename src/{lib => lib_spark/spark}/orderman/actors/order_manager/PositionIndex.h (100%) rename src/{lib => lib_spark/spark}/orderman/actors/order_manager/SessionServices.h (88%) rename src/{lib => lib_spark/spark}/orderman/actors/order_manager/order_gateway_definition.h (68%) rename src/{lib => lib_spark/spark}/orderman/actors/order_manager/session_services_data.h (73%) rename src/{lib => lib_spark/spark}/orderman/audit/audit_cme.py (100%) rename src/{lib => lib_spark/spark}/orderman/calculations/ITheoCalculator.h (100%) rename src/{lib => lib_spark/spark}/orderman/calculations/TheoCalculator.cpp (98%) rename src/{lib => lib_spark/spark}/orderman/calculations/TheoCalculator.h (100%) rename src/{lib => lib_spark/spark}/orderman/ccapi/CCAPIConnectionConfig.h (88%) rename src/{lib => lib_spark/spark}/orderman/ccapi/CCAPIDeribitHelpers.cpp (96%) rename src/{lib => lib_spark/spark}/orderman/ccapi/CCAPIDeribitHelpers.h (82%) rename src/{lib => lib_spark/spark}/orderman/ccapi/CCAPIDeribitOrderMux.cpp (98%) rename src/{lib => lib_spark/spark}/orderman/ccapi/CCAPIDeribitOrderMux.h (92%) rename src/{lib => lib_spark/spark}/orderman/ccapi/CCAPIOrderCallbackMsgs.cpp (96%) rename src/{lib => lib_spark/spark}/orderman/ccapi/CCAPIOrderCallbackMsgs.h (98%) rename src/{lib => lib_spark/spark}/orderman/ccapi/CCAPIOrderState.cpp (100%) rename src/{lib => lib_spark/spark}/orderman/ccapi/CCAPIOrderState.h (89%) rename src/{lib => lib_spark/spark}/orderman/ccapi/CCAPISingleOrderManager.cpp (97%) rename src/{lib => lib_spark/spark}/orderman/ccapi/CCAPISingleOrderManager.h (95%) rename src/{lib => lib_spark/spark}/orderman/ccapi/ICCAPIOrderMux.h (84%) rename src/{lib => lib_spark/spark}/orderman/doc/attach_detach.org (100%) rename src/{lib => lib_spark/spark}/orderman/doc/event_flow.pdf (100%) rename src/{lib => lib_spark/spark}/orderman/doc/ilink3.org (100%) rename src/{lib => lib_spark/spark}/orderman/doc/order_man_notes.org (100%) rename src/{lib => lib_spark/spark}/orderman/events/AccountPnLUpdateEvent.h (71%) rename src/{lib => lib_spark/spark}/orderman/events/ActivateOrderEvent.h (77%) rename src/{lib => lib_spark/spark}/orderman/events/BookUpdateEvent.h (72%) rename src/{lib => lib_spark/spark}/orderman/events/CancelOrderEvent.h (81%) rename src/{lib => lib_spark/spark}/orderman/events/CancelRejectEvent.cpp (100%) rename src/{lib => lib_spark/spark}/orderman/events/CancelRejectEvent.h (65%) rename src/{lib => lib_spark/spark}/orderman/events/CrackOrderEvent.h (76%) rename src/{lib => lib_spark/spark}/orderman/events/CreateFIXBufferReplyEvent.h (72%) rename src/{lib => lib_spark/spark}/orderman/events/CreateFIXBufferRequestEvent.h (76%) rename src/{lib => lib_spark/spark}/orderman/events/CreateOrderReplyEvent.h (78%) rename src/{lib => lib_spark/spark}/orderman/events/CreateOrderRequestEvent.h (81%) rename src/{lib => lib_spark/spark}/orderman/events/DetachOrderEvent.h (76%) rename src/{lib => lib_spark/spark}/orderman/events/ExcessLiquidityUpdateEvent.h (79%) rename src/{lib => lib_spark/spark}/orderman/events/ExchangeOpenOrdersEvent.h (60%) rename src/{lib => lib_spark/spark}/orderman/events/ExchangePositionEvent.h (59%) rename src/{lib => lib_spark/spark}/orderman/events/FilledPositionEvent.cpp (100%) rename src/{lib => lib_spark/spark}/orderman/events/FilledPositionEvent.h (81%) rename src/{lib => lib_spark/spark}/orderman/events/GatewayStatusChangeEvent.h (80%) rename src/{lib => lib_spark/spark}/orderman/events/MDRequestEvent.h (87%) rename src/{lib => lib_spark/spark}/orderman/events/ManuallyBustFillsEvent.h (79%) rename src/{lib => lib_spark/spark}/orderman/events/NewAdminDataEvent.h (66%) rename src/{lib => lib_spark/spark}/orderman/events/NewExecutionReportEvent.cpp (100%) rename src/{lib => lib_spark/spark}/orderman/events/NewExecutionReportEvent.h (63%) rename src/{lib => lib_spark/spark}/orderman/events/NewSecuritiesEvent.h (79%) rename src/{lib => lib_spark/spark}/orderman/events/OrderDefinitionUpdateEvent.h (81%) rename src/{lib => lib_spark/spark}/orderman/events/OrderManagerReadyEvent.h (85%) rename src/{lib => lib_spark/spark}/orderman/events/OrderOpResultEvent.h (75%) rename src/{lib => lib_spark/spark}/orderman/events/OrderStateUpdateEvent.h (96%) rename src/{lib => lib_spark/spark}/orderman/events/RFQEvent.h (68%) rename src/{lib => lib_spark/spark}/orderman/events/SettlementRequestEvent.h (85%) rename src/{lib => lib_spark/spark}/orderman/events/SettlementUpdateEvent.h (71%) rename src/{lib => lib_spark/spark}/orderman/events/StatusUpdateEvent.h (69%) rename src/{lib => lib_spark/spark}/orderman/events/StoredFillEvent.h (85%) rename src/{lib => lib_spark/spark}/orderman/events/StoredOrderEvent.h (78%) rename src/{lib => lib_spark/spark}/orderman/events/TheoEvent.h (78%) rename src/{lib => lib_spark/spark}/orderman/events/TickerUpdateEvent.h (88%) rename src/{lib => lib_spark/spark}/orderman/events/TradeSignalEvent.h (73%) rename src/{lib => lib_spark/spark}/orderman/events/TradeSummarySignalDispatcher.h (91%) rename src/{lib => lib_spark/spark}/orderman/events/UpdateOrderEvent.h (86%) rename src/{lib => lib_spark/spark}/orderman/gateways/CCAPIExecutionGateway.cpp (91%) rename src/{lib => lib_spark/spark}/orderman/gateways/CCAPIExecutionGateway.h (81%) rename src/{lib => lib_spark/spark}/orderman/gateways/FakeExecutionGateway.cpp (85%) rename src/{lib => lib_spark/spark}/orderman/gateways/FakeExecutionGateway.h (100%) rename src/{lib => lib_spark/spark}/orderman/gateways/GLBXExecutionGateway.cpp (95%) rename src/{lib => lib_spark/spark}/orderman/gateways/GLBXExecutionGateway.h (100%) rename src/{lib => lib_spark/spark}/orderman/gateways/GLBXiLink3ExecutionGateway.cpp (92%) rename src/{lib => lib_spark/spark}/orderman/gateways/GLBXiLink3ExecutionGateway.h (95%) rename src/{lib => lib_spark/spark}/orderman/gateways/GLBXiLink3ExecutionGatewayState.h (92%) rename src/{lib => lib_spark/spark}/orderman/gateways/GeneralExecutionGateway.cpp (93%) rename src/{lib => lib_spark/spark}/orderman/gateways/GeneralExecutionGateway.h (88%) rename src/{lib => lib_spark/spark}/orderman/gateways/ICEExecutionGateway.cpp (95%) rename src/{lib => lib_spark/spark}/orderman/gateways/ICEExecutionGateway.h (100%) rename src/{server/sparkd/md/platforms/emumba => lib_spark/spark/orderman/gateways}/IEMOrderMuxer.h (98%) rename src/{lib => lib_spark/spark}/orderman/gateways/IExecutionGateway.cpp (100%) rename src/{lib => lib_spark/spark}/orderman/gateways/IExecutionGateway.h (78%) rename src/{lib => lib_spark/spark}/orderman/gateways/IExecutionGenericAdapter.cpp (100%) rename src/{lib => lib_spark/spark}/orderman/gateways/IExecutionGenericAdapter.h (86%) rename src/{lib => lib_spark/spark}/orderman/gateways/OkxExecutionGateway.cpp (97%) rename src/{lib => lib_spark/spark}/orderman/gateways/OkxExecutionGateway.h (88%) rename src/{lib => lib_spark/spark}/orderman/gateways/OnixFIXAdapter.cpp (96%) rename src/{lib => lib_spark/spark}/orderman/gateways/OnixFIXAdapter.h (77%) rename src/{lib => lib_spark/spark}/orderman/gateways/OnixFIXListener.cpp (95%) rename src/{lib => lib_spark/spark}/orderman/gateways/OnixFIXListener.h (90%) rename src/{lib => lib_spark/spark}/orderman/gateways/TrafixOrderStateHandler.cpp (94%) rename src/{lib => lib_spark/spark}/orderman/gateways/TrafixOrderStateHandler.h (84%) rename src/{lib => lib_spark/spark}/orderman/gateways/i_execution_gateway_provider.cpp (100%) rename src/{lib => lib_spark/spark}/orderman/gateways/i_execution_gateway_provider.h (79%) rename src/{lib => lib_spark/spark}/orderman/gateways/sim/SimExecutionGateway.cpp (95%) rename src/{lib => lib_spark/spark}/orderman/gateways/sim/SimExecutionGateway.h (80%) rename src/{lib => lib_spark/spark}/orderman/gateways/sim/SimExecutionGatewayFactory.cpp (91%) rename src/{lib => lib_spark/spark}/orderman/gateways/sim/SimExecutionGatewayFactory.h (86%) rename src/{lib => lib_spark/spark}/orderman/gateways/sim/SimExecutionGatewayUniqueWrapper.cpp (97%) rename src/{lib => lib_spark/spark}/orderman/gateways/sim/SimExecutionGatewayUniqueWrapper.h (92%) rename src/{lib => lib_spark/spark}/orderman/ilink3/IL3Connection.h (94%) rename src/{lib => lib_spark/spark}/orderman/ilink3/IL3ConnectionHandler.cpp (100%) rename src/{lib => lib_spark/spark}/orderman/ilink3/IL3ConnectionHandler.h (100%) rename src/{lib => lib_spark/spark}/orderman/ilink3/IL3Dispatcher.h (100%) rename src/{lib => lib_spark/spark}/orderman/ilink3/IL3GW.cpp (98%) rename src/{lib => lib_spark/spark}/orderman/ilink3/IL3GW.h (93%) rename src/{lib => lib_spark/spark}/orderman/ilink3/IL3GeneratedFull.h (100%) rename src/{lib => lib_spark/spark}/orderman/ilink3/IL3GeneratedFwd.h (100%) rename src/{lib => lib_spark/spark}/orderman/ilink3/IL3MessageFramer.h (100%) rename src/{lib => lib_spark/spark}/orderman/ilink3/IL3Parser.cpp (97%) rename src/{lib => lib_spark/spark}/orderman/ilink3/IL3Parser.h (93%) rename src/{lib => lib_spark/spark}/orderman/ilink3/IL3Reactor.cpp (99%) rename src/{lib => lib_spark/spark}/orderman/ilink3/IL3Reactor.h (100%) rename src/{lib => lib_spark/spark}/orderman/ilink3/IL3ReceiveBuffer.h (98%) rename src/{lib => lib_spark/spark}/orderman/ilink3/IL3SecDB.h (86%) rename src/{lib => lib_spark/spark}/orderman/ilink3/IL3State.h (92%) rename src/{lib => lib_spark/spark}/orderman/ilink3/ILink3Utils.cpp (99%) rename src/{lib => lib_spark/spark}/orderman/ilink3/ILink3Utils.h (87%) rename src/{lib => lib_spark/spark}/orderman/ilink3/RawMsg.h (100%) rename src/{lib => lib_spark/spark}/orderman/ilink3/SessionStore.cpp (93%) rename src/{lib => lib_spark/spark}/orderman/ilink3/SessionStore.h (95%) rename src/{lib => lib_spark/spark}/orderman/ilink3/TimeKeeper.h (86%) rename src/{lib => lib_spark/spark}/orderman/ilink3/generated/AvgPxInd.h (100%) rename src/{lib => lib_spark/spark}/orderman/ilink3/generated/BooleanFlag.h (100%) rename src/{lib => lib_spark/spark}/orderman/ilink3/generated/BooleanNULL.h (100%) rename src/{lib => lib_spark/spark}/orderman/ilink3/generated/BusinessReject521.h (100%) rename src/{lib => lib_spark/spark}/orderman/ilink3/generated/ClearingAcctType.h (100%) rename src/{lib => lib_spark/spark}/orderman/ilink3/generated/CmtaGiveUpCD.h (100%) rename src/{lib => lib_spark/spark}/orderman/ilink3/generated/CustOrdHandlInst.h (100%) rename src/{lib => lib_spark/spark}/orderman/ilink3/generated/CustOrderCapacity.h (100%) rename src/{lib => lib_spark/spark}/orderman/ilink3/generated/DATA.h (100%) rename src/{lib => lib_spark/spark}/orderman/ilink3/generated/DKReason.h (100%) rename src/{lib => lib_spark/spark}/orderman/ilink3/generated/Decimal32NULL.h (100%) rename src/{lib => lib_spark/spark}/orderman/ilink3/generated/Decimal64NULL.h (100%) rename src/{lib => lib_spark/spark}/orderman/ilink3/generated/Establish503.h (100%) rename src/{lib => lib_spark/spark}/orderman/ilink3/generated/EstablishmentAck504.h (100%) rename src/{lib => lib_spark/spark}/orderman/ilink3/generated/EstablishmentReject505.h (100%) rename src/{lib => lib_spark/spark}/orderman/ilink3/generated/ExecAckStatus.h (100%) rename src/{lib => lib_spark/spark}/orderman/ilink3/generated/ExecInst.h (100%) rename src/{lib => lib_spark/spark}/orderman/ilink3/generated/ExecMode.h (100%) rename src/{lib => lib_spark/spark}/orderman/ilink3/generated/ExecReason.h (100%) rename src/{lib => lib_spark/spark}/orderman/ilink3/generated/ExecTypTrdCxl.h (100%) rename src/{lib => lib_spark/spark}/orderman/ilink3/generated/ExecutionAck539.h (100%) rename src/{lib => lib_spark/spark}/orderman/ilink3/generated/ExecutionReportCancel534.h (100%) rename src/{lib => lib_spark/spark}/orderman/ilink3/generated/ExecutionReportElimination524.h (100%) rename src/{lib => lib_spark/spark}/orderman/ilink3/generated/ExecutionReportModify531.h (100%) rename src/{lib => lib_spark/spark}/orderman/ilink3/generated/ExecutionReportNew522.h (100%) rename src/{lib => lib_spark/spark}/orderman/ilink3/generated/ExecutionReportPendingCancel564.h (100%) rename src/{lib => lib_spark/spark}/orderman/ilink3/generated/ExecutionReportPendingReplace565.h (100%) rename src/{lib => lib_spark/spark}/orderman/ilink3/generated/ExecutionReportReject523.h (100%) rename src/{lib => lib_spark/spark}/orderman/ilink3/generated/ExecutionReportStatus532.h (100%) rename src/{lib => lib_spark/spark}/orderman/ilink3/generated/ExecutionReportTradeAddendumOutright548.h (100%) rename src/{lib => lib_spark/spark}/orderman/ilink3/generated/ExecutionReportTradeAddendumSpread549.h (100%) rename src/{lib => lib_spark/spark}/orderman/ilink3/generated/ExecutionReportTradeAddendumSpreadLeg550.h (100%) rename src/{lib => lib_spark/spark}/orderman/ilink3/generated/ExecutionReportTradeOutright525.h (100%) rename src/{lib => lib_spark/spark}/orderman/ilink3/generated/ExecutionReportTradeSpread526.h (100%) rename src/{lib => lib_spark/spark}/orderman/ilink3/generated/ExecutionReportTradeSpreadLeg527.h (100%) rename src/{lib => lib_spark/spark}/orderman/ilink3/generated/ExpCycle.h (100%) rename src/{lib => lib_spark/spark}/orderman/ilink3/generated/FTI.h (100%) rename src/{lib => lib_spark/spark}/orderman/ilink3/generated/GroupSize.h (100%) rename src/{lib => lib_spark/spark}/orderman/ilink3/generated/KeepAliveLapsed.h (100%) rename src/{lib => lib_spark/spark}/orderman/ilink3/generated/ListUpdAct.h (100%) rename src/{lib => lib_spark/spark}/orderman/ilink3/generated/ManualOrdInd.h (100%) rename src/{lib => lib_spark/spark}/orderman/ilink3/generated/ManualOrdIndReq.h (100%) rename src/{lib => lib_spark/spark}/orderman/ilink3/generated/MassActionOrdTyp.h (100%) rename src/{lib => lib_spark/spark}/orderman/ilink3/generated/MassActionResponse.h (100%) rename src/{lib => lib_spark/spark}/orderman/ilink3/generated/MassActionScope.h (100%) rename src/{lib => lib_spark/spark}/orderman/ilink3/generated/MassCancelTIF.h (100%) rename src/{lib => lib_spark/spark}/orderman/ilink3/generated/MassCxlReqTyp.h (100%) rename src/{lib => lib_spark/spark}/orderman/ilink3/generated/MassQuote517.h (100%) rename src/{lib => lib_spark/spark}/orderman/ilink3/generated/MassQuoteAck545.h (100%) rename src/{lib => lib_spark/spark}/orderman/ilink3/generated/MassStatusOrdTyp.h (100%) rename src/{lib => lib_spark/spark}/orderman/ilink3/generated/MassStatusReqTyp.h (100%) rename src/{lib => lib_spark/spark}/orderman/ilink3/generated/MassStatusTIF.h (100%) rename src/{lib => lib_spark/spark}/orderman/ilink3/generated/MaturityMonthYear.h (100%) rename src/{lib => lib_spark/spark}/orderman/ilink3/generated/MessageHeader.h (100%) rename src/{lib => lib_spark/spark}/orderman/ilink3/generated/Negotiate500.h (100%) rename src/{lib => lib_spark/spark}/orderman/ilink3/generated/NegotiationReject502.h (100%) rename src/{lib => lib_spark/spark}/orderman/ilink3/generated/NegotiationResponse501.h (100%) rename src/{lib => lib_spark/spark}/orderman/ilink3/generated/NewOrderCross544.h (100%) rename src/{lib => lib_spark/spark}/orderman/ilink3/generated/NewOrderSingle514.h (100%) rename src/{lib => lib_spark/spark}/orderman/ilink3/generated/NotApplied513.h (100%) rename src/{lib => lib_spark/spark}/orderman/ilink3/generated/OFMOverrideReq.h (100%) rename src/{lib => lib_spark/spark}/orderman/ilink3/generated/OrdStatusTrd.h (100%) rename src/{lib => lib_spark/spark}/orderman/ilink3/generated/OrdStatusTrdCxl.h (100%) rename src/{lib => lib_spark/spark}/orderman/ilink3/generated/OrderCancelReject535.h (100%) rename src/{lib => lib_spark/spark}/orderman/ilink3/generated/OrderCancelReplaceReject536.h (100%) rename src/{lib => lib_spark/spark}/orderman/ilink3/generated/OrderCancelReplaceRequest515.h (100%) rename src/{lib => lib_spark/spark}/orderman/ilink3/generated/OrderCancelRequest516.h (100%) rename src/{lib => lib_spark/spark}/orderman/ilink3/generated/OrderEventType.h (100%) rename src/{lib => lib_spark/spark}/orderman/ilink3/generated/OrderMassActionReport562.h (100%) rename src/{lib => lib_spark/spark}/orderman/ilink3/generated/OrderMassActionRequest529.h (100%) rename src/{lib => lib_spark/spark}/orderman/ilink3/generated/OrderMassStatusRequest530.h (100%) rename src/{lib => lib_spark/spark}/orderman/ilink3/generated/OrderStatus.h (100%) rename src/{lib => lib_spark/spark}/orderman/ilink3/generated/OrderStatusRequest533.h (100%) rename src/{lib => lib_spark/spark}/orderman/ilink3/generated/OrderType.h (100%) rename src/{lib => lib_spark/spark}/orderman/ilink3/generated/OrderTypeReq.h (100%) rename src/{lib => lib_spark/spark}/orderman/ilink3/generated/PRICE9.h (100%) rename src/{lib => lib_spark/spark}/orderman/ilink3/generated/PRICENULL9.h (100%) rename src/{lib => lib_spark/spark}/orderman/ilink3/generated/PartyDetailRole.h (100%) rename src/{lib => lib_spark/spark}/orderman/ilink3/generated/PartyDetailsDefinitionRequest518.h (100%) rename src/{lib => lib_spark/spark}/orderman/ilink3/generated/PartyDetailsDefinitionRequestAck519.h (100%) rename src/{lib => lib_spark/spark}/orderman/ilink3/generated/PartyDetailsListReport538.h (100%) rename src/{lib => lib_spark/spark}/orderman/ilink3/generated/PartyDetailsListRequest537.h (100%) rename src/{lib => lib_spark/spark}/orderman/ilink3/generated/QuoteAckStatus.h (100%) rename src/{lib => lib_spark/spark}/orderman/ilink3/generated/QuoteCancel528.h (100%) rename src/{lib => lib_spark/spark}/orderman/ilink3/generated/QuoteCancelAck563.h (100%) rename src/{lib => lib_spark/spark}/orderman/ilink3/generated/QuoteCxlStatus.h (100%) rename src/{lib => lib_spark/spark}/orderman/ilink3/generated/QuoteCxlTyp.h (100%) rename src/{lib => lib_spark/spark}/orderman/ilink3/generated/QuoteTyp.h (100%) rename src/{lib => lib_spark/spark}/orderman/ilink3/generated/README.txt (100%) rename src/{lib => lib_spark/spark}/orderman/ilink3/generated/RFQSide.h (100%) rename src/{lib => lib_spark/spark}/orderman/ilink3/generated/ReqResult.h (100%) rename src/{lib => lib_spark/spark}/orderman/ilink3/generated/RequestForQuote543.h (100%) rename src/{lib => lib_spark/spark}/orderman/ilink3/generated/RequestForQuoteAck546.h (100%) rename src/{lib => lib_spark/spark}/orderman/ilink3/generated/Retransmission509.h (100%) rename src/{lib => lib_spark/spark}/orderman/ilink3/generated/RetransmitReject510.h (100%) rename src/{lib => lib_spark/spark}/orderman/ilink3/generated/RetransmitRequest508.h (100%) rename src/{lib => lib_spark/spark}/orderman/ilink3/generated/SLEDS.h (100%) rename src/{lib => lib_spark/spark}/orderman/ilink3/generated/SMPI.h (100%) rename src/{lib => lib_spark/spark}/orderman/ilink3/generated/SecRspTyp.h (100%) rename src/{lib => lib_spark/spark}/orderman/ilink3/generated/SecurityDefinitionRequest560.h (100%) rename src/{lib => lib_spark/spark}/orderman/ilink3/generated/SecurityDefinitionResponse561.h (100%) rename src/{lib => lib_spark/spark}/orderman/ilink3/generated/Sequence506.h (100%) rename src/{lib => lib_spark/spark}/orderman/ilink3/generated/ShortSaleType.h (100%) rename src/{lib => lib_spark/spark}/orderman/ilink3/generated/SideNULL.h (100%) rename src/{lib => lib_spark/spark}/orderman/ilink3/generated/SideReq.h (100%) rename src/{lib => lib_spark/spark}/orderman/ilink3/generated/SideTimeInForce.h (100%) rename src/{lib => lib_spark/spark}/orderman/ilink3/generated/SplitMsg.h (100%) rename src/{lib => lib_spark/spark}/orderman/ilink3/generated/Terminate507.h (100%) rename src/{lib => lib_spark/spark}/orderman/ilink3/generated/TimeInForce.h (100%) rename src/{lib => lib_spark/spark}/orderman/ilink3/generated/TradeAddendum.h (100%) rename src/{lib => lib_spark/spark}/orderman/ilink3/generated/generate.sh (100%) rename src/{lib => lib_spark/spark}/orderman/ilink3/generated/ilinkbinary.xml (100%) rename src/{lib => lib_spark/spark}/orderman/ilink3/generated/sbe-all-1.27.0.jar (100%) rename src/{lib => lib_spark/spark}/orderman/ilink3/test/IL3TestExchange.h (100%) rename src/{lib => lib_spark/spark}/orderman/ilink3/test/ILinkGWTests.cpp (99%) rename src/{lib => lib_spark/spark}/orderman/limiter/LimitStore.cpp (100%) rename src/{lib => lib_spark/spark}/orderman/limiter/LimitStore.h (97%) rename src/{lib => lib_spark/spark}/orderman/limiter/Limiter.cpp (96%) rename src/{lib => lib_spark/spark}/orderman/limiter/Limiter.h (96%) rename src/{lib => lib_spark/spark}/orderman/limiter/LimiterUtils.h (98%) rename src/{lib => lib_spark/spark}/orderman/limiter/ProductLimitNode.cpp (100%) rename src/{lib => lib_spark/spark}/orderman/limiter/ProductLimitNode.h (93%) rename src/{lib => lib_spark/spark}/orderman/limiter/ProductLimitTree.cpp (100%) rename src/{lib => lib_spark/spark}/orderman/limiter/ProductLimitTree.h (80%) rename src/{lib => lib_spark/spark}/orderman/limiter/SecurityLimitNode.cpp (100%) rename src/{lib => lib_spark/spark}/orderman/limiter/SecurityLimitNode.h (90%) rename src/{lib => lib_spark/spark}/orderman/limiter/SecurityLimitTree.cpp (87%) rename src/{lib => lib_spark/spark}/orderman/limiter/SecurityLimitTree.h (93%) rename src/{lib => lib_spark/spark}/orderman/limiter/tests/limit_tests.cpp (96%) rename src/{lib => lib_spark/spark}/orderman/log_messages/cancel_order_log.cpp (92%) rename src/{lib => lib_spark/spark}/orderman/log_messages/cancel_order_log.h (86%) rename src/{lib => lib_spark/spark}/orderman/log_messages/create_order_log.cpp (92%) rename src/{lib => lib_spark/spark}/orderman/log_messages/create_order_log.h (88%) rename src/{lib => lib_spark/spark}/orderman/log_messages/execution_report_log.cpp (85%) rename src/{lib => lib_spark/spark}/orderman/log_messages/execution_report_log.h (90%) rename src/{lib => lib_spark/spark}/orderman/log_messages/modify_order_log.cpp (84%) rename src/{lib => lib_spark/spark}/orderman/log_messages/modify_order_log.h (91%) rename src/{lib => lib_spark/spark}/orderman/order_desc.cpp (93%) rename src/{lib => lib_spark/spark}/orderman/order_desc.h (100%) rename src/{lib => lib_spark/spark}/orderman/order_factory/DynamicAlgoBuilder.h (100%) rename src/{lib => lib_spark/spark}/orderman/order_factory/DynamicOrderBuilder.h (100%) rename src/{lib => lib_spark/spark}/orderman/order_factory/DynamicOrderRegistry.cpp (90%) rename src/{lib => lib_spark/spark}/orderman/order_factory/DynamicOrderRegistry.h (81%) rename src/{lib => lib_spark/spark}/orderman/order_factory/IOrderFactory.h (92%) rename src/{lib => lib_spark/spark}/orderman/order_factory/OrderFactory.cpp (82%) rename src/{lib => lib_spark/spark}/orderman/order_factory/OrderFactory.h (92%) rename src/{lib => lib_spark/spark}/orderman/order_key.h (81%) rename src/{lib => lib_spark/spark}/orderman/orderman_utils/Book.h (93%) rename src/{lib => lib_spark/spark}/orderman/orderman_utils/BookUtils.cpp (100%) rename src/{lib => lib_spark/spark}/orderman/orderman_utils/BookUtils.h (67%) rename src/{lib => lib_spark/spark}/orderman/orderman_utils/CancelReject.h (82%) rename src/{lib => lib_spark/spark}/orderman/orderman_utils/EventStream.h (96%) rename src/{lib => lib_spark/spark}/orderman/orderman_utils/ExchangeOpenOrders.h (74%) rename src/{lib => lib_spark/spark}/orderman/orderman_utils/ExchangePosition.h (74%) rename src/{lib => lib_spark/spark}/orderman/orderman_utils/ExecutionReport.cpp (92%) rename src/{lib => lib_spark/spark}/orderman/orderman_utils/ExecutionReport.h (92%) rename src/{lib => lib_spark/spark}/orderman/orderman_utils/Formatter.h (93%) rename src/{lib => lib_spark/spark}/orderman/orderman_utils/OkxUtils.h (96%) rename src/{lib => lib_spark/spark}/orderman/orderman_utils/PriceComp.h (91%) rename src/{lib => lib_spark/spark}/orderman/orderman_utils/fix_order_codec.cpp (100%) rename src/{lib => lib_spark/spark}/orderman/orderman_utils/fix_order_codec.h (94%) rename src/{lib => lib_spark/spark}/orderman/orderman_utils/orderman_common.h (96%) rename src/{lib => lib_spark/spark}/orderman/orderman_utils/orderman_utils.cpp (99%) rename src/{lib => lib_spark/spark}/orderman/orderman_utils/orderman_utils.h (99%) rename src/{lib => lib_spark/spark}/orderman/orders/CompositeOrder.cpp (93%) rename src/{lib => lib_spark/spark}/orderman/orders/CompositeOrder.h (95%) rename src/{lib => lib_spark/spark}/orderman/orders/DynamicOrder.cpp (95%) rename src/{lib => lib_spark/spark}/orderman/orders/DynamicOrder.h (87%) rename src/{lib => lib_spark/spark}/orderman/orders/EMNativeOrder.cpp (95%) rename src/{lib => lib_spark/spark}/orderman/orders/EMNativeOrder.h (90%) rename src/{lib => lib_spark/spark}/orderman/orders/GLBXNativeOrder.cpp (97%) rename src/{lib => lib_spark/spark}/orderman/orders/GLBXNativeOrder.h (95%) rename src/{lib => lib_spark/spark}/orderman/orders/ICENativeOrder.cpp (98%) rename src/{lib => lib_spark/spark}/orderman/orders/ICENativeOrder.h (97%) rename src/{lib => lib_spark/spark}/orderman/orders/NativeOrderBase.h (80%) rename src/{lib => lib_spark/spark}/orderman/orders/Order.cpp (96%) rename src/{lib => lib_spark/spark}/orderman/orders/Order.h (96%) rename src/{lib => lib_spark/spark}/orderman/orders/OrderOpResult.h (92%) rename src/{lib => lib_spark/spark}/orderman/orders/PreActivationOrderServices.h (94%) rename src/{lib => lib_spark/spark}/orderman/orders/TimeBoxOrder.cpp (98%) rename src/{lib => lib_spark/spark}/orderman/orders/TimeBoxOrder.h (91%) rename src/{lib => lib_spark/spark}/orderman/orders/TriggerOrder.cpp (97%) rename src/{lib => lib_spark/spark}/orderman/orders/TriggerOrder.h (93%) rename src/{lib => lib_spark/spark}/orderman/orders/TriggerOrderCancelMode.h (94%) rename src/{lib => lib_spark/spark}/orderman/orders/TriggerOrderState.h (94%) rename src/{lib => lib_spark/spark}/orderman/orders/algo/AlgoWrapperOrder.cpp (98%) rename src/{lib => lib_spark/spark}/orderman/orders/algo/AlgoWrapperOrder.h (97%) rename src/{lib => lib_spark/spark}/orderman/orders/algo/ChildTemplate.h (100%) rename src/{lib => lib_spark/spark}/orderman/orders/algo/DynamicHelpers.cpp (100%) rename src/{lib => lib_spark/spark}/orderman/orders/algo/DynamicHelpers.h (90%) rename src/{lib => lib_spark/spark}/orderman/orders/algo/IAlgoOrder.h (95%) create mode 100644 src/lib_spark/spark/orderman/orders/algo/IAlgoServices.cpp rename src/{lib => lib_spark/spark}/orderman/orders/algo/IAlgoServices.h (97%) rename src/{lib => lib_spark/spark}/orderman/orders/algo/IBeforeLaunchAlgoServices.cpp (70%) rename src/{lib => lib_spark/spark}/orderman/orders/algo/IBeforeLaunchAlgoServices.h (90%) rename src/{lib => lib_spark/spark}/orderman/orders/algo/PositionUpdate.cpp (87%) rename src/{lib => lib_spark/spark}/orderman/orders/algo/PositionUpdate.h (77%) rename src/{lib => lib_spark/spark}/orderman/orders/algo/algo_orders/CoverAlgo.cpp (97%) rename src/{lib => lib_spark/spark}/orderman/orders/algo/algo_orders/CoverAlgo.h (96%) rename src/{lib => lib_spark/spark}/orderman/orders/algo/algo_orders/DeleteAndCoverAlgo.cpp (92%) rename src/{lib => lib_spark/spark}/orderman/orders/algo/algo_orders/DeleteAndCoverAlgo.h (92%) rename src/{lib => lib_spark/spark}/orderman/orders/algo/algo_orders/DormanAlgo.cpp (93%) rename src/{lib => lib_spark/spark}/orderman/orders/algo/algo_orders/DormanAlgo.h (95%) rename src/{lib => lib_spark/spark}/orderman/orders/algo/algo_orders/IcebergAlgo.cpp (94%) rename src/{lib => lib_spark/spark}/orderman/orders/algo/algo_orders/IcebergAlgo.h (94%) rename src/{lib => lib_spark/spark}/orderman/orders/algo/algo_orders/JoinAlgo.cpp (94%) rename src/{lib => lib_spark/spark}/orderman/orders/algo/algo_orders/JoinAlgo.h (95%) rename src/{lib => lib_spark/spark}/orderman/orders/algo/algo_orders/LeanAlgo.cpp (96%) rename src/{lib => lib_spark/spark}/orderman/orders/algo/algo_orders/LeanAlgo.h (93%) rename src/{lib => lib_spark/spark}/orderman/orders/algo/algo_orders/LimitCoverAlgo.cpp (92%) rename src/{lib => lib_spark/spark}/orderman/orders/algo/algo_orders/LimitCoverAlgo.h (90%) rename src/{lib => lib_spark/spark}/orderman/orders/algo/algo_orders/OffsetAlgo.cpp (95%) rename src/{lib => lib_spark/spark}/orderman/orders/algo/algo_orders/OffsetAlgo.h (95%) rename src/{lib => lib_spark/spark}/orderman/orders/algo/algo_orders/OnSignalAlgo.cpp (93%) rename src/{lib => lib_spark/spark}/orderman/orders/algo/algo_orders/OnSignalAlgo.h (94%) rename src/{lib => lib_spark/spark}/orderman/orders/algo/algo_orders/ProRataAlgo.cpp (97%) rename src/{lib => lib_spark/spark}/orderman/orders/algo/algo_orders/ProRataAlgo.h (96%) rename src/{lib => lib_spark/spark}/orderman/orders/algo/algo_orders/PyramidAlgo.cpp (97%) rename src/{lib => lib_spark/spark}/orderman/orders/algo/algo_orders/PyramidAlgo.h (97%) rename src/{lib => lib_spark/spark}/orderman/orders/algo/algo_orders/QuotingAlgo.cpp (92%) rename src/{lib => lib_spark/spark}/orderman/orders/algo/algo_orders/QuotingAlgo.h (87%) rename src/{lib => lib_spark/spark}/orderman/orders/algo/algo_orders/RegisterDorman.cpp (94%) rename src/{lib => lib_spark/spark}/orderman/orders/algo/algo_orders/ScratchAlgo.cpp (95%) rename src/{lib => lib_spark/spark}/orderman/orders/algo/algo_orders/ScratchAlgo.h (95%) rename src/{lib => lib_spark/spark}/orderman/orders/algo/algo_orders/SniperAlgo.cpp (97%) rename src/{lib => lib_spark/spark}/orderman/orders/algo/algo_orders/SniperAlgo.h (97%) rename src/{lib => lib_spark/spark}/orderman/orders/algo/algo_orders/SniperAlgoCommon.h (97%) rename src/{lib => lib_spark/spark}/orderman/orders/algo/algo_orders/SplitterAlgo.cpp (93%) rename src/{lib => lib_spark/spark}/orderman/orders/algo/algo_orders/SplitterAlgo.h (94%) rename src/{lib => lib_spark/spark}/orderman/orders/algo/algo_orders/TASAlgo.cpp (93%) rename src/{lib => lib_spark/spark}/orderman/orders/algo/algo_orders/TASAlgo.h (96%) rename src/{lib => lib_spark/spark}/orderman/orders/algo/algo_orders/TASCounterAlgo.cpp (97%) rename src/{lib => lib_spark/spark}/orderman/orders/algo/algo_orders/TASCounterAlgo.h (95%) rename src/{lib => lib_spark/spark}/orderman/orders/algo/algo_orders/TaskingEyeAlgo.cpp (94%) rename src/{lib => lib_spark/spark}/orderman/orders/algo/algo_orders/TaskingEyeAlgo.h (86%) rename src/{lib => lib_spark/spark}/orderman/orders/algo/algo_orders/TopAlgo.cpp (94%) rename src/{lib => lib_spark/spark}/orderman/orders/algo/algo_orders/TopAlgo.h (95%) rename src/{lib => lib_spark/spark}/orderman/orders/algo/algo_orders/VolAlgo.cpp (92%) rename src/{lib => lib_spark/spark}/orderman/orders/algo/algo_orders/VolAlgo.h (85%) rename src/{lib => lib_spark/spark}/orderman/orders/algo/algo_orders/limit_cover/LimitCoverAdapter.cpp (94%) rename src/{lib => lib_spark/spark}/orderman/orders/algo/algo_orders/limit_cover/LimitCoverAdapter.h (79%) rename src/{lib => lib_spark/spark}/orderman/orders/algo/algo_orders/limit_cover/LimitCoverDefinition.h (90%) rename src/{lib => lib_spark/spark}/orderman/orders/algo/algo_orders/limit_cover/LimitCoverGate.h (94%) rename src/{lib => lib_spark/spark}/orderman/orders/algo/algo_orders/tests/AlgoTestDriver.cpp (95%) rename src/{lib => lib_spark/spark}/orderman/orders/algo/algo_orders/tests/AlgoTestDriver.h (93%) rename src/{lib => lib_spark/spark}/orderman/orders/algo/algo_orders/tests/ExecutionTesterAlgo.h (94%) rename src/{lib => lib_spark/spark}/orderman/orders/algo/algo_orders/tests/ExecutiontTesterAlgo.cpp (90%) rename src/{lib => lib_spark/spark}/orderman/orders/algo/algo_orders/tests/LimitCoverTests.cpp (88%) rename src/{lib => lib_spark/spark}/orderman/orders/algo/algo_orders/tests/dorman_tests.cpp (95%) rename src/{lib => lib_spark/spark}/orderman/orders/algo/algo_orders/tests/limit_cover/LimitCoverState.cpp (90%) rename src/{lib => lib_spark/spark}/orderman/orders/algo/algo_orders/tests/limit_cover/LimitCoverState.h (87%) rename src/{lib => lib_spark/spark}/orderman/orders/algo/algo_orders/tests/limit_cover/LimitCoverTestUtils.h (80%) rename src/{lib => lib_spark/spark}/orderman/orders/algo/algo_orders/tests/limit_cover/TestSteps.cpp (93%) rename src/{lib => lib_spark/spark}/orderman/orders/algo/algo_orders/tests/limit_cover/TestSteps.h (93%) rename src/{lib => lib_spark/spark}/orderman/orders/algo/algo_orders/tests/splitter_tests.cpp (95%) rename src/{lib => lib_spark/spark}/orderman/orders/algo/doc/algo_wrapper_sm.png (100%) rename src/{lib => lib_spark/spark}/orderman/orders/algo/doc/state_machine.org (100%) rename src/{lib => lib_spark/spark}/orderman/orders/algo/utils/Accumulator.h (93%) rename src/{lib => lib_spark/spark}/orderman/orders/algo/utils/DynamicOrderAdapter.h (95%) rename src/{lib => lib_spark/spark}/orderman/orders/book_algos/BookAlgo.cpp (95%) rename src/{lib => lib_spark/spark}/orderman/orders/book_algos/BookAlgo.h (92%) rename src/{lib => lib_spark/spark}/orderman/orders/book_algos/BookOrderBase.cpp (98%) rename src/{lib => lib_spark/spark}/orderman/orders/book_algos/BookOrderBase.h (94%) rename src/{lib => lib_spark/spark}/orderman/orders/book_algos/OCOOrder.cpp (97%) rename src/{lib => lib_spark/spark}/orderman/orders/book_algos/OCOOrder.h (95%) rename src/{lib => lib_spark/spark}/orderman/orders/book_algos/PricerOrder.cpp (85%) rename src/{lib => lib_spark/spark}/orderman/orders/book_algos/PricerOrder.h (92%) rename src/{lib => lib_spark/spark}/orderman/orders/glbx/IGLBXOrderEncoder.cpp (100%) rename src/{lib => lib_spark/spark}/orderman/orders/glbx/IGLBXOrderEncoder.h (96%) rename src/{lib => lib_spark/spark}/orderman/orders/glbx/iLink2OrderEncoder.cpp (97%) rename src/{lib => lib_spark/spark}/orderman/orders/glbx/iLink2OrderEncoder.h (96%) rename src/{lib => lib_spark/spark}/orderman/orders/glbx/iLink3OrderEncoder.cpp (95%) rename src/{lib => lib_spark/spark}/orderman/orders/glbx/iLink3OrderEncoder.h (96%) rename src/{lib => lib_spark/spark}/orderman/orders/queue_holder/IQueueHolderOrderStateWorker.h (91%) rename src/{lib => lib_spark/spark}/orderman/orders/queue_holder/QHOOrderManager.h (98%) rename src/{lib => lib_spark/spark}/orderman/orders/queue_holder/QueueHolderOrder.cpp (94%) rename src/{lib => lib_spark/spark}/orderman/orders/queue_holder/QueueHolderOrder.h (88%) rename src/{lib => lib_spark/spark}/orderman/orders/queue_holder/QueueHolderOrderState.h (100%) rename src/{lib => lib_spark/spark}/orderman/orders/queue_holder/state_workers/QHOEndStateWorker.cpp (76%) rename src/{lib => lib_spark/spark}/orderman/orders/queue_holder/state_workers/QHOEndStateWorker.h (93%) rename src/{lib => lib_spark/spark}/orderman/orders/queue_holder/state_workers/QHOStartStateWorker.cpp (89%) rename src/{lib => lib_spark/spark}/orderman/orders/queue_holder/state_workers/QHOStartStateWorker.h (94%) rename src/{lib => lib_spark/spark}/orderman/orders/queue_holder/state_workers/QHOWaitingForAckStateWorker.cpp (83%) rename src/{lib => lib_spark/spark}/orderman/orders/queue_holder/state_workers/QHOWaitingForAckStateWorker.h (94%) rename src/{lib => lib_spark/spark}/orderman/orders/queue_holder/state_workers/QHOWaitingForCancelAllStateWorker.cpp (82%) rename src/{lib => lib_spark/spark}/orderman/orders/queue_holder/state_workers/QHOWaitingForCancelAllStateWorker.h (94%) rename src/{lib => lib_spark/spark}/orderman/orders/queue_holder/state_workers/QHOWorkingStateWorker.cpp (90%) rename src/{lib => lib_spark/spark}/orderman/orders/queue_holder/state_workers/QHOWorkingStateWorker.h (93%) rename src/{lib => lib_spark/spark}/orderman/orders/spreader_orders/ISpreaderStateWorker.h (84%) rename src/{lib => lib_spark/spark}/orderman/orders/spreader_orders/SpreaderOrder.cpp (96%) rename src/{lib => lib_spark/spark}/orderman/orders/spreader_orders/SpreaderOrder.h (92%) rename src/{lib => lib_spark/spark}/orderman/orders/spreader_orders/SpreaderOrderHeader.h (100%) rename src/{lib => lib_spark/spark}/orderman/orders/spreader_orders/spreader/ISpreaderManager.h (89%) rename src/{lib => lib_spark/spark}/orderman/orders/spreader_orders/spreader/LegFillState.cpp (100%) rename src/{lib => lib_spark/spark}/orderman/orders/spreader_orders/spreader/LegFillState.h (85%) rename src/{lib => lib_spark/spark}/orderman/orders/spreader_orders/spreader/LegPropertyData.cpp (94%) rename src/{lib => lib_spark/spark}/orderman/orders/spreader_orders/spreader/LegPropertyData.h (93%) rename src/{lib => lib_spark/spark}/orderman/orders/spreader_orders/spreader/NLegsHedgeRecompData.cpp (88%) rename src/{lib => lib_spark/spark}/orderman/orders/spreader_orders/spreader/NLegsHedgeRecompData.h (93%) rename src/{lib => lib_spark/spark}/orderman/orders/spreader_orders/spreader/QuoteLegPriceQuantityState.cpp (100%) rename src/{lib => lib_spark/spark}/orderman/orders/spreader_orders/spreader/QuoteLegPriceQuantityState.h (94%) rename src/{lib => lib_spark/spark}/orderman/orders/spreader_orders/spreader/SingleFillHedger.cpp (100%) rename src/{lib => lib_spark/spark}/orderman/orders/spreader_orders/spreader/SingleFillHedger.h (84%) rename src/{lib => lib_spark/spark}/orderman/orders/spreader_orders/spreader/SingleLegQuoter.cpp (96%) rename src/{lib => lib_spark/spark}/orderman/orders/spreader_orders/spreader/SingleLegQuoter.h (87%) rename src/{lib => lib_spark/spark}/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp (92%) rename src/{lib => lib_spark/spark}/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.h (87%) rename src/{lib => lib_spark/spark}/orderman/orders/spreader_orders/spreader/SpreaderCacheWarmingState.h (96%) rename src/{lib => lib_spark/spark}/orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.cpp (100%) rename src/{lib => lib_spark/spark}/orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.h (93%) rename src/{lib => lib_spark/spark}/orderman/orders/spreader_orders/spreader/SpreaderFractionalQtyHelper.cpp (92%) rename src/{lib => lib_spark/spark}/orderman/orders/spreader_orders/spreader/SpreaderFractionalQtyHelper.h (85%) rename src/{lib => lib_spark/spark}/orderman/orders/spreader_orders/spreader/SpreaderLegData.cpp (100%) rename src/{lib => lib_spark/spark}/orderman/orders/spreader_orders/spreader/SpreaderLegData.h (93%) rename src/{lib => lib_spark/spark}/orderman/orders/spreader_orders/spreader/SpreaderUtils.cpp (95%) rename src/{lib => lib_spark/spark}/orderman/orders/spreader_orders/spreader/SpreaderUtils.h (98%) rename src/{lib => lib_spark/spark}/orderman/orders/spreader_orders/spreader/external_interfacing/IAlternateOrderGateway.h (83%) rename src/{lib => lib_spark/spark}/orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderBuilder.cpp (92%) rename src/{lib => lib_spark/spark}/orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderBuilder.h (84%) rename src/{lib => lib_spark/spark}/orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderServices.cpp (100%) rename src/{lib => lib_spark/spark}/orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderServices.h (78%) rename src/{lib => lib_spark/spark}/orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderPreActivationOrderServices.cpp (95%) rename src/{lib => lib_spark/spark}/orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderPreActivationOrderServices.h (77%) rename src/{lib => lib_spark/spark}/orderman/orders/spreader_orders/spreader/hedger/HedgePriceQuantityState.h (93%) rename src/{lib => lib_spark/spark}/orderman/orders/spreader_orders/spreader/hedger/HedgerManager.cpp (100%) rename src/{lib => lib_spark/spark}/orderman/orders/spreader_orders/spreader/hedger/HedgerManager.h (97%) rename src/{lib => lib_spark/spark}/orderman/orders/spreader_orders/spreader/hedger/IHedgerStateWorker.h (84%) rename src/{lib => lib_spark/spark}/orderman/orders/spreader_orders/spreader/hedger/UnhedgedDelta.cpp (85%) rename src/{lib => lib_spark/spark}/orderman/orders/spreader_orders/spreader/hedger/UnhedgedDelta.h (100%) rename src/{lib => lib_spark/spark}/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerEndStateWorker.cpp (74%) rename src/{lib => lib_spark/spark}/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerEndStateWorker.h (92%) rename src/{lib => lib_spark/spark}/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerStartStateWorker.cpp (76%) rename src/{lib => lib_spark/spark}/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerStartStateWorker.h (92%) rename src/{lib => lib_spark/spark}/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerState.h (100%) rename src/{lib => lib_spark/spark}/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.cpp (76%) rename src/{lib => lib_spark/spark}/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.h (92%) rename src/{lib => lib_spark/spark}/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelledStateWorker.cpp (75%) rename src/{lib => lib_spark/spark}/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelledStateWorker.h (92%) rename src/{lib => lib_spark/spark}/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckStateWorker.cpp (78%) rename src/{lib => lib_spark/spark}/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckStateWorker.h (92%) rename src/{lib => lib_spark/spark}/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWorkingStateWorker.cpp (83%) rename src/{lib => lib_spark/spark}/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWorkingStateWorker.h (92%) rename src/{lib => lib_spark/spark}/orderman/orders/spreader_orders/spreader/quoter/IQuoterStateWorker.h (89%) rename src/{lib => lib_spark/spark}/orderman/orders/spreader_orders/spreader/quoter/QuoteDriverSet.cpp (100%) rename src/{lib => lib_spark/spark}/orderman/orders/spreader_orders/spreader/quoter/QuoteDriverSet.h (100%) rename src/{lib => lib_spark/spark}/orderman/orders/spreader_orders/spreader/quoter/QuoteDriverSetHistory.cpp (97%) rename src/{lib => lib_spark/spark}/orderman/orders/spreader_orders/spreader/quoter/QuoteDriverSetHistory.h (100%) rename src/{lib => lib_spark/spark}/orderman/orders/spreader_orders/spreader/quoter/QuoteLegDriver.cpp (100%) rename src/{lib => lib_spark/spark}/orderman/orders/spreader_orders/spreader/quoter/QuoteLegDriver.h (95%) rename src/{lib => lib_spark/spark}/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterEndStateWorker.cpp (76%) rename src/{lib => lib_spark/spark}/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterEndStateWorker.h (80%) rename src/{lib => lib_spark/spark}/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterStartStateWorker.cpp (86%) rename src/{lib => lib_spark/spark}/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterStartStateWorker.h (78%) rename src/{lib => lib_spark/spark}/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterState.h (100%) rename src/{lib => lib_spark/spark}/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.cpp (78%) rename src/{lib => lib_spark/spark}/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.h (80%) rename src/{lib => lib_spark/spark}/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.cpp (76%) rename src/{lib => lib_spark/spark}/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.h (84%) rename src/{lib => lib_spark/spark}/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.cpp (83%) rename src/{lib => lib_spark/spark}/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.h (83%) rename src/{lib => lib_spark/spark}/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForIOCWorker.cpp (78%) rename src/{lib => lib_spark/spark}/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForIOCWorker.h (82%) rename src/{lib => lib_spark/spark}/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.cpp (89%) rename src/{lib => lib_spark/spark}/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.h (84%) rename src/{lib => lib_spark/spark}/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWorkingStateWorker.cpp (88%) rename src/{lib => lib_spark/spark}/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWorkingStateWorker.h (84%) rename src/{lib => lib_spark/spark}/orderman/orders/spreader_orders/spreader_states/SpreaderEndStateWorker.cpp (96%) rename src/{lib => lib_spark/spark}/orderman/orders/spreader_orders/spreader_states/SpreaderEndStateWorker.h (94%) rename src/{lib => lib_spark/spark}/orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp (95%) rename src/{lib => lib_spark/spark}/orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.h (95%) rename src/{lib => lib_spark/spark}/orderman/orders/spreader_orders/spreader_states/SpreaderState.h (100%) rename src/{lib => lib_spark/spark}/orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.cpp (97%) rename src/{lib => lib_spark/spark}/orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.h (95%) rename src/{lib => lib_spark/spark}/orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForInitialDataStateWorker.cpp (98%) rename src/{lib => lib_spark/spark}/orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForInitialDataStateWorker.h (95%) rename src/{lib => lib_spark/spark}/orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp (97%) rename src/{lib => lib_spark/spark}/orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.h (94%) rename src/{lib => lib_spark/spark}/orderman/orders/spreader_orders/tests/spreader_tests.cpp (99%) rename src/{lib => lib_spark/spark}/orderman/orders/spreader_orders/tests/tests_common.h (94%) rename src/{lib => lib_spark/spark}/orderman/perf_analysis/obsolete/analyze_logs.py (100%) rename src/{lib => lib_spark/spark}/orderman/perf_analysis/obsolete/load_data.py (100%) rename src/{lib => lib_spark/spark}/orderman/perf_analysis/obsolete/logs/latency_data/import.sql (100%) rename src/{lib => lib_spark/spark}/orderman/perf_analysis/obsolete/logs/latency_data/trace.csv (100%) rename src/{lib => lib_spark/spark}/orderman/perf_analysis/obsolete/logs/latency_data/trace.sqlite (100%) rename src/{lib => lib_spark/spark}/orderman/perf_analysis/obsolete/logs/load.sh (100%) rename src/{lib => lib_spark/spark}/orderman/perf_analysis/obsolete/logs/parse_helper.py (100%) rename src/{lib => lib_spark/spark}/orderman/perf_analysis/obsolete/logs/quick_stats.sh (100%) rename src/{lib => lib_spark/spark}/orderman/perf_analysis/obsolete/logs/sync_to_bts-netx-dc3-01 (100%) rename src/{lib => lib_spark/spark}/orderman/perf_analysis/obsolete/lttng/load.sh (100%) rename src/{lib => lib_spark/spark}/orderman/perf_analysis/obsolete/lttng/parse.sh (100%) rename src/{lib => lib_spark/spark}/orderman/perf_analysis/obsolete/lttng/parse_helper.py (100%) rename src/{lib => lib_spark/spark}/orderman/perf_analysis/obsolete/lttng/sync_to_bts-host12 (100%) rename src/{lib => lib_spark/spark}/orderman/perf_analysis/obsolete/lttng/trace.sh (100%) rename src/{lib => lib_spark/spark}/orderman/perf_analysis/perf_log.sh (100%) rename src/{lib => lib_spark/spark}/orderman/securities/ISecurityDB.h (92%) rename src/{lib => lib_spark/spark}/orderman/securities/MapSecurityDB.h (85%) rename src/{lib => lib_spark/spark}/orderman/tests/CCApiExecutionTests.cpp (93%) rename src/{lib => lib_spark/spark}/orderman/tests/fat_wrapper_tests.cpp (95%) rename src/{lib => lib_spark/spark}/os/os.cpp (99%) rename src/{lib => lib_spark/spark}/os/os.h (99%) rename src/{lib => lib_spark/spark}/os/spark_data_directory.cpp (92%) rename src/{lib => lib_spark/spark}/os/spark_data_directory.h (100%) rename src/{lib => lib_spark/spark}/os/tests/os_tests.cpp (100%) rename src/{lib => lib_spark/spark}/persistence/IDGenerator.cpp (95%) rename src/{lib => lib_spark/spark}/persistence/IDGenerator.h (93%) rename src/{lib => lib_spark/spark}/persistence/IStore.cpp (100%) rename src/{lib => lib_spark/spark}/persistence/IStore.h (97%) rename src/{lib => lib_spark/spark}/persistence/PersistenceServiceServer.cpp (98%) rename src/{lib => lib_spark/spark}/persistence/PersistenceServiceServer.h (95%) rename src/{lib => lib_spark/spark}/persistence/SqliteStore.cpp (97%) rename src/{lib => lib_spark/spark}/persistence/SqliteStore.h (91%) rename src/{lib => lib_spark/spark}/persistence/persistence_utils.cpp (75%) rename src/{lib => lib_spark/spark}/persistence/persistence_utils.h (100%) rename src/{lib => lib_spark/spark}/persistence/store_row.h (100%) rename src/{lib => lib_spark/spark}/persistence/tests/PersistenceServiceTests.cpp (96%) rename src/{lib => lib_spark/spark}/plugin/SparkServices.cpp (96%) rename src/{lib => lib_spark/spark}/plugin/SparkServices.h (94%) rename src/{lib => lib_spark/spark}/plugin/plugin.cpp (89%) rename src/{lib => lib_spark/spark}/plugin/plugin.h (100%) rename src/{lib => lib_spark/spark}/quickbus/core/Advertisement.h (89%) rename src/{lib => lib_spark/spark}/quickbus/core/LocalNode.cpp (94%) rename src/{lib => lib_spark/spark}/quickbus/core/LocalNode.h (96%) rename src/{lib => lib_spark/spark}/quickbus/core/Quickbus.cpp (89%) rename src/{lib => lib_spark/spark}/quickbus/core/Quickbus.h (82%) rename src/{lib => lib_spark/spark}/quickbus/core/QuickbusThreadOptions.h (90%) rename src/{lib => lib_spark/spark}/quickbus/core/SubscriptionID.cpp (100%) rename src/{lib => lib_spark/spark}/quickbus/core/SubscriptionID.h (91%) rename src/{lib => lib_spark/spark}/quickbus/core/TableID.cpp (83%) rename src/{lib => lib_spark/spark}/quickbus/core/TableID.h (92%) rename src/{lib => lib_spark/spark}/quickbus/core/Topic.h (82%) rename src/{lib => lib_spark/spark}/quickbus/message_model/Change.h (79%) rename src/{lib => lib_spark/spark}/quickbus/message_model/Record.h (86%) rename src/{lib => lib_spark/spark}/quickbus/message_model/RecordKey.h (92%) rename src/{lib => lib_spark/spark}/quickbus/message_model/RecordValue.h (100%) rename src/{lib => lib_spark/spark}/quickbus/message_model/Update.cpp (100%) rename src/{lib => lib_spark/spark}/quickbus/message_model/Update.h (74%) rename src/{lib => lib_spark/spark}/quickbus/message_model/merge_updates.cpp (95%) rename src/{lib => lib_spark/spark}/quickbus/message_model/merge_updates.h (71%) rename src/{lib => lib_spark/spark}/quickbus/network/QBConnection.cpp (97%) rename src/{lib => lib_spark/spark}/quickbus/network/QBConnection.h (95%) rename src/{lib => lib_spark/spark}/quickbus/network/QBConnectionManager.cpp (93%) rename src/{lib => lib_spark/spark}/quickbus/network/QBConnectionManager.h (100%) rename src/{lib => lib_spark/spark}/quickbus/network/endpoint_description.cpp (100%) rename src/{lib => lib_spark/spark}/quickbus/network/endpoint_description.h (100%) rename src/{lib => lib_spark/spark}/quickbus/network/quickbus_msgs.proto (100%) rename src/{lib => lib_spark/spark}/quickbus/pubsub/TableEvent.h (82%) rename src/{lib => lib_spark/spark}/quickbus/pubsub/TableFilter.h (87%) rename src/{lib => lib_spark/spark}/quickbus/pubsub/TablePublisher.cpp (92%) rename src/{lib => lib_spark/spark}/quickbus/pubsub/TablePublisher.h (92%) rename src/{lib => lib_spark/spark}/quickbus/pubsub/TableSubscriber.cpp (94%) rename src/{lib => lib_spark/spark}/quickbus/pubsub/TableSubscriber.h (85%) rename src/{lib => lib_spark/spark}/quickbus/pubsub/tests/qb_pubsub_tests.cpp (98%) create mode 100644 src/lib_spark/spark/quickbus/quickbus.h rename src/{lib => lib_spark/spark}/quickbus/routing/INode.cpp (69%) rename src/{lib => lib_spark/spark}/quickbus/routing/INode.h (76%) rename src/{lib => lib_spark/spark}/quickbus/routing/INodePtr.h (100%) rename src/{lib => lib_spark/spark}/quickbus/routing/NodeID.cpp (83%) rename src/{lib => lib_spark/spark}/quickbus/routing/NodeID.h (84%) rename src/{lib => lib_spark/spark}/quickbus/routing/Router.cpp (97%) rename src/{lib => lib_spark/spark}/quickbus/routing/Router.h (93%) rename src/{lib => lib_spark/spark}/quickbus/rpc/OnRPCReply.h (68%) rename src/{lib => lib_spark/spark}/quickbus/rpc/OnRPCRequest.h (77%) rename src/{lib => lib_spark/spark}/quickbus/rpc/RPCClient.cpp (95%) rename src/{lib => lib_spark/spark}/quickbus/rpc/RPCClient.h (84%) rename src/{lib => lib_spark/spark}/quickbus/rpc/RPCError.h (100%) rename src/{lib => lib_spark/spark}/quickbus/rpc/RPCReply.h (76%) rename src/{lib => lib_spark/spark}/quickbus/rpc/RPCRequest.h (77%) rename src/{lib => lib_spark/spark}/quickbus/rpc/RPCServer.cpp (95%) rename src/{lib => lib_spark/spark}/quickbus/rpc/RPCServer.h (70%) rename src/{lib => lib_spark/spark}/quickbus/rpc/RPCServiceName.h (85%) rename src/{lib => lib_spark/spark}/quickbus/rpc/RPCSessionID.cpp (85%) rename src/{lib => lib_spark/spark}/quickbus/rpc/RPCSessionID.h (93%) rename src/{lib => lib_spark/spark}/quickbus/rpc/rpc_utils.cpp (92%) rename src/{lib => lib_spark/spark}/quickbus/rpc/rpc_utils.h (69%) rename src/{lib => lib_spark/spark}/quickbus/rpc/tests/qb_rpc_tests.cpp (97%) rename src/{lib => lib_spark/spark}/quickbus/tests/quickbus_tests.cpp (99%) rename src/{lib => lib_spark/spark}/sparkproto/SparkProtos.proto (100%) rename src/{lib => lib_spark/spark}/testing/catch_test_runner.cpp (81%) rename src/{lib => lib_spark/spark}/testing/catch_test_runner.h (100%) rename src/{lib => lib_spark/spark}/tracing/PerfLog.cpp (97%) rename src/{lib => lib_spark/spark}/tracing/PerfLog.h (99%) create mode 100644 src/lib_spark/spark/tracing/bts_trace.cpp rename src/{lib => lib_spark/spark}/tracing/bts_trace.h (100%) rename src/{lib => lib_spark/spark}/tracing/bts_trace_c.c (100%) rename src/{lib => lib_spark/spark}/tracing/bts_trace_c.h (95%) rename src/{lib => lib_spark/spark}/utils/AuthSessionManager.cpp (87%) rename src/{lib => lib_spark/spark}/utils/AuthSessionManager.h (82%) rename src/{lib => lib_spark/spark}/utils/AuthToken.cpp (95%) rename src/{lib => lib_spark/spark}/utils/AuthToken.h (77%) rename src/{lib => lib_spark/spark}/utils/CallTimer.h (96%) rename src/{lib => lib_spark/spark}/utils/ConcurrentAppendCollection.h (100%) rename src/{lib => lib_spark/spark}/utils/ConcurrentPool.h (100%) rename src/{lib => lib_spark/spark}/utils/Delegate.h (100%) rename src/{lib => lib_spark/spark}/utils/Dispatcher.cpp (98%) rename src/{lib => lib_spark/spark}/utils/Dispatcher.h (98%) rename src/{lib => lib_spark/spark}/utils/Event.h (100%) rename src/{lib => lib_spark/spark}/utils/FileUtils.cpp (100%) rename src/{lib => lib_spark/spark}/utils/FileUtils.h (100%) rename src/{lib => lib_spark/spark}/utils/GrowableSPSCQueue.cpp (100%) rename src/{lib => lib_spark/spark}/utils/GrowableSPSCQueue.h (100%) rename src/{lib => lib_spark/spark}/utils/HTTPStream.cpp (96%) rename src/{lib => lib_spark/spark}/utils/HTTPStream.h (90%) rename src/{lib => lib_spark/spark}/utils/LockBox.h (100%) rename src/{lib => lib_spark/spark}/utils/MapUtils.cc (100%) rename src/{lib => lib_spark/spark}/utils/MapUtils.h (100%) rename src/{lib => lib_spark/spark}/utils/MathUtils.cc (100%) rename src/{lib => lib_spark/spark}/utils/MathUtils.cpp (100%) rename src/{lib => lib_spark/spark}/utils/MathUtils.h (100%) rename src/{lib => lib_spark/spark}/utils/Optimistic.h (100%) rename src/{lib => lib_spark/spark}/utils/PBUtils.cpp (100%) rename src/{lib => lib_spark/spark}/utils/PBUtils.h (98%) rename src/{lib => lib_spark/spark}/utils/Puid.cpp (99%) rename src/{lib => lib_spark/spark}/utils/Puid.h (98%) rename src/{lib => lib_spark/spark}/utils/ReentrancyGuard.h (100%) rename src/{lib => lib_spark/spark}/utils/ResultEnum.h (100%) rename src/{lib => lib_spark/spark}/utils/SecureLogon.cpp (92%) rename src/{lib => lib_spark/spark}/utils/SecureLogon.h (100%) rename src/{lib => lib_spark/spark}/utils/SharedList.h (97%) rename src/{lib => lib_spark/spark}/utils/SharedMemory.cpp (98%) rename src/{lib => lib_spark/spark}/utils/SharedMemory.h (90%) rename src/{lib => lib_spark/spark}/utils/Shuffle.h (100%) rename src/{lib => lib_spark/spark}/utils/SpinLock.h (100%) rename src/{lib => lib_spark/spark}/utils/Sqlite_utils.cpp (100%) rename src/{lib => lib_spark/spark}/utils/Sqlite_utils.h (96%) rename src/{lib => lib_spark/spark}/utils/StringSplitter.h (100%) rename src/{lib => lib_spark/spark}/utils/TempDir.h (97%) rename src/{lib => lib_spark/spark}/utils/TempFile.h (98%) rename src/{lib => lib_spark/spark}/utils/ThrowIf.h (100%) rename src/{lib => lib_spark/spark}/utils/TimeStamp.h (100%) rename src/{lib => lib_spark/spark}/utils/UNUSED_PARAM.h (100%) rename src/{lib => lib_spark/spark}/utils/Uuid.cpp (98%) rename src/{lib => lib_spark/spark}/utils/Uuid.h (100%) rename src/{lib => lib_spark/spark}/utils/ValueWrapper.h (100%) rename src/{lib => lib_spark/spark}/utils/WaitFreeQueue.h (99%) rename src/{lib => lib_spark/spark}/utils/auto_init_shared_ptr.h (100%) rename src/{lib => lib_spark/spark}/utils/base62.h (96%) rename src/{lib => lib_spark/spark}/utils/base64.hpp (100%) rename src/{lib => lib_spark/spark}/utils/benchmarking_utils.h (100%) rename src/{lib => lib_spark/spark}/utils/bts_array_size.h (100%) rename src/{lib => lib_spark/spark}/utils/bts_assert.h (96%) rename src/{lib => lib_spark/spark}/utils/bts_chrono.h (100%) rename src/{lib => lib_spark/spark}/utils/bts_concat.h (100%) rename src/{lib => lib_spark/spark}/utils/bts_debugger.h (100%) rename src/{lib => lib_spark/spark}/utils/bts_export.h (100%) rename src/{lib => lib_spark/spark}/utils/bts_fatal.h (96%) rename src/{lib => lib_spark/spark}/utils/bts_lock_guard.h (87%) rename src/{lib => lib_spark/spark}/utils/bts_no_copy.h (100%) rename src/{lib => lib_spark/spark}/utils/checked_arithmetic.h (100%) rename src/{lib => lib_spark/spark}/utils/checked_cast.h (100%) rename src/{lib => lib_spark/spark}/utils/crypto/AlgoType.h (100%) rename src/{lib => lib_spark/spark}/utils/crypto/CipherType.cpp (100%) rename src/{lib => lib_spark/spark}/utils/crypto/CipherType.h (100%) rename src/{lib => lib_spark/spark}/utils/crypto/CryptoInit.cpp (100%) rename src/{lib => lib_spark/spark}/utils/crypto/CryptoInit.h (80%) rename src/{lib => lib_spark/spark}/utils/crypto/Digest.cpp (94%) rename src/{lib => lib_spark/spark}/utils/crypto/Digest.h (90%) rename src/{lib => lib_spark/spark}/utils/crypto/KeyCodeHelper.cpp (76%) rename src/{lib => lib_spark/spark}/utils/crypto/KeyCodeHelper.h (100%) rename src/{lib => lib_spark/spark}/utils/crypto/PasswordCallback.cpp (100%) rename src/{lib => lib_spark/spark}/utils/crypto/PasswordCallback.h (92%) rename src/{lib => lib_spark/spark}/utils/crypto/PrivateKey.cpp (94%) rename src/{lib => lib_spark/spark}/utils/crypto/PrivateKey.h (94%) rename src/{lib => lib_spark/spark}/utils/crypto/PublicKey.cpp (89%) rename src/{lib => lib_spark/spark}/utils/crypto/PublicKey.h (93%) rename src/{lib => lib_spark/spark}/utils/crypto/base64_chars.h (100%) rename src/{lib => lib_spark/spark}/utils/crypto/ed25519.cpp (93%) rename src/{lib => lib_spark/spark}/utils/crypto/ed25519.h (100%) rename src/{lib => lib_spark/spark}/utils/crypto/evp_md_ctx.h (100%) rename src/{lib => lib_spark/spark}/utils/crypto/evp_pkey.cpp (90%) rename src/{lib => lib_spark/spark}/utils/crypto/evp_pkey.h (100%) rename src/{lib => lib_spark/spark}/utils/crypto/file.h (100%) rename src/{lib => lib_spark/spark}/utils/crypto/hmac.cpp (100%) rename src/{lib => lib_spark/spark}/utils/crypto/hmac.h (100%) rename src/{lib => lib_spark/spark}/utils/crypto/iostreambio.cpp (93%) rename src/{lib => lib_spark/spark}/utils/crypto/iostreambio.h (100%) rename src/{lib => lib_spark/spark}/utils/crypto/openssl_compat.h (100%) rename src/{lib => lib_spark/spark}/utils/crypto/spark_private.pem (100%) rename src/{lib => lib_spark/spark}/utils/crypto/spark_public.pem (100%) rename src/{lib => lib_spark/spark}/utils/datetime.cpp (100%) rename src/{lib => lib_spark/spark}/utils/datetime.h (100%) rename src/{lib => lib_spark/spark}/utils/defer.h (100%) rename src/{lib => lib_spark/spark}/utils/download.cpp (93%) rename src/{lib => lib_spark/spark}/utils/download.h (100%) rename src/{lib => lib_spark/spark}/utils/file_utils.cpp (97%) rename src/{lib => lib_spark/spark}/utils/file_utils.h (100%) rename src/{lib => lib_spark/spark}/utils/formatters/error_code_formatter.h (100%) rename src/{lib => lib_spark/spark}/utils/formatters/exception_formatter.h (100%) rename src/{lib => lib_spark/spark}/utils/helper_macros.h (100%) rename src/{lib => lib_spark/spark}/utils/init_spark_lib.cpp (87%) rename src/{lib => lib_spark/spark}/utils/init_spark_lib.h (100%) rename src/{lib => lib_spark/spark}/utils/inplace_function.h (100%) rename src/{lib => lib_spark/spark}/utils/is_unittest_environment.cpp (100%) rename src/{lib => lib_spark/spark}/utils/is_unittest_environment.h (86%) rename src/{lib => lib_spark/spark}/utils/lazy.h (100%) rename src/{lib => lib_spark/spark}/utils/meta_programming.h (100%) rename src/{lib => lib_spark/spark}/utils/mpmc_bounded_queue.h (99%) rename src/{lib => lib_spark/spark}/utils/object_pool.h (95%) rename src/{lib => lib_spark/spark}/utils/observable_value_store.h (98%) rename src/{lib => lib_spark/spark}/utils/overloaded.h (100%) rename src/{lib => lib_spark/spark}/utils/parse_enum.h (100%) rename src/{lib => lib_spark/spark}/utils/pb_json_macros.h (100%) rename src/{lib => lib_spark/spark}/utils/proto_helper.h (99%) rename src/{lib => lib_spark/spark}/utils/sane_algorithm.h (100%) rename src/{lib => lib_spark/spark}/utils/sftp.cpp (96%) rename src/{lib => lib_spark/spark}/utils/sftp.h (100%) rename src/{lib => lib_spark/spark}/utils/stats.cpp (93%) rename src/{lib => lib_spark/spark}/utils/stats.h (100%) rename src/{lib => lib_spark/spark}/utils/stopwatch.h (96%) rename src/{lib => lib_spark/spark}/utils/string_utils.h (100%) rename src/{lib => lib_spark/spark}/utils/tests/AuthTokenTests.cpp (93%) rename src/{lib => lib_spark/spark}/utils/tests/IDGeneratorTests.cpp (100%) rename src/{lib => lib_spark/spark}/utils/tests/MathUtilsTests.cpp (97%) rename src/{lib => lib_spark/spark}/utils/tests/SingleWriterConcurrentVectorTests.cpp (100%) rename src/{lib => lib_spark/spark}/utils/thread_manager.cpp (95%) rename src/{lib => lib_spark/spark}/utils/thread_manager.h (96%) rename src/{lib => lib_spark/spark}/utils/type_name.h (100%) rename src/{lib => lib_spark/spark}/utils/warn_ctrl.h (100%) rename src/{lib => lib_spark/spark}/utils/windows_wrapper.h (100%) delete mode 100644 src/server/sparkd/CMakeLists.txt delete mode 100644 src/server/sparkd/cmds/Run.cpp delete mode 100644 src/server/sparkd/sparkd.vcxproj delete mode 100644 src/server/sparkd/sparkd.vcxproj.filters delete mode 100644 src/server/sparkd/sparkd.vcxproj.user diff --git a/.vscode/launch.json b/.vscode/launch.json index 75ae10b29..cb7821836 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -199,24 +199,27 @@ "request": "launch", "program": "", "linux": { - "preLaunchTask": "Build Sparkd (Debug)", - "program": "${workspaceFolder}/build/sparkd-debug-clang/server/sparkd", - "args": [ - "run" - ], - "stopAtEntry": false, - "cwd": "${workspaceFolder}/build/sparkd-debug-clang/server", - "environment": [], - "externalConsole": false, - "MIMode": "gdb", - "setupCommands": [ - { - "description": "Enable pretty-printing for gdb", - "text": "-enable-pretty-printing", - "ignoreFailures": true - } - ] - } + "program": "${workspaceFolder}/build/sparkd-debug-clang/src/app_sparkd/sparkd", + }, + "args": [ + "run" + ], + "cwd": "${workspaceFolder}/build/sparkd-debug-clang/src/app_sparkd", + "stopAtEntry": false, + "externalConsole": false, + "MIMode": "gdb", + "setupCommands": [ + { + "description": "Enable pretty-printing for gdb", + "text": "-enable-pretty-printing", + "ignoreFailures": true + }, + { + "description": "Set Disassembly Flavor to Intel", + "text": "-gdb-set disassembly-flavor intel", + "ignoreFailures": true + } + ] }, { "name": "Sparkd (Skip Build)", @@ -224,74 +227,27 @@ "request": "launch", "program": "", "linux": { - "program": "${workspaceFolder}/build/sparkd-debug-clang/server/sparkd", - "args": [ - "run" - ], - "stopAtEntry": false, - "cwd": "${workspaceFolder}/build/sparkd-debug-clang/server", - "environment": [], - "externalConsole": false, - "MIMode": "gdb", - "setupCommands": [ - { - "description": "Enable pretty-printing for gdb", - "text": "-enable-pretty-printing", - "ignoreFailures": true - } - ] - } - }, - { - "name": "Sparkd Test", - "type": "cppdbg", - "request": "launch", - "program": "", - "linux": { - "preLaunchTask": "Build Sparkd (Debug)", - "program": "${workspaceFolder}/build/sparkd-debug-clang/server/sparkd", - "args": [ - "test", - "${input:sparkdTest}", - ], - "stopAtEntry": false, - "cwd": "${workspaceFolder}/build/sparkd-debug-clang/server", - "environment": [], - "externalConsole": false, - "MIMode": "gdb", - "setupCommands": [ - { - "description": "Enable pretty-printing for gdb", - "text": "-enable-pretty-printing", - "ignoreFailures": true - } - ] - } - }, - { - "name": "Sparkd Test (Skip Build)", - "type": "cppdbg", - "request": "launch", - "program": "", - "linux": { - "program": "${workspaceFolder}/build/sparkd-debug-clang/server/sparkd", - "args": [ - "test", - "${input:sparkdTest}", - ], - "stopAtEntry": false, - "cwd": "${workspaceFolder}/build/sparkd-debug-clang/server", - "environment": [], - "externalConsole": false, - "MIMode": "gdb", - "setupCommands": [ - { - "description": "Enable pretty-printing for gdb", - "text": "-enable-pretty-printing", - "ignoreFailures": true - } - ] - } + "program": "${workspaceFolder}/build/sparkd-debug-clang/src/app_sparkd/sparkd", + }, + "args": [ + "run" + ], + "cwd": "${workspaceFolder}/build/sparkd-debug-clang/src/app_sparkd", + "stopAtEntry": false, + "externalConsole": false, + "MIMode": "gdb", + "setupCommands": [ + { + "description": "Enable pretty-printing for gdb", + "text": "-enable-pretty-printing", + "ignoreFailures": true + }, + { + "description": "Set Disassembly Flavor to Intel", + "text": "-gdb-set disassembly-flavor intel", + "ignoreFailures": true + } + ] }, ], "inputs": [ diff --git a/CMakeLists.txt b/CMakeLists.txt index 4f771fee9..cc8b1cdb0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -37,7 +37,7 @@ else() endif() include_directories(BEFORE SYSTEM ${EXTERNALS_INCLUDE} ${EXTERNALS_ROOT}/include/zlib) -link_directories(${SPARK_LIB}) +link_directories(${EXTERNALS_LIB}) add_compile_definitions(SHARED_MEMORY_PREFIX="${SHARED_MEMORY_PREFIX}") add_compile_definitions(APP_DATA_DIR="${APP_DATA_DIR}") @@ -47,12 +47,8 @@ endif() add_compile_definitions(EXPORT_MD_CONSUMER="${EXPORT_MD_CONSUMER}") if(WIN32) # subdirs - add_subdirectory(src/lib) + add_subdirectory(src/lib_spark) else() - # make sparkd look for libspark.so in its directory - set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) - set(CMAKE_INSTALL_RPATH ".") - if(BUILD_SPARKD) # Note: All macros that begin w/ 'CCAPI' are ccapi's macros (defined and/or # read by their code). We override some below. @@ -119,10 +115,10 @@ else() # subdirs if (BUILD_SPARKD) add_subdirectory(src/lib_binance_execution) - add_subdirectory(src/server/sparkd) + add_subdirectory(src/app_sparkd) add_subdirectory(src/data_files) endif() - add_subdirectory(src/lib) + add_subdirectory(src/lib_spark) if (BUILD_ADMIN_WEB_APP) add_subdirectory(src/Spark.Admin.WebApp) endif() @@ -132,37 +128,4 @@ else() if(BUILD_SDK) add_subdirectory(src/sdk) endif() - - if(BUILD_SPARKD) - add_custom_command( - OUTPUT ${CMAKE_BINARY_DIR}/server - COMMAND mkdir -p ${CMAKE_BINARY_DIR}/server - COMMAND ln ARGS -sf ${CMAKE_BINARY_DIR}/src/server/sparkd/sparkd ${CMAKE_BINARY_DIR}/server - COMMAND ln ARGS -sf ${CMAKE_BINARY_DIR}/data_files ${CMAKE_BINARY_DIR}/server - COMMAND ln ARGS -sf ${CMAKE_BINARY_DIR}/src/lib/libspark.so ${CMAKE_BINARY_DIR}/server - COMMAND ln ARGS -sf ${EXTERNALS_ROOT}/lib/${CMAKE_BUILD_TYPE}/libonixs-fix-engine.so.4 ${CMAKE_BINARY_DIR}/server - - COMMAND - ln ARGS -sf - ${EXTERNALS_ROOT}/lib/Release/libOnixS.IceImpactMulticastPriceFeedHandlerCpp.so.3.16.0.0 - ${CMAKE_BINARY_DIR}/server - COMMAND ln ARGS -sf ${EXTERNALS_ROOT}/lib/Release/libACE-5.7.5.so ${CMAKE_BINARY_DIR}/server - COMMAND mkdir ARGS -p ${CMAKE_BINARY_DIR}/server/plugins - COMMENT "Creating server runtime layout" - DEPENDS sparkd data_files_dir) - - add_custom_target(server_layout ALL DEPENDS ${CMAKE_BINARY_DIR}/server) - - install( - DIRECTORY "${CMAKE_BINARY_DIR}/server/plugins" - DESTINATION "${CMAKE_INSTALL_BINDIR}") - install( - FILES - "${SPARK_LIB}/libACE-5.7.5.so" - "${SPARK_LIB}/libOnixS.IceImpactMulticastPriceFeedHandlerCpp.so.3.16.0.0" - "${SPARK_LIB}/libonixs-fix-engine.so.4.10.1" - "${SPARK_LIB}/libonixs-fix-engine.so.4" - "${SPARK_LIB}/libonixs-fix-engine.so" - DESTINATION "${CMAKE_INSTALL_BINDIR}") - endif() endif() diff --git a/CMakePresets.json b/CMakePresets.json index 99fb33f0d..008626d8a 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -31,9 +31,8 @@ "CMAKE_SHARED_LINKER_FLAGS_RELEASE": "/OPT:REF /OPT:ICF /LTCG", "CMAKE_TOOLCHAIN_FILE": "${sourceDir}/vcpkg/scripts/buildsystems/vcpkg.cmake", "EXTERNALS_ROOT": "${sourceDir}/externals/windows", - "CONFIG_DEFAULTS_PATH": "config/profiles/default/*.conf", - "DOTNET_BINARY_DIR": "${sourceDir}/build/$/bin/net8.0", - "DOTNET_WINDOWS_BINARY_DIR": "${sourceDir}/build/$/bin/net8.0-windows", + "CONFIG_DEFAULTS_PATH": "spark/config/profiles/default/*.conf", + "DOTNET_BINARY_DIR": "${sourceDir}/build/$/bin/net8.0;${sourceDir}/build/$/bin/net8.0-windows", "EXPORT_MD_CONSUMER": { "type": "BOOL", "value": "ON" @@ -58,7 +57,7 @@ "APP_DATA_DIR_OVERRIDE": "${dollar}{SPARKD_DATA_DIR}", "CMAKE_BUILD_WITH_INSTALL_RPATH": { "type": "BOOL", - "value": "ON" + "value": "OFF" }, "CMAKE_CXX_STANDARD": "20", "CMAKE_INSTALL_RPATH": ".", @@ -93,7 +92,7 @@ "value": "ON" }, "CCAPI_LOG_LEVEL": "Info", - "CONFIG_DEFAULTS_PATH": "config/profiles/md_dev/*.conf;config/profiles/default/*.conf" + "CONFIG_DEFAULTS_PATH": "spark/config/profiles/md_dev/*.conf;spark/config/profiles/default/*.conf" } }, @@ -104,7 +103,7 @@ "cacheVariables": { "CMAKE_BUILD_TYPE": "Release", "CCAPI_LOG_LEVEL": "Warn", - "CONFIG_DEFAULTS_PATH": "config/profiles/md_prod/*.conf;config/profiles/default/*.conf" + "CONFIG_DEFAULTS_PATH": "spark/config/profiles/md_prod/*.conf;spark/config/profiles/default/*.conf" } }, @@ -186,7 +185,11 @@ "CMAKE_CXX_FLAGS_DEBUG": "-g -fPIC -Wall -pedantic -Wextra -Werror -Wno-missing-braces -Wno-ignored-qualifiers --std=c++20 -fdiagnostics-color -DDEBUG", "CMAKE_CXX_FLAGS_RELEASE": "-fPIC -Wall -pedantic -Wextra -Werror -Wno-missing-braces -Wno-ignored-qualifiers --std=c++20 -fdiagnostics-color -fno-omit-frame-pointer -DNDEBUG -O3", "CMAKE_INSTALL_PREFIX": "${sourceDir}/install/${presetName}", - "CONFIG_DEFAULTS_PATH": "config/profiles/default/*.conf", + "CMAKE_EXPORT_COMPILE_COMMANDS": { + "type": "BOOL", + "value": "ON" + }, + "CONFIG_DEFAULTS_PATH": "spark/config/profiles/default/*.conf", "DOTNET_BINARY_DIR": "${sourceDir}/build/$/bin/net8.0", "EXPORT_MD_CONSUMER": { "type": "BOOL", @@ -227,7 +230,7 @@ "cacheVariables": { "APP_DATA_DIR": "${dollar}{APPDATA}/bts/DataStream", "APP_DATA_DIR_OVERRIDE": "${dollar}{DATA_STREAM_DATA_DIR}", - "CONFIG_DEFAULTS_PATH": "config/profiles/default/*.conf;config/profiles/data_stream/*.conf", + "CONFIG_DEFAULTS_PATH": "spark/config/profiles/default/*.conf;spark/config/profiles/data_stream/*.conf", "SHARED_MEMORY_PREFIX": "data_stream" } }, @@ -262,8 +265,7 @@ "CMAKE_CXX_COMPILER": "clang++", "CMAKE_CXX_FLAGS_DEBUG": "-g -fPIC -Wall -pedantic -Wextra -Werror -Wno-missing-braces -Wno-ignored-qualifiers --std=c++20 -fdiagnostics-color -DDEBUG", "CMAKE_CXX_FLAGS_RELEASE": "-fPIC -Wall -pedantic -Wextra -Werror -Wno-missing-braces -Wno-ignored-qualifiers --std=c++20 -fdiagnostics-color -fno-omit-frame-pointer -DNDEBUG -O3", - "CMAKE_INSTALL_PREFIX": "${sourceDir}/install/${presetName}", - "CONFIG_DEFAULTS_PATH": "config/profiles/default/*.conf;config/profiles/data_stream/*.conf", + "CONFIG_DEFAULTS_PATH": "spark/config/profiles/default/*.conf;spark/config/profiles/data_stream/*.conf", "DOTNET_BINARY_DIR": "${sourceDir}/build/$/bin/net7.0", "EXPORT_MD_CONSUMER": { "type": "BOOL", diff --git a/cmake/ExportToParent.cmake b/cmake/ExportToParent.cmake new file mode 100644 index 000000000..106380e72 --- /dev/null +++ b/cmake/ExportToParent.cmake @@ -0,0 +1,7 @@ +include_guard(GLOBAL) + +macro(export_to_parent) + foreach(var IN ITEMS ${ARGN}) + set(${var} ${${var}} PARENT_SCOPE) + endforeach() +endmacro() diff --git a/cmake/InitLibrary.cmake b/cmake/InitLibrary.cmake new file mode 100644 index 000000000..38a71eb6e --- /dev/null +++ b/cmake/InitLibrary.cmake @@ -0,0 +1,142 @@ +include_guard(DIRECTORY) +include(${CMAKE_SOURCE_DIR}/cmake/ExportToParent.cmake) +include(${CMAKE_SOURCE_DIR}/cmake/InstallBasic.cmake) +include(${CMAKE_SOURCE_DIR}/cmake/ProtobufGenerateCpp.cmake) +include(${CMAKE_SOURCE_DIR}/cmake/SetFirstDefined.cmake) +include(${CMAKE_SOURCE_DIR}/cmake/safe_dep_glob.cmake) + +function(init_library) + set(_options SHARED STATIC) + set(_one_value_args + NAME + SOURCE_DIR + INCLUDE_DIR + ) + set(_multi_value_args) + cmake_parse_arguments(_ARGS "${_options}" "${_one_value_args}" "${_multi_value_args}" ${ARGN}) + if (_ARGS_SHARED AND _ARGS_STATIC) + message(FATAL_ERROR "Invalid args passed to init_library: cannot specify STATIC and SHARED") + endif() + set_first_defined(_name _ARGS_NAME PROJECT_NAME) + set_first_defined(_source_dir _ARGS_SOURCE_DIR _name) + set_first_defined(_include_dir _ARGS_INCLUDE_DIR _source_dir) + + # Cpp sources + file( + GLOB_RECURSE ${_name}_SOURCES + RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} + ${_source_dir}/*.cpp + ) + # Note: cpp files inside 'tests' dir(s) are considered tests. + # Remove tests from main sources, and add them to test sources + foreach(item ${${_name}_SOURCES}) + if(${item} MATCHES "tests/.*\.cpp$") + list(APPEND ${_name}_TEST_SOURCES ${item}) + endif() + endforeach() + foreach(item ${${_name}_TEST_SOURCES}) + list(REMOVE_ITEM ${_name}_SOURCES ${item}) + endforeach() + + # Proto sources + file( + GLOB_RECURSE ${_name}_PROTO_SOURCES + RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} + ${_source_dir}/protobufs/*.proto + ) + update_deps_file("${${_name}_PROTO_SOURCES};") + protobuf_generate_cpp( + CXX_SOURCES ${_name}_CXX_PROTO_SOURCES + CXX_HEADERS ${_name}_CXX_PROTO_HEADERS + CXX_OUT_DIR ${CMAKE_CURRENT_BINARY_DIR} + PROTO_INCLUDE_DIRS + ${EXTERNALS_INCLUDE} + ${CMAKE_CURRENT_SOURCE_DIR} + PROTO_SOURCES + ${${_name}_PROTO_SOURCES} + ) + + export_to_parent( + ${_name}_SOURCES + ${_name}_TEST_SOURCES + ${_name}_PROTO_SOURCES + ${_name}_CXX_PROTO_SOURCES + ${_name}_CXX_PROTO_HEADERS + ) + + # Add main lib + if (_ARGS_STATIC) + add_library(${_name} STATIC ${${_name}_SOURCES} ${${_name}_CXX_PROTO_SOURCES}) + elseif(_ARGS_SHARED) + add_library(${_name} SHARED ${${_name}_SOURCES} ${${_name}_CXX_PROTO_SOURCES}) + else() + add_library(${_name} ${${_name}_SOURCES} ${${_name}_CXX_PROTO_SOURCES}) + endif() + target_include_directories( + ${_name} + SYSTEM + BEFORE + PUBLIC + $ + $ + ) + target_include_directories( + ${_name} + PUBLIC + $ + $ + ) + # Include protos (if any) + if (${_name}_PROTO_SOURCES) + target_include_directories( + ${_name} + PUBLIC + $ + ) + endif() + target_link_directories( + ${_name} + PUBLIC + $ + $> + $ + ) + # Install main lib + foreach(_hdr ${${_name}_CXX_PROTO_HEADERS}) + file(RELATIVE_PATH _relative_path ${CMAKE_CURRENT_BINARY_DIR} ${_hdr}) + install(FILES ${_hdr} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${_relative_path}) + endforeach() + install_basic( + NAME ${_name} + INCLUDE_DIR ${_include_dir} + ) + + # Add tests executable (if there are any) + if (${_name}_TEST_SOURCES AND NOT WIN32) + add_executable(${_name}-tests ${${_name}_TEST_SOURCES}) + + get_target_property(_lib_type ${_name} TYPE) + if (_lib_type STREQUAL "SHARED_LIBRARY") + # Set RPATH so the tests exe knows where to find the shared lib. + set_target_properties( + ${_name}-tests + PROPERTIES + BUILD_RPATH "$ORIGIN" + INSTALL_RPATH "$ORIGIN/../${CMAKE_INSTALL_LIBDIR}" + ) + endif() + + # Link main lib + target_link_directories( + ${_name}-tests + PRIVATE + $ + $ + ) + target_link_libraries(${_name}-tests PRIVATE ${_name}) + + # Catch2 + find_package(Catch2 CONFIG REQUIRED COMPONENTS Catch2WithMain) + target_link_libraries(${_name}-tests PRIVATE Catch2::Catch2WithMain) + endif() +endfunction() diff --git a/cmake/InstallBasic.cmake b/cmake/InstallBasic.cmake new file mode 100644 index 000000000..252962853 --- /dev/null +++ b/cmake/InstallBasic.cmake @@ -0,0 +1,39 @@ +include_guard(DIRECTORY) +include(GNUInstallDirs) +include(${CMAKE_SOURCE_DIR}/cmake/PackBasic.cmake) +include(${CMAKE_SOURCE_DIR}/cmake/SetFirstDefined.cmake) + +function(install_basic) + set(_options) + set(_one_value_args NAME INCLUDE_DIR) + set(_multi_value_args) + cmake_parse_arguments(_ARGS "${_options}" "${_one_value_args}" "${_multi_value_args}" ${ARGN}) + set_first_defined(_name _ARGS_NAME PROJECT_NAME) + set_first_defined(_include_dir _ARGS_INCLUDE_DIR _name) + + file( + GLOB_RECURSE ${_name}_HEADERS + RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} + ${_include_dir}/*.h) + + target_sources(${_name} + PUBLIC + FILE_SET HEADERS FILES ${${_name}_HEADERS}) + + install( + TARGETS ${_name} + EXPORT ${_name}Targets + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + FILE_SET HEADERS DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} + ) + + install( + EXPORT ${_name}Targets + FILE ${_name}Targets.cmake + NAMESPACE ${_name}:: + DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${_name}) + + pack_basic() +endfunction() diff --git a/cmake/PackBasic.cmake b/cmake/PackBasic.cmake new file mode 100644 index 000000000..ec1bafbb2 --- /dev/null +++ b/cmake/PackBasic.cmake @@ -0,0 +1,44 @@ +include_guard(DIRECTORY) +include(CMakePackageConfigHelpers) +include(${CMAKE_SOURCE_DIR}/cmake/SetFirstDefined.cmake) + +function(pack_basic) + set(_options) + set(_one_value_args NAME) + set(_multi_value_args) + cmake_parse_arguments(_ARGS "${_options}" "${_one_value_args}" "${_multi_value_args}" ${ARGN}) + set_first_defined(_name _ARGS_NAME PROJECT_NAME) + + find_package(Git QUIET) + + if(GIT_FOUND) + execute_process( + COMMAND ${GIT_EXECUTABLE} describe --tags --always --dirty + WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} + OUTPUT_VARIABLE PROJECT_VERSION + OUTPUT_STRIP_TRAILING_WHITESPACE + ) + endif() + + if(NOT GIT_FOUND OR PROJECT_VERSION STREQUAL "") + set(PROJECT_VERSION "0.0.0") + endif() + + write_basic_package_version_file( + "${CMAKE_CURRENT_BINARY_DIR}/${_name}ConfigVersion.cmake" + VERSION ${PROJECT_VERSION} + COMPATIBILITY AnyNewerVersion + ) + + configure_package_config_file( + "${CMAKE_CURRENT_SOURCE_DIR}/Config.cmake.in" + "${CMAKE_CURRENT_BINARY_DIR}/${_name}Config.cmake" + INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${_name} + ) + + install( + FILES + "${CMAKE_CURRENT_BINARY_DIR}/${_name}Config.cmake" + "${CMAKE_CURRENT_BINARY_DIR}/${_name}ConfigVersion.cmake" + DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${_name}) +endfunction() diff --git a/cmake/Protobuf.cmake b/cmake/Protobuf.cmake index 285fb1071..4ce664e6d 100644 --- a/cmake/Protobuf.cmake +++ b/cmake/Protobuf.cmake @@ -1,12 +1,23 @@ set(Protobuf_PROTOC_EXECUTABLE "${EXTERNALS_BIN}/protoc") set(PROTOBUF_INCLUDE_DIRS "${EXTERNALS_INCLUDE}") set(PROTOBUF_STATIC_LIB "libprotobuf") +set(_protobuf_src_dir ${CMAKE_SOURCE_DIR}/src/lib_spark) +set(_protobuf_bin_dir ${CMAKE_BINARY_DIR}/src/lib_spark) -function(Protobuf_Generate_Cpp SRCS HDRS) - set(${SRCS}) - set(${HDRS}) +function(Protobuf_Generate_Cpp) + set(_options) + set(_one_value_args CXX_SOURCES CXX_HEADERS CXX_OUT_DIR) + set(_multi_value_args PROTO_INCLUDE_DIRS PROTO_SOURCES) + cmake_parse_arguments(_ARGS "${_options}" "${_one_value_args}" "${_multi_value_args}" ${ARGN}) + set(${_ARGS_CXX_SOURCES}) + set(${_ARGS_CXX_HEADERS}) - foreach(FIL ${ARGN}) + set(_proto_include_cli_args) + foreach(_dir ${_ARGS_PROTO_INCLUDE_DIRS}) + list(APPEND _proto_include_cli_args -I ${_dir}) + endforeach() + + foreach(FIL ${_ARGS_PROTO_SOURCES}) get_filename_component(ABS_FIL ${FIL} ABSOLUTE) get_filename_component(FIL_WE ${FIL} NAME_WE) get_filename_component(FIL_DIR ${FIL} DIRECTORY) @@ -14,48 +25,56 @@ function(Protobuf_Generate_Cpp SRCS HDRS) set(FIL_WE "${FIL_DIR}/${FIL_WE}") endif() - list(APPEND ${SRCS} "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.pb.cc") - list(APPEND ${HDRS} "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.pb.h") + list(APPEND ${_ARGS_CXX_SOURCES} "${_ARGS_CXX_OUT_DIR}/${FIL_WE}.pb.cc") + list(APPEND ${_ARGS_CXX_HEADERS} "${_ARGS_CXX_OUT_DIR}/${FIL_WE}.pb.h") add_custom_command( - OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.pb.cc" - "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.pb.h" + OUTPUT "${_ARGS_CXX_OUT_DIR}/${FIL_WE}.pb.cc" + "${_ARGS_CXX_OUT_DIR}/${FIL_WE}.pb.h" COMMAND - ${Protobuf_PROTOC_EXECUTABLE} ARGS --cpp_out=${CMAKE_BINARY_DIR}/src -I - ${PROTOBUF_INCLUDE_DIRS} -I ${CMAKE_SOURCE_DIR}/src ${ABS_FIL} + ${Protobuf_PROTOC_EXECUTABLE} ARGS --cpp_out=${_ARGS_CXX_OUT_DIR} ${_proto_include_cli_args} ${ABS_FIL} DEPENDS ${ABS_FIL} COMMENT "Running C++ protocol buffer compiler on ${FIL}" VERBATIM) endforeach() - set_source_files_properties(${${SRCS}} ${${HDRS}} PROPERTIES GENERATED TRUE) + set_source_files_properties(${${_ARGS_CXX_SOURCES}} ${${_ARGS_CXX_HEADERS}} PROPERTIES GENERATED TRUE) # remove some warnings from protobuf generated files if(WIN32) - set_source_files_properties(${${SRCS}} PROPERTIES COMPILE_FLAGS + set_source_files_properties(${${_ARGS_CXX_SOURCES}} PROPERTIES COMPILE_FLAGS "/wd4309 /wd4838") else() set_source_files_properties( - ${${SRCS}} + ${${_ARGS_CXX_SOURCES}} PROPERTIES COMPILE_FLAGS "-Wno-unused-parameter -Wno-effc++ -Wno-pedantic -Wno-sign-compare -Wno-uninitialized" ) endif() - set(${SRCS} - ${${SRCS}} + set(${_ARGS_CXX_SOURCES} + ${${_ARGS_CXX_SOURCES}} PARENT_SCOPE) - set(${HDRS} - ${${HDRS}} + set(${_ARGS_CXX_HEADERS} + ${${_ARGS_CXX_HEADERS}} PARENT_SCOPE) endfunction() -function(Service_Compiler_Generate_Cpp SRCS HDRS) - set(${SRCS}) - set(${HDRS}) +function(Service_Compiler_Generate_Cpp) + set(_options) + set(_one_value_args CXX_SOURCES CXX_HEADERS CXX_OUT_DIR) + set(_multi_value_args PROTO_INCLUDE_DIRS PROTO_SOURCES) + cmake_parse_arguments(_ARGS "${_options}" "${_one_value_args}" "${_multi_value_args}" ${ARGN}) + set(${_ARGS_CXX_SOURCES}) + set(${_ARGS_CXX_HEADERS}) - foreach(FIL ${ARGN}) + set(_proto_include_cli_args) + foreach(_dir ${_ARGS_PROTO_INCLUDE_DIRS}) + list(APPEND _proto_include_cli_args -I ${_dir}) + endforeach() + + foreach(FIL ${_ARGS_PROTO_SOURCES}) get_filename_component(ABS_FIL ${FIL} ABSOLUTE) get_filename_component(FIL_WE ${FIL} NAME_WE) get_filename_component(FIL_DIR ${FIL} DIRECTORY) @@ -63,58 +82,58 @@ function(Service_Compiler_Generate_Cpp SRCS HDRS) set(FIL_WE "${FIL_DIR}/${FIL_WE}") endif() - list(APPEND ${SRCS} "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.pb.cc") - list(APPEND ${HDRS} "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.pb.h") + list(APPEND ${_ARGS_CXX_SOURCES} "${_ARGS_CXX_OUT_DIR}/${FIL_WE}.pb.cc") + list(APPEND ${_ARGS_CXX_HEADERS} "${_ARGS_CXX_OUT_DIR}/${FIL_WE}.pb.h") - list(APPEND ${SRCS} "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.client.pb.cc") - list(APPEND ${HDRS} "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.client.pb.h") + list(APPEND ${_ARGS_CXX_SOURCES} "${_ARGS_CXX_OUT_DIR}/${FIL_WE}.client.pb.cc") + list(APPEND ${_ARGS_CXX_HEADERS} "${_ARGS_CXX_OUT_DIR}/${FIL_WE}.client.pb.h") - list(APPEND ${SRCS} "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.server.pb.cc") - list(APPEND ${HDRS} "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.server.pb.h") + list(APPEND ${_ARGS_CXX_SOURCES} "${_ARGS_CXX_OUT_DIR}/${FIL_WE}.server.pb.cc") + list(APPEND ${_ARGS_CXX_HEADERS} "${_ARGS_CXX_OUT_DIR}/${FIL_WE}.server.pb.h") set(TEMPLATES - ${CMAKE_CURRENT_SOURCE_DIR}/api/service_compiler/templates/cpp/client.pb.cc - ${CMAKE_CURRENT_SOURCE_DIR}/api/service_compiler/templates/cpp/client.pb.h - ${CMAKE_CURRENT_SOURCE_DIR}/api/service_compiler/templates/cpp/server.pb.cc - ${CMAKE_CURRENT_SOURCE_DIR}/api/service_compiler/templates/cpp/server.pb.h + ${CMAKE_SOURCE_DIR}/src/lib_spark/spark/api/service_compiler/templates/cpp/client.pb.cc + ${CMAKE_SOURCE_DIR}/src/lib_spark/spark/api/service_compiler/templates/cpp/client.pb.h + ${CMAKE_SOURCE_DIR}/src/lib_spark/spark/api/service_compiler/templates/cpp/server.pb.cc + ${CMAKE_SOURCE_DIR}/src/lib_spark/spark/api/service_compiler/templates/cpp/server.pb.h ) + set(_plugin_py ${CMAKE_SOURCE_DIR}/src/lib_spark/spark/api/service_compiler/plugin.py) if(WIN32) + set(_plugin_cmd ${CMAKE_SOURCE_DIR}/src/lib_spark/spark/api/service_compiler/plugin.cmd) add_custom_command( - OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.pb.cc" - "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.pb.h" - "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.client.pb.cc" - "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.client.pb.h" - "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.server.pb.cc" - "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.server.pb.h" + OUTPUT "${_ARGS_CXX_OUT_DIR}/${FIL_WE}.pb.cc" + "${_ARGS_CXX_OUT_DIR}/${FIL_WE}.pb.h" + "${_ARGS_CXX_OUT_DIR}/${FIL_WE}.client.pb.cc" + "${_ARGS_CXX_OUT_DIR}/${FIL_WE}.client.pb.h" + "${_ARGS_CXX_OUT_DIR}/${FIL_WE}.server.pb.cc" + "${_ARGS_CXX_OUT_DIR}/${FIL_WE}.server.pb.h" COMMAND SET PYTHONPATH=${SPARK_PYTHON} COMMAND ${CMAKE_SOURCE_DIR}/.venv/Scripts/activate.bat COMMAND - ${Protobuf_PROTOC_EXECUTABLE} ARGS --cpp_out=${CMAKE_BINARY_DIR}/src - --plugin=protoc-gen-service=${CMAKE_SOURCE_DIR}/src/lib/api/service_compiler/plugin.cmd - --service_out=lang=cpp:${CMAKE_BINARY_DIR}/src -I - ${PROTOBUF_INCLUDE_DIRS} -I ${CMAKE_SOURCE_DIR}/src ${ABS_FIL} - DEPENDS ${ABS_FIL} ${TEMPLATES} - ${CMAKE_CURRENT_SOURCE_DIR}/api/service_compiler/plugin.py + ${Protobuf_PROTOC_EXECUTABLE} ARGS --cpp_out=${_ARGS_CXX_OUT_DIR} + --plugin=protoc-gen-service=${_plugin_cmd} + --service_out=lang=cpp:${_ARGS_CXX_OUT_DIR} -I + ${PROTOBUF_INCLUDE_DIRS} -I ${_protobuf_src_dir} ${ABS_FIL} + DEPENDS ${ABS_FIL} ${TEMPLATES} ${_plugin_cmd} ${_plugin_py} COMMENT "Running C++ service compiler on ${FIL}" VERBATIM) else() add_custom_command( - OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.pb.cc" - "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.pb.h" - "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.client.pb.cc" - "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.client.pb.h" - "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.server.pb.cc" - "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.server.pb.h" + OUTPUT "${_ARGS_CXX_OUT_DIR}/${FIL_WE}.pb.cc" + "${_ARGS_CXX_OUT_DIR}/${FIL_WE}.pb.h" + "${_ARGS_CXX_OUT_DIR}/${FIL_WE}.client.pb.cc" + "${_ARGS_CXX_OUT_DIR}/${FIL_WE}.client.pb.h" + "${_ARGS_CXX_OUT_DIR}/${FIL_WE}.server.pb.cc" + "${_ARGS_CXX_OUT_DIR}/${FIL_WE}.server.pb.h" COMMAND ${CMAKE_SOURCE_DIR}/tools/venv_exec.sh ARGS ${Protobuf_PROTOC_EXECUTABLE} - --cpp_out=${CMAKE_BINARY_DIR}/src - --plugin=protoc-gen-service=${CMAKE_SOURCE_DIR}/src/lib/api/service_compiler/plugin.py - --service_out=lang=cpp,make_file_name=${ABS_FIL}:${CMAKE_BINARY_DIR}/src - -I ${PROTOBUF_INCLUDE_DIRS} -I ${CMAKE_SOURCE_DIR}/src ${ABS_FIL} - DEPENDS ${ABS_FIL} ${TEMPLATES} - ${CMAKE_CURRENT_SOURCE_DIR}/api/service_compiler/plugin.py + --cpp_out=${_ARGS_CXX_OUT_DIR} + --plugin=protoc-gen-service=${_plugin_py} + --service_out=lang=cpp,make_file_name=${ABS_FIL}:${_ARGS_CXX_OUT_DIR} + ${_proto_include_cli_args} ${ABS_FIL} + DEPENDS ${ABS_FIL} ${TEMPLATES} ${_plugin_py} COMMENT "Running C++ service compiler on ${FIL}" VERBATIM) endif() @@ -123,22 +142,22 @@ function(Service_Compiler_Generate_Cpp SRCS HDRS) # remove some warnings from protobuf generated files if(WIN32) - set_source_files_properties(${${SRCS}} PROPERTIES COMPILE_FLAGS + set_source_files_properties(${${_ARGS_CXX_SOURCES}} PROPERTIES COMPILE_FLAGS "/wd4309 /wd4838") else() set_source_files_properties( - ${${SRCS}} + ${${_ARGS_CXX_SOURCES}} PROPERTIES COMPILE_FLAGS "-Wno-unused-parameter -Wno-effc++ -Wno-pedantic -Wno-sign-compare -Wno-uninitialized" ) endif() - set(${SRCS} - ${${SRCS}} + set(${_ARGS_CXX_SOURCES} + ${${_ARGS_CXX_SOURCES}} PARENT_SCOPE) - set(${HDRS} - ${${HDRS}} + set(${_ARGS_CXX_HEADERS} + ${${_ARGS_CXX_HEADERS}} PARENT_SCOPE) endfunction() diff --git a/cmake/ProtobufGenerateFs.cmake b/cmake/ProtobufGenerateFs.cmake index f9d5da64e..5a44732d1 100644 --- a/cmake/ProtobufGenerateFs.cmake +++ b/cmake/ProtobufGenerateFs.cmake @@ -27,8 +27,8 @@ function(protobuf_generate_fs) endforeach() set(_venv_exec ${CMAKE_SOURCE_DIR}/tools/venv_exec.sh) - set(_plugin_py ${CMAKE_SOURCE_DIR}/src/lib/api/service_compiler/plugin.py) - set(_template_fs ${CMAKE_SOURCE_DIR}/src/lib/api/service_compiler/templates/fs/fable.fs) + set(_plugin_py ${CMAKE_SOURCE_DIR}/src/lib_spark/spark/api/service_compiler/plugin.py) + set(_template_fs ${CMAKE_SOURCE_DIR}/src/lib_spark/spark/api/service_compiler/templates/fs/fable.fs) add_custom_command( OUTPUT ${_outputs} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} diff --git a/cmake/SetFirstDefined.cmake b/cmake/SetFirstDefined.cmake new file mode 100644 index 000000000..b7f8e8a22 --- /dev/null +++ b/cmake/SetFirstDefined.cmake @@ -0,0 +1,10 @@ +include_guard(GLOBAL) + +macro(set_first_defined RESULT) + foreach(_arg ${ARGN}) + if (DEFINED ${_arg}) + set(${RESULT} ${${_arg}}) + break() + endif() + endforeach() +endmacro() diff --git a/cmake/vs_filters.cmake b/cmake/vs_filters.cmake deleted file mode 100644 index 028caf8e1..000000000 --- a/cmake/vs_filters.cmake +++ /dev/null @@ -1,24 +0,0 @@ -cmake_minimum_required(VERSION 3.5) - -# Explicitly set policy to convert relative paths to absolute (although this is a default policy, -# setting it explicitly prevents a compile-warning) -cmake_policy(SET CMP0076 NEW) - -# add protos to the library to facilitate source_group -target_sources(libspark PUBLIC ${Config_Protos} ${NonConfig_Protos} ${Service_Protos}) - -function(assign_source_group) - foreach(_source IN ITEMS ${ARGN}) - if(IS_ABSOLUTE "${_source}") - file(RELATIVE_PATH _source_rel "${CMAKE_CURRENT_SOURCE_DIR}" "${_source}") - else() - set(_source_rel "${_source}") - endif() - get_filename_component(_source_path "${_source_rel}" PATH) - string(REPLACE "/" "\\" _source_path_msvc "${_source_path}") - source_group("${_source_path_msvc}" FILES "${_source}") - set(SOURCE_FILES "${_source}") - endforeach() -endfunction(assign_source_group) - -assign_source_group(${SparkLib_Sources} ${Config_Protos} ${NonConfig_Protos} ${Service_Protos}) diff --git a/compose.yaml b/compose.yaml index aaabcae16..be532ca10 100644 --- a/compose.yaml +++ b/compose.yaml @@ -3,7 +3,7 @@ services: volumes: - ${SPARKD__DATA_DIR:-sparkd_data}:/home/bts/sparkdata/data build: - dockerfile: src/server/sparkd/Dockerfile + dockerfile: src/app_sparkd/Dockerfile args: - IMAGE=${SPARKD__IMAGE} - SOURCE_DIR=${SPARKD__SOURCE_DIR} @@ -39,7 +39,7 @@ services: - ${SPARKD__DATA_DIR:-sparkd_data}:/home/bts/sparkdata/data - ${SPARKD__RUNTIME_CONF_DIR:-sparkd_conf}:/home/bts/sparkdata/conf build: - dockerfile: src/server/sparkd/Dockerfile + dockerfile: src/app_sparkd/Dockerfile args: - IMAGE=${SPARKD__IMAGE} - SOURCE_DIR=${SPARKD__SOURCE_DIR} diff --git a/doc/api/content/client/getting-started/services.md b/doc/api/content/client/getting-started/services.md index 2a0f60757..f09676a9c 100644 --- a/doc/api/content/client/getting-started/services.md +++ b/doc/api/content/client/getting-started/services.md @@ -124,8 +124,8 @@ service OrderService { ``` ### C++ Example ```cpp -#include "lib/api/public/ServiceContext.h" -#include "lib/api/services/OrderService.client.pb.h" +#include "spark/api/public/ServiceContext.h" +#include "spark/api/services/OrderService.client.pb.h" using namespace bts::api; ServiceContext ctx; auto orders = ctx.locate(); diff --git a/doc/api/content/client/services/marketdata.md b/doc/api/content/client/services/marketdata.md index b2c08638c..dacdd26de 100644 --- a/doc/api/content/client/services/marketdata.md +++ b/doc/api/content/client/services/marketdata.md @@ -29,9 +29,9 @@ namespace sample { ``` ```cpp -#include "lib/api/public/ServiceContext.h" -#include "spark/lib/domain_model/Security.h" -#include "lib/api/services/MarketDataService.client.pb.h" +#include "spark/api/public/ServiceContext.h" +#include "spark/domain_model/Security.h" +#include "spark/api/services/MarketDataService.client.pb.h" #include using namespace bts::api; diff --git a/src/DataStreamSuite/DataStreamCore/DataStreamCore.csproj b/src/DataStreamSuite/DataStreamCore/DataStreamCore.csproj index 0fe587cc4..534eab78b 100644 --- a/src/DataStreamSuite/DataStreamCore/DataStreamCore.csproj +++ b/src/DataStreamSuite/DataStreamCore/DataStreamCore.csproj @@ -19,8 +19,8 @@ - - $(ProtoOutputPath)/lib/config/protos + + $(ProtoOutputPath)/lib_spark/spark/config/protos diff --git a/src/Directory.Build.props b/src/Directory.Build.props index 839a47d18..87b8de912 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -43,7 +43,7 @@ Condition="Exists($(ComputerSpecificConfig))" /> - $(SparkRoot)\src\lib\api\service_compiler + $(SparkRoot)\src\lib_spark\spark\api\service_compiler diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets index 6f55fbc4a..3409f22ba 100644 --- a/src/Directory.Build.targets +++ b/src/Directory.Build.targets @@ -24,7 +24,7 @@ $(protoc) %(Proto.FullPath) $(GenProtosCmd) --error_format=msvs - $(GenProtosCmd) --proto_path=$(SourceRoot) + $(GenProtosCmd) --proto_path=$(SourceRoot)/lib_spark $(GenProtosCmd) --plugin="protoc-gen-spark-csharp=$(ProtocPlugin)" $(GenProtosCmd) --spark-csharp_out=lang=c#,templates=immutable.pb.cs,strip_out_path=1:%(Proto.OutDir) $(GenProtosCmd) --csharp_out=%(Proto.OutDir) @@ -65,7 +65,7 @@ $(protoc) %(ProtoService.FullPath) $(GenProtosCmd) --error_format=msvs - $(GenProtosCmd) --proto_path=$(SourceRoot) + $(GenProtosCmd) --proto_path=$(SourceRoot)/lib_spark $(GenProtosCmd) --plugin="protoc-gen-service=$(ProtocPlugin)" $(GenProtosCmd) --service_out=lang=c#,strip_out_path=1:%(ProtoService.OutDir) $(GenProtosCmd) --csharp_out=%(ProtoService.OutDir) diff --git a/src/Spark.Admin.WebApp/CMakeLists.txt b/src/Spark.Admin.WebApp/CMakeLists.txt index 3742635d8..136f74271 100644 --- a/src/Spark.Admin.WebApp/CMakeLists.txt +++ b/src/Spark.Admin.WebApp/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.10) +cmake_minimum_required(VERSION 3.5) project(Spark.Admin.WebApp) include(GNUInstallDirs) @@ -10,11 +10,11 @@ include(${CMAKE_SOURCE_DIR}/cmake/ProtobufGenerateFs.cmake) file( GLOB_RECURSE ${PROJECT_NAME}_PROTO_SOURCES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - ../lib/api/*.proto - ../lib/api/services/*.proto - ../lib/domain_model/*.proto - ../lib/sparkproto/*.proto - ../lib/md/protos/*.proto + ../lib_spark/spark/api/*.proto + ../lib_spark/spark/api/services/*.proto + ../lib_spark/spark/domain_model/*.proto + ../lib_spark/spark/sparkproto/*.proto + ../lib_spark/spark/md/protos/*.proto ../../externals/linux/include/google/protobuf/descriptor.proto ../../externals/linux/include/google/protobuf/timestamp.proto ) @@ -44,7 +44,7 @@ set(_build_admin_web_app_deps ${_build_admin_web_app_py} ${CMAKE_CURRENT_SOURCE_DIR}/src/Spark.Admin.WebApp.fsproj ${CMAKE_CURRENT_SOURCE_DIR}/webpack.config.js - ${CMAKE_SOURCE_DIR}/src/lib/api/service_compiler/templates/fs/fable.fs + ${CMAKE_SOURCE_DIR}/src/lib_spark/spark/api/service_compiler/templates/fs/fable.fs ${CMAKE_CURRENT_SOURCE_DIR}/package-lock.json ${${PROJECT_NAME}_PROTO_SOURCES} ${_api_ts_SOURCES} @@ -73,7 +73,7 @@ add_custom_command( protobuf_generate_js( TARGET_NAME generate_js_protos PROTO_INCLUDE_DIRS - .. + ../lib_spark ../../externals/linux/include PROTO_SOURCES ${${PROJECT_NAME}_PROTO_SOURCES} OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/proto.js @@ -82,7 +82,7 @@ protobuf_generate_js( protobuf_generate_fs( TARGET_NAME generate_fs_protos PROTO_INCLUDE_DIRS - .. + ../lib_spark ../../externals/linux/include PROTO_SOURCES ${${PROJECT_NAME}_PROTO_SOURCES} OUT_DIR ${CMAKE_CURRENT_BINARY_DIR}/fable @@ -184,4 +184,3 @@ install( DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/public" DESTINATION "${CMAKE_INSTALL_BINDIR}/${PROJECT_NAME}" ) - diff --git a/src/app_sparkd/CMakeLists.txt b/src/app_sparkd/CMakeLists.txt new file mode 100644 index 000000000..96da7da90 --- /dev/null +++ b/src/app_sparkd/CMakeLists.txt @@ -0,0 +1,161 @@ +cmake_minimum_required(VERSION 3.14) +project(sparkd) + +include(FetchContent) +include(${CMAKE_SOURCE_DIR}/cmake/safe_dep_glob.cmake) +include(${CMAKE_SOURCE_DIR}/cmake/ProtobufGenerateCpp.cmake) +include(${CMAKE_SOURCE_DIR}/cmake/InstallBasic.cmake) +include(GNUInstallDirs) + +if (NOT DEFINED PROJECT_VERSION) + set(PROJECT_VERSION 1.0.0) +endif() + +# dependencies +file( + GLOB_RECURSE ${PROJECT_NAME}_PROTO_SOURCES + RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} + *.proto +) +file( + GLOB_RECURSE ${PROJECT_NAME}_SOURCES + RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} + *.cpp +) +update_deps_file("${${PROJECT_NAME}_PROTO_SOURCES};${${PROJECT_NAME}_SOURCES}") + +protobuf_generate_cpp( + CXX_SOURCES ${PROJECT_NAME}_PROTO_CXX_SOURCES + CXX_HEADERS ${PROJECT_NAME}_PROTO_CXX_HEADERS + CXX_OUT_DIR ${CMAKE_CURRENT_BINARY_DIR}/include + PROTO_INCLUDE_DIRS + ${EXTERNALS_INCLUDE} + ${CMAKE_SOURCE_DIR}/src/lib_spark + ${CMAKE_CURRENT_SOURCE_DIR} + PROTO_SOURCES + ${${PROJECT_NAME}_PROTO_SOURCES} +) +add_executable(sparkd ${${PROJECT_NAME}_SOURCES} ${${PROJECT_NAME}_PROTO_CXX_SOURCES}) + +# include paths +target_include_directories( + sparkd + PUBLIC + $ + $/include + $ +) + +find_package(PkgConfig REQUIRED) +pkg_check_modules(emumba-deribit-connector-library REQUIRED emumba-deribit-connector) + +# This dir contains rapidjsonConfig.cmake +list(APPEND CMAKE_PREFIX_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake_modules) +find_package(rapidjson REQUIRED) +target_include_directories( + ${PROJECT_NAME} SYSTEM + PUBLIC + $ +) +add_dependencies(${PROJECT_NAME} rapidjson_project) + +# databento +FetchContent_Declare( + databento + GIT_REPOSITORY https://github.com/databento/databento-cpp + GIT_TAG v0.31.0 +) +FetchContent_MakeAvailable(databento) + +# deribit-demo log level +if(NOT DEFINED DERIBIT_DEMO_LOG_LEVEL) + add_definitions(-DSPDLOG_ACTIVE_LEVEL=0) + message("-- Building of DERIBIT_DEMO_LOG_LEVEL=TRACE") +elseif(DERIBIT_DEMO_LOG_LEVEL STREQUAL "TRACE") + add_definitions(-DSPDLOG_ACTIVE_LEVEL=0) + message("-- Building of DERIBIT_DEMO_LOG_LEVEL=TRACE") +elseif(DERIBIT_DEMO_LOG_LEVEL STREQUAL "DEBUG") + add_definitions(-DSPDLOG_ACTIVE_LEVEL=1) + message("-- Building of DERIBIT_DEMO_LOG_LEVEL=DEBUG") +elseif(DERIBIT_DEMO_LOG_LEVEL STREQUAL "INFO") + add_definitions(-DSPDLOG_ACTIVE_LEVEL=2) + message("-- Building of DERIBIT_DEMO_LOG_LEVEL=INFO") +elseif(DERIBIT_DEMO_LOG_LEVEL STREQUAL "WARN") + add_definitions(-DSPDLOG_ACTIVE_LEVEL=3) + message("-- Building of DERIBIT_DEMO_LOG_LEVEL=WARN") +elseif(DERIBIT_DEMO_LOG_LEVEL STREQUAL "ERROR") + add_definitions(-DSPDLOG_ACTIVE_LEVEL=4) + message("-- Building of DERIBIT_DEMO_LOG_LEVEL=ERROR") +elseif(DERIBIT_DEMO_LOG_LEVEL STREQUAL "CRITICAL") + add_definitions(-DSPDLOG_ACTIVE_LEVEL=5) + message("-- Building of DERIBIT_DEMO_LOG_LEVEL=CRITICAL") +elseif(DERIBIT_DEMO_LOG_LEVEL STREQUAL "OFF") + add_definitions(-DSPDLOG_ACTIVE_LEVEL=6) + message("-- Building of DERIBIT_DEMO_LOG_LEVEL=OFF") +else() + add_definitions(-DSPDLOG_ACTIVE_LEVEL=0) + message("-- Building of DERIBIT_DEMO_LOG_LEVEL=TRACE") +endif() + +target_link_directories( + ${PROJECT_NAME} PUBLIC + $ + $ +) + +# Set RPATH so sparkd knows where to find our shared libs (e.g., libspark). +# The dirs are relative to sparkd's path, represented by "$ORIGIN". +set_target_properties( + ${PROJECT_NAME} PROPERTIES + BUILD_RPATH "$ORIGIN/../lib_spark;$ORIGIN/../lib_python_md" + INSTALL_RPATH "$ORIGIN/../${CMAKE_INSTALL_LIBDIR}" +) + +target_link_libraries( + sparkd + spark + binance_execution + databento::databento + ${emumba-deribit-connector-library_LIBRARIES} + tbb + quickfix + benchmark + Common++ + Packet++ + Pcap++ + lttng-ust + -lpcap + -static-libgcc + -static-libstdc++ + -pthread) + +# Onixs +target_link_libraries( + ${PROJECT_NAME} + onixs-cmemdh + OnixS.IceImpactMulticastPriceFeedHandlerCpp + # gcc doesn't resolve onixs-fix-engine and ACE in runtime path unless we specify + # --no-as-needed. These are onixs deps that aren't called directly by our code. + # Note: this isn't an issue for clang + -Wl,--no-as-needed + onixs-fix-engine + ACE +) + +# Catch2 +find_package(Catch2 CONFIG REQUIRED) +target_link_libraries(${PROJECT_NAME} Catch2::Catch2) + +install_basic() +install( + FILES + "${EXTERNALS_LIB}/libonixs-cmemdh.so" + "${EXTERNALS_LIB}/libonixs-cmemdh.so.4" + "${EXTERNALS_LIB}/libonixs-cmemdh.so.4.8.0" + "${EXTERNALS_LIB}/libOnixS.IceImpactMulticastPriceFeedHandlerCpp.so.3.16.0.0" + "${EXTERNALS_LIB}/libonixs-fix-engine.so" + "${EXTERNALS_LIB}/libonixs-fix-engine.so.4" + "${EXTERNALS_LIB}/libonixs-fix-engine.so.4.10.1" + "${EXTERNALS_LIB}/libACE-5.7.5.so" + DESTINATION ${CMAKE_INSTALL_LIBDIR} +) diff --git a/src/app_sparkd/Config.cmake.in b/src/app_sparkd/Config.cmake.in new file mode 100644 index 000000000..8c9ad12aa --- /dev/null +++ b/src/app_sparkd/Config.cmake.in @@ -0,0 +1,5 @@ +@PACKAGE_INIT@ + +include("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake") + +check_required_components(@PROJECT_NAME@) diff --git a/src/server/sparkd/Dockerfile b/src/app_sparkd/Dockerfile similarity index 91% rename from src/server/sparkd/Dockerfile rename to src/app_sparkd/Dockerfile index 302ef1b1e..ebfd75eab 100644 --- a/src/server/sparkd/Dockerfile +++ b/src/app_sparkd/Dockerfile @@ -1,5 +1,5 @@ ARG IMAGE="sparkd" -ARG CONFIG_DIR="src/server/sparkd/configurations/dev" +ARG CONFIG_DIR="src/app_sparkd/configurations/dev" ARG SOURCE_DIR="install/sparkd-release-gcc" # sparkd_base @@ -22,7 +22,7 @@ FROM sparkd_base AS sparkd # sparkd_md_replay FROM sparkd_base AS sparkd_md_replay -ARG MD_RECORDING_DIR="src/server/sparkd/.md_recording" +ARG MD_RECORDING_DIR="src/app_sparkd/.md_recording" COPY --chown=bts:bts "${MD_RECORDING_DIR}" "/home/bts/sparkdata/data/md_recording" # sparkd_symbols - like sparkd, but doesn't copy a config dir into the image diff --git a/src/server/sparkd/cmake_modules/rapidjsonConfig.cmake b/src/app_sparkd/cmake_modules/rapidjsonConfig.cmake similarity index 100% rename from src/server/sparkd/cmake_modules/rapidjsonConfig.cmake rename to src/app_sparkd/cmake_modules/rapidjsonConfig.cmake diff --git a/src/server/sparkd/spark.conf b/src/app_sparkd/spark.conf similarity index 100% rename from src/server/sparkd/spark.conf rename to src/app_sparkd/spark.conf diff --git a/src/server/sparkd/algo/AlgoDefinitionServiceServer.cpp b/src/app_sparkd/sparkd/algo/AlgoDefinitionServiceServer.cpp similarity index 96% rename from src/server/sparkd/algo/AlgoDefinitionServiceServer.cpp rename to src/app_sparkd/sparkd/algo/AlgoDefinitionServiceServer.cpp index 284a37dad..ba2426a66 100644 --- a/src/server/sparkd/algo/AlgoDefinitionServiceServer.cpp +++ b/src/app_sparkd/sparkd/algo/AlgoDefinitionServiceServer.cpp @@ -1,5 +1,5 @@ #include "AlgoDefinitionServiceServer.h" -#include "lib/utils/PBUtils.h" +#include "spark/utils/PBUtils.h" namespace bts { namespace api { diff --git a/src/server/sparkd/algo/AlgoDefinitionServiceServer.h b/src/app_sparkd/sparkd/algo/AlgoDefinitionServiceServer.h similarity index 76% rename from src/server/sparkd/algo/AlgoDefinitionServiceServer.h rename to src/app_sparkd/sparkd/algo/AlgoDefinitionServiceServer.h index 4c4e282cb..5ec356423 100644 --- a/src/server/sparkd/algo/AlgoDefinitionServiceServer.h +++ b/src/app_sparkd/sparkd/algo/AlgoDefinitionServiceServer.h @@ -1,9 +1,17 @@ #pragma once -#include "lib/api/public/ServiceContext.h" -#include "lib/api/services/AlgoDefinitionService.server.pb.h" -#include "lib/persistence/IStore.h" -#include "lib/persistence/SqliteStore.h" +#include "spark/api/public/ServiceContext.h" +#include "spark/api/services/AlgoDefinitionService.server.pb.h" +#include "spark/api/services/OrderService.client.pb.h" +#include "spark/api/services/OrderService.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/TimeStamp.h" +#include "spark/utils/bts_assert.h" +#include "spark/utils/bts_no_copy.h" +#include #include #include diff --git a/src/server/sparkd/analytics/AnalyticsServiceServer.cpp b/src/app_sparkd/sparkd/analytics/AnalyticsServiceServer.cpp similarity index 98% rename from src/server/sparkd/analytics/AnalyticsServiceServer.cpp rename to src/app_sparkd/sparkd/analytics/AnalyticsServiceServer.cpp index b7672e18f..53a24e537 100644 --- a/src/server/sparkd/analytics/AnalyticsServiceServer.cpp +++ b/src/app_sparkd/sparkd/analytics/AnalyticsServiceServer.cpp @@ -1,14 +1,14 @@ #include "AnalyticsServiceServer.h" -#include "lib/api/apicore.pb.h" -#include "lib/api/services/AnalyticsService.pb.h" -#include "lib/api/services/AnalyticsService.server.pb.h" -#include "lib/logging/logging.h" -#include "lib/persistence/IStore.h" -#include "lib/persistence/SqliteStore.h" -#include "lib/utils/PBUtils.h" -#include "lib/utils/TimeStamp.h" -#include "lib/utils/bts_assert.h" -#include "server/sparkd/algo/AlgoDefinitionServiceServer.h" +#include "spark/api/apicore.pb.h" +#include "spark/api/services/AnalyticsService.pb.h" +#include "spark/api/services/AnalyticsService.server.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/TimeStamp.h" +#include "spark/utils/bts_assert.h" +#include "sparkd/algo/AlgoDefinitionServiceServer.h" #include #include diff --git a/src/server/sparkd/analytics/AnalyticsServiceServer.h b/src/app_sparkd/sparkd/analytics/AnalyticsServiceServer.h similarity index 96% rename from src/server/sparkd/analytics/AnalyticsServiceServer.h rename to src/app_sparkd/sparkd/analytics/AnalyticsServiceServer.h index a79b3b23d..0cdc4c66d 100644 --- a/src/server/sparkd/analytics/AnalyticsServiceServer.h +++ b/src/app_sparkd/sparkd/analytics/AnalyticsServiceServer.h @@ -1,6 +1,7 @@ #pragma once -#include "lib/api/services/AnalyticsService.server.pb.h" +#include "spark/api/services/AnalyticsService.server.pb.h" +#include "spark/utils/bts_no_copy.h" namespace bts { namespace api { diff --git a/src/server/sparkd/cmds/AdminReport.cpp b/src/app_sparkd/sparkd/cmds/AdminReport.cpp similarity index 91% rename from src/server/sparkd/cmds/AdminReport.cpp rename to src/app_sparkd/sparkd/cmds/AdminReport.cpp index 7c9709bc6..dc8678d11 100644 --- a/src/server/sparkd/cmds/AdminReport.cpp +++ b/src/app_sparkd/sparkd/cmds/AdminReport.cpp @@ -1,13 +1,13 @@ #include "AdminReport.h" -#include "lib/api/public/ServiceContext.h" -#include "lib/config/config.h" -#include "lib/config/protos/logging.pb.h" -#include "lib/logging/logging.h" -#include "lib/quickbus/quickbus.h" +#include "spark/api/public/ServiceContext.h" +#include "spark/config/config.h" +#include "spark/config/protos/logging.pb.h" +#include "spark/logging/logging.h" +#include "spark/quickbus/quickbus.h" -#include "lib/api/service_helpers/AdminServiceUtils.h" -#include "lib/api/services/AdminService.client.pb.h" +#include "spark/api/service_helpers/AdminServiceUtils.h" +#include "spark/api/services/AdminService.client.pb.h" #include #include diff --git a/src/server/sparkd/cmds/AdminReport.h b/src/app_sparkd/sparkd/cmds/AdminReport.h similarity index 100% rename from src/server/sparkd/cmds/AdminReport.h rename to src/app_sparkd/sparkd/cmds/AdminReport.h diff --git a/src/server/sparkd/cmds/AutoCert.cpp b/src/app_sparkd/sparkd/cmds/AutoCert.cpp similarity index 99% rename from src/server/sparkd/cmds/AutoCert.cpp rename to src/app_sparkd/sparkd/cmds/AutoCert.cpp index 2e1577f05..40d99132b 100644 --- a/src/server/sparkd/cmds/AutoCert.cpp +++ b/src/app_sparkd/sparkd/cmds/AutoCert.cpp @@ -1,12 +1,12 @@ #include "AutoCert.h" -#include "lib/utils/PBUtils.h" +#include "spark/utils/PBUtils.h" -#include "lib/jetfix/common/InMsgBuffer.h" -#include "lib/utils/bts_chrono.h" -#include "lib/utils/datetime.h" +#include "spark/jetfix/common/InMsgBuffer.h" +#include "spark/utils/bts_chrono.h" +#include "spark/utils/datetime.h" -#include "lib/jetfix/codec/i32_toa.h" -#include "lib/utils/SecureLogon.h" +#include "spark/jetfix/codec/i32_toa.h" +#include "spark/utils/SecureLogon.h" #include #include #include diff --git a/src/server/sparkd/cmds/AutoCert.h b/src/app_sparkd/sparkd/cmds/AutoCert.h similarity index 100% rename from src/server/sparkd/cmds/AutoCert.h rename to src/app_sparkd/sparkd/cmds/AutoCert.h diff --git a/src/server/sparkd/cmds/CMECert.cpp b/src/app_sparkd/sparkd/cmds/CMECert.cpp similarity index 98% rename from src/server/sparkd/cmds/CMECert.cpp rename to src/app_sparkd/sparkd/cmds/CMECert.cpp index 853028715..1167320cd 100644 --- a/src/server/sparkd/cmds/CMECert.cpp +++ b/src/app_sparkd/sparkd/cmds/CMECert.cpp @@ -1,13 +1,13 @@ #include "CMECert.h" -#include "lib/logging/logging.h" -#include "lib/orderman/ilink3/IL3Dispatcher.h" -#include "lib/orderman/ilink3/IL3GW.h" -#include "lib/orderman/ilink3/IL3Reactor.h" -#include "lib/orderman/ilink3/ILink3Utils.h" -#include "lib/os/os.h" -#include "lib/utils/Dispatcher.h" -#include "lib/utils/SecureLogon.h" -#include "lib/utils/TimeStamp.h" +#include "spark/logging/logging.h" +#include "spark/orderman/ilink3/IL3Dispatcher.h" +#include "spark/orderman/ilink3/IL3GW.h" +#include "spark/orderman/ilink3/IL3Reactor.h" +#include "spark/orderman/ilink3/ILink3Utils.h" +#include "spark/os/os.h" +#include "spark/utils/Dispatcher.h" +#include "spark/utils/SecureLogon.h" +#include "spark/utils/TimeStamp.h" #include #include #include diff --git a/src/server/sparkd/cmds/CMECert.h b/src/app_sparkd/sparkd/cmds/CMECert.h similarity index 100% rename from src/server/sparkd/cmds/CMECert.h rename to src/app_sparkd/sparkd/cmds/CMECert.h diff --git a/src/server/sparkd/cmds/ConfigCmd.cpp b/src/app_sparkd/sparkd/cmds/ConfigCmd.cpp similarity index 92% rename from src/server/sparkd/cmds/ConfigCmd.cpp rename to src/app_sparkd/sparkd/cmds/ConfigCmd.cpp index 8bfa35862..526b99b10 100644 --- a/src/server/sparkd/cmds/ConfigCmd.cpp +++ b/src/app_sparkd/sparkd/cmds/ConfigCmd.cpp @@ -1,6 +1,6 @@ #include "ConfigCmd.h" -#include "lib/config/ConfigQuerier.h" -#include "lib/config/config.h" +#include "spark/config/ConfigQuerier.h" +#include "spark/config/config.h" namespace bts::cmds { diff --git a/src/server/sparkd/cmds/ConfigCmd.h b/src/app_sparkd/sparkd/cmds/ConfigCmd.h similarity index 100% rename from src/server/sparkd/cmds/ConfigCmd.h rename to src/app_sparkd/sparkd/cmds/ConfigCmd.h diff --git a/src/server/sparkd/cmds/FIXSim.cpp b/src/app_sparkd/sparkd/cmds/FIXSim.cpp similarity index 69% rename from src/server/sparkd/cmds/FIXSim.cpp rename to src/app_sparkd/sparkd/cmds/FIXSim.cpp index 5f6715e92..9e0352154 100644 --- a/src/server/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/server/sparkd/cmds/FIXSim.h b/src/app_sparkd/sparkd/cmds/FIXSim.h similarity index 100% rename from src/server/sparkd/cmds/FIXSim.h rename to src/app_sparkd/sparkd/cmds/FIXSim.h diff --git a/src/server/sparkd/cmds/KeyCmd.cpp b/src/app_sparkd/sparkd/cmds/KeyCmd.cpp similarity index 90% rename from src/server/sparkd/cmds/KeyCmd.cpp rename to src/app_sparkd/sparkd/cmds/KeyCmd.cpp index afd9181b9..5ac7ed22c 100644 --- a/src/server/sparkd/cmds/KeyCmd.cpp +++ b/src/app_sparkd/sparkd/cmds/KeyCmd.cpp @@ -1,18 +1,18 @@ #include "KeyCmd.h" -#include "lib/config/config.h" -#include "lib/config/protos/keycode.pb.h" -#include "lib/logging/logging.h" -#include "lib/os/os.h" -#include "lib/utils/AuthToken.h" -#include "lib/utils/FileUtils.h" -#include "lib/utils/bts_assert.h" -#include "lib/utils/crypto/CryptoInit.h" -#include "lib/utils/crypto/KeyCodeHelper.h" -#include "lib/utils/crypto/PrivateKey.h" -#include "lib/utils/crypto/PublicKey.h" -#include "lib/utils/datetime.h" -#include "lib/utils/helper_macros.h" +#include "spark/config/config.h" +#include "spark/config/protos/keycode.pb.h" +#include "spark/logging/logging.h" +#include "spark/os/os.h" +#include "spark/utils/AuthToken.h" +#include "spark/utils/FileUtils.h" +#include "spark/utils/bts_assert.h" +#include "spark/utils/crypto/CryptoInit.h" +#include "spark/utils/crypto/KeyCodeHelper.h" +#include "spark/utils/crypto/PrivateKey.h" +#include "spark/utils/crypto/PublicKey.h" +#include "spark/utils/datetime.h" +#include "spark/utils/helper_macros.h" #include #include diff --git a/src/server/sparkd/cmds/KeyCmd.h b/src/app_sparkd/sparkd/cmds/KeyCmd.h similarity index 100% rename from src/server/sparkd/cmds/KeyCmd.h rename to src/app_sparkd/sparkd/cmds/KeyCmd.h diff --git a/src/server/sparkd/cmds/Md.cpp b/src/app_sparkd/sparkd/cmds/Md.cpp similarity index 100% rename from src/server/sparkd/cmds/Md.cpp rename to src/app_sparkd/sparkd/cmds/Md.cpp diff --git a/src/server/sparkd/cmds/Md.h b/src/app_sparkd/sparkd/cmds/Md.h similarity index 100% rename from src/server/sparkd/cmds/Md.h rename to src/app_sparkd/sparkd/cmds/Md.h diff --git a/src/server/sparkd/cmds/ParseHistoricalFIX.cpp b/src/app_sparkd/sparkd/cmds/ParseHistoricalFIX.cpp similarity index 98% rename from src/server/sparkd/cmds/ParseHistoricalFIX.cpp rename to src/app_sparkd/sparkd/cmds/ParseHistoricalFIX.cpp index 820d88f84..e6ea05d88 100644 --- a/src/server/sparkd/cmds/ParseHistoricalFIX.cpp +++ b/src/app_sparkd/sparkd/cmds/ParseHistoricalFIX.cpp @@ -1,10 +1,10 @@ #include "ParseHistoricalFIX.h" -#include "lib/jetfix/codec/FIXMsg.h" -#include "lib/jetfix/codec/FIXParser.h" -#include "lib/jetfix/codec/Fields.h" -#include "lib/jetfix/codec/Group.h" -#include "lib/jetfix/codec/MessageTypes.h" -#include "lib/utils/bts_chrono.h" +#include "spark/jetfix/codec/FIXMsg.h" +#include "spark/jetfix/codec/FIXParser.h" +#include "spark/jetfix/codec/Fields.h" +#include "spark/jetfix/codec/Group.h" +#include "spark/jetfix/codec/MessageTypes.h" +#include "spark/utils/bts_chrono.h" #include #include diff --git a/src/server/sparkd/cmds/ParseHistoricalFIX.h b/src/app_sparkd/sparkd/cmds/ParseHistoricalFIX.h similarity index 100% rename from src/server/sparkd/cmds/ParseHistoricalFIX.h rename to src/app_sparkd/sparkd/cmds/ParseHistoricalFIX.h diff --git a/src/server/sparkd/cmds/PrintHedgeOrders.cpp b/src/app_sparkd/sparkd/cmds/PrintHedgeOrders.cpp similarity index 92% rename from src/server/sparkd/cmds/PrintHedgeOrders.cpp rename to src/app_sparkd/sparkd/cmds/PrintHedgeOrders.cpp index 54b1a7937..2500ce82f 100644 --- a/src/server/sparkd/cmds/PrintHedgeOrders.cpp +++ b/src/app_sparkd/sparkd/cmds/PrintHedgeOrders.cpp @@ -1,7 +1,7 @@ -#include "server/sparkd/cmds/PrintHedgeOrders.h" -#include "lib/api/services/OrderService.pb.h" -#include "lib/persistence/SqliteStore.h" -#include "lib/utils/PBUtils.h" +#include "PrintHedgeOrders.h" +#include "spark/api/services/OrderService.pb.h" +#include "spark/persistence/SqliteStore.h" +#include "spark/utils/PBUtils.h" namespace bts::cmds { diff --git a/src/server/sparkd/cmds/PrintHedgeOrders.h b/src/app_sparkd/sparkd/cmds/PrintHedgeOrders.h similarity index 100% rename from src/server/sparkd/cmds/PrintHedgeOrders.h rename to src/app_sparkd/sparkd/cmds/PrintHedgeOrders.h diff --git a/src/server/sparkd/cmds/QuickTest.cpp b/src/app_sparkd/sparkd/cmds/QuickTest.cpp similarity index 92% rename from src/server/sparkd/cmds/QuickTest.cpp rename to src/app_sparkd/sparkd/cmds/QuickTest.cpp index 004d7cfe5..297b55e97 100644 --- a/src/server/sparkd/cmds/QuickTest.cpp +++ b/src/app_sparkd/sparkd/cmds/QuickTest.cpp @@ -1,5 +1,5 @@ #include "QuickTest.h" -#include "lib/logging/logging.h" +#include "spark/logging/logging.h" #include diff --git a/src/server/sparkd/cmds/QuickTest.h b/src/app_sparkd/sparkd/cmds/QuickTest.h similarity index 100% rename from src/server/sparkd/cmds/QuickTest.h rename to src/app_sparkd/sparkd/cmds/QuickTest.h diff --git a/src/app_sparkd/sparkd/cmds/Run.cpp b/src/app_sparkd/sparkd/cmds/Run.cpp new file mode 100644 index 000000000..53b7d17cd --- /dev/null +++ b/src/app_sparkd/sparkd/cmds/Run.cpp @@ -0,0 +1,159 @@ +#include "Run.h" +#include "spark/api/public/ServiceContext.h" +#include "spark/config/config.h" +#include "spark/config/protos/ports.pb.h" +#include "spark/config/protos/quickbus_cfg.pb.h" +#include "spark/io/http/curl_session.h" +#include "spark/logging/logging.h" +#include "spark/md/MBOProcessor.h" +#include "spark/md/MBOServiceServer.h" +#include "spark/md/MDClient.h" +#include "spark/md/SyntheticSecurityService.h" +#include "spark/md/relay/QueryServer.h" +#include "spark/md/service/MarketDataServiceServer.h" +#include "spark/metrics/metrics.h" +#include "spark/metrics/system_metrics.h" +#include "spark/orderman/OrderServiceServer.h" +#include "spark/orderman/events/TradeSummarySignalDispatcher.h" +#include "spark/orderman/order_factory/DynamicOrderRegistry.h" +#include "spark/os/os.h" +#include "spark/os/spark_data_directory.h" +#include "spark/persistence/PersistenceServiceServer.h" +#include "spark/plugin/SparkServices.h" +#include "spark/plugin/plugin.h" +#include "spark/quickbus/core/Quickbus.h" +#include "spark/tracing/PerfLog.h" +#include "spark/utils/Dispatcher.h" +#include "spark/version.h" +#include "sparkd/algo/AlgoDefinitionServiceServer.h" +#include "sparkd/analytics/AnalyticsServiceServer.h" +#include "sparkd/cmds/md/cmds/Run.h" +#include "sparkd/execution/execution_gateway_provider.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" + +namespace bts::cmds { + +using bts::api::ServiceContext; +using bts::md::MDClient; +using bts::md::TradeSummarySignalDispatcher; +using bts::metrics::MetricsContainer; +using bts::orderman::DynamicOrderRegistry; +using bts::orderman::ExecutionGatewayProvider; +using bts::orderman::IExecutionGatewayProvider; +using bts::orderman::OrderServiceServer; +using bts::trace::PerfLog; +using std::unique_ptr; +using std::vector; + +static OrderServiceServer create_order_service_server( + ServiceContext &sc, + MDClient &mdclient, + DynamicOrderRegistry &dyn_order_registry, + MetricsContainer &stats, + PerfLog &perf_log, + TradeSummarySignalDispatcher &tss_dispatcher) { + vector> gw_pros; + gw_pros.push_back(std::make_unique( + &perf_log, mdclient.oracle(), config::get(), + [](const std::string &name) { + const spark::SparkDataDirectory data_dir; + return data_dir.load_config_json(name); + })); + return OrderServiceServer( + sc, mdclient, dyn_order_registry, std::move(gw_pros), stats, perf_log, + tss_dispatcher); +} + +static void execute() { + using namespace bts; + LOG(Gen, Warn, + "------------------------------------ Sparkd " BTS_SPARK_VERSION_FULL + " launched " + "--------------------------------"); + // Initializes curl for the application, and eventual cleanup in destructor + http::CurlSession global_curl_session; + auto qb_cfg = config::get().node(); + auto &ports = config::get(); + qb_cfg.set_my_port(ports.qbus_port()); + qbus::Quickbus quickbus(qb_cfg, qbus::QuickbusThreadOptions::DEFERRED_START); + api::ServiceContext sc(&quickbus); + + trace::PerfLog perf_log; + metrics::MetricsContainer stats; + metrics::publish_system_metrics(stats); + http::SparkWebServer webserver(sc, stats, perf_log, ports.config_port()); + + persistence::PersistenceServiceServer settings_saver(sc, "settings"); + user::AuthServiceServer login_server(sc); + + bts::md::MBOProcessor mbo_processor; + bts::md::TradeSummarySignalDispatcher tss_dispatcher; + md::cmds::Run::run(); + + api::synthetic::SyntheticSecurityService synthetic_service(sc); + bts::md::MDClient mdclient( + &utils::Dispatcher::background(), &synthetic_service, + &mbo_processor.reader()); + + bts::md::QueryServerPtr md_query_server( + bts::md::run_query_server(sc, mdclient, stats)); + + bts::md::MBOServiceServer mboserver( + sc, utils::Dispatcher::background(), mdclient); + bts::md::MarketDataService mdserver(mdclient, sc, stats); + + // initialize order plugins + orderman::DynamicOrderRegistry dyn_order_registry; + SparkServices plugin_services(dyn_order_registry); + plugin::init_plugins(plugin_services); + // finished initializing order plugins + + auto order_service_server = create_order_service_server( + sc, mdclient, dyn_order_registry, stats, perf_log, tss_dispatcher); + support::ErrorReportServer error_report_service(sc); + admin::AdminServiceServer admin_service(sc); + bts::md::auxiliary::MarketDataAuxiliaryServiceServer md_aux_server(sc); + bts::api::orderman::algo::AlgoDefinitionServiceServer algo_definition_server( + sc); + bts::analytics::AnalyticsServiceServer analytics_server(sc); + position::BasePositionServiceServer base_pos_server(sc); + position::MoneyFileServiceServer money_file_server(sc); + position::PositionServiceServer position_service(sc, mdclient); + position::MarginServiceServer margin_service(sc, mdclient); + metrics::ShellLatencyServer shell_latency_service( + sc, stats, utils::Dispatcher::background()); + bts::md::recording::MDRecorder::start_recording(mdclient); + + auto bg_health = + std::make_shared("spark_background_thread"); + utils::DispatcherTimer timer(utils::Dispatcher::background(), 5000, [=]() { + bg_health->increment(); + }); + timer.start(); + + utils::DispatcherTimer timer2(utils::Dispatcher::background(), 1000, [&]() { + perf_log.store_log_entries(); + }); + timer2.start(); + stats.publish(bg_health); + subprocess::run_all(); + + quickbus.run(); +} + +Run::Run() : CLI::App("Run default sparkd services", "run") { + callback([]() { execute(); }); +} + +} // namespace bts::cmds diff --git a/src/server/sparkd/cmds/Run.h b/src/app_sparkd/sparkd/cmds/Run.h similarity index 100% rename from src/server/sparkd/cmds/Run.h rename to src/app_sparkd/sparkd/cmds/Run.h diff --git a/src/server/sparkd/cmds/Span.cpp b/src/app_sparkd/sparkd/cmds/Span.cpp similarity index 72% rename from src/server/sparkd/cmds/Span.cpp rename to src/app_sparkd/sparkd/cmds/Span.cpp index f225076c2..69a7e080e 100644 --- a/src/server/sparkd/cmds/Span.cpp +++ b/src/app_sparkd/sparkd/cmds/Span.cpp @@ -1,17 +1,17 @@ #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 "lib/orderman/orderman_utils/orderman_common.h" +#include "spark/orderman/orderman_utils/orderman_common.h" -#include "lib/api/public/ServiceContext.h" -#include "lib/api/services/AuthService.client.pb.h" -#include "lib/config/config.h" -#include "lib/domain_model/Security.pb.h" -#include "lib/utils/Dispatcher.h" -#include "lib/utils/helper_macros.h" +#include "spark/api/public/ServiceContext.h" +#include "spark/api/services/AuthService.client.pb.h" +#include "spark/config/config.h" +#include "spark/domain_model/Security.pb.h" +#include "spark/utils/Dispatcher.h" +#include "spark/utils/helper_macros.h" #include #include diff --git a/src/server/sparkd/cmds/Span.h b/src/app_sparkd/sparkd/cmds/Span.h similarity index 100% rename from src/server/sparkd/cmds/Span.h rename to src/app_sparkd/sparkd/cmds/Span.h diff --git a/src/server/sparkd/cmds/Web.cpp b/src/app_sparkd/sparkd/cmds/Web.cpp similarity index 58% rename from src/server/sparkd/cmds/Web.cpp rename to src/app_sparkd/sparkd/cmds/Web.cpp index b8f3c0093..14add1290 100644 --- a/src/server/sparkd/cmds/Web.cpp +++ b/src/app_sparkd/sparkd/cmds/Web.cpp @@ -1,28 +1,27 @@ #include "Web.h" -#include "lib/api/public/ServiceContext.h" -#include "lib/api/services/MarketDataService.pb.h" -#include "lib/api/services/SyntheticSecurityService.pb.h" -#include "lib/config/config.h" -#include "lib/config/protos/market_data.pb.h" -#include "lib/config/protos/ports.pb.h" -#include "lib/config/protos/quickbus_cfg.pb.h" -#include "lib/md/MBOProcessor.h" -#include "lib/md/MDClient.h" -#include "lib/md/SyntheticSecurityService.h" -#include "lib/md/relay/QueryServer.h" -#include "lib/metrics/metrics.h" -#include "lib/metrics/system_metrics.h" -#include "lib/quickbus/quickbus.h" -#include "lib/tracing/PerfLog.h" -#include "lib/utils/Dispatcher.h" -#include "lib/utils/thread_manager.h" +#include "spark/api/public/ServiceContext.h" +#include "spark/api/services/MarketDataService.pb.h" +#include "spark/api/services/SyntheticSecurityService.pb.h" +#include "spark/config/config.h" +#include "spark/config/protos/market_data.pb.h" +#include "spark/config/protos/ports.pb.h" +#include "spark/config/protos/quickbus_cfg.pb.h" +#include "spark/md/MBOProcessor.h" +#include "spark/md/MDClient.h" +#include "spark/md/SyntheticSecurityService.h" +#include "spark/md/relay/QueryServer.h" +#include "spark/metrics/metrics.h" +#include "spark/metrics/system_metrics.h" +#include "spark/quickbus/quickbus.h" +#include "spark/tracing/PerfLog.h" +#include "spark/utils/Dispatcher.h" +#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/server/sparkd/cmds/Web.h b/src/app_sparkd/sparkd/cmds/Web.h similarity index 100% rename from src/server/sparkd/cmds/Web.h rename to src/app_sparkd/sparkd/cmds/Web.h diff --git a/src/server/sparkd/cmds/common/EnumOptionNames.h b/src/app_sparkd/sparkd/cmds/common/EnumOptionNames.h similarity index 100% rename from src/server/sparkd/cmds/common/EnumOptionNames.h rename to src/app_sparkd/sparkd/cmds/common/EnumOptionNames.h diff --git a/src/server/sparkd/cmds/common/Validators.cpp b/src/app_sparkd/sparkd/cmds/common/Validators.cpp similarity index 92% rename from src/server/sparkd/cmds/common/Validators.cpp rename to src/app_sparkd/sparkd/cmds/common/Validators.cpp index 12e7e7a63..0b6c530b3 100644 --- a/src/server/sparkd/cmds/common/Validators.cpp +++ b/src/app_sparkd/sparkd/cmds/common/Validators.cpp @@ -1,5 +1,5 @@ #include "Validators.h" -#include "lib/utils/FileUtils.h" +#include "spark/utils/FileUtils.h" #include namespace bts::cmds { diff --git a/src/server/sparkd/cmds/common/Validators.h b/src/app_sparkd/sparkd/cmds/common/Validators.h similarity index 100% rename from src/server/sparkd/cmds/common/Validators.h rename to src/app_sparkd/sparkd/cmds/common/Validators.h diff --git a/src/server/sparkd/cmds/crypto/CryptoCmd.cpp b/src/app_sparkd/sparkd/cmds/crypto/CryptoCmd.cpp similarity index 100% rename from src/server/sparkd/cmds/crypto/CryptoCmd.cpp rename to src/app_sparkd/sparkd/cmds/crypto/CryptoCmd.cpp diff --git a/src/server/sparkd/cmds/crypto/CryptoCmd.h b/src/app_sparkd/sparkd/cmds/crypto/CryptoCmd.h similarity index 100% rename from src/server/sparkd/cmds/crypto/CryptoCmd.h rename to src/app_sparkd/sparkd/cmds/crypto/CryptoCmd.h diff --git a/src/server/sparkd/cmds/crypto/DeribitDemo.cpp b/src/app_sparkd/sparkd/cmds/crypto/DeribitDemo.cpp similarity index 85% rename from src/server/sparkd/cmds/crypto/DeribitDemo.cpp rename to src/app_sparkd/sparkd/cmds/crypto/DeribitDemo.cpp index 426f7abee..bddc12bfa 100644 --- a/src/server/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 "lib/logging/logging.h" -#include "server/sparkd/cmds/crypto/DeribitDemoListener.h" +#include "spark/logging/logging.h" +#include "sparkd/cmds/crypto/DeribitDemoListener.h" + #include #include #include #include #include -#include namespace bts::cmds { diff --git a/src/server/sparkd/cmds/crypto/DeribitDemo.h b/src/app_sparkd/sparkd/cmds/crypto/DeribitDemo.h similarity index 100% rename from src/server/sparkd/cmds/crypto/DeribitDemo.h rename to src/app_sparkd/sparkd/cmds/crypto/DeribitDemo.h diff --git a/src/server/sparkd/cmds/crypto/DeribitDemoCmd.cpp b/src/app_sparkd/sparkd/cmds/crypto/DeribitDemoCmd.cpp similarity index 92% rename from src/server/sparkd/cmds/crypto/DeribitDemoCmd.cpp rename to src/app_sparkd/sparkd/cmds/crypto/DeribitDemoCmd.cpp index 843ef3311..557b54d94 100644 --- a/src/server/sparkd/cmds/crypto/DeribitDemoCmd.cpp +++ b/src/app_sparkd/sparkd/cmds/crypto/DeribitDemoCmd.cpp @@ -1,7 +1,7 @@ #include "DeribitDemoCmd.h" #include "DeribitDemo.h" -#include "lib/config/config.h" -#include "lib/os/os.h" +#include "spark/config/config.h" +#include "spark/os/os.h" #include #include #include diff --git a/src/server/sparkd/cmds/crypto/DeribitDemoCmd.h b/src/app_sparkd/sparkd/cmds/crypto/DeribitDemoCmd.h similarity index 100% rename from src/server/sparkd/cmds/crypto/DeribitDemoCmd.h rename to src/app_sparkd/sparkd/cmds/crypto/DeribitDemoCmd.h diff --git a/src/server/sparkd/cmds/crypto/DeribitDemoConfiguration.cpp b/src/app_sparkd/sparkd/cmds/crypto/DeribitDemoConfiguration.cpp similarity index 99% rename from src/server/sparkd/cmds/crypto/DeribitDemoConfiguration.cpp rename to src/app_sparkd/sparkd/cmds/crypto/DeribitDemoConfiguration.cpp index 3051b4551..b31142c32 100644 --- a/src/server/sparkd/cmds/crypto/DeribitDemoConfiguration.cpp +++ b/src/app_sparkd/sparkd/cmds/crypto/DeribitDemoConfiguration.cpp @@ -1,6 +1,6 @@ #include "DeribitDemoConfiguration.h" #include "RapidJsonReader.h" -#include "lib/logging/logging.h" +#include "spark/logging/logging.h" #include "rapidjson/istreamwrapper.h" #include #include diff --git a/src/server/sparkd/cmds/crypto/DeribitDemoConfiguration.h b/src/app_sparkd/sparkd/cmds/crypto/DeribitDemoConfiguration.h similarity index 98% rename from src/server/sparkd/cmds/crypto/DeribitDemoConfiguration.h rename to src/app_sparkd/sparkd/cmds/crypto/DeribitDemoConfiguration.h index 46ac86f0a..1e797b964 100644 --- a/src/server/sparkd/cmds/crypto/DeribitDemoConfiguration.h +++ b/src/app_sparkd/sparkd/cmds/crypto/DeribitDemoConfiguration.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/core/FMT_IMPL.h" +#include "spark/core/FMT_IMPL.h" #include #include diff --git a/src/server/sparkd/cmds/crypto/DeribitDemoListener.cpp b/src/app_sparkd/sparkd/cmds/crypto/DeribitDemoListener.cpp similarity index 99% rename from src/server/sparkd/cmds/crypto/DeribitDemoListener.cpp rename to src/app_sparkd/sparkd/cmds/crypto/DeribitDemoListener.cpp index ca5795d7a..d8aca8873 100644 --- a/src/server/sparkd/cmds/crypto/DeribitDemoListener.cpp +++ b/src/app_sparkd/sparkd/cmds/crypto/DeribitDemoListener.cpp @@ -1,12 +1,12 @@ // #include "DeribitDemoListener.h" -// #include "lib/utils/UNUSED_PARAM.h" -// #include "lib/utils/overloaded.h" +// #include "spark/utils/UNUSED_PARAM.h" +// #include "spark/utils/overloaded.h" // #include "rapidjson/istreamwrapper.h" // #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/server/sparkd/cmds/crypto/DeribitDemoListener.h b/src/app_sparkd/sparkd/cmds/crypto/DeribitDemoListener.h similarity index 100% rename from src/server/sparkd/cmds/crypto/DeribitDemoListener.h rename to src/app_sparkd/sparkd/cmds/crypto/DeribitDemoListener.h diff --git a/src/server/sparkd/cmds/crypto/LiveLadderDemo.cpp b/src/app_sparkd/sparkd/cmds/crypto/LiveLadderDemo.cpp similarity index 75% rename from src/server/sparkd/cmds/crypto/LiveLadderDemo.cpp rename to src/app_sparkd/sparkd/cmds/crypto/LiveLadderDemo.cpp index b5d6585fa..d137a2b05 100644 --- a/src/server/sparkd/cmds/crypto/LiveLadderDemo.cpp +++ b/src/app_sparkd/sparkd/cmds/crypto/LiveLadderDemo.cpp @@ -1,9 +1,8 @@ #include "LiveLadderDemo.h" -#include "lib/api/md/MarketDataConfig.pb.h" -#include "lib/config/config.h" -#include "lib/persistence/IDGenerator.h" -#include "server/sparkd/md/MarketDataGateway.h" -#include "server/sparkd/md/listeners/LiveLadderPrinter.h" +#include "spark/api/md/MarketDataConfig.pb.h" +#include "spark/persistence/IDGenerator.h" +#include "sparkd/md/MarketDataGateway.h" +#include "sparkd/md/listeners/LiveLadderPrinter.h" #include diff --git a/src/server/sparkd/cmds/crypto/LiveLadderDemo.h b/src/app_sparkd/sparkd/cmds/crypto/LiveLadderDemo.h similarity index 100% rename from src/server/sparkd/cmds/crypto/LiveLadderDemo.h rename to src/app_sparkd/sparkd/cmds/crypto/LiveLadderDemo.h diff --git a/src/server/sparkd/cmds/crypto/LiveLadderDemoCmd.cpp b/src/app_sparkd/sparkd/cmds/crypto/LiveLadderDemoCmd.cpp similarity index 84% rename from src/server/sparkd/cmds/crypto/LiveLadderDemoCmd.cpp rename to src/app_sparkd/sparkd/cmds/crypto/LiveLadderDemoCmd.cpp index 5145704f7..ab586f247 100644 --- a/src/server/sparkd/cmds/crypto/LiveLadderDemoCmd.cpp +++ b/src/app_sparkd/sparkd/cmds/crypto/LiveLadderDemoCmd.cpp @@ -1,11 +1,11 @@ #ifdef SPARK_ENABLE_CCAPI #include "LiveLadderDemoCmd.h" #include "LiveLadderDemo.h" -#include "lib/api/md/MarketDataConfig.pb.h" -#include "lib/io/ProtoReader.h" -#include "lib/logging/logging.h" -#include "server/sparkd/cmds/common/Validators.h" -#include "server/sparkd/cmds/crypto/LiveLadderDemo.h" +#include "spark/api/md/MarketDataConfig.pb.h" +#include "spark/io/ProtoReader.h" +#include "spark/logging/logging.h" +#include "sparkd/cmds/common/Validators.h" +#include "sparkd/cmds/crypto/LiveLadderDemo.h" #include #include diff --git a/src/server/sparkd/cmds/crypto/LiveLadderDemoCmd.h b/src/app_sparkd/sparkd/cmds/crypto/LiveLadderDemoCmd.h similarity index 100% rename from src/server/sparkd/cmds/crypto/LiveLadderDemoCmd.h rename to src/app_sparkd/sparkd/cmds/crypto/LiveLadderDemoCmd.h diff --git a/src/server/sparkd/cmds/crypto/RapidJsonReader.h b/src/app_sparkd/sparkd/cmds/crypto/RapidJsonReader.h similarity index 98% rename from src/server/sparkd/cmds/crypto/RapidJsonReader.h rename to src/app_sparkd/sparkd/cmds/crypto/RapidJsonReader.h index 6853a7c58..4cf3261da 100644 --- a/src/server/sparkd/cmds/crypto/RapidJsonReader.h +++ b/src/app_sparkd/sparkd/cmds/crypto/RapidJsonReader.h @@ -1,5 +1,5 @@ #pragma once -#include "lib/utils/bts_assert.h" +#include "spark/utils/bts_assert.h" #include #include diff --git a/src/server/sparkd/cmds/crypto/UserInstrumentData.cpp b/src/app_sparkd/sparkd/cmds/crypto/UserInstrumentData.cpp similarity index 100% rename from src/server/sparkd/cmds/crypto/UserInstrumentData.cpp rename to src/app_sparkd/sparkd/cmds/crypto/UserInstrumentData.cpp diff --git a/src/server/sparkd/cmds/crypto/UserInstrumentData.h b/src/app_sparkd/sparkd/cmds/crypto/UserInstrumentData.h similarity index 100% rename from src/server/sparkd/cmds/crypto/UserInstrumentData.h rename to src/app_sparkd/sparkd/cmds/crypto/UserInstrumentData.h diff --git a/src/server/sparkd/cmds/crypto/deribit_demo_config.json b/src/app_sparkd/sparkd/cmds/crypto/deribit_demo_config.json similarity index 100% rename from src/server/sparkd/cmds/crypto/deribit_demo_config.json rename to src/app_sparkd/sparkd/cmds/crypto/deribit_demo_config.json diff --git a/src/server/sparkd/cmds/md/cmds/Channels.cpp b/src/app_sparkd/sparkd/cmds/md/cmds/Channels.cpp similarity index 94% rename from src/server/sparkd/cmds/md/cmds/Channels.cpp rename to src/app_sparkd/sparkd/cmds/md/cmds/Channels.cpp index fb42218c9..d2269402d 100644 --- a/src/server/sparkd/cmds/md/cmds/Channels.cpp +++ b/src/app_sparkd/sparkd/cmds/md/cmds/Channels.cpp @@ -1,5 +1,5 @@ #include "Channels.h" -#include "lib/md/cme/MDP3Utils.h" +#include "spark/md/cme/MDP3Utils.h" namespace bts::cmds::md::cmds { diff --git a/src/server/sparkd/cmds/md/cmds/Channels.h b/src/app_sparkd/sparkd/cmds/md/cmds/Channels.h similarity index 100% rename from src/server/sparkd/cmds/md/cmds/Channels.h rename to src/app_sparkd/sparkd/cmds/md/cmds/Channels.h diff --git a/src/server/sparkd/cmds/md/cmds/Cleanup.cpp b/src/app_sparkd/sparkd/cmds/md/cmds/Cleanup.cpp similarity index 87% rename from src/server/sparkd/cmds/md/cmds/Cleanup.cpp rename to src/app_sparkd/sparkd/cmds/md/cmds/Cleanup.cpp index 6ce9494c7..1f1d45ae0 100644 --- a/src/server/sparkd/cmds/md/cmds/Cleanup.cpp +++ b/src/app_sparkd/sparkd/cmds/md/cmds/Cleanup.cpp @@ -1,9 +1,9 @@ #include "Cleanup.h" -#include "lib/config/config.h" -#include "lib/config/protos/market_data.pb.h" -#include "lib/logging/logging.h" -#include "lib/md/ShmSegmentName.h" -#include "lib/md/protos/co2.pb.h" +#include "spark/config/config.h" +#include "spark/config/protos/market_data.pb.h" +#include "spark/logging/logging.h" +#include "spark/md/ShmSegmentName.h" +#include "spark/md/protos/co2.pb.h" #include #include diff --git a/src/server/sparkd/cmds/md/cmds/Cleanup.h b/src/app_sparkd/sparkd/cmds/md/cmds/Cleanup.h similarity index 100% rename from src/server/sparkd/cmds/md/cmds/Cleanup.h rename to src/app_sparkd/sparkd/cmds/md/cmds/Cleanup.h diff --git a/src/server/sparkd/cmds/md/cmds/Dump.cpp b/src/app_sparkd/sparkd/cmds/md/cmds/Dump.cpp similarity index 85% rename from src/server/sparkd/cmds/md/cmds/Dump.cpp rename to src/app_sparkd/sparkd/cmds/md/cmds/Dump.cpp index 0be9687c1..2695ff0bb 100644 --- a/src/server/sparkd/cmds/md/cmds/Dump.cpp +++ b/src/app_sparkd/sparkd/cmds/md/cmds/Dump.cpp @@ -1,12 +1,12 @@ #include "Dump.h" #include "../common/SecurityTypeOption.h" #include "../common/VenueOption.h" -#include "lib/config/config.h" -#include "lib/config/protos/market_data.pb.h" -#include "lib/domain_model/Security.pb.h" -#include "lib/md/Diag/ShmDumper.h" -#include "lib/md/ShmSegmentName.h" -#include "lib/md/protos/co2.pb.h" +#include "spark/config/config.h" +#include "spark/config/protos/market_data.pb.h" +#include "spark/domain_model/Security.pb.h" +#include "spark/md/Diag/ShmDumper.h" +#include "spark/md/ShmSegmentName.h" +#include "spark/md/protos/co2.pb.h" #include #include #include diff --git a/src/server/sparkd/cmds/md/cmds/Dump.h b/src/app_sparkd/sparkd/cmds/md/cmds/Dump.h similarity index 100% rename from src/server/sparkd/cmds/md/cmds/Dump.h rename to src/app_sparkd/sparkd/cmds/md/cmds/Dump.h diff --git a/src/server/sparkd/cmds/md/cmds/DumpSecurity.cpp b/src/app_sparkd/sparkd/cmds/md/cmds/DumpSecurity.cpp similarity index 90% rename from src/server/sparkd/cmds/md/cmds/DumpSecurity.cpp rename to src/app_sparkd/sparkd/cmds/md/cmds/DumpSecurity.cpp index fc3f0706e..ec6377b96 100644 --- a/src/server/sparkd/cmds/md/cmds/DumpSecurity.cpp +++ b/src/app_sparkd/sparkd/cmds/md/cmds/DumpSecurity.cpp @@ -1,11 +1,16 @@ #include "DumpSecurity.h" -#include "lib/core/TableFormatter.h" -#include "lib/domain_model/Security.h" -#include "lib/domain_model/Security.pb.h" -#include "lib/domain_model/SecurityType.h" -#include "lib/md/SecurityDB.h" -#include "lib/md/SymbolLoader.h" -#include "lib/utils/lazy.h" +#include "spark/api/domain/SecurityType.h" +#include "spark/config/protos/market_data.pb.h" +#include "spark/core/TableFormatter.h" +#include "spark/domain_model/Security.h" +#include "spark/domain_model/Security.pb.h" +#include "spark/domain_model/SecurityType.h" +#include "spark/domain_model/Venue.h" +#include "spark/md/Diag/ShmDumper.h" +#include "spark/md/SecurityDB.h" +#include "spark/md/SymbolLoader.h" +#include "spark/md/UserSymbol.h" +#include "spark/utils/lazy.h" #include #include @@ -126,7 +131,7 @@ struct DumpSecurity::Args { return ids.find(s.id()) != ids.end(); } if (!types.empty()) { - auto st = security_type(s); + auto st = securities::security_type(s); if (!std::any_of( types.begin(), types.end(), [st](SecurityType _st) { return _st == st; })) { diff --git a/src/server/sparkd/cmds/md/cmds/DumpSecurity.h b/src/app_sparkd/sparkd/cmds/md/cmds/DumpSecurity.h similarity index 100% rename from src/server/sparkd/cmds/md/cmds/DumpSecurity.h rename to src/app_sparkd/sparkd/cmds/md/cmds/DumpSecurity.h diff --git a/src/server/sparkd/cmds/md/cmds/RecTool.cpp b/src/app_sparkd/sparkd/cmds/md/cmds/RecTool.cpp similarity index 100% rename from src/server/sparkd/cmds/md/cmds/RecTool.cpp rename to src/app_sparkd/sparkd/cmds/md/cmds/RecTool.cpp diff --git a/src/server/sparkd/cmds/md/cmds/RecTool.h b/src/app_sparkd/sparkd/cmds/md/cmds/RecTool.h similarity index 100% rename from src/server/sparkd/cmds/md/cmds/RecTool.h rename to src/app_sparkd/sparkd/cmds/md/cmds/RecTool.h diff --git a/src/server/sparkd/cmds/md/cmds/Record.cpp b/src/app_sparkd/sparkd/cmds/md/cmds/Record.cpp similarity index 92% rename from src/server/sparkd/cmds/md/cmds/Record.cpp rename to src/app_sparkd/sparkd/cmds/md/cmds/Record.cpp index dd0b4cee3..66def29fb 100644 --- a/src/server/sparkd/cmds/md/cmds/Record.cpp +++ b/src/app_sparkd/sparkd/cmds/md/cmds/Record.cpp @@ -1,5 +1,5 @@ #include "Record.h" -#include "lib/md/relay/RelayRecorder.h" +#include "spark/md/relay/RelayRecorder.h" #include namespace bts::cmds::md::cmds { diff --git a/src/server/sparkd/cmds/md/cmds/Record.h b/src/app_sparkd/sparkd/cmds/md/cmds/Record.h similarity index 100% rename from src/server/sparkd/cmds/md/cmds/Record.h rename to src/app_sparkd/sparkd/cmds/md/cmds/Record.h diff --git a/src/server/sparkd/cmds/md/cmds/Relay.cpp b/src/app_sparkd/sparkd/cmds/md/cmds/Relay.cpp similarity index 83% rename from src/server/sparkd/cmds/md/cmds/Relay.cpp rename to src/app_sparkd/sparkd/cmds/md/cmds/Relay.cpp index fc86a6e8d..f4085133f 100644 --- a/src/server/sparkd/cmds/md/cmds/Relay.cpp +++ b/src/app_sparkd/sparkd/cmds/md/cmds/Relay.cpp @@ -1,5 +1,5 @@ #include "Relay.h" -#include "lib/md/relay/RelayClient.h" +#include "spark/md/relay/RelayClient.h" namespace bts::cmds::md::cmds { diff --git a/src/server/sparkd/cmds/md/cmds/Relay.h b/src/app_sparkd/sparkd/cmds/md/cmds/Relay.h similarity index 100% rename from src/server/sparkd/cmds/md/cmds/Relay.h rename to src/app_sparkd/sparkd/cmds/md/cmds/Relay.h diff --git a/src/server/sparkd/cmds/md/cmds/Replay.cpp b/src/app_sparkd/sparkd/cmds/md/cmds/Replay.cpp similarity index 91% rename from src/server/sparkd/cmds/md/cmds/Replay.cpp rename to src/app_sparkd/sparkd/cmds/md/cmds/Replay.cpp index 026f3a528..ebd3ba843 100644 --- a/src/server/sparkd/cmds/md/cmds/Replay.cpp +++ b/src/app_sparkd/sparkd/cmds/md/cmds/Replay.cpp @@ -1,5 +1,5 @@ #include "Replay.h" -#include "lib/md/relay/RelayRecorder.h" +#include "spark/md/relay/RelayRecorder.h" namespace bts::cmds::md::cmds { diff --git a/src/server/sparkd/cmds/md/cmds/Replay.h b/src/app_sparkd/sparkd/cmds/md/cmds/Replay.h similarity index 100% rename from src/server/sparkd/cmds/md/cmds/Replay.h rename to src/app_sparkd/sparkd/cmds/md/cmds/Replay.h diff --git a/src/server/sparkd/cmds/md/cmds/Run.cpp b/src/app_sparkd/sparkd/cmds/md/cmds/Run.cpp similarity index 86% rename from src/server/sparkd/cmds/md/cmds/Run.cpp rename to src/app_sparkd/sparkd/cmds/md/cmds/Run.cpp index d11b0e1ad..7ab9f6a83 100644 --- a/src/server/sparkd/cmds/md/cmds/Run.cpp +++ b/src/app_sparkd/sparkd/cmds/md/cmds/Run.cpp @@ -1,20 +1,21 @@ #include "Run.h" #include "Cleanup.h" -#include "lib/api/md/MarketDataConfig.pb.h" -#include "lib/config/protos/market_data.pb.h" -#include "lib/domain/SecurityCriteria.h" -#include "lib/logging/logging.h" -#include "lib/md/SymbolLoader.h" -#include "lib/md/UserSymbol.h" -#include "lib/md/relay/RelayRecorder.h" -#include "lib/os/os.h" -#include "lib/persistence/IDGenerator.h" -#include "lib/utils/bts_assert.h" -#include "lib/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 "spark/api/md/MarketDataConfig.pb.h" +#include "spark/config/protos/market_data.pb.h" +#include "spark/domain/SecurityCriteria.h" +#include "spark/logging/logging.h" +#include "spark/md/SymbolLoader.h" +#include "spark/md/UserSymbol.h" +#include "spark/md/relay/RelayRecorder.h" +#include "spark/os/os.h" +#include "spark/persistence/IDGenerator.h" +#include "spark/utils/bts_assert.h" +#include "spark/utils/thread_manager.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 #include diff --git a/src/server/sparkd/cmds/md/cmds/Run.h b/src/app_sparkd/sparkd/cmds/md/cmds/Run.h similarity index 77% rename from src/server/sparkd/cmds/md/cmds/Run.h rename to src/app_sparkd/sparkd/cmds/md/cmds/Run.h index b2aa93030..169a0c68a 100644 --- a/src/server/sparkd/cmds/md/cmds/Run.h +++ b/src/app_sparkd/sparkd/cmds/md/cmds/Run.h @@ -1,6 +1,5 @@ #pragma once -#include "lib/md/MBOProcessor.h" -#include "server/sparkd/md/platforms/mdp3_onixs/TradeSummarySignalDispatcher.h" + #include namespace bts::cmds::md::cmds { diff --git a/src/server/sparkd/cmds/md/cmds/Tail.cpp b/src/app_sparkd/sparkd/cmds/md/cmds/Tail.cpp similarity index 81% rename from src/server/sparkd/cmds/md/cmds/Tail.cpp rename to src/app_sparkd/sparkd/cmds/md/cmds/Tail.cpp index b6c820940..f785803a3 100644 --- a/src/server/sparkd/cmds/md/cmds/Tail.cpp +++ b/src/app_sparkd/sparkd/cmds/md/cmds/Tail.cpp @@ -1,12 +1,12 @@ #include "Tail.h" -#include "lib/api/domain/SecurityType.pb.h" -#include "lib/api/domain/Venue.pb.h" -#include "lib/config/protos/market_data.pb.h" -#include "lib/domain/SecurityCriteria.h" -#include "lib/md/Diag/MDPeriodicDumper.h" -#include "lib/md/Diag/ShmDumper.h" -#include "lib/md/SymbolLoader.h" -#include "lib/md/UserSymbol.h" +#include "spark/api/domain/SecurityType.pb.h" +#include "spark/api/domain/Venue.pb.h" +#include "spark/config/protos/market_data.pb.h" +#include "spark/domain/SecurityCriteria.h" +#include "spark/md/Diag/MDPeriodicDumper.h" +#include "spark/md/Diag/ShmDumper.h" +#include "spark/md/SymbolLoader.h" +#include "spark/md/UserSymbol.h" #include namespace bts::cmds::md::cmds { diff --git a/src/server/sparkd/cmds/md/cmds/Tail.h b/src/app_sparkd/sparkd/cmds/md/cmds/Tail.h similarity index 100% rename from src/server/sparkd/cmds/md/cmds/Tail.h rename to src/app_sparkd/sparkd/cmds/md/cmds/Tail.h diff --git a/src/server/sparkd/cmds/md/cmds/rec_tool/cmds/Print.cpp b/src/app_sparkd/sparkd/cmds/md/cmds/rec_tool/cmds/Print.cpp similarity index 91% rename from src/server/sparkd/cmds/md/cmds/rec_tool/cmds/Print.cpp rename to src/app_sparkd/sparkd/cmds/md/cmds/rec_tool/cmds/Print.cpp index 2c68cf01b..7052ebc8e 100644 --- a/src/server/sparkd/cmds/md/cmds/rec_tool/cmds/Print.cpp +++ b/src/app_sparkd/sparkd/cmds/md/cmds/rec_tool/cmds/Print.cpp @@ -1,5 +1,5 @@ #include "Print.h" -#include "lib/md/relay/RelayRecorder.h" +#include "spark/md/relay/RelayRecorder.h" namespace bts::cmds::md::cmds::rec_tool::cmds { diff --git a/src/server/sparkd/cmds/md/cmds/rec_tool/cmds/Print.h b/src/app_sparkd/sparkd/cmds/md/cmds/rec_tool/cmds/Print.h similarity index 100% rename from src/server/sparkd/cmds/md/cmds/rec_tool/cmds/Print.h rename to src/app_sparkd/sparkd/cmds/md/cmds/rec_tool/cmds/Print.h diff --git a/src/server/sparkd/cmds/md/cmds/rec_tool/cmds/Trace.cpp b/src/app_sparkd/sparkd/cmds/md/cmds/rec_tool/cmds/Trace.cpp similarity index 93% rename from src/server/sparkd/cmds/md/cmds/rec_tool/cmds/Trace.cpp rename to src/app_sparkd/sparkd/cmds/md/cmds/rec_tool/cmds/Trace.cpp index 8b32c264c..d6f42ad0a 100644 --- a/src/server/sparkd/cmds/md/cmds/rec_tool/cmds/Trace.cpp +++ b/src/app_sparkd/sparkd/cmds/md/cmds/rec_tool/cmds/Trace.cpp @@ -1,5 +1,5 @@ #include "Trace.h" -#include "lib/md/relay/RelayRecorder.h" +#include "spark/md/relay/RelayRecorder.h" namespace bts::cmds::md::cmds::rec_tool::cmds { diff --git a/src/server/sparkd/cmds/md/cmds/rec_tool/cmds/Trace.h b/src/app_sparkd/sparkd/cmds/md/cmds/rec_tool/cmds/Trace.h similarity index 100% rename from src/server/sparkd/cmds/md/cmds/rec_tool/cmds/Trace.h rename to src/app_sparkd/sparkd/cmds/md/cmds/rec_tool/cmds/Trace.h diff --git a/src/server/sparkd/cmds/md/cmds/rec_tool/cmds/Unprint.cpp b/src/app_sparkd/sparkd/cmds/md/cmds/rec_tool/cmds/Unprint.cpp similarity index 93% rename from src/server/sparkd/cmds/md/cmds/rec_tool/cmds/Unprint.cpp rename to src/app_sparkd/sparkd/cmds/md/cmds/rec_tool/cmds/Unprint.cpp index 0397c8c04..17066aa03 100644 --- a/src/server/sparkd/cmds/md/cmds/rec_tool/cmds/Unprint.cpp +++ b/src/app_sparkd/sparkd/cmds/md/cmds/rec_tool/cmds/Unprint.cpp @@ -1,5 +1,5 @@ #include "Unprint.h" -#include "lib/md/relay/RelayRecorder.h" +#include "spark/md/relay/RelayRecorder.h" namespace bts::cmds::md::cmds::rec_tool::cmds { diff --git a/src/server/sparkd/cmds/md/cmds/rec_tool/cmds/Unprint.h b/src/app_sparkd/sparkd/cmds/md/cmds/rec_tool/cmds/Unprint.h similarity index 100% rename from src/server/sparkd/cmds/md/cmds/rec_tool/cmds/Unprint.h rename to src/app_sparkd/sparkd/cmds/md/cmds/rec_tool/cmds/Unprint.h diff --git a/src/server/sparkd/cmds/md/common/SecurityTypeOption.cpp b/src/app_sparkd/sparkd/cmds/md/common/SecurityTypeOption.cpp similarity index 100% rename from src/server/sparkd/cmds/md/common/SecurityTypeOption.cpp rename to src/app_sparkd/sparkd/cmds/md/common/SecurityTypeOption.cpp diff --git a/src/server/sparkd/cmds/md/common/SecurityTypeOption.h b/src/app_sparkd/sparkd/cmds/md/common/SecurityTypeOption.h similarity index 86% rename from src/server/sparkd/cmds/md/common/SecurityTypeOption.h rename to src/app_sparkd/sparkd/cmds/md/common/SecurityTypeOption.h index 06f0c0078..b0d7ed129 100644 --- a/src/server/sparkd/cmds/md/common/SecurityTypeOption.h +++ b/src/app_sparkd/sparkd/cmds/md/common/SecurityTypeOption.h @@ -1,6 +1,6 @@ #pragma once #include "../../common/EnumOptionNames.h" -#include "lib/domain_model/Security.pb.h" +#include "spark/domain_model/Security.pb.h" #include #include diff --git a/src/server/sparkd/cmds/md/common/VenueOption.cpp b/src/app_sparkd/sparkd/cmds/md/common/VenueOption.cpp similarity index 97% rename from src/server/sparkd/cmds/md/common/VenueOption.cpp rename to src/app_sparkd/sparkd/cmds/md/common/VenueOption.cpp index 4661d7f4a..44d4aef2e 100644 --- a/src/server/sparkd/cmds/md/common/VenueOption.cpp +++ b/src/app_sparkd/sparkd/cmds/md/common/VenueOption.cpp @@ -1,5 +1,5 @@ #include "VenueOption.h" -#include "lib/domain_model/Security.pb.h" +#include "spark/domain_model/Security.pb.h" namespace bts::cmds::md { diff --git a/src/server/sparkd/cmds/md/common/VenueOption.h b/src/app_sparkd/sparkd/cmds/md/common/VenueOption.h similarity index 85% rename from src/server/sparkd/cmds/md/common/VenueOption.h rename to src/app_sparkd/sparkd/cmds/md/common/VenueOption.h index c7cb4be85..c1fba07a5 100644 --- a/src/server/sparkd/cmds/md/common/VenueOption.h +++ b/src/app_sparkd/sparkd/cmds/md/common/VenueOption.h @@ -1,6 +1,6 @@ #pragma once #include "../../common/EnumOptionNames.h" -#include "lib/domain_model/Security.pb.h" +#include "spark/domain_model/Security.pb.h" #include #include diff --git a/src/server/sparkd/exchange_sim/ExchangeSim.cpp b/src/app_sparkd/sparkd/exchange_sim/ExchangeSim.cpp similarity index 92% rename from src/server/sparkd/exchange_sim/ExchangeSim.cpp rename to src/app_sparkd/sparkd/exchange_sim/ExchangeSim.cpp index 306e3f8a7..9dd24039f 100644 --- a/src/server/sparkd/exchange_sim/ExchangeSim.cpp +++ b/src/app_sparkd/sparkd/exchange_sim/ExchangeSim.cpp @@ -10,21 +10,21 @@ #include #include -#include "lib/config/config.h" -#include "lib/config/protos/exchange_sim_cfg.pb.h" -#include "lib/config/protos/ports.pb.h" -#include "lib/config/protos/system_config.pb.h" -#include "lib/domain_model/Security.pb.h" -#include "lib/logging/logging.h" -#include "lib/md/PriceSize.h" -#include "lib/os/os.h" +#include "spark/config/config.h" +#include "spark/config/protos/exchange_sim_cfg.pb.h" +#include "spark/config/protos/ports.pb.h" +#include "spark/config/protos/system_config.pb.h" +#include "spark/domain_model/Security.pb.h" +#include "spark/logging/logging.h" +#include "spark/md/PriceSize.h" +#include "spark/os/os.h" -#include "lib/domain_model/Security.pb.h" -#include "lib/md/IntPrice.h" -#include "lib/md/MBOProcessor.h" -#include "lib/md/relay/RelayClient.h" -#include "lib/md/relay/RelayRecorder.h" -#include "lib/utils/bts_chrono.h" +#include "spark/domain_model/Security.pb.h" +#include "spark/md/IntPrice.h" +#include "spark/md/MBOProcessor.h" +#include "spark/md/relay/RelayClient.h" +#include "spark/md/relay/RelayRecorder.h" +#include "spark/utils/bts_chrono.h" #include #include diff --git a/src/server/sparkd/exchange_sim/ExchangeSim.h b/src/app_sparkd/sparkd/exchange_sim/ExchangeSim.h similarity index 81% rename from src/server/sparkd/exchange_sim/ExchangeSim.h rename to src/app_sparkd/sparkd/exchange_sim/ExchangeSim.h index 4325e5ea8..b9079fa84 100644 --- a/src/server/sparkd/exchange_sim/ExchangeSim.h +++ b/src/app_sparkd/sparkd/exchange_sim/ExchangeSim.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/domain_model/Security.pb.h" +#include "spark/domain_model/Security.pb.h" #include namespace bts { diff --git a/src/server/sparkd/exchange_sim/ExchangeSimApplication.cpp b/src/app_sparkd/sparkd/exchange_sim/ExchangeSimApplication.cpp similarity index 97% rename from src/server/sparkd/exchange_sim/ExchangeSimApplication.cpp rename to src/app_sparkd/sparkd/exchange_sim/ExchangeSimApplication.cpp index 5acc34f92..cdfe5b3db 100644 --- a/src/server/sparkd/exchange_sim/ExchangeSimApplication.cpp +++ b/src/app_sparkd/sparkd/exchange_sim/ExchangeSimApplication.cpp @@ -1,22 +1,22 @@ #include "ExchangeSimApplication.h" -#include "lib/md/SecurityDB.h" +#include "spark/md/SecurityDB.h" #include "IDGenerator.h" -#include "lib/config/config.h" -#include "lib/config/protos/exchange_sim_cfg.pb.h" -#include "lib/domain_model/Security.h" -#include "lib/logging/logging.h" -#include "lib/md/MBOProcessor.h" -#include "lib/md/MDProducer.h" -#include "lib/md/Shm/FixedSecurity.h" -#include "lib/md/Shm/MDStructure.h" -#include "lib/orderman/orderman_utils/fix_order_codec.h" -#include "lib/persistence/SqliteStore.h" -#include "lib/utils/Dispatcher.h" -#include "lib/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 "spark/config/config.h" +#include "spark/config/protos/exchange_sim_cfg.pb.h" +#include "spark/domain_model/Security.h" +#include "spark/logging/logging.h" +#include "spark/md/MBOProcessor.h" +#include "spark/md/MDProducer.h" +#include "spark/md/Shm/FixedSecurity.h" +#include "spark/md/Shm/MDStructure.h" +#include "spark/orderman/orderman_utils/fix_order_codec.h" +#include "spark/persistence/SqliteStore.h" +#include "spark/utils/Dispatcher.h" +#include "spark/utils/datetime.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/server/sparkd/exchange_sim/ExchangeSimApplication.h b/src/app_sparkd/sparkd/exchange_sim/ExchangeSimApplication.h similarity index 97% rename from src/server/sparkd/exchange_sim/ExchangeSimApplication.h rename to src/app_sparkd/sparkd/exchange_sim/ExchangeSimApplication.h index 87eebc5a8..204271444 100644 --- a/src/server/sparkd/exchange_sim/ExchangeSimApplication.h +++ b/src/app_sparkd/sparkd/exchange_sim/ExchangeSimApplication.h @@ -22,7 +22,7 @@ #ifndef ORDERMATCH_APPLICATION_H #define ORDERMATCH_APPLICATION_H -#include "lib/utils/warn_ctrl.h" +#include "spark/utils/warn_ctrl.h" GCC_DIAG_OFF("-Woverloaded-virtual") GCC_DIAG_OFF("-Wdeprecated") @@ -37,8 +37,8 @@ GCC_DIAG_OFF("-Wignored-qualifiers") #include #include -#include "lib/domain_model/Security.pb.h" -#include "server/sparkd/exchange_sim/IMDPlayerObserver.h" +#include "spark/domain_model/Security.pb.h" +#include "sparkd/exchange_sim/IMDPlayerObserver.h" #include #include diff --git a/src/server/sparkd/exchange_sim/IDGenerator.h b/src/app_sparkd/sparkd/exchange_sim/IDGenerator.h similarity index 100% rename from src/server/sparkd/exchange_sim/IDGenerator.h rename to src/app_sparkd/sparkd/exchange_sim/IDGenerator.h diff --git a/src/server/sparkd/exchange_sim/IMDPlayerObserver.h b/src/app_sparkd/sparkd/exchange_sim/IMDPlayerObserver.h similarity index 92% rename from src/server/sparkd/exchange_sim/IMDPlayerObserver.h rename to src/app_sparkd/sparkd/exchange_sim/IMDPlayerObserver.h index 1d04eb3ea..c30db1421 100644 --- a/src/server/sparkd/exchange_sim/IMDPlayerObserver.h +++ b/src/app_sparkd/sparkd/exchange_sim/IMDPlayerObserver.h @@ -1,7 +1,7 @@ #pragma once -#include "lib/md/PriceSize.h" -#include "lib/md/Shm/MDStructure.h" +#include "spark/md/PriceSize.h" +#include "spark/md/Shm/MDStructure.h" namespace bts { namespace api { diff --git a/src/server/sparkd/exchange_sim/book/Book.cpp b/src/app_sparkd/sparkd/exchange_sim/book/Book.cpp similarity index 100% rename from src/server/sparkd/exchange_sim/book/Book.cpp rename to src/app_sparkd/sparkd/exchange_sim/book/Book.cpp diff --git a/src/server/sparkd/exchange_sim/book/Book.h b/src/app_sparkd/sparkd/exchange_sim/book/Book.h similarity index 95% rename from src/server/sparkd/exchange_sim/book/Book.h rename to src/app_sparkd/sparkd/exchange_sim/book/Book.h index 7aced7d6e..85e308698 100644 --- a/src/server/sparkd/exchange_sim/book/Book.h +++ b/src/app_sparkd/sparkd/exchange_sim/book/Book.h @@ -1,9 +1,9 @@ #pragma once -#include "lib/core/FMT_IMPL.h" -#include "lib/domain_model/Security.pb.h" -#include "lib/orderman/orderman_utils/orderman_common.h" -#include "server/sparkd/exchange_sim/book/Order.h" +#include "spark/core/FMT_IMPL.h" +#include "spark/domain_model/Security.pb.h" +#include "spark/orderman/orderman_utils/orderman_common.h" +#include "sparkd/exchange_sim/book/Order.h" #include #include diff --git a/src/server/sparkd/exchange_sim/book/ExchangeSim.proto b/src/app_sparkd/sparkd/exchange_sim/book/ExchangeSim.proto similarity index 88% rename from src/server/sparkd/exchange_sim/book/ExchangeSim.proto rename to src/app_sparkd/sparkd/exchange_sim/book/ExchangeSim.proto index 877f2352c..bc0bafd0d 100644 --- a/src/server/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/server/sparkd/exchange_sim/book/Order.cpp b/src/app_sparkd/sparkd/exchange_sim/book/Order.cpp similarity index 100% rename from src/server/sparkd/exchange_sim/book/Order.cpp rename to src/app_sparkd/sparkd/exchange_sim/book/Order.cpp diff --git a/src/server/sparkd/exchange_sim/book/Order.h b/src/app_sparkd/sparkd/exchange_sim/book/Order.h similarity index 73% rename from src/server/sparkd/exchange_sim/book/Order.h rename to src/app_sparkd/sparkd/exchange_sim/book/Order.h index aad199f94..841847fcf 100644 --- a/src/server/sparkd/exchange_sim/book/Order.h +++ b/src/app_sparkd/sparkd/exchange_sim/book/Order.h @@ -1,12 +1,12 @@ #pragma once -#include "lib/api/services/OrderService.pb.h" -#include "lib/domain_model/Security.pb.h" -#include "lib/domain_model/common.h" -#include "lib/orderman/orderman_utils/orderman_common.h" -#include "lib/utils/PBUtils.h" -#include "lib/utils/bts_chrono.h" -#include "server/sparkd/exchange_sim/book/ExchangeSim.pb.h" +#include "spark/api/services/OrderService.pb.h" +#include "spark/domain_model/Security.pb.h" +#include "spark/domain_model/common.h" +#include "spark/orderman/orderman_utils/orderman_common.h" +#include "spark/utils/PBUtils.h" +#include "spark/utils/bts_chrono.h" +#include "sparkd/exchange_sim/book/ExchangeSim.pb.h" #include namespace bts { diff --git a/src/server/sparkd/exchange_sim/book/OrderMatcher.cpp b/src/app_sparkd/sparkd/exchange_sim/book/OrderMatcher.cpp similarity index 97% rename from src/server/sparkd/exchange_sim/book/OrderMatcher.cpp rename to src/app_sparkd/sparkd/exchange_sim/book/OrderMatcher.cpp index 5db2d687a..9f8b084c6 100644 --- a/src/server/sparkd/exchange_sim/book/OrderMatcher.cpp +++ b/src/app_sparkd/sparkd/exchange_sim/book/OrderMatcher.cpp @@ -1,9 +1,9 @@ #include "OrderMatcher.h" -#include "lib/config/config.h" -#include "lib/config/protos/exchange_sim_cfg.pb.h" -#include "lib/utils/bts_assert.h" -#include "server/sparkd/exchange_sim/book/Book.h" -#include "server/sparkd/exchange_sim/book/Order.h" +#include "spark/config/config.h" +#include "spark/config/protos/exchange_sim_cfg.pb.h" +#include "spark/utils/bts_assert.h" +#include "sparkd/exchange_sim/book/Book.h" +#include "sparkd/exchange_sim/book/Order.h" #include diff --git a/src/server/sparkd/exchange_sim/book/OrderMatcher.h b/src/app_sparkd/sparkd/exchange_sim/book/OrderMatcher.h similarity index 89% rename from src/server/sparkd/exchange_sim/book/OrderMatcher.h rename to src/app_sparkd/sparkd/exchange_sim/book/OrderMatcher.h index 274e077a1..736831761 100644 --- a/src/server/sparkd/exchange_sim/book/OrderMatcher.h +++ b/src/app_sparkd/sparkd/exchange_sim/book/OrderMatcher.h @@ -1,11 +1,11 @@ #pragma once -#include "lib/api/services/OrderService.pb.h" -#include "lib/domain_model/Security.pb.h" -#include "lib/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 "spark/api/services/OrderService.pb.h" +#include "spark/domain_model/Security.pb.h" +#include "spark/orderman/orderman_utils/orderman_common.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/server/sparkd/exchange_sim/book/book_transform.cpp b/src/app_sparkd/sparkd/exchange_sim/book/book_transform.cpp similarity index 96% rename from src/server/sparkd/exchange_sim/book/book_transform.cpp rename to src/app_sparkd/sparkd/exchange_sim/book/book_transform.cpp index 71f69591d..491d3a140 100644 --- a/src/server/sparkd/exchange_sim/book/book_transform.cpp +++ b/src/app_sparkd/sparkd/exchange_sim/book/book_transform.cpp @@ -1,7 +1,7 @@ #include "book_transform.h" -#include "lib/domain_model/Security.pb.h" -#include "lib/orderman/orderman_utils/orderman_common.h" +#include "spark/domain_model/Security.pb.h" +#include "spark/orderman/orderman_utils/orderman_common.h" #include namespace bts { diff --git a/src/server/sparkd/exchange_sim/book/book_transform.h b/src/app_sparkd/sparkd/exchange_sim/book/book_transform.h similarity index 77% rename from src/server/sparkd/exchange_sim/book/book_transform.h rename to src/app_sparkd/sparkd/exchange_sim/book/book_transform.h index 10bb77128..feef74e73 100644 --- a/src/server/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/server/sparkd/exchange_sim/tests/test_book_transform.cpp b/src/app_sparkd/sparkd/exchange_sim/tests/test_book_transform.cpp similarity index 99% rename from src/server/sparkd/exchange_sim/tests/test_book_transform.cpp rename to src/app_sparkd/sparkd/exchange_sim/tests/test_book_transform.cpp index 121b91140..88831c5ef 100644 --- a/src/server/sparkd/exchange_sim/tests/test_book_transform.cpp +++ b/src/app_sparkd/sparkd/exchange_sim/tests/test_book_transform.cpp @@ -1,5 +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/server/sparkd/execution/EMExecutionGateway.cpp b/src/app_sparkd/sparkd/execution/EMExecutionGateway.cpp similarity index 94% rename from src/server/sparkd/execution/EMExecutionGateway.cpp rename to src/app_sparkd/sparkd/execution/EMExecutionGateway.cpp index b5d297430..f2fe6b4d7 100644 --- a/src/server/sparkd/execution/EMExecutionGateway.cpp +++ b/src/app_sparkd/sparkd/execution/EMExecutionGateway.cpp @@ -1,39 +1,37 @@ #include "EMExecutionGateway.h" -#include "lib/api/service_helpers/AdminServiceUtils.h" -#include "lib/api/services/AdminService.pb.h" -#include "lib/api/services/OrderService.pb.h" -#include "lib/domain_model/Security.pb.h" -#include "lib/domain_model/SecurityKey.h" -#include "lib/domain_model/common.h" -#include "lib/logging/logging.h" -#include "lib/md/SecurityOracle.h" -#include "lib/orderman/CancelOrderMsg.h" -#include "lib/orderman/CancelReplaceOrderMsg.h" -#include "lib/orderman/CreateOrderMsg.h" -#include "lib/orderman/OrderMsg.h" -#include "lib/orderman/RFQMsg.h" -#include "lib/orderman/events/NewAdminDataEvent.h" -#include "lib/orderman/events/NewExecutionReportEvent.h" -#include "lib/orderman/events/NewSecuritiesEvent.h" -#include "lib/orderman/orderman_utils/CancelReject.h" -#include "lib/orderman/orderman_utils/ExchangeOpenOrders.h" -#include "lib/orderman/orderman_utils/ExchangePosition.h" -#include "lib/orderman/orderman_utils/ExecutionReport.h" -#include "lib/orderman/orderman_utils/orderman_common.h" -#include "lib/os/os.h" -#include "lib/tracing/bts_trace.h" -#include "lib/utils/bts_assert.h" -#include "lib/utils/datetime.h" -//#include "lib/utils/helper_macros.h" -#include "server/sparkd/md/platforms/emumba/EmMDListener.h" -#include "server/sparkd/md/platforms/emumba/IEMOrderMuxer.h" +#include "spark/api/service_helpers/AdminServiceUtils.h" +#include "spark/api/services/AdminService.pb.h" +#include "spark/api/services/OrderService.pb.h" +#include "spark/config/config.h" +#include "spark/config/protos/toggles.pb.h" +#include "spark/domain_model/Security.h" +#include "spark/domain_model/Security.pb.h" +#include "spark/domain_model/SecurityKey.h" +#include "spark/domain_model/common.h" +#include "spark/logging/logging.h" +#include "spark/md/SecurityOracle.h" +#include "spark/orderman/CancelOrderMsg.h" +#include "spark/orderman/CancelReplaceOrderMsg.h" +#include "spark/orderman/CreateOrderMsg.h" +#include "spark/orderman/OrderMsg.h" +#include "spark/orderman/RFQMsg.h" +#include "spark/orderman/events/NewAdminDataEvent.h" +#include "spark/orderman/events/NewExecutionReportEvent.h" +#include "spark/orderman/events/NewSecuritiesEvent.h" +#include "spark/orderman/gateways/IEMOrderMuxer.h" +#include "spark/orderman/orderman_utils/CancelReject.h" +#include "spark/orderman/orderman_utils/ExchangeOpenOrders.h" +#include "spark/orderman/orderman_utils/ExchangePosition.h" +#include "spark/orderman/orderman_utils/ExecutionReport.h" +#include "spark/orderman/orderman_utils/orderman_common.h" +#include "spark/os/os.h" +#include "spark/tracing/bts_trace.h" +#include "spark/utils/PBUtils.h" +#include "spark/utils/Uuid.h" +#include "spark/utils/bts_assert.h" +#include "spark/utils/datetime.h" +#include "sparkd/md/platforms/emumba/EmMDListener.h" -#include "lib/api/service_helpers/AdminServiceUtils.h" -#include "lib/config/config.h" -#include "lib/config/protos/toggles.pb.h" -#include "lib/domain_model/Security.h" -#include "lib/utils/PBUtils.h" -#include "lib/utils/Uuid.h" #include #include #include diff --git a/src/server/sparkd/execution/EMExecutionGateway.h b/src/app_sparkd/sparkd/execution/EMExecutionGateway.h similarity index 93% rename from src/server/sparkd/execution/EMExecutionGateway.h rename to src/app_sparkd/sparkd/execution/EMExecutionGateway.h index a454b66bf..5de1ddf85 100644 --- a/src/server/sparkd/execution/EMExecutionGateway.h +++ b/src/app_sparkd/sparkd/execution/EMExecutionGateway.h @@ -1,11 +1,11 @@ #pragma once -#include "lib/api/services/AdminService.pb.h" -#include "lib/orderman/CancelOrderMsg.h" -#include "lib/orderman/CancelReplaceOrderMsg.h" -#include "lib/orderman/CreateOrderMsg.h" -#include "lib/orderman/RFQMsg.h" -#include "lib/orderman/gateways/IExecutionGateway.h" +#include "spark/api/services/AdminService.pb.h" +#include "spark/orderman/CancelOrderMsg.h" +#include "spark/orderman/CancelReplaceOrderMsg.h" +#include "spark/orderman/CreateOrderMsg.h" +#include "spark/orderman/RFQMsg.h" +#include "spark/orderman/gateways/IExecutionGateway.h" #include #include diff --git a/src/server/sparkd/execution/execution_gateway_provider.cpp b/src/app_sparkd/sparkd/execution/execution_gateway_provider.cpp similarity index 86% rename from src/server/sparkd/execution/execution_gateway_provider.cpp rename to src/app_sparkd/sparkd/execution/execution_gateway_provider.cpp index 923ed4ab3..55a400818 100644 --- a/src/server/sparkd/execution/execution_gateway_provider.cpp +++ b/src/app_sparkd/sparkd/execution/execution_gateway_provider.cpp @@ -3,20 +3,20 @@ #include "binance_execution/gateway_config.h" #include "binance_execution/spots/spots_gateway.h" #include "binance_execution/usds_futures/usds_futures_gateway.h" -#include "lib/domain_model/Security.pb.h" -#include "lib/io/JsonReader.h" -#include "lib/orderman/gateways/CCAPIExecutionGateway.h" -#include "lib/orderman/gateways/FakeExecutionGateway.h" -#include "lib/orderman/gateways/GLBXExecutionGateway.h" -#include "lib/orderman/gateways/GLBXiLink3ExecutionGateway.h" -#include "lib/orderman/gateways/GeneralExecutionGateway.h" -#include "lib/orderman/gateways/ICEExecutionGateway.h" -#include "lib/orderman/gateways/IExecutionGenericAdapter.h" -#include "lib/orderman/gateways/OkxExecutionGateway.h" -#include "lib/orderman/gateways/OnixFIXAdapter.h" -#include "lib/orderman/gateways/sim/SimExecutionGatewayFactory.h" -#include "lib/orderman/gateways/sim/SimExecutionGatewayUniqueWrapper.h" -#include "lib/utils/PBUtils.h" +#include "spark/domain_model/Security.pb.h" +#include "spark/io/JsonReader.h" +#include "spark/orderman/gateways/CCAPIExecutionGateway.h" +#include "spark/orderman/gateways/FakeExecutionGateway.h" +#include "spark/orderman/gateways/GLBXExecutionGateway.h" +#include "spark/orderman/gateways/GLBXiLink3ExecutionGateway.h" +#include "spark/orderman/gateways/GeneralExecutionGateway.h" +#include "spark/orderman/gateways/ICEExecutionGateway.h" +#include "spark/orderman/gateways/IExecutionGenericAdapter.h" +#include "spark/orderman/gateways/OkxExecutionGateway.h" +#include "spark/orderman/gateways/OnixFIXAdapter.h" +#include "spark/orderman/gateways/sim/SimExecutionGatewayFactory.h" +#include "spark/orderman/gateways/sim/SimExecutionGatewayUniqueWrapper.h" +#include "spark/utils/PBUtils.h" namespace bts::orderman { diff --git a/src/server/sparkd/execution/execution_gateway_provider.h b/src/app_sparkd/sparkd/execution/execution_gateway_provider.h similarity index 90% rename from src/server/sparkd/execution/execution_gateway_provider.h rename to src/app_sparkd/sparkd/execution/execution_gateway_provider.h index c5f5a30e4..c978f8678 100644 --- a/src/server/sparkd/execution/execution_gateway_provider.h +++ b/src/app_sparkd/sparkd/execution/execution_gateway_provider.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/orderman/gateways/i_execution_gateway_provider.h" +#include "spark/orderman/gateways/i_execution_gateway_provider.h" #include #include diff --git a/src/server/sparkd/http/ApiGateway.cpp b/src/app_sparkd/sparkd/http/ApiGateway.cpp similarity index 94% rename from src/server/sparkd/http/ApiGateway.cpp rename to src/app_sparkd/sparkd/http/ApiGateway.cpp index 50200c218..85ba0384a 100644 --- a/src/server/sparkd/http/ApiGateway.cpp +++ b/src/app_sparkd/sparkd/http/ApiGateway.cpp @@ -1,11 +1,11 @@ #include "ApiGateway.h" -#include "lib/api/core/ApiClientInterop.h" -#include "lib/api/public/ApiUtils.h" -#include "lib/api/services/AdminService.client.pb.h" -#include "lib/api/services/AuthService.client.pb.h" -#include "lib/logging/logging.h" -#include "lib/utils/bts_assert.h" +#include "spark/api/core/ApiClientInterop.h" +#include "spark/api/public/ApiUtils.h" +#include "spark/api/services/AdminService.client.pb.h" +#include "spark/api/services/AuthService.client.pb.h" +#include "spark/logging/logging.h" +#include "spark/utils/bts_assert.h" #include #include #include diff --git a/src/server/sparkd/http/ApiGateway.h b/src/app_sparkd/sparkd/http/ApiGateway.h similarity index 83% rename from src/server/sparkd/http/ApiGateway.h rename to src/app_sparkd/sparkd/http/ApiGateway.h index a51d95737..125633aa6 100644 --- a/src/server/sparkd/http/ApiGateway.h +++ b/src/app_sparkd/sparkd/http/ApiGateway.h @@ -1,7 +1,7 @@ #pragma once -#include "lib/api/apigateway.pb.h" -#include "lib/api/public/ServiceContext.h" +#include "spark/api/apigateway.pb.h" +#include "spark/api/public/ServiceContext.h" #include #include diff --git a/src/server/sparkd/http/MultipartFormDecoder.cpp b/src/app_sparkd/sparkd/http/MultipartFormDecoder.cpp similarity index 95% rename from src/server/sparkd/http/MultipartFormDecoder.cpp rename to src/app_sparkd/sparkd/http/MultipartFormDecoder.cpp index 2ff530bcf..e71cd367a 100644 --- a/src/server/sparkd/http/MultipartFormDecoder.cpp +++ b/src/app_sparkd/sparkd/http/MultipartFormDecoder.cpp @@ -1,5 +1,5 @@ #include "MultipartFormDecoder.h" -#include "lib/logging/logging.h" +#include "spark/logging/logging.h" #include #include diff --git a/src/server/sparkd/http/MultipartFormDecoder.h b/src/app_sparkd/sparkd/http/MultipartFormDecoder.h similarity index 100% rename from src/server/sparkd/http/MultipartFormDecoder.h rename to src/app_sparkd/sparkd/http/MultipartFormDecoder.h diff --git a/src/server/sparkd/http/WebServer.cpp b/src/app_sparkd/sparkd/http/WebServer.cpp similarity index 95% rename from src/server/sparkd/http/WebServer.cpp rename to src/app_sparkd/sparkd/http/WebServer.cpp index 6b97a00a7..2da6f738d 100644 --- a/src/server/sparkd/http/WebServer.cpp +++ b/src/app_sparkd/sparkd/http/WebServer.cpp @@ -3,14 +3,14 @@ #include "WebServer.h" #include "ApiGateway.h" #include "MultipartFormDecoder.h" -#include "lib/api/apigateway.pb.h" -#include "lib/api/core/ApiClientInterop.h" -#include "lib/logging/logging.h" -#include "lib/os/os.h" -#include "lib/tracing/PerfLog.h" -#include "lib/utils/Dispatcher.h" -#include "lib/utils/TimeStamp.h" -#include "lib/utils/bts_chrono.h" +#include "spark/api/apigateway.pb.h" +#include "spark/api/core/ApiClientInterop.h" +#include "spark/logging/logging.h" +#include "spark/os/os.h" +#include "spark/tracing/PerfLog.h" +#include "spark/utils/Dispatcher.h" +#include "spark/utils/TimeStamp.h" +#include "spark/utils/bts_chrono.h" #include #include diff --git a/src/server/sparkd/http/WebServer.h b/src/app_sparkd/sparkd/http/WebServer.h similarity index 78% rename from src/server/sparkd/http/WebServer.h rename to src/app_sparkd/sparkd/http/WebServer.h index 5ed82be56..a68cdef1f 100644 --- a/src/server/sparkd/http/WebServer.h +++ b/src/app_sparkd/sparkd/http/WebServer.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/api/public/ServiceContext.h" -#include "lib/metrics/metrics.h" +#include "spark/api/public/ServiceContext.h" +#include "spark/metrics/metrics.h" #include namespace bts { diff --git a/src/server/sparkd/http/tests/MultiPartFormTests.cpp b/src/app_sparkd/sparkd/http/tests/MultiPartFormTests.cpp similarity index 100% rename from src/server/sparkd/http/tests/MultiPartFormTests.cpp rename to src/app_sparkd/sparkd/http/tests/MultiPartFormTests.cpp diff --git a/src/server/sparkd/main.cpp b/src/app_sparkd/sparkd/main.cpp similarity index 72% rename from src/server/sparkd/main.cpp rename to src/app_sparkd/sparkd/main.cpp index d79e9fedc..263ab38de 100644 --- a/src/server/sparkd/main.cpp +++ b/src/app_sparkd/sparkd/main.cpp @@ -1,14 +1,14 @@ -#include "lib/testing/catch_test_runner.h" -#include "lib/utils/init_spark_lib.h" -#include "lib/version.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 "spark/testing/catch_test_runner.h" +#include "spark/utils/init_spark_lib.h" +#include "spark/version.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 diff --git a/src/server/sparkd/md/ChannelVolume.cpp b/src/app_sparkd/sparkd/md/ChannelVolume.cpp similarity index 96% rename from src/server/sparkd/md/ChannelVolume.cpp rename to src/app_sparkd/sparkd/md/ChannelVolume.cpp index 5a2f8631a..491f9b701 100644 --- a/src/server/sparkd/md/ChannelVolume.cpp +++ b/src/app_sparkd/sparkd/md/ChannelVolume.cpp @@ -1,6 +1,6 @@ #include "ChannelVolume.h" -#include "lib/md/IntPrice.h" -#include "lib/md/protos/co2.pb.h" +#include "spark/md/IntPrice.h" +#include "spark/md/protos/co2.pb.h" namespace bts { namespace md { diff --git a/src/server/sparkd/md/ChannelVolume.h b/src/app_sparkd/sparkd/md/ChannelVolume.h similarity index 94% rename from src/server/sparkd/md/ChannelVolume.h rename to src/app_sparkd/sparkd/md/ChannelVolume.h index 028d26b68..0511a7420 100644 --- a/src/server/sparkd/md/ChannelVolume.h +++ b/src/app_sparkd/sparkd/md/ChannelVolume.h @@ -1,5 +1,5 @@ #pragma once -#include "lib/api/services/MarketDataAuxiliaryService.pb.h" +#include "spark/api/services/MarketDataAuxiliaryService.pb.h" #include namespace bts { diff --git a/src/server/sparkd/md/MarketDataAuxiliaryServiceServer.cpp b/src/app_sparkd/sparkd/md/MarketDataAuxiliaryServiceServer.cpp similarity index 88% rename from src/server/sparkd/md/MarketDataAuxiliaryServiceServer.cpp rename to src/app_sparkd/sparkd/md/MarketDataAuxiliaryServiceServer.cpp index 165c3a57b..5ae6e1ea7 100644 --- a/src/server/sparkd/md/MarketDataAuxiliaryServiceServer.cpp +++ b/src/app_sparkd/sparkd/md/MarketDataAuxiliaryServiceServer.cpp @@ -1,12 +1,12 @@ #include "MarketDataAuxiliaryServiceServer.h" -#include "VolumeAtPriceState.h" -#include "lib/api/public/ServiceContext.h" -#include "lib/api/services/MarketDataRelay.client.pb.h" -#include "lib/config/config.h" -#include "lib/config/protos/toggles.pb.h" -#include "lib/logging/logging.h" -#include "lib/utils/Dispatcher.h" -#include "lib/utils/bts_chrono.h" +#include "spark/api/public/ServiceContext.h" +#include "spark/api/services/MarketDataRelay.client.pb.h" +#include "spark/config/config.h" +#include "spark/config/protos/toggles.pb.h" +#include "spark/logging/logging.h" +#include "spark/utils/Dispatcher.h" +#include "spark/utils/bts_chrono.h" +#include "sparkd/md/VolumeAtPriceState.h" namespace bts { namespace md { diff --git a/src/server/sparkd/md/MarketDataAuxiliaryServiceServer.h b/src/app_sparkd/sparkd/md/MarketDataAuxiliaryServiceServer.h similarity index 89% rename from src/server/sparkd/md/MarketDataAuxiliaryServiceServer.h rename to src/app_sparkd/sparkd/md/MarketDataAuxiliaryServiceServer.h index 36ee9c7ba..9fab6a1bc 100644 --- a/src/server/sparkd/md/MarketDataAuxiliaryServiceServer.h +++ b/src/app_sparkd/sparkd/md/MarketDataAuxiliaryServiceServer.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/api/services/MarketDataAuxiliaryService.server.pb.h" +#include "spark/api/services/MarketDataAuxiliaryService.server.pb.h" #include diff --git a/src/server/sparkd/md/MarketDataError.cpp b/src/app_sparkd/sparkd/md/MarketDataError.cpp similarity index 100% rename from src/server/sparkd/md/MarketDataError.cpp rename to src/app_sparkd/sparkd/md/MarketDataError.cpp diff --git a/src/server/sparkd/md/MarketDataError.h b/src/app_sparkd/sparkd/md/MarketDataError.h similarity index 95% rename from src/server/sparkd/md/MarketDataError.h rename to src/app_sparkd/sparkd/md/MarketDataError.h index 227807e28..8227839a9 100644 --- a/src/server/sparkd/md/MarketDataError.h +++ b/src/app_sparkd/sparkd/md/MarketDataError.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/core/FMT_IMPL.h" +#include "spark/core/FMT_IMPL.h" #include #include diff --git a/src/server/sparkd/md/MarketDataGateway.cpp b/src/app_sparkd/sparkd/md/MarketDataGateway.cpp similarity index 79% rename from src/server/sparkd/md/MarketDataGateway.cpp rename to src/app_sparkd/sparkd/md/MarketDataGateway.cpp index 35aff9dbb..5342b49e4 100644 --- a/src/server/sparkd/md/MarketDataGateway.cpp +++ b/src/app_sparkd/sparkd/md/MarketDataGateway.cpp @@ -1,29 +1,29 @@ #include "MarketDataGateway.h" -#include "lib/api/domain/Venue.h" -#include "lib/api/md/MarketDataConfig.pb.h" -#include "lib/api/md/MarketDataConfigUtils.h" -#include "lib/core/FMT.h" -#include "lib/core/TimeSpan.h" -#include "lib/domain/DomainSecurityUtils.h" -#include "lib/domain/SecurityID.h" -#include "lib/domain_model/Venue.h" -#include "lib/logging/logging.h" -#include "lib/md/GeneralMarketDataListener.h" -#include "lib/md/GeneralSecurityIndex.h" -#include "lib/md/IMarketDataListener.h" -#include "lib/md/IMarketDataProvider.h" -#include "lib/md/IMarketDataSource.h" -#include "lib/md/MDProducer.h" -#include "lib/os/os.h" -#include "lib/persistence/IDGenerator.h" -#include "lib/utils/bts_fatal.h" -#include "lib/utils/stopwatch.h" -#include "server/sparkd/md/OnixsMarketDataProvider.h" -#include "server/sparkd/md/ReplayMarketDataProvider.h" -#include "server/sparkd/md/ccapi/CCApiMarketDataProvider.h" -#include "server/sparkd/md/databento/DatabentoMarketDataProvider.h" -#include "server/sparkd/md/emumba/EmumbaMarketDataProvider.h" -#include "server/sparkd/md/taifex/TaifexMarketDataProvider.h" +#include "spark/api/domain/Venue.h" +#include "spark/api/md/MarketDataConfig.pb.h" +#include "spark/api/md/MarketDataConfigUtils.h" +#include "spark/core/FMT.h" +#include "spark/core/TimeSpan.h" +#include "spark/domain/DomainSecurityUtils.h" +#include "spark/domain/SecurityID.h" +#include "spark/domain_model/Venue.h" +#include "spark/logging/logging.h" +#include "spark/md/GeneralMarketDataListener.h" +#include "spark/md/GeneralSecurityIndex.h" +#include "spark/md/IMarketDataListener.h" +#include "spark/md/IMarketDataProvider.h" +#include "spark/md/IMarketDataSource.h" +#include "spark/md/MDProducer.h" +#include "spark/os/os.h" +#include "spark/persistence/IDGenerator.h" +#include "spark/utils/bts_fatal.h" +#include "spark/utils/stopwatch.h" +#include "sparkd/md/OnixsMarketDataProvider.h" +#include "sparkd/md/ReplayMarketDataProvider.h" +#include "sparkd/md/ccapi/CCApiMarketDataProvider.h" +#include "sparkd/md/databento/DatabentoMarketDataProvider.h" +#include "sparkd/md/emumba/EmumbaMarketDataProvider.h" +#include "sparkd/md/taifex/TaifexMarketDataProvider.h" #include #include diff --git a/src/server/sparkd/md/MarketDataGateway.h b/src/app_sparkd/sparkd/md/MarketDataGateway.h similarity index 100% rename from src/server/sparkd/md/MarketDataGateway.h rename to src/app_sparkd/sparkd/md/MarketDataGateway.h diff --git a/src/server/sparkd/md/MarketDataListener.h b/src/app_sparkd/sparkd/md/MarketDataListener.h similarity index 85% rename from src/server/sparkd/md/MarketDataListener.h rename to src/app_sparkd/sparkd/md/MarketDataListener.h index 03e606953..2541bf483 100644 --- a/src/server/sparkd/md/MarketDataListener.h +++ b/src/app_sparkd/sparkd/md/MarketDataListener.h @@ -1,12 +1,12 @@ #pragma once -#include "lib/md/IMarketDataListener.h" -#include "lib/domain/Book.h" -#include "lib/domain/Security.h" -#include "lib/domain/SecurityMarketDataStatistics.h" -#include "lib/domain/SecurityState.h" -#include "lib/domain/TradeRecord.h" -#include "server/sparkd/md/MarketDataError.h" +#include "spark/md/IMarketDataListener.h" +#include "spark/domain/Book.h" +#include "spark/domain/Security.h" +#include "spark/domain/SecurityMarketDataStatistics.h" +#include "spark/domain/SecurityState.h" +#include "spark/domain/TradeRecord.h" +#include "sparkd/md/MarketDataError.h" namespace bts::md { diff --git a/src/server/sparkd/md/MarketDataListenerID.h b/src/app_sparkd/sparkd/md/MarketDataListenerID.h similarity index 77% rename from src/server/sparkd/md/MarketDataListenerID.h rename to src/app_sparkd/sparkd/md/MarketDataListenerID.h index 8af8d5818..809957535 100644 --- a/src/server/sparkd/md/MarketDataListenerID.h +++ b/src/app_sparkd/sparkd/md/MarketDataListenerID.h @@ -1,8 +1,8 @@ #pragma once #ifndef _WIN32 -#include "lib/core/FMT_IMPL.h" -#include "lib/core/ValueWrapper.h" +#include "spark/core/FMT_IMPL.h" +#include "spark/core/ValueWrapper.h" namespace bts::md { diff --git a/src/server/sparkd/md/MarketDataRegistration.h b/src/app_sparkd/sparkd/md/MarketDataRegistration.h similarity index 100% rename from src/server/sparkd/md/MarketDataRegistration.h rename to src/app_sparkd/sparkd/md/MarketDataRegistration.h diff --git a/src/server/sparkd/md/MarketDataRegistrationError.h b/src/app_sparkd/sparkd/md/MarketDataRegistrationError.h similarity index 100% rename from src/server/sparkd/md/MarketDataRegistrationError.h rename to src/app_sparkd/sparkd/md/MarketDataRegistrationError.h diff --git a/src/server/sparkd/md/MarketDataRegistrationFactory.cpp b/src/app_sparkd/sparkd/md/MarketDataRegistrationFactory.cpp similarity index 100% rename from src/server/sparkd/md/MarketDataRegistrationFactory.cpp rename to src/app_sparkd/sparkd/md/MarketDataRegistrationFactory.cpp diff --git a/src/server/sparkd/md/MarketDataRegistrationFactory.h b/src/app_sparkd/sparkd/md/MarketDataRegistrationFactory.h similarity index 100% rename from src/server/sparkd/md/MarketDataRegistrationFactory.h rename to src/app_sparkd/sparkd/md/MarketDataRegistrationFactory.h diff --git a/src/server/sparkd/md/OnixsMarketDataProvider.cpp b/src/app_sparkd/sparkd/md/OnixsMarketDataProvider.cpp similarity index 89% rename from src/server/sparkd/md/OnixsMarketDataProvider.cpp rename to src/app_sparkd/sparkd/md/OnixsMarketDataProvider.cpp index 7e960bd26..60ce7c4a7 100644 --- a/src/server/sparkd/md/OnixsMarketDataProvider.cpp +++ b/src/app_sparkd/sparkd/md/OnixsMarketDataProvider.cpp @@ -1,7 +1,7 @@ #include "OnixsMarketDataProvider.h" -#include "lib/api/domain/Venue.pb.h" -#include "lib/persistence/IDGenerator.h" -#include "server/sparkd/md/glbx/OnixsGlbxSubscription.h" +#include "spark/api/domain/Venue.pb.h" +#include "spark/persistence/IDGenerator.h" +#include "sparkd/md/glbx/OnixsGlbxSubscription.h" #include #include diff --git a/src/server/sparkd/md/OnixsMarketDataProvider.h b/src/app_sparkd/sparkd/md/OnixsMarketDataProvider.h similarity index 78% rename from src/server/sparkd/md/OnixsMarketDataProvider.h rename to src/app_sparkd/sparkd/md/OnixsMarketDataProvider.h index 283114937..1b623b886 100644 --- a/src/server/sparkd/md/OnixsMarketDataProvider.h +++ b/src/app_sparkd/sparkd/md/OnixsMarketDataProvider.h @@ -1,8 +1,8 @@ #pragma once -#include "lib/api/md/MarketDataConfig.pb.h" -#include "lib/md/IMarketDataProvider.h" -#include "lib/md/IMarketDataSource.h" +#include "spark/api/md/MarketDataConfig.pb.h" +#include "spark/md/IMarketDataProvider.h" +#include "spark/md/IMarketDataSource.h" #include diff --git a/src/server/sparkd/md/ReplayMarketDataProvider.cpp b/src/app_sparkd/sparkd/md/ReplayMarketDataProvider.cpp similarity index 83% rename from src/server/sparkd/md/ReplayMarketDataProvider.cpp rename to src/app_sparkd/sparkd/md/ReplayMarketDataProvider.cpp index 64f12b464..7659a871b 100644 --- a/src/server/sparkd/md/ReplayMarketDataProvider.cpp +++ b/src/app_sparkd/sparkd/md/ReplayMarketDataProvider.cpp @@ -1,11 +1,11 @@ #include "ReplayMarketDataProvider.h" -#include "lib/api/md/MarketDataConfig.pb.h" -#include "lib/api/md/MarketDataConfigUtils.h" -#include "lib/config/config.h" -#include "lib/domain/DomainSecurityUtils.h" -#include "lib/md/IMarketDataSource.h" -#include "lib/persistence/IDGenerator.h" -#include "server/sparkd/md/recording/MDReplayer.h" +#include "spark/api/md/MarketDataConfig.pb.h" +#include "spark/api/md/MarketDataConfigUtils.h" +#include "spark/config/config.h" +#include "spark/domain/DomainSecurityUtils.h" +#include "spark/md/IMarketDataSource.h" +#include "spark/persistence/IDGenerator.h" +#include "sparkd/md/recording/MDReplayer.h" namespace bts::md { diff --git a/src/server/sparkd/md/ReplayMarketDataProvider.h b/src/app_sparkd/sparkd/md/ReplayMarketDataProvider.h similarity index 80% rename from src/server/sparkd/md/ReplayMarketDataProvider.h rename to src/app_sparkd/sparkd/md/ReplayMarketDataProvider.h index 534fc7fe3..ff41d7f87 100644 --- a/src/server/sparkd/md/ReplayMarketDataProvider.h +++ b/src/app_sparkd/sparkd/md/ReplayMarketDataProvider.h @@ -1,8 +1,8 @@ #pragma once -#include "lib/api/md/MarketDataConfig.pb.h" -#include "lib/md/IMarketDataProvider.h" -#include "lib/persistence/IDGenerator.h" +#include "spark/api/md/MarketDataConfig.pb.h" +#include "spark/md/IMarketDataProvider.h" +#include "spark/persistence/IDGenerator.h" #include diff --git a/src/server/sparkd/md/ReplayMarketDataSubscription.cpp b/src/app_sparkd/sparkd/md/ReplayMarketDataSubscription.cpp similarity index 81% rename from src/server/sparkd/md/ReplayMarketDataSubscription.cpp rename to src/app_sparkd/sparkd/md/ReplayMarketDataSubscription.cpp index 31b765c4d..77ded9aa3 100644 --- a/src/server/sparkd/md/ReplayMarketDataSubscription.cpp +++ b/src/app_sparkd/sparkd/md/ReplayMarketDataSubscription.cpp @@ -1,11 +1,11 @@ #include "ReplayMarketDataSubscription.h" -#include "lib/api/md/MarketDataReplayConfig.pb.h" -#include "lib/logging/logging.h" -#include "lib/md/GeneralMarketDataListener.h" -#include "lib/md/IMarketDataListener.h" -#include "lib/md/MDProducer.h" -#include "lib/utils/thread_manager.h" -#include "server/sparkd/md/recording/MDReplayer.h" +#include "spark/api/md/MarketDataReplayConfig.pb.h" +#include "spark/logging/logging.h" +#include "spark/md/GeneralMarketDataListener.h" +#include "spark/md/IMarketDataListener.h" +#include "spark/md/MDProducer.h" +#include "spark/utils/thread_manager.h" +#include "sparkd/md/recording/MDReplayer.h" #include #include diff --git a/src/server/sparkd/md/ReplayMarketDataSubscription.h b/src/app_sparkd/sparkd/md/ReplayMarketDataSubscription.h similarity index 76% rename from src/server/sparkd/md/ReplayMarketDataSubscription.h rename to src/app_sparkd/sparkd/md/ReplayMarketDataSubscription.h index e4bf9d104..a5b84494f 100644 --- a/src/server/sparkd/md/ReplayMarketDataSubscription.h +++ b/src/app_sparkd/sparkd/md/ReplayMarketDataSubscription.h @@ -1,8 +1,8 @@ #pragma once -#include "lib/api/md/MarketDataReplayConfig.pb.h" -#include "lib/md/IMarketDataListener.h" -#include "lib/md/IMarketDataSource.h" +#include "spark/api/md/MarketDataReplayConfig.pb.h" +#include "spark/md/IMarketDataListener.h" +#include "spark/md/IMarketDataSource.h" #include diff --git a/src/server/sparkd/md/VolumeAtPriceState.cpp b/src/app_sparkd/sparkd/md/VolumeAtPriceState.cpp similarity index 94% rename from src/server/sparkd/md/VolumeAtPriceState.cpp rename to src/app_sparkd/sparkd/md/VolumeAtPriceState.cpp index 1a9fe228a..86d634b47 100644 --- a/src/server/sparkd/md/VolumeAtPriceState.cpp +++ b/src/app_sparkd/sparkd/md/VolumeAtPriceState.cpp @@ -1,6 +1,6 @@ #include "VolumeAtPriceState.h" -#include "lib/api/services/MarketDataAuxiliaryService.server.pb.h" -#include "lib/md/SymbolLoader.h" +#include "spark/api/services/MarketDataAuxiliaryService.server.pb.h" +#include "spark/md/SymbolLoader.h" namespace bts { namespace md { diff --git a/src/server/sparkd/md/VolumeAtPriceState.h b/src/app_sparkd/sparkd/md/VolumeAtPriceState.h similarity index 87% rename from src/server/sparkd/md/VolumeAtPriceState.h rename to src/app_sparkd/sparkd/md/VolumeAtPriceState.h index ec105462b..74681f433 100644 --- a/src/server/sparkd/md/VolumeAtPriceState.h +++ b/src/app_sparkd/sparkd/md/VolumeAtPriceState.h @@ -1,8 +1,8 @@ #pragma once -#include "ChannelVolume.h" -#include "lib/api/services/MarketDataAuxiliaryService.server.pb.h" -#include "lib/md/protos/co2.pb.h" +#include "spark/api/services/MarketDataAuxiliaryService.server.pb.h" +#include "spark/md/protos/co2.pb.h" +#include "sparkd/md/ChannelVolume.h" namespace bts { namespace co2 { diff --git a/src/server/sparkd/md/binance/BinanceContractType.h b/src/app_sparkd/sparkd/md/binance/BinanceContractType.h similarity index 89% rename from src/server/sparkd/md/binance/BinanceContractType.h rename to src/app_sparkd/sparkd/md/binance/BinanceContractType.h index 2375e8a32..2a986022f 100644 --- a/src/server/sparkd/md/binance/BinanceContractType.h +++ b/src/app_sparkd/sparkd/md/binance/BinanceContractType.h @@ -1,7 +1,7 @@ #pragma once -#include "lib/core/EnumMacros.h" -#include "lib/core/FMT_IMPL.h" +#include "spark/core/EnumMacros.h" +#include "spark/core/FMT_IMPL.h" #include #include diff --git a/src/server/sparkd/md/binance/BinanceFilterTuple.h b/src/app_sparkd/sparkd/md/binance/BinanceFilterTuple.h similarity index 79% rename from src/server/sparkd/md/binance/BinanceFilterTuple.h rename to src/app_sparkd/sparkd/md/binance/BinanceFilterTuple.h index 9b8326953..20abddaa6 100644 --- a/src/server/sparkd/md/binance/BinanceFilterTuple.h +++ b/src/app_sparkd/sparkd/md/binance/BinanceFilterTuple.h @@ -1,20 +1,20 @@ #pragma once -#include "lib/io/JsonDumper.h" -#include "lib/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 "spark/io/JsonDumper.h" +#include "spark/io/JsonReader.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/server/sparkd/md/binance/BinanceFilterType.h b/src/app_sparkd/sparkd/md/binance/BinanceFilterType.h similarity index 96% rename from src/server/sparkd/md/binance/BinanceFilterType.h rename to src/app_sparkd/sparkd/md/binance/BinanceFilterType.h index 07feb3930..f22107b70 100644 --- a/src/server/sparkd/md/binance/BinanceFilterType.h +++ b/src/app_sparkd/sparkd/md/binance/BinanceFilterType.h @@ -1,7 +1,7 @@ #pragma once -#include "lib/core/EnumMacros.h" -#include "lib/core/FMT_IMPL.h" +#include "spark/core/EnumMacros.h" +#include "spark/core/FMT_IMPL.h" #include #include diff --git a/src/server/sparkd/md/binance/BinanceIcebergPartsFilter.cpp b/src/app_sparkd/sparkd/md/binance/BinanceIcebergPartsFilter.cpp similarity index 85% rename from src/server/sparkd/md/binance/BinanceIcebergPartsFilter.cpp rename to src/app_sparkd/sparkd/md/binance/BinanceIcebergPartsFilter.cpp index 84d510677..f8153af74 100644 --- a/src/server/sparkd/md/binance/BinanceIcebergPartsFilter.cpp +++ b/src/app_sparkd/sparkd/md/binance/BinanceIcebergPartsFilter.cpp @@ -1,6 +1,6 @@ #include "BinanceIcebergPartsFilter.h" -#include "lib/io/JsonMacros.h" -#include "lib/io/JsonReader.h" +#include "spark/io/JsonMacros.h" +#include "spark/io/JsonReader.h" namespace bts::md::binance { diff --git a/src/server/sparkd/md/binance/BinanceIcebergPartsFilter.h b/src/app_sparkd/sparkd/md/binance/BinanceIcebergPartsFilter.h similarity index 88% rename from src/server/sparkd/md/binance/BinanceIcebergPartsFilter.h rename to src/app_sparkd/sparkd/md/binance/BinanceIcebergPartsFilter.h index d9424e957..799343dd5 100644 --- a/src/server/sparkd/md/binance/BinanceIcebergPartsFilter.h +++ b/src/app_sparkd/sparkd/md/binance/BinanceIcebergPartsFilter.h @@ -1,6 +1,6 @@ #pragma once -#include "server/sparkd/md/binance/BinanceFilterType.h" +#include "sparkd/md/binance/BinanceFilterType.h" #include #include diff --git a/src/server/sparkd/md/binance/BinanceInstrumentStatus.h b/src/app_sparkd/sparkd/md/binance/BinanceInstrumentStatus.h similarity index 90% rename from src/server/sparkd/md/binance/BinanceInstrumentStatus.h rename to src/app_sparkd/sparkd/md/binance/BinanceInstrumentStatus.h index 3978e1b46..4c4b630cc 100644 --- a/src/server/sparkd/md/binance/BinanceInstrumentStatus.h +++ b/src/app_sparkd/sparkd/md/binance/BinanceInstrumentStatus.h @@ -1,7 +1,7 @@ #pragma once -#include "lib/core/EnumMacros.h" -#include "lib/core/FMT_IMPL.h" +#include "spark/core/EnumMacros.h" +#include "spark/core/FMT_IMPL.h" #include #include diff --git a/src/server/sparkd/md/binance/BinanceLotSizeFilter.h b/src/app_sparkd/sparkd/md/binance/BinanceLotSizeFilter.h similarity index 94% rename from src/server/sparkd/md/binance/BinanceLotSizeFilter.h rename to src/app_sparkd/sparkd/md/binance/BinanceLotSizeFilter.h index 740375381..fbad53527 100644 --- a/src/server/sparkd/md/binance/BinanceLotSizeFilter.h +++ b/src/app_sparkd/sparkd/md/binance/BinanceLotSizeFilter.h @@ -1,7 +1,7 @@ #pragma once -#include "lib/io/JsonReader.h" -#include "server/sparkd/md/binance/BinanceFilterType.h" +#include "spark/io/JsonReader.h" +#include "sparkd/md/binance/BinanceFilterType.h" #include #include diff --git a/src/server/sparkd/md/binance/BinanceMarketLotSizeFilter.h b/src/app_sparkd/sparkd/md/binance/BinanceMarketLotSizeFilter.h similarity index 95% rename from src/server/sparkd/md/binance/BinanceMarketLotSizeFilter.h rename to src/app_sparkd/sparkd/md/binance/BinanceMarketLotSizeFilter.h index 0b5bef52b..c6ac0098b 100644 --- a/src/server/sparkd/md/binance/BinanceMarketLotSizeFilter.h +++ b/src/app_sparkd/sparkd/md/binance/BinanceMarketLotSizeFilter.h @@ -1,7 +1,7 @@ #pragma once -#include "lib/io/JsonReader.h" -#include "server/sparkd/md/binance/BinanceFilterType.h" +#include "spark/io/JsonReader.h" +#include "sparkd/md/binance/BinanceFilterType.h" #include diff --git a/src/server/sparkd/md/binance/BinanceMaxNumAlgoOrdersFilter.h b/src/app_sparkd/sparkd/md/binance/BinanceMaxNumAlgoOrdersFilter.h similarity index 95% rename from src/server/sparkd/md/binance/BinanceMaxNumAlgoOrdersFilter.h rename to src/app_sparkd/sparkd/md/binance/BinanceMaxNumAlgoOrdersFilter.h index 46efbbf07..5897885b8 100644 --- a/src/server/sparkd/md/binance/BinanceMaxNumAlgoOrdersFilter.h +++ b/src/app_sparkd/sparkd/md/binance/BinanceMaxNumAlgoOrdersFilter.h @@ -1,7 +1,7 @@ #pragma once -#include "lib/io/JsonReader.h" -#include "server/sparkd/md/binance/BinanceFilterType.h" +#include "spark/io/JsonReader.h" +#include "sparkd/md/binance/BinanceFilterType.h" #include #include diff --git a/src/server/sparkd/md/binance/BinanceMaxNumOrdersFilter.h b/src/app_sparkd/sparkd/md/binance/BinanceMaxNumOrdersFilter.h similarity index 94% rename from src/server/sparkd/md/binance/BinanceMaxNumOrdersFilter.h rename to src/app_sparkd/sparkd/md/binance/BinanceMaxNumOrdersFilter.h index 9a7a023bb..ab5f2e56c 100644 --- a/src/server/sparkd/md/binance/BinanceMaxNumOrdersFilter.h +++ b/src/app_sparkd/sparkd/md/binance/BinanceMaxNumOrdersFilter.h @@ -1,7 +1,7 @@ #pragma once -#include "lib/io/JsonReader.h" -#include "server/sparkd/md/binance/BinanceFilterType.h" +#include "spark/io/JsonReader.h" +#include "sparkd/md/binance/BinanceFilterType.h" #include #include diff --git a/src/server/sparkd/md/binance/BinanceMaxPositionFilter.h b/src/app_sparkd/sparkd/md/binance/BinanceMaxPositionFilter.h similarity index 94% rename from src/server/sparkd/md/binance/BinanceMaxPositionFilter.h rename to src/app_sparkd/sparkd/md/binance/BinanceMaxPositionFilter.h index 955842931..c393cade1 100644 --- a/src/server/sparkd/md/binance/BinanceMaxPositionFilter.h +++ b/src/app_sparkd/sparkd/md/binance/BinanceMaxPositionFilter.h @@ -1,7 +1,7 @@ #pragma once -#include "lib/io/JsonReader.h" -#include "server/sparkd/md/binance/BinanceFilterType.h" +#include "spark/io/JsonReader.h" +#include "sparkd/md/binance/BinanceFilterType.h" #include diff --git a/src/server/sparkd/md/binance/BinanceMessageType.h b/src/app_sparkd/sparkd/md/binance/BinanceMessageType.h similarity index 94% rename from src/server/sparkd/md/binance/BinanceMessageType.h rename to src/app_sparkd/sparkd/md/binance/BinanceMessageType.h index 86bae43f3..b13e6ef0e 100644 --- a/src/server/sparkd/md/binance/BinanceMessageType.h +++ b/src/app_sparkd/sparkd/md/binance/BinanceMessageType.h @@ -1,7 +1,7 @@ #pragma once -#include "lib/core/EnumMacros.h" -#include "lib/core/FMT_IMPL.h" +#include "spark/core/EnumMacros.h" +#include "spark/core/FMT_IMPL.h" #include #include diff --git a/src/server/sparkd/md/binance/BinanceMinNotionalFilter.cpp b/src/app_sparkd/sparkd/md/binance/BinanceMinNotionalFilter.cpp similarity index 91% rename from src/server/sparkd/md/binance/BinanceMinNotionalFilter.cpp rename to src/app_sparkd/sparkd/md/binance/BinanceMinNotionalFilter.cpp index 1fdeed9e7..d88cde411 100644 --- a/src/server/sparkd/md/binance/BinanceMinNotionalFilter.cpp +++ b/src/app_sparkd/sparkd/md/binance/BinanceMinNotionalFilter.cpp @@ -1,6 +1,6 @@ #include "BinanceMinNotionalFilter.h" -#include "lib/io/JsonMacros.h" -#include "lib/io/JsonReader.h" +#include "spark/io/JsonMacros.h" +#include "spark/io/JsonReader.h" #include diff --git a/src/server/sparkd/md/binance/BinanceMinNotionalFilter.h b/src/app_sparkd/sparkd/md/binance/BinanceMinNotionalFilter.h similarity index 93% rename from src/server/sparkd/md/binance/BinanceMinNotionalFilter.h rename to src/app_sparkd/sparkd/md/binance/BinanceMinNotionalFilter.h index 956383ee9..1b96180e5 100644 --- a/src/server/sparkd/md/binance/BinanceMinNotionalFilter.h +++ b/src/app_sparkd/sparkd/md/binance/BinanceMinNotionalFilter.h @@ -1,6 +1,6 @@ #pragma once -#include "server/sparkd/md/binance/BinanceFilterType.h" +#include "sparkd/md/binance/BinanceFilterType.h" #include #include diff --git a/src/server/sparkd/md/binance/BinanceMiniTickerAdaptor.cpp b/src/app_sparkd/sparkd/md/binance/BinanceMiniTickerAdaptor.cpp similarity index 92% rename from src/server/sparkd/md/binance/BinanceMiniTickerAdaptor.cpp rename to src/app_sparkd/sparkd/md/binance/BinanceMiniTickerAdaptor.cpp index b48fe40fb..92f1847db 100644 --- a/src/server/sparkd/md/binance/BinanceMiniTickerAdaptor.cpp +++ b/src/app_sparkd/sparkd/md/binance/BinanceMiniTickerAdaptor.cpp @@ -1,6 +1,6 @@ #include "BinanceMiniTickerAdaptor.h" -#include "lib/md/IMarketDataListener.h" -#include "server/sparkd/md/binance/BinanceMiniTickerUpdate.h" +#include "spark/md/IMarketDataListener.h" +#include "sparkd/md/binance/BinanceMiniTickerUpdate.h" #include #include diff --git a/src/server/sparkd/md/binance/BinanceMiniTickerAdaptor.h b/src/app_sparkd/sparkd/md/binance/BinanceMiniTickerAdaptor.h similarity index 86% rename from src/server/sparkd/md/binance/BinanceMiniTickerAdaptor.h rename to src/app_sparkd/sparkd/md/binance/BinanceMiniTickerAdaptor.h index 1a01c53aa..0946703e8 100644 --- a/src/server/sparkd/md/binance/BinanceMiniTickerAdaptor.h +++ b/src/app_sparkd/sparkd/md/binance/BinanceMiniTickerAdaptor.h @@ -1,7 +1,7 @@ #pragma once -#include "lib/domain/SecurityID.h" -#include "server/sparkd/md/ccapi/ICCApiMessageHandler.h" +#include "spark/domain/SecurityID.h" +#include "sparkd/md/ccapi/ICCApiMessageHandler.h" namespace bts::md { class IMarketDataListener; diff --git a/src/server/sparkd/md/binance/BinanceMiniTickerEventType.h b/src/app_sparkd/sparkd/md/binance/BinanceMiniTickerEventType.h similarity index 99% rename from src/server/sparkd/md/binance/BinanceMiniTickerEventType.h rename to src/app_sparkd/sparkd/md/binance/BinanceMiniTickerEventType.h index 6e1e32ac7..be42f5414 100644 --- a/src/server/sparkd/md/binance/BinanceMiniTickerEventType.h +++ b/src/app_sparkd/sparkd/md/binance/BinanceMiniTickerEventType.h @@ -1,6 +1,6 @@ #pragma once #ifdef SPARK_ENABLE_CCAPI -#include "lib/api/domain/SecurityType.pb.h" +#include "spark/api/domain/SecurityType.pb.h" #include #include diff --git a/src/server/sparkd/md/binance/BinanceMiniTickerUpdate.cpp b/src/app_sparkd/sparkd/md/binance/BinanceMiniTickerUpdate.cpp similarity index 91% rename from src/server/sparkd/md/binance/BinanceMiniTickerUpdate.cpp rename to src/app_sparkd/sparkd/md/binance/BinanceMiniTickerUpdate.cpp index 7f7bafa4c..d3153a8fe 100644 --- a/src/server/sparkd/md/binance/BinanceMiniTickerUpdate.cpp +++ b/src/app_sparkd/sparkd/md/binance/BinanceMiniTickerUpdate.cpp @@ -1,12 +1,12 @@ #ifdef SPARK_ENABLE_CCAPI #include "BinanceMiniTickerUpdate.h" -#include "lib/core/TimeStamp.h" -#include "lib/domain/Price.h" -#include "lib/domain/Quantity.h" -#include "lib/domain/SecurityMarketDataStatistics.h" -#include "lib/io/JsonDumper.h" -#include "lib/io/JsonReader.h" -#include "server/sparkd/md/ccapi/CCApiReader.h" +#include "spark/core/TimeStamp.h" +#include "spark/domain/Price.h" +#include "spark/domain/Quantity.h" +#include "spark/domain/SecurityMarketDataStatistics.h" +#include "spark/io/JsonDumper.h" +#include "spark/io/JsonReader.h" +#include "sparkd/md/ccapi/CCApiReader.h" #include #include diff --git a/src/server/sparkd/md/binance/BinanceMiniTickerUpdate.h b/src/app_sparkd/sparkd/md/binance/BinanceMiniTickerUpdate.h similarity index 87% rename from src/server/sparkd/md/binance/BinanceMiniTickerUpdate.h rename to src/app_sparkd/sparkd/md/binance/BinanceMiniTickerUpdate.h index 63e5f53fe..b9dd5133e 100644 --- a/src/server/sparkd/md/binance/BinanceMiniTickerUpdate.h +++ b/src/app_sparkd/sparkd/md/binance/BinanceMiniTickerUpdate.h @@ -1,8 +1,8 @@ #pragma once -#include "lib/core/TimeStamp.h" -#include "lib/domain/SecurityMarketDataStatistics.h" -#include "server/sparkd/md/binance/BinanceMiniTickerEventType.h" +#include "spark/core/TimeStamp.h" +#include "spark/domain/SecurityMarketDataStatistics.h" +#include "sparkd/md/binance/BinanceMiniTickerEventType.h" #include #include diff --git a/src/server/sparkd/md/binance/BinanceNotionalFilter.cpp b/src/app_sparkd/sparkd/md/binance/BinanceNotionalFilter.cpp similarity index 91% rename from src/server/sparkd/md/binance/BinanceNotionalFilter.cpp rename to src/app_sparkd/sparkd/md/binance/BinanceNotionalFilter.cpp index c1fa6d975..2d847497d 100644 --- a/src/server/sparkd/md/binance/BinanceNotionalFilter.cpp +++ b/src/app_sparkd/sparkd/md/binance/BinanceNotionalFilter.cpp @@ -1,6 +1,6 @@ #include "BinanceNotionalFilter.h" -#include "lib/io/JsonMacros.h" -#include "lib/io/JsonReader.h" +#include "spark/io/JsonMacros.h" +#include "spark/io/JsonReader.h" #include diff --git a/src/server/sparkd/md/binance/BinanceNotionalFilter.h b/src/app_sparkd/sparkd/md/binance/BinanceNotionalFilter.h similarity index 92% rename from src/server/sparkd/md/binance/BinanceNotionalFilter.h rename to src/app_sparkd/sparkd/md/binance/BinanceNotionalFilter.h index 031096f27..e1059f413 100644 --- a/src/server/sparkd/md/binance/BinanceNotionalFilter.h +++ b/src/app_sparkd/sparkd/md/binance/BinanceNotionalFilter.h @@ -1,6 +1,6 @@ #pragma once -#include "server/sparkd/md/binance/BinanceFilterType.h" +#include "sparkd/md/binance/BinanceFilterType.h" #include diff --git a/src/server/sparkd/md/binance/BinanceOrderType.h b/src/app_sparkd/sparkd/md/binance/BinanceOrderType.h similarity index 94% rename from src/server/sparkd/md/binance/BinanceOrderType.h rename to src/app_sparkd/sparkd/md/binance/BinanceOrderType.h index 3f23ee832..5b1a04ce7 100644 --- a/src/server/sparkd/md/binance/BinanceOrderType.h +++ b/src/app_sparkd/sparkd/md/binance/BinanceOrderType.h @@ -1,7 +1,7 @@ #pragma once -#include "lib/core/EnumMacros.h" -#include "lib/core/FMT_IMPL.h" +#include "spark/core/EnumMacros.h" +#include "spark/core/FMT_IMPL.h" #include #include diff --git a/src/server/sparkd/md/binance/BinancePercentPriceBySideFilter.h b/src/app_sparkd/sparkd/md/binance/BinancePercentPriceBySideFilter.h similarity index 95% rename from src/server/sparkd/md/binance/BinancePercentPriceBySideFilter.h rename to src/app_sparkd/sparkd/md/binance/BinancePercentPriceBySideFilter.h index 662f9d962..aeda9ec39 100644 --- a/src/server/sparkd/md/binance/BinancePercentPriceBySideFilter.h +++ b/src/app_sparkd/sparkd/md/binance/BinancePercentPriceBySideFilter.h @@ -1,8 +1,8 @@ #pragma once -#include "lib/io/JsonDumper.h" -#include "lib/io/JsonReader.h" -#include "server/sparkd/md/binance/BinanceFilterType.h" +#include "spark/io/JsonDumper.h" +#include "spark/io/JsonReader.h" +#include "sparkd/md/binance/BinanceFilterType.h" #include #include diff --git a/src/server/sparkd/md/binance/BinancePercentPriceFilter.h b/src/app_sparkd/sparkd/md/binance/BinancePercentPriceFilter.h similarity index 95% rename from src/server/sparkd/md/binance/BinancePercentPriceFilter.h rename to src/app_sparkd/sparkd/md/binance/BinancePercentPriceFilter.h index d32e62f29..7a7a39a40 100644 --- a/src/server/sparkd/md/binance/BinancePercentPriceFilter.h +++ b/src/app_sparkd/sparkd/md/binance/BinancePercentPriceFilter.h @@ -1,7 +1,7 @@ #pragma once -#include "lib/io/JsonReader.h" -#include "server/sparkd/md/binance/BinanceFilterType.h" +#include "spark/io/JsonReader.h" +#include "sparkd/md/binance/BinanceFilterType.h" #include #include diff --git a/src/server/sparkd/md/binance/BinancePermission.h b/src/app_sparkd/sparkd/md/binance/BinancePermission.h similarity index 93% rename from src/server/sparkd/md/binance/BinancePermission.h rename to src/app_sparkd/sparkd/md/binance/BinancePermission.h index ed0c67419..79fde3a4d 100644 --- a/src/server/sparkd/md/binance/BinancePermission.h +++ b/src/app_sparkd/sparkd/md/binance/BinancePermission.h @@ -1,7 +1,7 @@ #pragma once -#include "lib/core/EnumMacros.h" -#include "lib/core/FMT_IMPL.h" +#include "spark/core/EnumMacros.h" +#include "spark/core/FMT_IMPL.h" #include #include diff --git a/src/server/sparkd/md/binance/BinancePriceFilter.h b/src/app_sparkd/sparkd/md/binance/BinancePriceFilter.h similarity index 93% rename from src/server/sparkd/md/binance/BinancePriceFilter.h rename to src/app_sparkd/sparkd/md/binance/BinancePriceFilter.h index 223176c82..16d3dc53f 100644 --- a/src/server/sparkd/md/binance/BinancePriceFilter.h +++ b/src/app_sparkd/sparkd/md/binance/BinancePriceFilter.h @@ -1,8 +1,8 @@ #pragma once -#include "lib/io/JsonDumper.h" -#include "lib/io/JsonReader.h" -#include "server/sparkd/md/binance/BinanceFilterType.h" +#include "spark/io/JsonDumper.h" +#include "spark/io/JsonReader.h" +#include "sparkd/md/binance/BinanceFilterType.h" #include #include diff --git a/src/server/sparkd/md/binance/BinancePriceStatistics.cpp b/src/app_sparkd/sparkd/md/binance/BinancePriceStatistics.cpp similarity index 93% rename from src/server/sparkd/md/binance/BinancePriceStatistics.cpp rename to src/app_sparkd/sparkd/md/binance/BinancePriceStatistics.cpp index 407587a36..6a4814ea7 100644 --- a/src/server/sparkd/md/binance/BinancePriceStatistics.cpp +++ b/src/app_sparkd/sparkd/md/binance/BinancePriceStatistics.cpp @@ -1,11 +1,11 @@ #include "BinancePriceStatistics.h" -#include "lib/core/TimeStamp.h" -#include "lib/domain/Price.h" -#include "lib/domain/Quantity.h" -#include "lib/domain/SecurityMarketDataStatistics.h" -#include "lib/io/JsonDumper.h" -#include "lib/io/JsonReader.h" -#include "server/sparkd/md/ccapi/CCApiReader.h" +#include "spark/core/TimeStamp.h" +#include "spark/domain/Price.h" +#include "spark/domain/Quantity.h" +#include "spark/domain/SecurityMarketDataStatistics.h" +#include "spark/io/JsonDumper.h" +#include "spark/io/JsonReader.h" +#include "sparkd/md/ccapi/CCApiReader.h" #include #include diff --git a/src/server/sparkd/md/binance/BinancePriceStatistics.h b/src/app_sparkd/sparkd/md/binance/BinancePriceStatistics.h similarity index 97% rename from src/server/sparkd/md/binance/BinancePriceStatistics.h rename to src/app_sparkd/sparkd/md/binance/BinancePriceStatistics.h index 79c112248..5fcc050f3 100644 --- a/src/server/sparkd/md/binance/BinancePriceStatistics.h +++ b/src/app_sparkd/sparkd/md/binance/BinancePriceStatistics.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/core/TimeStamp.h" +#include "spark/core/TimeStamp.h" #include #include diff --git a/src/server/sparkd/md/binance/BinancePriceStatisticsAdaptor.cpp b/src/app_sparkd/sparkd/md/binance/BinancePriceStatisticsAdaptor.cpp similarity index 90% rename from src/server/sparkd/md/binance/BinancePriceStatisticsAdaptor.cpp rename to src/app_sparkd/sparkd/md/binance/BinancePriceStatisticsAdaptor.cpp index d69533a2f..d76cd3ff8 100644 --- a/src/server/sparkd/md/binance/BinancePriceStatisticsAdaptor.cpp +++ b/src/app_sparkd/sparkd/md/binance/BinancePriceStatisticsAdaptor.cpp @@ -1,9 +1,9 @@ #include "BinancePriceStatisticsAdaptor.h" -#include "lib/domain/SecurityID.h" -#include "lib/domain/SecurityMarketDataStatistics.h" -#include "lib/md/IMarketDataListener.h" -#include "lib/utils/bts_fatal.h" -#include "server/sparkd/md/binance/BinancePriceStatistics.h" +#include "spark/domain/SecurityID.h" +#include "spark/domain/SecurityMarketDataStatistics.h" +#include "spark/md/IMarketDataListener.h" +#include "spark/utils/bts_fatal.h" +#include "sparkd/md/binance/BinancePriceStatistics.h" #include #include diff --git a/src/server/sparkd/md/binance/BinancePriceStatisticsAdaptor.h b/src/app_sparkd/sparkd/md/binance/BinancePriceStatisticsAdaptor.h similarity index 85% rename from src/server/sparkd/md/binance/BinancePriceStatisticsAdaptor.h rename to src/app_sparkd/sparkd/md/binance/BinancePriceStatisticsAdaptor.h index 280deaf34..96f879200 100644 --- a/src/server/sparkd/md/binance/BinancePriceStatisticsAdaptor.h +++ b/src/app_sparkd/sparkd/md/binance/BinancePriceStatisticsAdaptor.h @@ -1,8 +1,8 @@ #pragma once -#include "lib/api/domain/SecurityType.pb.h" -#include "lib/domain/SecurityID.h" -#include "server/sparkd/md/ccapi/ICCApiMessageHandler.h" +#include "spark/api/domain/SecurityType.pb.h" +#include "spark/domain/SecurityID.h" +#include "sparkd/md/ccapi/ICCApiMessageHandler.h" #include #include diff --git a/src/server/sparkd/md/binance/BinanceQuoteAsset.h b/src/app_sparkd/sparkd/md/binance/BinanceQuoteAsset.h similarity index 97% rename from src/server/sparkd/md/binance/BinanceQuoteAsset.h rename to src/app_sparkd/sparkd/md/binance/BinanceQuoteAsset.h index 89b940fa3..477275cdc 100644 --- a/src/server/sparkd/md/binance/BinanceQuoteAsset.h +++ b/src/app_sparkd/sparkd/md/binance/BinanceQuoteAsset.h @@ -1,8 +1,8 @@ #pragma once -#include "lib/api/domain/Currency.pb.h" -#include "lib/core/EnumMacros.h" -#include "lib/core/FMT_IMPL.h" +#include "spark/api/domain/Currency.pb.h" +#include "spark/core/EnumMacros.h" +#include "spark/core/FMT_IMPL.h" #include #include diff --git a/src/server/sparkd/md/binance/BinanceSecurityRequestor.cpp b/src/app_sparkd/sparkd/md/binance/BinanceSecurityRequestor.cpp similarity index 93% rename from src/server/sparkd/md/binance/BinanceSecurityRequestor.cpp rename to src/app_sparkd/sparkd/md/binance/BinanceSecurityRequestor.cpp index d9483fb86..d9e24d67f 100644 --- a/src/server/sparkd/md/binance/BinanceSecurityRequestor.cpp +++ b/src/app_sparkd/sparkd/md/binance/BinanceSecurityRequestor.cpp @@ -1,19 +1,19 @@ #include "BinanceSecurityRequestor.h" -#include "lib/api/domain/SecurityType.pb.h" -#include "lib/api/domain/Venue.pb.h" -#include "lib/collections/Contains.h" -#include "lib/collections/Remove.h" -#include "lib/domain/Security.h" -#include "lib/domain/SecurityCriteria.h" -#include "lib/logging/logging.h" -#include "lib/persistence/IDGenerator.h" -#include "lib/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 "spark/api/domain/SecurityType.pb.h" +#include "spark/api/domain/Venue.pb.h" +#include "spark/collections/Contains.h" +#include "spark/collections/Remove.h" +#include "spark/domain/Security.h" +#include "spark/domain/SecurityCriteria.h" +#include "spark/logging/logging.h" +#include "spark/persistence/IDGenerator.h" +#include "spark/utils/bts_fatal.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/server/sparkd/md/binance/BinanceSecurityRequestor.h b/src/app_sparkd/sparkd/md/binance/BinanceSecurityRequestor.h similarity index 98% rename from src/server/sparkd/md/binance/BinanceSecurityRequestor.h rename to src/app_sparkd/sparkd/md/binance/BinanceSecurityRequestor.h index 6bbaad5d6..3ca0a893b 100644 --- a/src/server/sparkd/md/binance/BinanceSecurityRequestor.h +++ b/src/app_sparkd/sparkd/md/binance/BinanceSecurityRequestor.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/utils/Delegate.h" +#include "spark/utils/Delegate.h" #include #include diff --git a/src/server/sparkd/md/binance/BinanceSpot.cpp b/src/app_sparkd/sparkd/md/binance/BinanceSpot.cpp similarity index 95% rename from src/server/sparkd/md/binance/BinanceSpot.cpp rename to src/app_sparkd/sparkd/md/binance/BinanceSpot.cpp index 1a0d44475..acf5601c0 100644 --- a/src/server/sparkd/md/binance/BinanceSpot.cpp +++ b/src/app_sparkd/sparkd/md/binance/BinanceSpot.cpp @@ -1,9 +1,9 @@ #include "BinanceSpot.h" -#include "lib/domain/Quantity.h" -#include "lib/domain/Security.h" -#include "lib/io/JsonMacros.h" -#include "lib/io/JsonReader.h" -#include "lib/logging/logging.h" +#include "spark/api/domain/Venue.pb.h" +#include "spark/domain/Quantity.h" +#include "spark/domain/Security.h" +#include "spark/io/JsonReader.h" +#include "spark/logging/logging.h" #include #include diff --git a/src/server/sparkd/md/binance/BinanceSpot.h b/src/app_sparkd/sparkd/md/binance/BinanceSpot.h similarity index 80% rename from src/server/sparkd/md/binance/BinanceSpot.h rename to src/app_sparkd/sparkd/md/binance/BinanceSpot.h index 6f85b8986..cba2e878f 100644 --- a/src/server/sparkd/md/binance/BinanceSpot.h +++ b/src/app_sparkd/sparkd/md/binance/BinanceSpot.h @@ -1,12 +1,13 @@ #pragma once -#include "lib/api/domain/Venue.h" -#include "lib/core/FMT_IMPL.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 "spark/api/domain/Venue.h" +#include "spark/core/FMT_IMPL.h" +#include "spark/io/JsonMacros.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/server/sparkd/md/binance/BinanceSubscription.cpp b/src/app_sparkd/sparkd/md/binance/BinanceSubscription.cpp similarity index 92% rename from src/server/sparkd/md/binance/BinanceSubscription.cpp rename to src/app_sparkd/sparkd/md/binance/BinanceSubscription.cpp index 6c1a9ad0d..ea9a52c2b 100644 --- a/src/server/sparkd/md/binance/BinanceSubscription.cpp +++ b/src/app_sparkd/sparkd/md/binance/BinanceSubscription.cpp @@ -1,28 +1,30 @@ #include "BinanceSubscription.h" -#include "lib/api/domain/Venue.pb.h" -#include "lib/api/md/BinanceMarketDataConfig.pb.h" -#include "lib/collections/Contains.h" -#include "lib/collections/Remove.h" -#include "lib/core/FMT.h" -#include "lib/domain/Security.h" -#include "lib/domain/SecurityCriteria.h" -#include "lib/io/ProtoPrinter.h" -#include "lib/io/QueryParams.h" -#include "lib/io/http/http_client.h" -#include "lib/io/http/http_response.h" -#include "lib/logging/logging.h" -#include "lib/md/IMarketDataListener.h" -#include "lib/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/binance/BinanceSpot.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 "spark/api/domain/Venue.pb.h" +#include "spark/api/md/BinanceMarketDataConfig.pb.h" +#include "spark/collections/Contains.h" +#include "spark/collections/Remove.h" +#include "spark/collections/UnorderedSetFactory.h" +#include "spark/core/FMT.h" +#include "spark/domain/Security.h" +#include "spark/domain/SecurityCriteria.h" +#include "spark/io/ProtoPrinter.h" +#include "spark/io/QueryParams.h" +#include "spark/io/http/http_client.h" +#include "spark/io/http/http_response.h" +#include "spark/logging/logging.h" +#include "spark/md/IMarketDataListener.h" +#include "spark/persistence/IDGenerator.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/binance/BinanceSpot.h" +#include "sparkd/md/binance/BinanceSubscription.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/server/sparkd/md/binance/BinanceSubscription.h b/src/app_sparkd/sparkd/md/binance/BinanceSubscription.h similarity index 96% rename from src/server/sparkd/md/binance/BinanceSubscription.h rename to src/app_sparkd/sparkd/md/binance/BinanceSubscription.h index 541305580..3a855d7d1 100644 --- a/src/server/sparkd/md/binance/BinanceSubscription.h +++ b/src/app_sparkd/sparkd/md/binance/BinanceSubscription.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/md/IMarketDataSource.h" +#include "spark/md/IMarketDataSource.h" #include diff --git a/src/server/sparkd/md/binance/BinanceTrailingDeltaFilter.h b/src/app_sparkd/sparkd/md/binance/BinanceTrailingDeltaFilter.h similarity index 94% rename from src/server/sparkd/md/binance/BinanceTrailingDeltaFilter.h rename to src/app_sparkd/sparkd/md/binance/BinanceTrailingDeltaFilter.h index ed084e139..6278e043a 100644 --- a/src/server/sparkd/md/binance/BinanceTrailingDeltaFilter.h +++ b/src/app_sparkd/sparkd/md/binance/BinanceTrailingDeltaFilter.h @@ -1,8 +1,8 @@ #pragma once -#include "lib/io/JsonDumper.h" -#include "lib/io/JsonReader.h" -#include "server/sparkd/md/binance/BinanceFilterType.h" +#include "spark/io/JsonDumper.h" +#include "spark/io/JsonReader.h" +#include "sparkd/md/binance/BinanceFilterType.h" #include diff --git a/src/server/sparkd/md/binance_coin_futures/binance_coin_future.cpp b/src/app_sparkd/sparkd/md/binance_coin_futures/binance_coin_future.cpp similarity index 96% rename from src/server/sparkd/md/binance_coin_futures/binance_coin_future.cpp rename to src/app_sparkd/sparkd/md/binance_coin_futures/binance_coin_future.cpp index 6a24192fa..f2005cd43 100644 --- a/src/server/sparkd/md/binance_coin_futures/binance_coin_future.cpp +++ b/src/app_sparkd/sparkd/md/binance_coin_futures/binance_coin_future.cpp @@ -1,10 +1,10 @@ #include "binance_coin_future.h" -#include "lib/domain/Price.h" -#include "lib/domain/Quantity.h" -#include "lib/domain/Security.h" -#include "lib/io/JsonDumper.h" -#include "lib/io/JsonReader.h" -#include "lib/logging/logging.h" +#include "spark/domain/Price.h" +#include "spark/domain/Quantity.h" +#include "spark/domain/Security.h" +#include "spark/io/JsonDumper.h" +#include "spark/io/JsonReader.h" +#include "spark/logging/logging.h" #include #include diff --git a/src/server/sparkd/md/binance_coin_futures/binance_coin_future.h b/src/app_sparkd/sparkd/md/binance_coin_futures/binance_coin_future.h similarity index 83% rename from src/server/sparkd/md/binance_coin_futures/binance_coin_future.h rename to src/app_sparkd/sparkd/md/binance_coin_futures/binance_coin_future.h index df34232a8..643bc60bc 100644 --- a/src/server/sparkd/md/binance_coin_futures/binance_coin_future.h +++ b/src/app_sparkd/sparkd/md/binance_coin_futures/binance_coin_future.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_coin_futures/binance_coin_futures_contract_type.h" -#include "server/sparkd/md/binance_coin_futures/binance_coin_futures_filter_tuple.h" +#include "sparkd/md/binance/BinanceInstrumentStatus.h" +#include "sparkd/md/binance/BinanceQuoteAsset.h" +#include "sparkd/md/binance_coin_futures/binance_coin_futures_contract_type.h" +#include "sparkd/md/binance_coin_futures/binance_coin_futures_filter_tuple.h" #include #include diff --git a/src/server/sparkd/md/binance_coin_futures/binance_coin_futures_contract_type.h b/src/app_sparkd/sparkd/md/binance_coin_futures/binance_coin_futures_contract_type.h similarity index 92% rename from src/server/sparkd/md/binance_coin_futures/binance_coin_futures_contract_type.h rename to src/app_sparkd/sparkd/md/binance_coin_futures/binance_coin_futures_contract_type.h index 6ed02eab3..20e1db8dd 100644 --- a/src/server/sparkd/md/binance_coin_futures/binance_coin_futures_contract_type.h +++ b/src/app_sparkd/sparkd/md/binance_coin_futures/binance_coin_futures_contract_type.h @@ -1,7 +1,7 @@ #pragma once -#include "lib/core/EnumMacros.h" -#include "lib/core/FMT_IMPL.h" +#include "spark/core/EnumMacros.h" +#include "spark/core/FMT_IMPL.h" #include #include diff --git a/src/server/sparkd/md/binance_coin_futures/binance_coin_futures_filter_tuple.h b/src/app_sparkd/sparkd/md/binance_coin_futures/binance_coin_futures_filter_tuple.h similarity index 81% rename from src/server/sparkd/md/binance_coin_futures/binance_coin_futures_filter_tuple.h rename to src/app_sparkd/sparkd/md/binance_coin_futures/binance_coin_futures_filter_tuple.h index 475df7145..d105a53d2 100644 --- a/src/server/sparkd/md/binance_coin_futures/binance_coin_futures_filter_tuple.h +++ b/src/app_sparkd/sparkd/md/binance_coin_futures/binance_coin_futures_filter_tuple.h @@ -1,13 +1,13 @@ #pragma once -#include "lib/io/JsonDumper.h" -#include "lib/io/JsonReader.h" -#include "server/sparkd/md/binance/BinanceFilterType.h" -#include "server/sparkd/md/binance/BinanceLotSizeFilter.h" -#include "server/sparkd/md/binance/BinanceMarketLotSizeFilter.h" -#include "server/sparkd/md/binance/BinancePriceFilter.h" -#include "server/sparkd/md/binance_coin_futures/binance_coin_futures_max_num_orders_filter.h" -#include "server/sparkd/md/binance_coin_futures/binance_coin_futures_percent_price_filter.h" +#include "spark/io/JsonDumper.h" +#include "spark/io/JsonReader.h" +#include "sparkd/md/binance/BinanceFilterType.h" +#include "sparkd/md/binance/BinanceLotSizeFilter.h" +#include "sparkd/md/binance/BinanceMarketLotSizeFilter.h" +#include "sparkd/md/binance/BinancePriceFilter.h" +#include "sparkd/md/binance_coin_futures/binance_coin_futures_max_num_orders_filter.h" +#include "sparkd/md/binance_coin_futures/binance_coin_futures_percent_price_filter.h" #include #include diff --git a/src/server/sparkd/md/binance_coin_futures/binance_coin_futures_max_num_orders_filter.h b/src/app_sparkd/sparkd/md/binance_coin_futures/binance_coin_futures_max_num_orders_filter.h similarity index 92% rename from src/server/sparkd/md/binance_coin_futures/binance_coin_futures_max_num_orders_filter.h rename to src/app_sparkd/sparkd/md/binance_coin_futures/binance_coin_futures_max_num_orders_filter.h index 2e06e36ed..65606233f 100644 --- a/src/server/sparkd/md/binance_coin_futures/binance_coin_futures_max_num_orders_filter.h +++ b/src/app_sparkd/sparkd/md/binance_coin_futures/binance_coin_futures_max_num_orders_filter.h @@ -1,8 +1,8 @@ #pragma once -#include "lib/io/JsonDumper.h" -#include "lib/io/JsonReader.h" -#include "server/sparkd/md/binance/BinanceFilterType.h" +#include "spark/io/JsonDumper.h" +#include "spark/io/JsonReader.h" +#include "sparkd/md/binance/BinanceFilterType.h" #include #include diff --git a/src/server/sparkd/md/binance_coin_futures/binance_coin_futures_message_type.h b/src/app_sparkd/sparkd/md/binance_coin_futures/binance_coin_futures_message_type.h similarity index 95% rename from src/server/sparkd/md/binance_coin_futures/binance_coin_futures_message_type.h rename to src/app_sparkd/sparkd/md/binance_coin_futures/binance_coin_futures_message_type.h index 106baedbf..81ef55675 100644 --- a/src/server/sparkd/md/binance_coin_futures/binance_coin_futures_message_type.h +++ b/src/app_sparkd/sparkd/md/binance_coin_futures/binance_coin_futures_message_type.h @@ -1,7 +1,7 @@ #pragma once -#include "lib/core/EnumMacros.h" -#include "lib/core/FMT_IMPL.h" +#include "spark/core/EnumMacros.h" +#include "spark/core/FMT_IMPL.h" #include #include diff --git a/src/server/sparkd/md/binance_coin_futures/binance_coin_futures_percent_price_filter.h b/src/app_sparkd/sparkd/md/binance_coin_futures/binance_coin_futures_percent_price_filter.h similarity index 94% rename from src/server/sparkd/md/binance_coin_futures/binance_coin_futures_percent_price_filter.h rename to src/app_sparkd/sparkd/md/binance_coin_futures/binance_coin_futures_percent_price_filter.h index 1626c011b..f4213a9e7 100644 --- a/src/server/sparkd/md/binance_coin_futures/binance_coin_futures_percent_price_filter.h +++ b/src/app_sparkd/sparkd/md/binance_coin_futures/binance_coin_futures_percent_price_filter.h @@ -1,8 +1,8 @@ #pragma once -#include "lib/io/JsonDumper.h" -#include "lib/io/JsonReader.h" -#include "server/sparkd/md/binance/BinanceFilterType.h" +#include "spark/io/JsonDumper.h" +#include "spark/io/JsonReader.h" +#include "sparkd/md/binance/BinanceFilterType.h" #include #include diff --git a/src/server/sparkd/md/binance_coin_futures/binance_coin_futures_price_statistics.cpp b/src/app_sparkd/sparkd/md/binance_coin_futures/binance_coin_futures_price_statistics.cpp similarity index 93% rename from src/server/sparkd/md/binance_coin_futures/binance_coin_futures_price_statistics.cpp rename to src/app_sparkd/sparkd/md/binance_coin_futures/binance_coin_futures_price_statistics.cpp index 5b7655eb7..063ee03cd 100644 --- a/src/server/sparkd/md/binance_coin_futures/binance_coin_futures_price_statistics.cpp +++ b/src/app_sparkd/sparkd/md/binance_coin_futures/binance_coin_futures_price_statistics.cpp @@ -1,10 +1,10 @@ #include "binance_coin_futures_price_statistics.h" -#include "lib/domain/Price.h" -#include "lib/domain/Quantity.h" -#include "lib/domain/SecurityMarketDataStatistics.h" -#include "lib/io/JsonMacros.h" -#include "lib/io/JsonReader.h" -#include "server/sparkd/md/ccapi/CCApiReader.h" +#include "spark/domain/Price.h" +#include "spark/domain/Quantity.h" +#include "spark/domain/SecurityMarketDataStatistics.h" +#include "spark/io/JsonMacros.h" +#include "spark/io/JsonReader.h" +#include "sparkd/md/ccapi/CCApiReader.h" #include #include diff --git a/src/server/sparkd/md/binance_coin_futures/binance_coin_futures_price_statistics.h b/src/app_sparkd/sparkd/md/binance_coin_futures/binance_coin_futures_price_statistics.h similarity index 100% rename from src/server/sparkd/md/binance_coin_futures/binance_coin_futures_price_statistics.h rename to src/app_sparkd/sparkd/md/binance_coin_futures/binance_coin_futures_price_statistics.h diff --git a/src/server/sparkd/md/binance_coin_futures/binance_coin_futures_price_statistics_adaptor.cpp b/src/app_sparkd/sparkd/md/binance_coin_futures/binance_coin_futures_price_statistics_adaptor.cpp similarity index 91% rename from src/server/sparkd/md/binance_coin_futures/binance_coin_futures_price_statistics_adaptor.cpp rename to src/app_sparkd/sparkd/md/binance_coin_futures/binance_coin_futures_price_statistics_adaptor.cpp index 3d765bc13..5a92f3fe0 100644 --- a/src/server/sparkd/md/binance_coin_futures/binance_coin_futures_price_statistics_adaptor.cpp +++ b/src/app_sparkd/sparkd/md/binance_coin_futures/binance_coin_futures_price_statistics_adaptor.cpp @@ -1,9 +1,9 @@ #include "binance_coin_futures_price_statistics_adaptor.h" -#include "lib/domain/SecurityID.h" -#include "lib/domain/SecurityMarketDataStatistics.h" -#include "lib/md/IMarketDataListener.h" -#include "lib/utils/bts_fatal.h" -#include "server/sparkd/md/binance_coin_futures/binance_coin_futures_price_statistics.h" +#include "spark/domain/SecurityID.h" +#include "spark/domain/SecurityMarketDataStatistics.h" +#include "spark/md/IMarketDataListener.h" +#include "spark/utils/bts_fatal.h" +#include "sparkd/md/binance_coin_futures/binance_coin_futures_price_statistics.h" #include #include diff --git a/src/server/sparkd/md/binance_coin_futures/binance_coin_futures_price_statistics_adaptor.h b/src/app_sparkd/sparkd/md/binance_coin_futures/binance_coin_futures_price_statistics_adaptor.h similarity index 91% rename from src/server/sparkd/md/binance_coin_futures/binance_coin_futures_price_statistics_adaptor.h rename to src/app_sparkd/sparkd/md/binance_coin_futures/binance_coin_futures_price_statistics_adaptor.h index 430051fe0..9dfb264ed 100644 --- a/src/server/sparkd/md/binance_coin_futures/binance_coin_futures_price_statistics_adaptor.h +++ b/src/app_sparkd/sparkd/md/binance_coin_futures/binance_coin_futures_price_statistics_adaptor.h @@ -1,7 +1,7 @@ #pragma once -#include "lib/domain/SecurityID.h" -#include "server/sparkd/md/ccapi/ICCApiMessageHandler.h" +#include "spark/domain/SecurityID.h" +#include "sparkd/md/ccapi/ICCApiMessageHandler.h" #include diff --git a/src/server/sparkd/md/binance_coin_futures/binance_coin_futures_security_requestor.cpp b/src/app_sparkd/sparkd/md/binance_coin_futures/binance_coin_futures_security_requestor.cpp similarity index 92% rename from src/server/sparkd/md/binance_coin_futures/binance_coin_futures_security_requestor.cpp rename to src/app_sparkd/sparkd/md/binance_coin_futures/binance_coin_futures_security_requestor.cpp index 177d9bf52..3fae4d06a 100644 --- a/src/server/sparkd/md/binance_coin_futures/binance_coin_futures_security_requestor.cpp +++ b/src/app_sparkd/sparkd/md/binance_coin_futures/binance_coin_futures_security_requestor.cpp @@ -1,19 +1,19 @@ #include "binance_coin_futures_security_requestor.h" -#include "lib/api/md/BinanceCoinFuturesMarketDataConfig.pb.h" -#include "lib/collections/Contains.h" -#include "lib/collections/Remove.h" -#include "lib/collections/UnorderedSetFactory.h" -#include "lib/core/FMT.h" -#include "lib/domain/Security.h" -#include "lib/domain/SecurityCriteria.h" -#include "lib/logging/logging.h" -#include "lib/persistence/IDGenerator.h" -#include "lib/utils/bts_fatal.h" -#include "server/sparkd/md/binance_coin_futures/binance_coin_future.h" -#include "server/sparkd/md/binance_coin_futures/binance_coin_futures_message_type.h" -#include "server/sparkd/md/ccapi/CCApiCorrelationID.h" -#include "server/sparkd/md/ccapi/CCApiMessageHandler.h" -#include "server/sparkd/md/ccapi/CCApiSession.h" +#include "spark/api/md/BinanceCoinFuturesMarketDataConfig.pb.h" +#include "spark/collections/Contains.h" +#include "spark/collections/Remove.h" +#include "spark/collections/UnorderedSetFactory.h" +#include "spark/core/FMT.h" +#include "spark/domain/Security.h" +#include "spark/domain/SecurityCriteria.h" +#include "spark/logging/logging.h" +#include "spark/persistence/IDGenerator.h" +#include "spark/utils/bts_fatal.h" +#include "sparkd/md/binance_coin_futures/binance_coin_future.h" +#include "sparkd/md/binance_coin_futures/binance_coin_futures_message_type.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/server/sparkd/md/binance_coin_futures/binance_coin_futures_security_requestor.h b/src/app_sparkd/sparkd/md/binance_coin_futures/binance_coin_futures_security_requestor.h similarity index 98% rename from src/server/sparkd/md/binance_coin_futures/binance_coin_futures_security_requestor.h rename to src/app_sparkd/sparkd/md/binance_coin_futures/binance_coin_futures_security_requestor.h index e938b3706..50432048c 100644 --- a/src/server/sparkd/md/binance_coin_futures/binance_coin_futures_security_requestor.h +++ b/src/app_sparkd/sparkd/md/binance_coin_futures/binance_coin_futures_security_requestor.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/utils/Delegate.h" +#include "spark/utils/Delegate.h" #include #include diff --git a/src/server/sparkd/md/binance_coin_futures/binance_coin_futures_subscription.cpp b/src/app_sparkd/sparkd/md/binance_coin_futures/binance_coin_futures_subscription.cpp similarity index 92% rename from src/server/sparkd/md/binance_coin_futures/binance_coin_futures_subscription.cpp rename to src/app_sparkd/sparkd/md/binance_coin_futures/binance_coin_futures_subscription.cpp index 5fc0a4011..b5b103118 100644 --- a/src/server/sparkd/md/binance_coin_futures/binance_coin_futures_subscription.cpp +++ b/src/app_sparkd/sparkd/md/binance_coin_futures/binance_coin_futures_subscription.cpp @@ -1,22 +1,22 @@ #include "binance_coin_futures_subscription.h" -#include "lib/api/domain/Venue.pb.h" -#include "lib/api/md/BinanceCoinFuturesMarketDataConfig.pb.h" -#include "lib/core/FMT.h" -#include "lib/domain/Security.h" -#include "lib/domain/SecurityCriteria.h" -#include "lib/domain/SecurityID.h" -#include "lib/io/ProtoPrinter.h" -#include "lib/io/QueryParams.h" -#include "lib/logging/logging.h" -#include "lib/md/IMarketDataListener.h" -#include "lib/persistence/IDGenerator.h" -#include "server/sparkd/md/binance_coin_futures/binance_coin_futures_message_type.h" -#include "server/sparkd/md/binance_coin_futures/binance_coin_futures_price_statistics_adaptor.h" -#include "server/sparkd/md/binance_coin_futures/binance_coin_futures_security_requestor.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 "spark/api/domain/Venue.pb.h" +#include "spark/api/md/BinanceCoinFuturesMarketDataConfig.pb.h" +#include "spark/core/FMT.h" +#include "spark/domain/Security.h" +#include "spark/domain/SecurityCriteria.h" +#include "spark/domain/SecurityID.h" +#include "spark/io/ProtoPrinter.h" +#include "spark/io/QueryParams.h" +#include "spark/logging/logging.h" +#include "spark/md/IMarketDataListener.h" +#include "spark/persistence/IDGenerator.h" +#include "sparkd/md/binance_coin_futures/binance_coin_futures_message_type.h" +#include "sparkd/md/binance_coin_futures/binance_coin_futures_price_statistics_adaptor.h" +#include "sparkd/md/binance_coin_futures/binance_coin_futures_security_requestor.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/server/sparkd/md/binance_coin_futures/binance_coin_futures_subscription.h b/src/app_sparkd/sparkd/md/binance_coin_futures/binance_coin_futures_subscription.h similarity index 97% rename from src/server/sparkd/md/binance_coin_futures/binance_coin_futures_subscription.h rename to src/app_sparkd/sparkd/md/binance_coin_futures/binance_coin_futures_subscription.h index f65ba80b8..b46d85a46 100644 --- a/src/server/sparkd/md/binance_coin_futures/binance_coin_futures_subscription.h +++ b/src/app_sparkd/sparkd/md/binance_coin_futures/binance_coin_futures_subscription.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/md/IMarketDataSource.h" +#include "spark/md/IMarketDataSource.h" #include diff --git a/src/server/sparkd/md/binance_us/BinanceUsMessageType.h b/src/app_sparkd/sparkd/md/binance_us/BinanceUsMessageType.h similarity index 94% rename from src/server/sparkd/md/binance_us/BinanceUsMessageType.h rename to src/app_sparkd/sparkd/md/binance_us/BinanceUsMessageType.h index 994ef19c4..161f55cf7 100644 --- a/src/server/sparkd/md/binance_us/BinanceUsMessageType.h +++ b/src/app_sparkd/sparkd/md/binance_us/BinanceUsMessageType.h @@ -1,7 +1,7 @@ #pragma once -#include "lib/core/EnumMacros.h" -#include "lib/core/FMT_IMPL.h" +#include "spark/core/EnumMacros.h" +#include "spark/core/FMT_IMPL.h" #include #include diff --git a/src/server/sparkd/md/binance_us/BinanceUsPriceStatistics.cpp b/src/app_sparkd/sparkd/md/binance_us/BinanceUsPriceStatistics.cpp similarity index 93% rename from src/server/sparkd/md/binance_us/BinanceUsPriceStatistics.cpp rename to src/app_sparkd/sparkd/md/binance_us/BinanceUsPriceStatistics.cpp index 899acee97..1d68f2067 100644 --- a/src/server/sparkd/md/binance_us/BinanceUsPriceStatistics.cpp +++ b/src/app_sparkd/sparkd/md/binance_us/BinanceUsPriceStatistics.cpp @@ -1,11 +1,11 @@ #include "BinanceUsPriceStatistics.h" -#include "lib/core/TimeStamp.h" -#include "lib/domain/Price.h" -#include "lib/domain/Quantity.h" -#include "lib/domain/SecurityMarketDataStatistics.h" -#include "lib/io/JsonDumper.h" -#include "lib/io/JsonReader.h" -#include "server/sparkd/md/ccapi/CCApiReader.h" +#include "spark/core/TimeStamp.h" +#include "spark/domain/Price.h" +#include "spark/domain/Quantity.h" +#include "spark/domain/SecurityMarketDataStatistics.h" +#include "spark/io/JsonDumper.h" +#include "spark/io/JsonReader.h" +#include "sparkd/md/ccapi/CCApiReader.h" #include #include diff --git a/src/server/sparkd/md/binance_us/BinanceUsPriceStatistics.h b/src/app_sparkd/sparkd/md/binance_us/BinanceUsPriceStatistics.h similarity index 97% rename from src/server/sparkd/md/binance_us/BinanceUsPriceStatistics.h rename to src/app_sparkd/sparkd/md/binance_us/BinanceUsPriceStatistics.h index 852c6c4f5..59c3976c9 100644 --- a/src/server/sparkd/md/binance_us/BinanceUsPriceStatistics.h +++ b/src/app_sparkd/sparkd/md/binance_us/BinanceUsPriceStatistics.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/core/TimeStamp.h" +#include "spark/core/TimeStamp.h" #include #include diff --git a/src/server/sparkd/md/binance_us/BinanceUsPriceStatisticsAdaptor.cpp b/src/app_sparkd/sparkd/md/binance_us/BinanceUsPriceStatisticsAdaptor.cpp similarity index 90% rename from src/server/sparkd/md/binance_us/BinanceUsPriceStatisticsAdaptor.cpp rename to src/app_sparkd/sparkd/md/binance_us/BinanceUsPriceStatisticsAdaptor.cpp index 954106e1c..a55a46607 100644 --- a/src/server/sparkd/md/binance_us/BinanceUsPriceStatisticsAdaptor.cpp +++ b/src/app_sparkd/sparkd/md/binance_us/BinanceUsPriceStatisticsAdaptor.cpp @@ -1,9 +1,9 @@ #include "BinanceUsPriceStatisticsAdaptor.h" -#include "lib/domain/SecurityID.h" -#include "lib/domain/SecurityMarketDataStatistics.h" -#include "lib/md/IMarketDataListener.h" -#include "lib/utils/bts_fatal.h" -#include "server/sparkd/md/binance_us/BinanceUsPriceStatistics.h" +#include "spark/domain/SecurityID.h" +#include "spark/domain/SecurityMarketDataStatistics.h" +#include "spark/md/IMarketDataListener.h" +#include "spark/utils/bts_fatal.h" +#include "sparkd/md/binance_us/BinanceUsPriceStatistics.h" #include #include diff --git a/src/server/sparkd/md/binance_us/BinanceUsPriceStatisticsAdaptor.h b/src/app_sparkd/sparkd/md/binance_us/BinanceUsPriceStatisticsAdaptor.h similarity index 88% rename from src/server/sparkd/md/binance_us/BinanceUsPriceStatisticsAdaptor.h rename to src/app_sparkd/sparkd/md/binance_us/BinanceUsPriceStatisticsAdaptor.h index a0af77602..40a6a26fb 100644 --- a/src/server/sparkd/md/binance_us/BinanceUsPriceStatisticsAdaptor.h +++ b/src/app_sparkd/sparkd/md/binance_us/BinanceUsPriceStatisticsAdaptor.h @@ -1,8 +1,8 @@ #pragma once -#include "lib/api/domain/SecurityType.pb.h" -#include "lib/domain/SecurityID.h" -#include "server/sparkd/md/ccapi/ICCApiMessageHandler.h" +#include "spark/api/domain/SecurityType.pb.h" +#include "spark/domain/SecurityID.h" +#include "sparkd/md/ccapi/ICCApiMessageHandler.h" #include #include diff --git a/src/server/sparkd/md/binance_us/BinanceUsSecurityRequestor.cpp b/src/app_sparkd/sparkd/md/binance_us/BinanceUsSecurityRequestor.cpp similarity index 92% rename from src/server/sparkd/md/binance_us/BinanceUsSecurityRequestor.cpp rename to src/app_sparkd/sparkd/md/binance_us/BinanceUsSecurityRequestor.cpp index 620b861a8..b141ba66a 100644 --- a/src/server/sparkd/md/binance_us/BinanceUsSecurityRequestor.cpp +++ b/src/app_sparkd/sparkd/md/binance_us/BinanceUsSecurityRequestor.cpp @@ -1,18 +1,18 @@ #include "BinanceUsSecurityRequestor.h" -#include "lib/api/domain/SecurityType.pb.h" -#include "lib/api/domain/Venue.pb.h" -#include "lib/collections/Contains.h" -#include "lib/collections/Remove.h" -#include "lib/domain/Security.h" -#include "lib/domain/SecurityCriteria.h" -#include "lib/logging/logging.h" -#include "lib/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 "spark/api/domain/SecurityType.pb.h" +#include "spark/api/domain/Venue.pb.h" +#include "spark/collections/Contains.h" +#include "spark/collections/Remove.h" +#include "spark/domain/Security.h" +#include "spark/domain/SecurityCriteria.h" +#include "spark/logging/logging.h" +#include "spark/persistence/IDGenerator.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/server/sparkd/md/binance_us/BinanceUsSecurityRequestor.h b/src/app_sparkd/sparkd/md/binance_us/BinanceUsSecurityRequestor.h similarity index 98% rename from src/server/sparkd/md/binance_us/BinanceUsSecurityRequestor.h rename to src/app_sparkd/sparkd/md/binance_us/BinanceUsSecurityRequestor.h index e2f12b0b3..c33cf728b 100644 --- a/src/server/sparkd/md/binance_us/BinanceUsSecurityRequestor.h +++ b/src/app_sparkd/sparkd/md/binance_us/BinanceUsSecurityRequestor.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/utils/Delegate.h" +#include "spark/utils/Delegate.h" #include #include diff --git a/src/server/sparkd/md/binance_us/BinanceUsSpot.h b/src/app_sparkd/sparkd/md/binance_us/BinanceUsSpot.h similarity index 73% rename from src/server/sparkd/md/binance_us/BinanceUsSpot.h rename to src/app_sparkd/sparkd/md/binance_us/BinanceUsSpot.h index a5232b0b2..383b54b4f 100644 --- a/src/server/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/server/sparkd/md/binance_us/BinanceUsSubscription.cpp b/src/app_sparkd/sparkd/md/binance_us/BinanceUsSubscription.cpp similarity index 92% rename from src/server/sparkd/md/binance_us/BinanceUsSubscription.cpp rename to src/app_sparkd/sparkd/md/binance_us/BinanceUsSubscription.cpp index 49cc4f1dd..d737760ea 100644 --- a/src/server/sparkd/md/binance_us/BinanceUsSubscription.cpp +++ b/src/app_sparkd/sparkd/md/binance_us/BinanceUsSubscription.cpp @@ -1,25 +1,25 @@ #include "BinanceUsSubscription.h" -#include "lib/api/domain/Venue.pb.h" -#include "lib/api/md/BinanceUsMarketDataConfig.pb.h" -#include "lib/collections/UnorderedSetFactory.h" -#include "lib/core/FMT.h" -#include "lib/domain/Security.h" -#include "lib/domain/SecurityCriteria.h" -#include "lib/io/ProtoPrinter.h" -#include "lib/io/QueryParams.h" -#include "lib/logging/logging.h" -#include "lib/md/IMarketDataListener.h" -#include "lib/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 "spark/api/domain/Venue.pb.h" +#include "spark/api/md/BinanceUsMarketDataConfig.pb.h" +#include "spark/collections/UnorderedSetFactory.h" +#include "spark/core/FMT.h" +#include "spark/domain/Security.h" +#include "spark/domain/SecurityCriteria.h" +#include "spark/io/ProtoPrinter.h" +#include "spark/io/QueryParams.h" +#include "spark/logging/logging.h" +#include "spark/md/IMarketDataListener.h" +#include "spark/persistence/IDGenerator.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/server/sparkd/md/binance_us/BinanceUsSubscription.h b/src/app_sparkd/sparkd/md/binance_us/BinanceUsSubscription.h similarity index 96% rename from src/server/sparkd/md/binance_us/BinanceUsSubscription.h rename to src/app_sparkd/sparkd/md/binance_us/BinanceUsSubscription.h index 4c19a4ca2..552687c33 100644 --- a/src/server/sparkd/md/binance_us/BinanceUsSubscription.h +++ b/src/app_sparkd/sparkd/md/binance_us/BinanceUsSubscription.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/md/IMarketDataSource.h" +#include "spark/md/IMarketDataSource.h" #include diff --git a/src/server/sparkd/md/binance_usds_futures/BinanceUsdsFuture.cpp b/src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuture.cpp similarity index 96% rename from src/server/sparkd/md/binance_usds_futures/BinanceUsdsFuture.cpp rename to src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuture.cpp index 1e1b9d5e5..f4ee37503 100644 --- a/src/server/sparkd/md/binance_usds_futures/BinanceUsdsFuture.cpp +++ b/src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuture.cpp @@ -1,12 +1,10 @@ #include "BinanceUsdsFuture.h" -#include "lib/api/md/BinanceUsdsFuturesMarketDataConfig.pb.h" -#include "lib/domain/Price.h" -#include "lib/domain/Quantity.h" -#include "lib/domain/Security.h" -#include "lib/io/JsonDumper.h" -#include "lib/io/JsonReader.h" -#include "lib/logging/logging.h" -#include "server/sparkd/md/binance_usds_futures/BinanceUsdsFuturesSecurityRequestor.h" +#include "spark/domain/Price.h" +#include "spark/domain/Quantity.h" +#include "spark/domain/Security.h" +#include "spark/io/JsonDumper.h" +#include "spark/io/JsonReader.h" +#include "spark/logging/logging.h" #include #include diff --git a/src/server/sparkd/md/binance_usds_futures/BinanceUsdsFuture.h b/src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuture.h similarity index 83% rename from src/server/sparkd/md/binance_usds_futures/BinanceUsdsFuture.h rename to src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuture.h index 7c33ff324..100a53557 100644 --- a/src/server/sparkd/md/binance_usds_futures/BinanceUsdsFuture.h +++ b/src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuture.h @@ -1,11 +1,10 @@ #pragma once -#include "lib/api/domain/Venue.pb.h" -#include "lib/core/FMT_IMPL.h" -#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 "spark/core/FMT_IMPL.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/server/sparkd/md/binance_usds_futures/BinanceUsdsFuturesContractType.h b/src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuturesContractType.h similarity index 92% rename from src/server/sparkd/md/binance_usds_futures/BinanceUsdsFuturesContractType.h rename to src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuturesContractType.h index 11a81be4d..1b80adfc5 100644 --- a/src/server/sparkd/md/binance_usds_futures/BinanceUsdsFuturesContractType.h +++ b/src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuturesContractType.h @@ -1,7 +1,7 @@ #pragma once -#include "lib/core/EnumMacros.h" -#include "lib/core/FMT_IMPL.h" +#include "spark/core/EnumMacros.h" +#include "spark/core/FMT_IMPL.h" #include #include diff --git a/src/server/sparkd/md/binance_usds_futures/BinanceUsdsFuturesFilterTuple.cpp b/src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuturesFilterTuple.cpp similarity index 95% rename from src/server/sparkd/md/binance_usds_futures/BinanceUsdsFuturesFilterTuple.cpp rename to src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuturesFilterTuple.cpp index 6c67d8a4d..4e1f888c7 100644 --- a/src/server/sparkd/md/binance_usds_futures/BinanceUsdsFuturesFilterTuple.cpp +++ b/src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuturesFilterTuple.cpp @@ -1,7 +1,7 @@ #include "BinanceUsdsFuturesFilterTuple.h" -#include "lib/io/JsonDumper.h" -#include "lib/io/JsonReader.h" -#include "server/sparkd/md/binance/BinanceFilterType.h" +#include "spark/io/JsonDumper.h" +#include "spark/io/JsonReader.h" +#include "sparkd/md/binance/BinanceFilterType.h" #include #include diff --git a/src/server/sparkd/md/binance_usds_futures/BinanceUsdsFuturesFilterTuple.h b/src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuturesFilterTuple.h similarity index 56% rename from src/server/sparkd/md/binance_usds_futures/BinanceUsdsFuturesFilterTuple.h rename to src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuturesFilterTuple.h index 466b31609..5e817824a 100644 --- a/src/server/sparkd/md/binance_usds_futures/BinanceUsdsFuturesFilterTuple.h +++ b/src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuturesFilterTuple.h @@ -1,16 +1,16 @@ #pragma once -#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/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/BinanceUsdsFuturesMinNotionalFilter.h" -#include "server/sparkd/md/binance_usds_futures/BinanceUsdsFuturesPercentPriceFilter.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/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/BinanceUsdsFuturesMinNotionalFilter.h" +#include "sparkd/md/binance_usds_futures/BinanceUsdsFuturesPercentPriceFilter.h" #include diff --git a/src/server/sparkd/md/binance_usds_futures/BinanceUsdsFuturesMaxNumAlgoOrdersFilter.h b/src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuturesMaxNumAlgoOrdersFilter.h similarity index 94% rename from src/server/sparkd/md/binance_usds_futures/BinanceUsdsFuturesMaxNumAlgoOrdersFilter.h rename to src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuturesMaxNumAlgoOrdersFilter.h index 7a46ea50f..ce32ad820 100644 --- a/src/server/sparkd/md/binance_usds_futures/BinanceUsdsFuturesMaxNumAlgoOrdersFilter.h +++ b/src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuturesMaxNumAlgoOrdersFilter.h @@ -1,8 +1,8 @@ #pragma once -#include "lib/io/JsonDumper.h" -#include "lib/io/JsonReader.h" -#include "server/sparkd/md/binance/BinanceFilterType.h" +#include "spark/io/JsonDumper.h" +#include "spark/io/JsonReader.h" +#include "sparkd/md/binance/BinanceFilterType.h" #include #include diff --git a/src/server/sparkd/md/binance_usds_futures/BinanceUsdsFuturesMaxNumOrdersFilter.h b/src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuturesMaxNumOrdersFilter.h similarity index 92% rename from src/server/sparkd/md/binance_usds_futures/BinanceUsdsFuturesMaxNumOrdersFilter.h rename to src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuturesMaxNumOrdersFilter.h index a9ad02261..85bff3366 100644 --- a/src/server/sparkd/md/binance_usds_futures/BinanceUsdsFuturesMaxNumOrdersFilter.h +++ b/src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuturesMaxNumOrdersFilter.h @@ -1,8 +1,8 @@ #pragma once -#include "lib/io/JsonDumper.h" -#include "lib/io/JsonReader.h" -#include "server/sparkd/md/binance/BinanceFilterType.h" +#include "spark/io/JsonDumper.h" +#include "spark/io/JsonReader.h" +#include "sparkd/md/binance/BinanceFilterType.h" #include #include diff --git a/src/server/sparkd/md/binance_usds_futures/BinanceUsdsFuturesMessageType.h b/src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuturesMessageType.h similarity index 95% rename from src/server/sparkd/md/binance_usds_futures/BinanceUsdsFuturesMessageType.h rename to src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuturesMessageType.h index f7b463ea3..cbca2fe13 100644 --- a/src/server/sparkd/md/binance_usds_futures/BinanceUsdsFuturesMessageType.h +++ b/src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuturesMessageType.h @@ -1,7 +1,7 @@ #pragma once -#include "lib/core/EnumMacros.h" -#include "lib/core/FMT_IMPL.h" +#include "spark/core/EnumMacros.h" +#include "spark/core/FMT_IMPL.h" #include #include diff --git a/src/server/sparkd/md/binance_usds_futures/BinanceUsdsFuturesMinNotionalFilter.cpp b/src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuturesMinNotionalFilter.cpp similarity index 90% rename from src/server/sparkd/md/binance_usds_futures/BinanceUsdsFuturesMinNotionalFilter.cpp rename to src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuturesMinNotionalFilter.cpp index ec5fe2e7e..8fab6b373 100644 --- a/src/server/sparkd/md/binance_usds_futures/BinanceUsdsFuturesMinNotionalFilter.cpp +++ b/src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuturesMinNotionalFilter.cpp @@ -1,6 +1,6 @@ #include "BinanceUsdsFuturesMinNotionalFilter.h" -#include "lib/io/JsonMacros.h" -#include "lib/io/JsonReader.h" +#include "spark/io/JsonMacros.h" +#include "spark/io/JsonReader.h" #include diff --git a/src/server/sparkd/md/binance_usds_futures/BinanceUsdsFuturesMinNotionalFilter.h b/src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuturesMinNotionalFilter.h similarity index 93% rename from src/server/sparkd/md/binance_usds_futures/BinanceUsdsFuturesMinNotionalFilter.h rename to src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuturesMinNotionalFilter.h index d888e797d..9307b90fe 100644 --- a/src/server/sparkd/md/binance_usds_futures/BinanceUsdsFuturesMinNotionalFilter.h +++ b/src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuturesMinNotionalFilter.h @@ -1,6 +1,6 @@ #pragma once -#include "server/sparkd/md/binance/BinanceFilterType.h" +#include "sparkd/md/binance/BinanceFilterType.h" #include #include diff --git a/src/server/sparkd/md/binance_usds_futures/BinanceUsdsFuturesPercentPriceFilter.h b/src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuturesPercentPriceFilter.h similarity index 94% rename from src/server/sparkd/md/binance_usds_futures/BinanceUsdsFuturesPercentPriceFilter.h rename to src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuturesPercentPriceFilter.h index 57fdc3cb5..176b6c4d6 100644 --- a/src/server/sparkd/md/binance_usds_futures/BinanceUsdsFuturesPercentPriceFilter.h +++ b/src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuturesPercentPriceFilter.h @@ -1,8 +1,8 @@ #pragma once -#include "lib/io/JsonDumper.h" -#include "lib/io/JsonReader.h" -#include "server/sparkd/md/binance/BinanceFilterType.h" +#include "spark/io/JsonDumper.h" +#include "spark/io/JsonReader.h" +#include "sparkd/md/binance/BinanceFilterType.h" #include #include diff --git a/src/server/sparkd/md/binance_usds_futures/BinanceUsdsFuturesPriceStatistics.cpp b/src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuturesPriceStatistics.cpp similarity index 93% rename from src/server/sparkd/md/binance_usds_futures/BinanceUsdsFuturesPriceStatistics.cpp rename to src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuturesPriceStatistics.cpp index 886600b40..051c7e7b5 100644 --- a/src/server/sparkd/md/binance_usds_futures/BinanceUsdsFuturesPriceStatistics.cpp +++ b/src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuturesPriceStatistics.cpp @@ -1,10 +1,10 @@ #include "BinanceUsdsFuturesPriceStatistics.h" -#include "lib/domain/Price.h" -#include "lib/domain/Quantity.h" -#include "lib/domain/SecurityMarketDataStatistics.h" -#include "lib/io/JsonMacros.h" -#include "lib/io/JsonReader.h" -#include "server/sparkd/md/ccapi/CCApiReader.h" +#include "spark/domain/Price.h" +#include "spark/domain/Quantity.h" +#include "spark/domain/SecurityMarketDataStatistics.h" +#include "spark/io/JsonMacros.h" +#include "spark/io/JsonReader.h" +#include "sparkd/md/ccapi/CCApiReader.h" #include #include diff --git a/src/server/sparkd/md/binance_usds_futures/BinanceUsdsFuturesPriceStatistics.h b/src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuturesPriceStatistics.h similarity index 100% rename from src/server/sparkd/md/binance_usds_futures/BinanceUsdsFuturesPriceStatistics.h rename to src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuturesPriceStatistics.h diff --git a/src/server/sparkd/md/binance_usds_futures/BinanceUsdsFuturesPriceStatisticsAdaptor.cpp b/src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuturesPriceStatisticsAdaptor.cpp similarity index 91% rename from src/server/sparkd/md/binance_usds_futures/BinanceUsdsFuturesPriceStatisticsAdaptor.cpp rename to src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuturesPriceStatisticsAdaptor.cpp index 9de05a252..a546ce3b0 100644 --- a/src/server/sparkd/md/binance_usds_futures/BinanceUsdsFuturesPriceStatisticsAdaptor.cpp +++ b/src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuturesPriceStatisticsAdaptor.cpp @@ -1,9 +1,9 @@ #include "BinanceUsdsFuturesPriceStatisticsAdaptor.h" -#include "lib/domain/SecurityID.h" -#include "lib/domain/SecurityMarketDataStatistics.h" -#include "lib/md/IMarketDataListener.h" -#include "lib/utils/bts_fatal.h" -#include "server/sparkd/md/binance_usds_futures/BinanceUsdsFuturesPriceStatistics.h" +#include "spark/domain/SecurityID.h" +#include "spark/domain/SecurityMarketDataStatistics.h" +#include "spark/md/IMarketDataListener.h" +#include "spark/utils/bts_fatal.h" +#include "sparkd/md/binance_usds_futures/BinanceUsdsFuturesPriceStatistics.h" #include #include diff --git a/src/server/sparkd/md/binance_usds_futures/BinanceUsdsFuturesPriceStatisticsAdaptor.h b/src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuturesPriceStatisticsAdaptor.h similarity index 91% rename from src/server/sparkd/md/binance_usds_futures/BinanceUsdsFuturesPriceStatisticsAdaptor.h rename to src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuturesPriceStatisticsAdaptor.h index 1f2160d9c..fa88154fa 100644 --- a/src/server/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 "lib/domain/SecurityID.h" -#include "server/sparkd/md/ccapi/ICCApiMessageHandler.h" +#include "spark/domain/SecurityID.h" +#include "sparkd/md/ccapi/ICCApiMessageHandler.h" #include diff --git a/src/server/sparkd/md/binance_usds_futures/BinanceUsdsFuturesSecurityRequestor.cpp b/src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuturesSecurityRequestor.cpp similarity index 92% rename from src/server/sparkd/md/binance_usds_futures/BinanceUsdsFuturesSecurityRequestor.cpp rename to src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuturesSecurityRequestor.cpp index cb7e51c70..6479bcc73 100644 --- a/src/server/sparkd/md/binance_usds_futures/BinanceUsdsFuturesSecurityRequestor.cpp +++ b/src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuturesSecurityRequestor.cpp @@ -1,19 +1,19 @@ #include "BinanceUsdsFuturesSecurityRequestor.h" -#include "lib/api/md/BinanceUsdsFuturesMarketDataConfig.pb.h" -#include "lib/collections/Contains.h" -#include "lib/collections/Remove.h" -#include "lib/collections/UnorderedSetFactory.h" -#include "lib/core/FMT.h" -#include "lib/domain/Security.h" -#include "lib/domain/SecurityCriteria.h" -#include "lib/logging/logging.h" -#include "lib/persistence/IDGenerator.h" -#include "lib/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 "spark/api/md/BinanceUsdsFuturesMarketDataConfig.pb.h" +#include "spark/collections/Contains.h" +#include "spark/collections/Remove.h" +#include "spark/collections/UnorderedSetFactory.h" +#include "spark/core/FMT.h" +#include "spark/domain/Security.h" +#include "spark/domain/SecurityCriteria.h" +#include "spark/logging/logging.h" +#include "spark/persistence/IDGenerator.h" +#include "spark/utils/bts_fatal.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/server/sparkd/md/binance_usds_futures/BinanceUsdsFuturesSecurityRequestor.h b/src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuturesSecurityRequestor.h similarity index 98% rename from src/server/sparkd/md/binance_usds_futures/BinanceUsdsFuturesSecurityRequestor.h rename to src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuturesSecurityRequestor.h index 86e0143eb..a7c450b75 100644 --- a/src/server/sparkd/md/binance_usds_futures/BinanceUsdsFuturesSecurityRequestor.h +++ b/src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuturesSecurityRequestor.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/utils/Delegate.h" +#include "spark/utils/Delegate.h" #include #include diff --git a/src/server/sparkd/md/binance_usds_futures/BinanceUsdsFuturesSubscription.cpp b/src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuturesSubscription.cpp similarity index 92% rename from src/server/sparkd/md/binance_usds_futures/BinanceUsdsFuturesSubscription.cpp rename to src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuturesSubscription.cpp index af1ef17c7..ab4494418 100644 --- a/src/server/sparkd/md/binance_usds_futures/BinanceUsdsFuturesSubscription.cpp +++ b/src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuturesSubscription.cpp @@ -1,27 +1,27 @@ #include "BinanceUsdsFuturesSubscription.h" -#include "lib/api/domain/Venue.pb.h" -#include "lib/api/md/BinanceUsdsFuturesMarketDataConfig.pb.h" -#include "lib/collections/Contains.h" -#include "lib/collections/Remove.h" -#include "lib/core/FMT.h" -#include "lib/domain/Security.h" -#include "lib/domain/SecurityCriteria.h" -#include "lib/domain/SecurityID.h" -#include "lib/io/ProtoPrinter.h" -#include "lib/io/QueryParams.h" -#include "lib/io/http/http_client.h" -#include "lib/io/http/http_response.h" -#include "lib/logging/logging.h" -#include "lib/md/IMarketDataListener.h" -#include "lib/persistence/IDGenerator.h" -#include "server/sparkd/md/binance_usds_futures/BinanceUsdsFuture.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 "spark/api/domain/Venue.pb.h" +#include "spark/api/md/BinanceUsdsFuturesMarketDataConfig.pb.h" +#include "spark/collections/Contains.h" +#include "spark/collections/Remove.h" +#include "spark/core/FMT.h" +#include "spark/domain/Security.h" +#include "spark/domain/SecurityCriteria.h" +#include "spark/domain/SecurityID.h" +#include "spark/io/ProtoPrinter.h" +#include "spark/io/QueryParams.h" +#include "spark/io/http/http_client.h" +#include "spark/io/http/http_response.h" +#include "spark/logging/logging.h" +#include "spark/md/IMarketDataListener.h" +#include "spark/persistence/IDGenerator.h" +#include "sparkd/md/binance_usds_futures/BinanceUsdsFuture.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/server/sparkd/md/binance_usds_futures/BinanceUsdsFuturesSubscription.h b/src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuturesSubscription.h similarity index 97% rename from src/server/sparkd/md/binance_usds_futures/BinanceUsdsFuturesSubscription.h rename to src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuturesSubscription.h index 7486da7f9..6d82ac489 100644 --- a/src/server/sparkd/md/binance_usds_futures/BinanceUsdsFuturesSubscription.h +++ b/src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuturesSubscription.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/md/IMarketDataSource.h" +#include "spark/md/IMarketDataSource.h" #include diff --git a/src/server/sparkd/md/cboe/CboeMarketDataHandler.cpp b/src/app_sparkd/sparkd/md/cboe/CboeMarketDataHandler.cpp similarity index 83% rename from src/server/sparkd/md/cboe/CboeMarketDataHandler.cpp rename to src/app_sparkd/sparkd/md/cboe/CboeMarketDataHandler.cpp index 7e3ac1dd7..0f6895026 100644 --- a/src/server/sparkd/md/cboe/CboeMarketDataHandler.cpp +++ b/src/app_sparkd/sparkd/md/cboe/CboeMarketDataHandler.cpp @@ -1,9 +1,10 @@ #include "CboeMarketDataHandler.h" -#include "lib/api/domain/Venue.pb.h" -#include "lib/config/config.h" -#include "lib/config/protos/system_config.pb.h" -#include "lib/utils/bts_assert.h" -#include "server/sparkd/md/databento/DatabentoDataHandler.h" +#include "spark/api/domain/Venue.pb.h" +#include "spark/config/config.h" +#include "spark/config/protos/system_config.pb.h" +#include "spark/utils/bts_assert.h" +#include "sparkd/md/databento/DatabentoDataHandler.h" + #include #include #include @@ -34,4 +35,4 @@ void CboeMarketDatahandler::run( config.databento_settings().load_reference_data()); } -} // namespace bts::md::cboe \ No newline at end of file +} // namespace bts::md::cboe diff --git a/src/server/sparkd/md/cboe/CboeMarketDataHandler.h b/src/app_sparkd/sparkd/md/cboe/CboeMarketDataHandler.h similarity index 61% rename from src/server/sparkd/md/cboe/CboeMarketDataHandler.h rename to src/app_sparkd/sparkd/md/cboe/CboeMarketDataHandler.h index f9db8becc..5ba4c7271 100644 --- a/src/server/sparkd/md/cboe/CboeMarketDataHandler.h +++ b/src/app_sparkd/sparkd/md/cboe/CboeMarketDataHandler.h @@ -1,7 +1,9 @@ #pragma once -#include "lib/api/md/CboeMarketDataConfig.pb.h" -#include "lib/md/IMarketDataListener.h" -#include "lib/persistence/IDGenerator.h" + +#include "spark/api/md/CboeMarketDataConfig.pb.h" +#include "spark/md/IMarketDataListener.h" +#include "spark/persistence/IDGenerator.h" + namespace bts::api::md::cboe { class CboeMarketDatahandler { public: @@ -9,4 +11,4 @@ class CboeMarketDatahandler { std::shared_ptr sec_id_store, const CboeMarketDataConfig &config); }; -} // namespace bts::md::cboe \ No newline at end of file +} // namespace bts::md::cboe diff --git a/src/server/sparkd/md/ccapi/CCApiCompositeMessageHandler.cpp b/src/app_sparkd/sparkd/md/ccapi/CCApiCompositeMessageHandler.cpp similarity index 96% rename from src/server/sparkd/md/ccapi/CCApiCompositeMessageHandler.cpp rename to src/app_sparkd/sparkd/md/ccapi/CCApiCompositeMessageHandler.cpp index 4ac8d8828..cc784d3c4 100644 --- a/src/server/sparkd/md/ccapi/CCApiCompositeMessageHandler.cpp +++ b/src/app_sparkd/sparkd/md/ccapi/CCApiCompositeMessageHandler.cpp @@ -1,5 +1,5 @@ #include "CCApiCompositeMessageHandler.h" -#include "lib/collections/Remove.h" +#include "spark/collections/Remove.h" #include #include diff --git a/src/server/sparkd/md/ccapi/CCApiCompositeMessageHandler.h b/src/app_sparkd/sparkd/md/ccapi/CCApiCompositeMessageHandler.h similarity index 94% rename from src/server/sparkd/md/ccapi/CCApiCompositeMessageHandler.h rename to src/app_sparkd/sparkd/md/ccapi/CCApiCompositeMessageHandler.h index 373ddcda8..fb70cefcc 100644 --- a/src/server/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/server/sparkd/md/ccapi/CCApiCorrelationID.h b/src/app_sparkd/sparkd/md/ccapi/CCApiCorrelationID.h similarity index 98% rename from src/server/sparkd/md/ccapi/CCApiCorrelationID.h rename to src/app_sparkd/sparkd/md/ccapi/CCApiCorrelationID.h index c672c9d40..07b5f9ec0 100644 --- a/src/server/sparkd/md/ccapi/CCApiCorrelationID.h +++ b/src/app_sparkd/sparkd/md/ccapi/CCApiCorrelationID.h @@ -1,9 +1,9 @@ #pragma once -#include "lib/core/FMT_IMPL.h" -#include "lib/core/StringFinder.h" -#include "lib/core/StringJoiner.h" -#include "lib/utils/bts_assert.h" +#include "spark/core/FMT_IMPL.h" +#include "spark/core/StringFinder.h" +#include "spark/core/StringJoiner.h" +#include "spark/utils/bts_assert.h" #include #include diff --git a/src/server/sparkd/md/ccapi/CCApiDepthWalker.cpp b/src/app_sparkd/sparkd/md/ccapi/CCApiDepthWalker.cpp similarity index 96% rename from src/server/sparkd/md/ccapi/CCApiDepthWalker.cpp rename to src/app_sparkd/sparkd/md/ccapi/CCApiDepthWalker.cpp index 8a663a2b1..4211bde41 100644 --- a/src/server/sparkd/md/ccapi/CCApiDepthWalker.cpp +++ b/src/app_sparkd/sparkd/md/ccapi/CCApiDepthWalker.cpp @@ -1,5 +1,5 @@ #include "CCApiDepthWalker.h" -#include "lib/utils/bts_assert.h" +#include "spark/utils/bts_assert.h" #include diff --git a/src/server/sparkd/md/ccapi/CCApiDepthWalker.h b/src/app_sparkd/sparkd/md/ccapi/CCApiDepthWalker.h similarity index 90% rename from src/server/sparkd/md/ccapi/CCApiDepthWalker.h rename to src/app_sparkd/sparkd/md/ccapi/CCApiDepthWalker.h index 260e45d60..3e758cf13 100644 --- a/src/server/sparkd/md/ccapi/CCApiDepthWalker.h +++ b/src/app_sparkd/sparkd/md/ccapi/CCApiDepthWalker.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/domain/BookSide.h" +#include "spark/domain/BookSide.h" #include #include diff --git a/src/server/sparkd/md/ccapi/CCApiEventDemuxer.cpp b/src/app_sparkd/sparkd/md/ccapi/CCApiEventDemuxer.cpp similarity index 95% rename from src/server/sparkd/md/ccapi/CCApiEventDemuxer.cpp rename to src/app_sparkd/sparkd/md/ccapi/CCApiEventDemuxer.cpp index c9c846289..0441c4d3e 100644 --- a/src/server/sparkd/md/ccapi/CCApiEventDemuxer.cpp +++ b/src/app_sparkd/sparkd/md/ccapi/CCApiEventDemuxer.cpp @@ -1,10 +1,10 @@ #include "CCApiEventDemuxer.h" -#include "lib/collections/DiscreteValuesFilter.h" -#include "lib/collections/Find.h" -#include "server/sparkd/md/ccapi/CCApiCorrelationID.h" -#include "server/sparkd/md/ccapi/ICCApiMessageHandler.h" +#include "spark/collections/DiscreteValuesFilter.h" +#include "spark/collections/Find.h" +#include "sparkd/md/ccapi/CCApiCorrelationID.h" +#include "sparkd/md/ccapi/ICCApiMessageHandler.h" -#include "lib/utils/helper_macros.h" +#include "spark/utils/helper_macros.h" #include #include #include diff --git a/src/server/sparkd/md/ccapi/CCApiEventDemuxer.h b/src/app_sparkd/sparkd/md/ccapi/CCApiEventDemuxer.h similarity index 97% rename from src/server/sparkd/md/ccapi/CCApiEventDemuxer.h rename to src/app_sparkd/sparkd/md/ccapi/CCApiEventDemuxer.h index 59b8dbcaf..43276976c 100644 --- a/src/server/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/server/sparkd/md/ccapi/CCApiEventLogger.h b/src/app_sparkd/sparkd/md/ccapi/CCApiEventLogger.h similarity index 91% rename from src/server/sparkd/md/ccapi/CCApiEventLogger.h rename to src/app_sparkd/sparkd/md/ccapi/CCApiEventLogger.h index 1bf7d019c..2d514493f 100644 --- a/src/server/sparkd/md/ccapi/CCApiEventLogger.h +++ b/src/app_sparkd/sparkd/md/ccapi/CCApiEventLogger.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/logging/logging.h" +#include "spark/logging/logging.h" #include diff --git a/src/server/sparkd/md/ccapi/CCApiHttpParams.cpp b/src/app_sparkd/sparkd/md/ccapi/CCApiHttpParams.cpp similarity index 96% rename from src/server/sparkd/md/ccapi/CCApiHttpParams.cpp rename to src/app_sparkd/sparkd/md/ccapi/CCApiHttpParams.cpp index 07dabdf86..55102f838 100644 --- a/src/server/sparkd/md/ccapi/CCApiHttpParams.cpp +++ b/src/app_sparkd/sparkd/md/ccapi/CCApiHttpParams.cpp @@ -1,5 +1,5 @@ #include "CCApiHttpParams.h" -#include "lib/algorithm/StringCaseConverter.h" +#include "spark/algorithm/StringCaseConverter.h" #include diff --git a/src/server/sparkd/md/ccapi/CCApiHttpParams.h b/src/app_sparkd/sparkd/md/ccapi/CCApiHttpParams.h similarity index 81% rename from src/server/sparkd/md/ccapi/CCApiHttpParams.h rename to src/app_sparkd/sparkd/md/ccapi/CCApiHttpParams.h index 9c20a5a8f..15fab929c 100644 --- a/src/server/sparkd/md/ccapi/CCApiHttpParams.h +++ b/src/app_sparkd/sparkd/md/ccapi/CCApiHttpParams.h @@ -1,8 +1,8 @@ #pragma once -#include "lib/io/QueryParams.h" -#include "lib/io/http/HttpMethod.h" -#include "lib/io/http/HttpProtocol.h" +#include "spark/io/QueryParams.h" +#include "spark/io/http/HttpMethod.h" +#include "spark/io/http/HttpProtocol.h" #include #include diff --git a/src/server/sparkd/md/ccapi/CCApiJsonRpcRequest.h b/src/app_sparkd/sparkd/md/ccapi/CCApiJsonRpcRequest.h similarity index 93% rename from src/server/sparkd/md/ccapi/CCApiJsonRpcRequest.h rename to src/app_sparkd/sparkd/md/ccapi/CCApiJsonRpcRequest.h index 504b6ee31..b6494975e 100644 --- a/src/server/sparkd/md/ccapi/CCApiJsonRpcRequest.h +++ b/src/app_sparkd/sparkd/md/ccapi/CCApiJsonRpcRequest.h @@ -1,7 +1,7 @@ #pragma once -#include "lib/io/websocket/JsonRpcRequest.h" -#include "server/sparkd/md/ccapi/CCApiCorrelationID.h" +#include "spark/io/websocket/JsonRpcRequest.h" +#include "sparkd/md/ccapi/CCApiCorrelationID.h" #include diff --git a/src/server/sparkd/md/ccapi/CCApiJsonRpcRouter.cpp b/src/app_sparkd/sparkd/md/ccapi/CCApiJsonRpcRouter.cpp similarity index 88% rename from src/server/sparkd/md/ccapi/CCApiJsonRpcRouter.cpp rename to src/app_sparkd/sparkd/md/ccapi/CCApiJsonRpcRouter.cpp index 1b7f3cc49..f9fa0cf28 100644 --- a/src/server/sparkd/md/ccapi/CCApiJsonRpcRouter.cpp +++ b/src/app_sparkd/sparkd/md/ccapi/CCApiJsonRpcRouter.cpp @@ -1,8 +1,8 @@ #include "CCApiJsonRpcRouter.h" -#include "lib/algorithm/TryCatch.h" -#include "lib/io/websocket/JsonRpcHandler.h" -#include "lib/utils/bts_fatal.h" -#include "server/sparkd/md/ccapi/CCApiReader.h" +#include "spark/algorithm/TryCatch.h" +#include "spark/io/websocket/JsonRpcHandler.h" +#include "spark/utils/bts_fatal.h" +#include "sparkd/md/ccapi/CCApiReader.h" #include #include diff --git a/src/server/sparkd/md/ccapi/CCApiJsonRpcRouter.h b/src/app_sparkd/sparkd/md/ccapi/CCApiJsonRpcRouter.h similarity index 92% rename from src/server/sparkd/md/ccapi/CCApiJsonRpcRouter.h rename to src/app_sparkd/sparkd/md/ccapi/CCApiJsonRpcRouter.h index 61f4f0a8f..324c74c4d 100644 --- a/src/server/sparkd/md/ccapi/CCApiJsonRpcRouter.h +++ b/src/app_sparkd/sparkd/md/ccapi/CCApiJsonRpcRouter.h @@ -1,8 +1,8 @@ #pragma once -#include "lib/io/websocket/JsonRpcHandler.h" -#include "lib/io/websocket/JsonRpcRouter.h" -#include "server/sparkd/md/ccapi/ICCApiMessageHandler.h" +#include "spark/io/websocket/JsonRpcHandler.h" +#include "spark/io/websocket/JsonRpcRouter.h" +#include "sparkd/md/ccapi/ICCApiMessageHandler.h" #include #include diff --git a/src/server/sparkd/md/ccapi/CCApiMarketDataProvider.cpp b/src/app_sparkd/sparkd/md/ccapi/CCApiMarketDataProvider.cpp similarity index 84% rename from src/server/sparkd/md/ccapi/CCApiMarketDataProvider.cpp rename to src/app_sparkd/sparkd/md/ccapi/CCApiMarketDataProvider.cpp index 882ecdd0d..9019ecc71 100644 --- a/src/server/sparkd/md/ccapi/CCApiMarketDataProvider.cpp +++ b/src/app_sparkd/sparkd/md/ccapi/CCApiMarketDataProvider.cpp @@ -1,20 +1,20 @@ #include "CCApiMarketDataProvider.h" -#include "lib/api/domain/Venue.pb.h" -#include "lib/api/md/MarketDataConfig.pb.h" -#include "lib/config/config.h" -#include "lib/io/ProtoPrinter.h" -#include "lib/logging/logging.h" -#include "lib/md/GeneralMarketDataListener.h" -#include "lib/md/GeneralSecurityIndex.h" -#include "lib/md/MDProducer.h" -#include "lib/persistence/IDGenerator.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 "spark/api/domain/Venue.pb.h" +#include "spark/api/md/MarketDataConfig.pb.h" +#include "spark/config/config.h" +#include "spark/io/ProtoPrinter.h" +#include "spark/logging/logging.h" +#include "spark/md/GeneralMarketDataListener.h" +#include "spark/md/GeneralSecurityIndex.h" +#include "spark/md/MDProducer.h" +#include "spark/persistence/IDGenerator.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/server/sparkd/md/ccapi/CCApiMarketDataProvider.h b/src/app_sparkd/sparkd/md/ccapi/CCApiMarketDataProvider.h similarity index 79% rename from src/server/sparkd/md/ccapi/CCApiMarketDataProvider.h rename to src/app_sparkd/sparkd/md/ccapi/CCApiMarketDataProvider.h index 34ba7fb23..7bcb8fed6 100644 --- a/src/server/sparkd/md/ccapi/CCApiMarketDataProvider.h +++ b/src/app_sparkd/sparkd/md/ccapi/CCApiMarketDataProvider.h @@ -1,8 +1,8 @@ #pragma once -#include "lib/api/md/MarketDataConfig.pb.h" -#include "lib/md/IMarketDataProvider.h" -#include "lib/persistence/IDGenerator.h" +#include "spark/api/md/MarketDataConfig.pb.h" +#include "spark/md/IMarketDataProvider.h" +#include "spark/persistence/IDGenerator.h" #include diff --git a/src/server/sparkd/md/ccapi/CCApiMarketDepthAdaptor.cpp b/src/app_sparkd/sparkd/md/ccapi/CCApiMarketDepthAdaptor.cpp similarity index 91% rename from src/server/sparkd/md/ccapi/CCApiMarketDepthAdaptor.cpp rename to src/app_sparkd/sparkd/md/ccapi/CCApiMarketDepthAdaptor.cpp index 4c416d42e..f7e71d2c7 100644 --- a/src/server/sparkd/md/ccapi/CCApiMarketDepthAdaptor.cpp +++ b/src/app_sparkd/sparkd/md/ccapi/CCApiMarketDepthAdaptor.cpp @@ -1,10 +1,10 @@ #include "CCApiMarketDepthAdaptor.h" -#include "lib/core/FMT.h" -#include "lib/domain/BUY_SELL.h" -#include "lib/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 "spark/core/FMT.h" +#include "spark/domain/BUY_SELL.h" +#include "spark/domain/Book.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/server/sparkd/md/ccapi/CCApiMarketDepthAdaptor.h b/src/app_sparkd/sparkd/md/ccapi/CCApiMarketDepthAdaptor.h similarity index 87% rename from src/server/sparkd/md/ccapi/CCApiMarketDepthAdaptor.h rename to src/app_sparkd/sparkd/md/ccapi/CCApiMarketDepthAdaptor.h index 1d2a836c1..9390fa388 100644 --- a/src/server/sparkd/md/ccapi/CCApiMarketDepthAdaptor.h +++ b/src/app_sparkd/sparkd/md/ccapi/CCApiMarketDepthAdaptor.h @@ -1,8 +1,8 @@ #pragma once -#include "lib/domain/Book.h" -#include "lib/md/IMarketDataListener.h" -#include "server/sparkd/md/ccapi/ICCApiMessageHandler.h" +#include "spark/domain/Book.h" +#include "spark/md/IMarketDataListener.h" +#include "sparkd/md/ccapi/ICCApiMessageHandler.h" #include diff --git a/src/server/sparkd/md/ccapi/CCApiMessageHandler.h b/src/app_sparkd/sparkd/md/ccapi/CCApiMessageHandler.h similarity index 90% rename from src/server/sparkd/md/ccapi/CCApiMessageHandler.h rename to src/app_sparkd/sparkd/md/ccapi/CCApiMessageHandler.h index 0931cf43b..8427196d0 100644 --- a/src/server/sparkd/md/ccapi/CCApiMessageHandler.h +++ b/src/app_sparkd/sparkd/md/ccapi/CCApiMessageHandler.h @@ -1,8 +1,8 @@ #pragma once -#include "server/sparkd/md/ccapi/CCApiCorrelationID.h" -#include "server/sparkd/md/ccapi/ICCApiMessageHandler.h" -#include "lib/utils/Delegate.h" +#include "sparkd/md/ccapi/CCApiCorrelationID.h" +#include "sparkd/md/ccapi/ICCApiMessageHandler.h" +#include "spark/utils/Delegate.h" #include #include diff --git a/src/server/sparkd/md/ccapi/CCApiMessageLogger.cpp b/src/app_sparkd/sparkd/md/ccapi/CCApiMessageLogger.cpp similarity index 92% rename from src/server/sparkd/md/ccapi/CCApiMessageLogger.cpp rename to src/app_sparkd/sparkd/md/ccapi/CCApiMessageLogger.cpp index d2e3b09ac..fcdb352b6 100644 --- a/src/server/sparkd/md/ccapi/CCApiMessageLogger.cpp +++ b/src/app_sparkd/sparkd/md/ccapi/CCApiMessageLogger.cpp @@ -1,6 +1,6 @@ #include "CCApiMessageLogger.h" -#include "lib/core/StringJoiner.h" -#include "lib/core/TimeStamp.h" +#include "spark/core/StringJoiner.h" +#include "spark/core/TimeStamp.h" #include #include diff --git a/src/server/sparkd/md/ccapi/CCApiMessageLogger.h b/src/app_sparkd/sparkd/md/ccapi/CCApiMessageLogger.h similarity index 90% rename from src/server/sparkd/md/ccapi/CCApiMessageLogger.h rename to src/app_sparkd/sparkd/md/ccapi/CCApiMessageLogger.h index ec87b758b..cf737866c 100644 --- a/src/server/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/server/sparkd/md/ccapi/CCApiReader.cpp b/src/app_sparkd/sparkd/md/ccapi/CCApiReader.cpp similarity index 100% rename from src/server/sparkd/md/ccapi/CCApiReader.cpp rename to src/app_sparkd/sparkd/md/ccapi/CCApiReader.cpp diff --git a/src/server/sparkd/md/ccapi/CCApiReader.h b/src/app_sparkd/sparkd/md/ccapi/CCApiReader.h similarity index 99% rename from src/server/sparkd/md/ccapi/CCApiReader.h rename to src/app_sparkd/sparkd/md/ccapi/CCApiReader.h index b2f35c584..7ccdf8df7 100644 --- a/src/server/sparkd/md/ccapi/CCApiReader.h +++ b/src/app_sparkd/sparkd/md/ccapi/CCApiReader.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/utils/bts_assert.h" +#include "spark/utils/bts_assert.h" #include #include diff --git a/src/server/sparkd/md/ccapi/CCApiSession.cpp b/src/app_sparkd/sparkd/md/ccapi/CCApiSession.cpp similarity index 96% rename from src/server/sparkd/md/ccapi/CCApiSession.cpp rename to src/app_sparkd/sparkd/md/ccapi/CCApiSession.cpp index 783dda62e..ad946306c 100644 --- a/src/server/sparkd/md/ccapi/CCApiSession.cpp +++ b/src/app_sparkd/sparkd/md/ccapi/CCApiSession.cpp @@ -1,8 +1,8 @@ #include "CCApiSession.h" -#include "lib/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 "spark/logging/logging.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/server/sparkd/md/ccapi/CCApiSession.h b/src/app_sparkd/sparkd/md/ccapi/CCApiSession.h similarity index 94% rename from src/server/sparkd/md/ccapi/CCApiSession.h rename to src/app_sparkd/sparkd/md/ccapi/CCApiSession.h index 5e06deca6..741529b7a 100644 --- a/src/server/sparkd/md/ccapi/CCApiSession.h +++ b/src/app_sparkd/sparkd/md/ccapi/CCApiSession.h @@ -1,8 +1,8 @@ #pragma once -#include "lib/utils/Delegate.h" -#include "server/sparkd/md/ccapi/CCApiCorrelationID.h" -#include "server/sparkd/md/ccapi/ICCApiMessageHandler.h" +#include "spark/utils/Delegate.h" +#include "sparkd/md/ccapi/CCApiCorrelationID.h" +#include "sparkd/md/ccapi/ICCApiMessageHandler.h" #include #include diff --git a/src/server/sparkd/md/ccapi/CCApiTradeAdaptor.cpp b/src/app_sparkd/sparkd/md/ccapi/CCApiTradeAdaptor.cpp similarity index 86% rename from src/server/sparkd/md/ccapi/CCApiTradeAdaptor.cpp rename to src/app_sparkd/sparkd/md/ccapi/CCApiTradeAdaptor.cpp index d972f4ce8..dd441e3af 100644 --- a/src/server/sparkd/md/ccapi/CCApiTradeAdaptor.cpp +++ b/src/app_sparkd/sparkd/md/ccapi/CCApiTradeAdaptor.cpp @@ -1,11 +1,11 @@ #include "CCApiTradeAdaptor.h" -#include "lib/core/TimeStamp.h" -#include "lib/domain/SecurityID.h" -#include "lib/domain/TradeRecord.h" -#include "lib/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 "spark/core/TimeStamp.h" +#include "spark/domain/SecurityID.h" +#include "spark/domain/TradeRecord.h" +#include "spark/utils/bts_fatal.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/server/sparkd/md/ccapi/CCApiTradeAdaptor.h b/src/app_sparkd/sparkd/md/ccapi/CCApiTradeAdaptor.h similarity index 79% rename from src/server/sparkd/md/ccapi/CCApiTradeAdaptor.h rename to src/app_sparkd/sparkd/md/ccapi/CCApiTradeAdaptor.h index 7c984f67a..90245c717 100644 --- a/src/server/sparkd/md/ccapi/CCApiTradeAdaptor.h +++ b/src/app_sparkd/sparkd/md/ccapi/CCApiTradeAdaptor.h @@ -1,9 +1,9 @@ #pragma once -#include "lib/domain/SecurityID.h" -#include "server/sparkd/md/ccapi/CCApiTradeRecord.h" -#include "server/sparkd/md/ccapi/ICCApiMessageHandler.h" -#include "lib/md/IMarketDataListener.h" +#include "spark/domain/SecurityID.h" +#include "sparkd/md/ccapi/CCApiTradeRecord.h" +#include "sparkd/md/ccapi/ICCApiMessageHandler.h" +#include "spark/md/IMarketDataListener.h" #include diff --git a/src/server/sparkd/md/ccapi/CCApiTradeRecord.cpp b/src/app_sparkd/sparkd/md/ccapi/CCApiTradeRecord.cpp similarity index 91% rename from src/server/sparkd/md/ccapi/CCApiTradeRecord.cpp rename to src/app_sparkd/sparkd/md/ccapi/CCApiTradeRecord.cpp index bf969eebc..cabfbfc23 100644 --- a/src/server/sparkd/md/ccapi/CCApiTradeRecord.cpp +++ b/src/app_sparkd/sparkd/md/ccapi/CCApiTradeRecord.cpp @@ -1,13 +1,13 @@ #include "CCApiTradeRecord.h" -#include "lib/domain/AggressorSide.h" -#include "lib/domain/Price.h" -#include "lib/domain/Quantity.h" -#include "lib/domain/TradeRecord.h" -#include "lib/io/JsonDumper.h" -#include "lib/io/JsonReader.h" -#include "lib/utils/bts_chrono.h" -#include "lib/utils/datetime.h" -#include "server/sparkd/md/ccapi/CCApiReader.h" +#include "spark/domain/AggressorSide.h" +#include "spark/domain/Price.h" +#include "spark/domain/Quantity.h" +#include "spark/domain/TradeRecord.h" +#include "spark/io/JsonDumper.h" +#include "spark/io/JsonReader.h" +#include "spark/utils/bts_chrono.h" +#include "spark/utils/datetime.h" +#include "sparkd/md/ccapi/CCApiReader.h" #include #include diff --git a/src/server/sparkd/md/ccapi/CCApiTradeRecord.h b/src/app_sparkd/sparkd/md/ccapi/CCApiTradeRecord.h similarity index 97% rename from src/server/sparkd/md/ccapi/CCApiTradeRecord.h rename to src/app_sparkd/sparkd/md/ccapi/CCApiTradeRecord.h index 5fc12055c..abbb02696 100644 --- a/src/server/sparkd/md/ccapi/CCApiTradeRecord.h +++ b/src/app_sparkd/sparkd/md/ccapi/CCApiTradeRecord.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/core/NaN.h" +#include "spark/core/NaN.h" #include #include diff --git a/src/server/sparkd/md/ccapi/CCDemoListener.cpp b/src/app_sparkd/sparkd/md/ccapi/CCDemoListener.cpp similarity index 95% rename from src/server/sparkd/md/ccapi/CCDemoListener.cpp rename to src/app_sparkd/sparkd/md/ccapi/CCDemoListener.cpp index 0a9bdfc1f..5f3f07dcd 100644 --- a/src/server/sparkd/md/ccapi/CCDemoListener.cpp +++ b/src/app_sparkd/sparkd/md/ccapi/CCDemoListener.cpp @@ -1,6 +1,6 @@ #include "CCDemoListener.h" -#include "lib/logging/logging.h" -#include "server/sparkd/md/MarketDataError.h" +#include "spark/logging/logging.h" +#include "sparkd/md/MarketDataError.h" #include #include diff --git a/src/server/sparkd/md/ccapi/CCDemoListener.h b/src/app_sparkd/sparkd/md/ccapi/CCDemoListener.h similarity index 95% rename from src/server/sparkd/md/ccapi/CCDemoListener.h rename to src/app_sparkd/sparkd/md/ccapi/CCDemoListener.h index 407134358..5ab84fa91 100644 --- a/src/server/sparkd/md/ccapi/CCDemoListener.h +++ b/src/app_sparkd/sparkd/md/ccapi/CCDemoListener.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/md/IMarketDataListener.h" +#include "spark/md/IMarketDataListener.h" namespace bts::md { diff --git a/src/server/sparkd/md/ccapi/CCSecurityIDFactory.h b/src/app_sparkd/sparkd/md/ccapi/CCSecurityIDFactory.h similarity index 89% rename from src/server/sparkd/md/ccapi/CCSecurityIDFactory.h rename to src/app_sparkd/sparkd/md/ccapi/CCSecurityIDFactory.h index ffe9eba7d..cbb99535d 100644 --- a/src/server/sparkd/md/ccapi/CCSecurityIDFactory.h +++ b/src/app_sparkd/sparkd/md/ccapi/CCSecurityIDFactory.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/domain_model/Security.pb.h" +#include "spark/domain_model/Security.pb.h" #include #include diff --git a/src/server/sparkd/md/ccapi/ICCApiMessageHandler.cpp b/src/app_sparkd/sparkd/md/ccapi/ICCApiMessageHandler.cpp similarity index 70% rename from src/server/sparkd/md/ccapi/ICCApiMessageHandler.cpp rename to src/app_sparkd/sparkd/md/ccapi/ICCApiMessageHandler.cpp index 594b156fc..24ca70a7b 100644 --- a/src/server/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/server/sparkd/md/ccapi/ICCApiMessageHandler.h b/src/app_sparkd/sparkd/md/ccapi/ICCApiMessageHandler.h similarity index 92% rename from src/server/sparkd/md/ccapi/ICCApiMessageHandler.h rename to src/app_sparkd/sparkd/md/ccapi/ICCApiMessageHandler.h index 7e805d287..549741fe5 100644 --- a/src/server/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/server/sparkd/md/coinbase/CoinbaseMessageType.h b/src/app_sparkd/sparkd/md/coinbase/CoinbaseMessageType.h similarity index 94% rename from src/server/sparkd/md/coinbase/CoinbaseMessageType.h rename to src/app_sparkd/sparkd/md/coinbase/CoinbaseMessageType.h index 4fc8abf81..82401250b 100644 --- a/src/server/sparkd/md/coinbase/CoinbaseMessageType.h +++ b/src/app_sparkd/sparkd/md/coinbase/CoinbaseMessageType.h @@ -1,7 +1,7 @@ #pragma once -#include "lib/core/EnumMacros.h" -#include "lib/core/FMT_IMPL.h" +#include "spark/core/EnumMacros.h" +#include "spark/core/FMT_IMPL.h" #include #include diff --git a/src/server/sparkd/md/coinbase/CoinbasePriceStatistics.cpp b/src/app_sparkd/sparkd/md/coinbase/CoinbasePriceStatistics.cpp similarity index 91% rename from src/server/sparkd/md/coinbase/CoinbasePriceStatistics.cpp rename to src/app_sparkd/sparkd/md/coinbase/CoinbasePriceStatistics.cpp index b35115dcb..0c53e56b5 100644 --- a/src/server/sparkd/md/coinbase/CoinbasePriceStatistics.cpp +++ b/src/app_sparkd/sparkd/md/coinbase/CoinbasePriceStatistics.cpp @@ -1,11 +1,11 @@ #include "CoinbasePriceStatistics.h" -#include "lib/core/TimeStamp.h" -#include "lib/domain/Price.h" -#include "lib/domain/Quantity.h" -#include "lib/domain/SecurityMarketDataStatistics.h" -#include "lib/io/JsonDumper.h" -#include "lib/io/JsonReader.h" -#include "server/sparkd/md/ccapi/CCApiReader.h" +#include "spark/core/TimeStamp.h" +#include "spark/domain/Price.h" +#include "spark/domain/Quantity.h" +#include "spark/domain/SecurityMarketDataStatistics.h" +#include "spark/io/JsonDumper.h" +#include "spark/io/JsonReader.h" +#include "sparkd/md/ccapi/CCApiReader.h" #include #include diff --git a/src/server/sparkd/md/coinbase/CoinbasePriceStatistics.h b/src/app_sparkd/sparkd/md/coinbase/CoinbasePriceStatistics.h similarity index 97% rename from src/server/sparkd/md/coinbase/CoinbasePriceStatistics.h rename to src/app_sparkd/sparkd/md/coinbase/CoinbasePriceStatistics.h index 80fa611e0..c13dc386c 100644 --- a/src/server/sparkd/md/coinbase/CoinbasePriceStatistics.h +++ b/src/app_sparkd/sparkd/md/coinbase/CoinbasePriceStatistics.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/core/TimeStamp.h" +#include "spark/core/TimeStamp.h" #include #include diff --git a/src/server/sparkd/md/coinbase/CoinbasePriceStatisticsAdaptor.cpp b/src/app_sparkd/sparkd/md/coinbase/CoinbasePriceStatisticsAdaptor.cpp similarity index 89% rename from src/server/sparkd/md/coinbase/CoinbasePriceStatisticsAdaptor.cpp rename to src/app_sparkd/sparkd/md/coinbase/CoinbasePriceStatisticsAdaptor.cpp index e17537fff..9f349c3f4 100644 --- a/src/server/sparkd/md/coinbase/CoinbasePriceStatisticsAdaptor.cpp +++ b/src/app_sparkd/sparkd/md/coinbase/CoinbasePriceStatisticsAdaptor.cpp @@ -1,8 +1,8 @@ #include "CoinbasePriceStatisticsAdaptor.h" -#include "lib/domain/SecurityID.h" -#include "lib/domain/SecurityMarketDataStatistics.h" -#include "lib/md/IMarketDataListener.h" -#include "server/sparkd/md/coinbase/CoinbasePriceStatistics.h" +#include "spark/domain/SecurityID.h" +#include "spark/domain/SecurityMarketDataStatistics.h" +#include "spark/md/IMarketDataListener.h" +#include "sparkd/md/coinbase/CoinbasePriceStatistics.h" #include #include diff --git a/src/server/sparkd/md/coinbase/CoinbasePriceStatisticsAdaptor.h b/src/app_sparkd/sparkd/md/coinbase/CoinbasePriceStatisticsAdaptor.h similarity index 90% rename from src/server/sparkd/md/coinbase/CoinbasePriceStatisticsAdaptor.h rename to src/app_sparkd/sparkd/md/coinbase/CoinbasePriceStatisticsAdaptor.h index e93944121..abac72b2f 100644 --- a/src/server/sparkd/md/coinbase/CoinbasePriceStatisticsAdaptor.h +++ b/src/app_sparkd/sparkd/md/coinbase/CoinbasePriceStatisticsAdaptor.h @@ -1,7 +1,7 @@ #pragma once -#include "lib/domain/SecurityID.h" -#include "server/sparkd/md/ccapi/ICCApiMessageHandler.h" +#include "spark/domain/SecurityID.h" +#include "sparkd/md/ccapi/ICCApiMessageHandler.h" #include diff --git a/src/server/sparkd/md/coinbase/CoinbaseSecurityRequestor.cpp b/src/app_sparkd/sparkd/md/coinbase/CoinbaseSecurityRequestor.cpp similarity index 93% rename from src/server/sparkd/md/coinbase/CoinbaseSecurityRequestor.cpp rename to src/app_sparkd/sparkd/md/coinbase/CoinbaseSecurityRequestor.cpp index d7e8b37c2..26773a27e 100644 --- a/src/server/sparkd/md/coinbase/CoinbaseSecurityRequestor.cpp +++ b/src/app_sparkd/sparkd/md/coinbase/CoinbaseSecurityRequestor.cpp @@ -1,17 +1,17 @@ #include "CoinbaseSecurityRequestor.h" -#include "lib/api/domain/SecurityType.pb.h" -#include "lib/api/domain/Venue.pb.h" -#include "lib/collections/Contains.h" -#include "lib/collections/Remove.h" -#include "lib/domain/Security.h" -#include "lib/domain/SecurityCriteria.h" -#include "lib/logging/logging.h" -#include "lib/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 "spark/api/domain/SecurityType.pb.h" +#include "spark/api/domain/Venue.pb.h" +#include "spark/collections/Contains.h" +#include "spark/collections/Remove.h" +#include "spark/domain/Security.h" +#include "spark/domain/SecurityCriteria.h" +#include "spark/logging/logging.h" +#include "spark/persistence/IDGenerator.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/server/sparkd/md/coinbase/CoinbaseSecurityRequestor.h b/src/app_sparkd/sparkd/md/coinbase/CoinbaseSecurityRequestor.h similarity index 98% rename from src/server/sparkd/md/coinbase/CoinbaseSecurityRequestor.h rename to src/app_sparkd/sparkd/md/coinbase/CoinbaseSecurityRequestor.h index df01d2ac2..5376f206a 100644 --- a/src/server/sparkd/md/coinbase/CoinbaseSecurityRequestor.h +++ b/src/app_sparkd/sparkd/md/coinbase/CoinbaseSecurityRequestor.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/utils/Delegate.h" +#include "spark/utils/Delegate.h" #include #include diff --git a/src/server/sparkd/md/coinbase/CoinbaseSpot.cpp b/src/app_sparkd/sparkd/md/coinbase/CoinbaseSpot.cpp similarity index 90% rename from src/server/sparkd/md/coinbase/CoinbaseSpot.cpp rename to src/app_sparkd/sparkd/md/coinbase/CoinbaseSpot.cpp index b9be60929..1ecac7412 100644 --- a/src/server/sparkd/md/coinbase/CoinbaseSpot.cpp +++ b/src/app_sparkd/sparkd/md/coinbase/CoinbaseSpot.cpp @@ -1,9 +1,9 @@ #include "CoinbaseSpot.h" -#include "lib/api/domain/Currency.pb.h" -#include "lib/domain/Quantity.h" -#include "lib/domain/Security.h" -#include "lib/io/JsonReader.h" -#include "lib/logging/logging.h" +#include "spark/api/domain/Currency.pb.h" +#include "spark/domain/Quantity.h" +#include "spark/domain/Security.h" +#include "spark/io/JsonReader.h" +#include "spark/logging/logging.h" #include #include diff --git a/src/server/sparkd/md/coinbase/CoinbaseSpot.h b/src/app_sparkd/sparkd/md/coinbase/CoinbaseSpot.h similarity index 96% rename from src/server/sparkd/md/coinbase/CoinbaseSpot.h rename to src/app_sparkd/sparkd/md/coinbase/CoinbaseSpot.h index 0c8ed64a1..8ef117f65 100644 --- a/src/server/sparkd/md/coinbase/CoinbaseSpot.h +++ b/src/app_sparkd/sparkd/md/coinbase/CoinbaseSpot.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/api/domain/Venue.pb.h" +#include "spark/api/domain/Venue.pb.h" #include #include diff --git a/src/server/sparkd/md/coinbase/CoinbaseSubscription.cpp b/src/app_sparkd/sparkd/md/coinbase/CoinbaseSubscription.cpp similarity index 93% rename from src/server/sparkd/md/coinbase/CoinbaseSubscription.cpp rename to src/app_sparkd/sparkd/md/coinbase/CoinbaseSubscription.cpp index cba166c29..f11d4dbee 100644 --- a/src/server/sparkd/md/coinbase/CoinbaseSubscription.cpp +++ b/src/app_sparkd/sparkd/md/coinbase/CoinbaseSubscription.cpp @@ -1,19 +1,19 @@ #include "CoinbaseSubscription.h" -#include "lib/api/md/CoinbaseMarketDataConfig.pb.h" -#include "lib/collections/UnorderedSetFactory.h" -#include "lib/domain/Security.h" -#include "lib/domain/SecurityCriteria.h" -#include "lib/io/ProtoPrinter.h" -#include "lib/io/QueryParams.h" -#include "lib/md/IMarketDataListener.h" -#include "lib/persistence/IDGenerator.h" -#include "lib/utils/bts_assert.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 "spark/api/md/CoinbaseMarketDataConfig.pb.h" +#include "spark/collections/UnorderedSetFactory.h" +#include "spark/domain/Security.h" +#include "spark/domain/SecurityCriteria.h" +#include "spark/io/ProtoPrinter.h" +#include "spark/io/QueryParams.h" +#include "spark/md/IMarketDataListener.h" +#include "spark/persistence/IDGenerator.h" +#include "spark/utils/bts_assert.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/server/sparkd/md/coinbase/CoinbaseSubscription.h b/src/app_sparkd/sparkd/md/coinbase/CoinbaseSubscription.h similarity index 96% rename from src/server/sparkd/md/coinbase/CoinbaseSubscription.h rename to src/app_sparkd/sparkd/md/coinbase/CoinbaseSubscription.h index c8e76ea01..45d9d2905 100644 --- a/src/server/sparkd/md/coinbase/CoinbaseSubscription.h +++ b/src/app_sparkd/sparkd/md/coinbase/CoinbaseSubscription.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/md/IMarketDataSource.h" +#include "spark/md/IMarketDataSource.h" #include diff --git a/src/server/sparkd/md/databento/DatabentoDataHandler.cpp b/src/app_sparkd/sparkd/md/databento/DatabentoDataHandler.cpp similarity index 96% rename from src/server/sparkd/md/databento/DatabentoDataHandler.cpp rename to src/app_sparkd/sparkd/md/databento/DatabentoDataHandler.cpp index d5f93dfe4..bb023fc28 100644 --- a/src/server/sparkd/md/databento/DatabentoDataHandler.cpp +++ b/src/app_sparkd/sparkd/md/databento/DatabentoDataHandler.cpp @@ -7,27 +7,27 @@ #include "databento/log.hpp" #include "databento/record.hpp" #include "databento/timeseries.hpp" -#include "lib/api/domain/Venue.pb.h" -#include "lib/api/md/MarketDataConfig.pb.h" -#include "lib/config/config.h" -#include "lib/config/protos/system_config.pb.h" -#include "lib/core/TimeStamp.h" -#include "lib/domain/AggressorSide.h" -#include "lib/domain/Book.h" -#include "lib/domain/Quantity.h" -#include "lib/domain/Security.h" -#include "lib/domain/SecurityID.h" -#include "lib/domain/Side.h" -#include "lib/domain/TradeRecord.h" -#include "lib/domain_model/Security.pb.h" -#include "lib/logging/logging.h" -#include "lib/utils/TimeStamp.h" -#include "lib/utils/bts_assert.h" -#include "lib/utils/bts_chrono.h" -#include "lib/utils/datetime.h" -#include "lib/utils/helper_macros.h" +#include "spark/api/domain/Venue.pb.h" +#include "spark/api/md/MarketDataConfig.pb.h" +#include "spark/config/config.h" +#include "spark/config/protos/system_config.pb.h" +#include "spark/domain/AggressorSide.h" +#include "spark/domain/Book.h" +#include "spark/domain/Quantity.h" +#include "spark/domain/Security.h" +#include "spark/domain/SecurityID.h" +#include "spark/domain/Side.h" +#include "spark/domain/TradeRecord.h" +#include "spark/domain_model/Security.pb.h" +#include "spark/md/IMarketDataListener.h" +#include "spark/persistence/IDGenerator.h" +#include "spark/core/TimeStamp.h" +#include "spark/utils/bts_assert.h" +#include "spark/utils/bts_chrono.h" +#include "spark/utils/bts_assert.h" +#include "spark/utils/datetime.h" + #include -#include #include #include #include diff --git a/src/server/sparkd/md/databento/DatabentoDataHandler.h b/src/app_sparkd/sparkd/md/databento/DatabentoDataHandler.h similarity index 83% rename from src/server/sparkd/md/databento/DatabentoDataHandler.h rename to src/app_sparkd/sparkd/md/databento/DatabentoDataHandler.h index bdf5d7d70..59f83662f 100644 --- a/src/server/sparkd/md/databento/DatabentoDataHandler.h +++ b/src/app_sparkd/sparkd/md/databento/DatabentoDataHandler.h @@ -1,7 +1,10 @@ #pragma once -#include "lib/md/IMarketDataListener.h" -#include "lib/persistence/IDGenerator.h" + +#include "spark/md/IMarketDataListener.h" +#include "spark/persistence/IDGenerator.h" + #include + namespace bts::md::DatabentoHandler { class DatabentoDatahandler { public: @@ -18,4 +21,4 @@ class DatabentoDatahandler { const bool load_reference_data = true, const std::chrono::duration sleep_duration = 0.04s); }; -} // namespace bts::md::databento \ No newline at end of file +} // namespace bts::md::databento diff --git a/src/server/sparkd/md/databento/DatabentoMarketDataProvider.cpp b/src/app_sparkd/sparkd/md/databento/DatabentoMarketDataProvider.cpp similarity index 83% rename from src/server/sparkd/md/databento/DatabentoMarketDataProvider.cpp rename to src/app_sparkd/sparkd/md/databento/DatabentoMarketDataProvider.cpp index 66c2d1294..81c83decd 100644 --- a/src/server/sparkd/md/databento/DatabentoMarketDataProvider.cpp +++ b/src/app_sparkd/sparkd/md/databento/DatabentoMarketDataProvider.cpp @@ -1,10 +1,10 @@ #include "DatabentoMarketDataProvider.h" -#include "lib/api/domain/Venue.pb.h" -#include "lib/api/md/MarketDataConfig.pb.h" -#include "lib/md/IMarketDataSource.h" -#include "lib/persistence/IDGenerator.h" -#include "server/sparkd/md/databento/DatabentoDataHandler.h" -#include "server/sparkd/md/glbx/DatabentoGlbxSubscription.h" +#include "spark/api/domain/Venue.pb.h" +#include "spark/api/md/MarketDataConfig.pb.h" +#include "spark/md/IMarketDataSource.h" +#include "spark/persistence/IDGenerator.h" +#include "sparkd/md/databento/DatabentoDataHandler.h" +#include "sparkd/md/glbx/DatabentoGlbxSubscription.h" #include #include diff --git a/src/server/sparkd/md/databento/DatabentoMarketDataProvider.h b/src/app_sparkd/sparkd/md/databento/DatabentoMarketDataProvider.h similarity index 93% rename from src/server/sparkd/md/databento/DatabentoMarketDataProvider.h rename to src/app_sparkd/sparkd/md/databento/DatabentoMarketDataProvider.h index 41275ce30..a792434cf 100644 --- a/src/server/sparkd/md/databento/DatabentoMarketDataProvider.h +++ b/src/app_sparkd/sparkd/md/databento/DatabentoMarketDataProvider.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/md/IMarketDataProvider.h" +#include "spark/md/IMarketDataProvider.h" #include diff --git a/src/server/sparkd/md/deribit/DeribitChannelDemuxer.cpp b/src/app_sparkd/sparkd/md/deribit/DeribitChannelDemuxer.cpp similarity index 97% rename from src/server/sparkd/md/deribit/DeribitChannelDemuxer.cpp rename to src/app_sparkd/sparkd/md/deribit/DeribitChannelDemuxer.cpp index d0ce01c72..66e0f6670 100644 --- a/src/server/sparkd/md/deribit/DeribitChannelDemuxer.cpp +++ b/src/app_sparkd/sparkd/md/deribit/DeribitChannelDemuxer.cpp @@ -1,7 +1,7 @@ #include "DeribitChannelDemuxer.h" -#include "lib/io/JsonReader.h" -#include "server/sparkd/md/ccapi/CCApiCorrelationID.h" -#include "server/sparkd/md/ccapi/CCApiReader.h" +#include "spark/io/JsonReader.h" +#include "sparkd/md/ccapi/CCApiCorrelationID.h" +#include "sparkd/md/ccapi/CCApiReader.h" #include #include diff --git a/src/server/sparkd/md/deribit/DeribitChannelDemuxer.h b/src/app_sparkd/sparkd/md/deribit/DeribitChannelDemuxer.h similarity index 94% rename from src/server/sparkd/md/deribit/DeribitChannelDemuxer.h rename to src/app_sparkd/sparkd/md/deribit/DeribitChannelDemuxer.h index bf9f0c5cb..98251e62b 100644 --- a/src/server/sparkd/md/deribit/DeribitChannelDemuxer.h +++ b/src/app_sparkd/sparkd/md/deribit/DeribitChannelDemuxer.h @@ -1,7 +1,7 @@ #pragma once -#include "lib/utils/Delegate.h" -#include "server/sparkd/md/ccapi/ICCApiMessageHandler.h" +#include "spark/utils/Delegate.h" +#include "sparkd/md/ccapi/ICCApiMessageHandler.h" #include #include diff --git a/src/server/sparkd/md/deribit/DeribitCombo.cpp b/src/app_sparkd/sparkd/md/deribit/DeribitCombo.cpp similarity index 94% rename from src/server/sparkd/md/deribit/DeribitCombo.cpp rename to src/app_sparkd/sparkd/md/deribit/DeribitCombo.cpp index a19baa290..d8bddc267 100644 --- a/src/server/sparkd/md/deribit/DeribitCombo.cpp +++ b/src/app_sparkd/sparkd/md/deribit/DeribitCombo.cpp @@ -1,6 +1,6 @@ #include "DeribitCombo.h" -#include "lib/core/FMT.h" -#include "lib/io/JsonReader.h" +#include "spark/core/FMT.h" +#include "spark/io/JsonReader.h" #include #include diff --git a/src/server/sparkd/md/deribit/DeribitCombo.h b/src/app_sparkd/sparkd/md/deribit/DeribitCombo.h similarity index 88% rename from src/server/sparkd/md/deribit/DeribitCombo.h rename to src/app_sparkd/sparkd/md/deribit/DeribitCombo.h index 34926f5df..684204c12 100644 --- a/src/server/sparkd/md/deribit/DeribitCombo.h +++ b/src/app_sparkd/sparkd/md/deribit/DeribitCombo.h @@ -1,7 +1,7 @@ #pragma once -#include "lib/core/TimeStamp.h" -#include "server/sparkd/md/deribit/DeribitComboLeg.h" +#include "spark/core/TimeStamp.h" +#include "sparkd/md/deribit/DeribitComboLeg.h" #include #include diff --git a/src/server/sparkd/md/deribit/DeribitComboLeg.cpp b/src/app_sparkd/sparkd/md/deribit/DeribitComboLeg.cpp similarity index 100% rename from src/server/sparkd/md/deribit/DeribitComboLeg.cpp rename to src/app_sparkd/sparkd/md/deribit/DeribitComboLeg.cpp diff --git a/src/server/sparkd/md/deribit/DeribitComboLeg.h b/src/app_sparkd/sparkd/md/deribit/DeribitComboLeg.h similarity index 96% rename from src/server/sparkd/md/deribit/DeribitComboLeg.h rename to src/app_sparkd/sparkd/md/deribit/DeribitComboLeg.h index ae44c0cae..a30ccbb3d 100644 --- a/src/server/sparkd/md/deribit/DeribitComboLeg.h +++ b/src/app_sparkd/sparkd/md/deribit/DeribitComboLeg.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/core/FMT_IMPL.h" +#include "spark/core/FMT_IMPL.h" #include #include diff --git a/src/server/sparkd/md/deribit/DeribitComboRequest.h b/src/app_sparkd/sparkd/md/deribit/DeribitComboRequest.h similarity index 97% rename from src/server/sparkd/md/deribit/DeribitComboRequest.h rename to src/app_sparkd/sparkd/md/deribit/DeribitComboRequest.h index 539a5bccb..1f532fede 100644 --- a/src/server/sparkd/md/deribit/DeribitComboRequest.h +++ b/src/app_sparkd/sparkd/md/deribit/DeribitComboRequest.h @@ -1,8 +1,8 @@ #pragma once -#include "lib/core/BoolName.h" -#include "lib/core/FMT.h" -#include "lib/core/FMT_IMPL.h" +#include "spark/core/BoolName.h" +#include "spark/core/FMT.h" +#include "spark/core/FMT_IMPL.h" #include #include diff --git a/src/server/sparkd/md/deribit/DeribitCurrency.h b/src/app_sparkd/sparkd/md/deribit/DeribitCurrency.h similarity index 90% rename from src/server/sparkd/md/deribit/DeribitCurrency.h rename to src/app_sparkd/sparkd/md/deribit/DeribitCurrency.h index 4ced535ae..f19a8225c 100644 --- a/src/server/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/server/sparkd/md/deribit/DeribitDepthAdaptor.cpp b/src/app_sparkd/sparkd/md/deribit/DeribitDepthAdaptor.cpp similarity index 92% rename from src/server/sparkd/md/deribit/DeribitDepthAdaptor.cpp rename to src/app_sparkd/sparkd/md/deribit/DeribitDepthAdaptor.cpp index c4436fca1..781f0aae8 100644 --- a/src/server/sparkd/md/deribit/DeribitDepthAdaptor.cpp +++ b/src/app_sparkd/sparkd/md/deribit/DeribitDepthAdaptor.cpp @@ -1,9 +1,9 @@ #include "DeribitDepthAdaptor.h" -#include "lib/domain/Book.h" -#include "lib/domain/BookLevelComp.h" -#include "lib/domain/SecurityID.h" -#include "lib/logging/logging.h" -#include "lib/md/IMarketDataListener.h" +#include "spark/domain/Book.h" +#include "spark/domain/BookLevelComp.h" +#include "spark/domain/SecurityID.h" +#include "spark/logging/logging.h" +#include "spark/md/IMarketDataListener.h" #include #include diff --git a/src/server/sparkd/md/deribit/DeribitDepthAdaptor.h b/src/app_sparkd/sparkd/md/deribit/DeribitDepthAdaptor.h similarity index 95% rename from src/server/sparkd/md/deribit/DeribitDepthAdaptor.h rename to src/app_sparkd/sparkd/md/deribit/DeribitDepthAdaptor.h index 5c497e525..0ba1dabcc 100644 --- a/src/server/sparkd/md/deribit/DeribitDepthAdaptor.h +++ b/src/app_sparkd/sparkd/md/deribit/DeribitDepthAdaptor.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/domain/SecurityID.h" +#include "spark/domain/SecurityID.h" #include #include diff --git a/src/server/sparkd/md/deribit/DeribitInstrument.cpp b/src/app_sparkd/sparkd/md/deribit/DeribitInstrument.cpp similarity index 98% rename from src/server/sparkd/md/deribit/DeribitInstrument.cpp rename to src/app_sparkd/sparkd/md/deribit/DeribitInstrument.cpp index 928458bee..04560ac6b 100644 --- a/src/server/sparkd/md/deribit/DeribitInstrument.cpp +++ b/src/app_sparkd/sparkd/md/deribit/DeribitInstrument.cpp @@ -1,5 +1,5 @@ #include "DeribitInstrument.h" -#include "lib/io/JsonReader.h" +#include "spark/io/JsonReader.h" #include #include diff --git a/src/server/sparkd/md/deribit/DeribitInstrument.h b/src/app_sparkd/sparkd/md/deribit/DeribitInstrument.h similarity index 93% rename from src/server/sparkd/md/deribit/DeribitInstrument.h rename to src/app_sparkd/sparkd/md/deribit/DeribitInstrument.h index e5555d3db..8de2c2f0a 100644 --- a/src/server/sparkd/md/deribit/DeribitInstrument.h +++ b/src/app_sparkd/sparkd/md/deribit/DeribitInstrument.h @@ -1,7 +1,7 @@ #pragma once -#include "lib/core/TimeStamp.h" -#include "server/sparkd/md/deribit/DeribitInstrumentKind.h" +#include "spark/core/TimeStamp.h" +#include "sparkd/md/deribit/DeribitInstrumentKind.h" #include #include diff --git a/src/server/sparkd/md/deribit/DeribitInstrumentKind.h b/src/app_sparkd/sparkd/md/deribit/DeribitInstrumentKind.h similarity index 94% rename from src/server/sparkd/md/deribit/DeribitInstrumentKind.h rename to src/app_sparkd/sparkd/md/deribit/DeribitInstrumentKind.h index a56c6e831..5ddd59cbe 100644 --- a/src/server/sparkd/md/deribit/DeribitInstrumentKind.h +++ b/src/app_sparkd/sparkd/md/deribit/DeribitInstrumentKind.h @@ -1,11 +1,11 @@ #pragma once -#include "lib/algorithm/StringCaseConverter.h" -#include "lib/api/domain/SecurityType.pb.h" -#include "lib/collections/HASH_IMPL.h" -#include "lib/core/EnumMacros.h" -#include "lib/core/FMT_IMPL.h" -#include "lib/domain_model/Security.pb.h" +#include "spark/algorithm/StringCaseConverter.h" +#include "spark/api/domain/SecurityType.pb.h" +#include "spark/collections/HASH_IMPL.h" +#include "spark/core/EnumMacros.h" +#include "spark/core/FMT_IMPL.h" +#include "spark/domain_model/Security.pb.h" #include #include diff --git a/src/server/sparkd/md/deribit/DeribitInstrumentRequest.h b/src/app_sparkd/sparkd/md/deribit/DeribitInstrumentRequest.h similarity index 96% rename from src/server/sparkd/md/deribit/DeribitInstrumentRequest.h rename to src/app_sparkd/sparkd/md/deribit/DeribitInstrumentRequest.h index b0a1573c6..e6f035ac6 100644 --- a/src/server/sparkd/md/deribit/DeribitInstrumentRequest.h +++ b/src/app_sparkd/sparkd/md/deribit/DeribitInstrumentRequest.h @@ -1,11 +1,11 @@ #pragma once -#include "lib/collections/Contains.h" -#include "lib/core/FMT.h" -#include "lib/core/FMT_IMPL.h" -#include "lib/domain/SecurityCriteria.h" -#include "lib/domain/SecurityCriteriaClause.h" -#include "server/sparkd/md/deribit/DeribitInstrumentKind.h" +#include "spark/collections/Contains.h" +#include "spark/core/FMT.h" +#include "spark/core/FMT_IMPL.h" +#include "spark/domain/SecurityCriteria.h" +#include "spark/domain/SecurityCriteriaClause.h" +#include "sparkd/md/deribit/DeribitInstrumentKind.h" #include #include diff --git a/src/server/sparkd/md/deribit/DeribitInstrumentState.h b/src/app_sparkd/sparkd/md/deribit/DeribitInstrumentState.h similarity index 92% rename from src/server/sparkd/md/deribit/DeribitInstrumentState.h rename to src/app_sparkd/sparkd/md/deribit/DeribitInstrumentState.h index e9fbcaf49..b1aa5ab40 100644 --- a/src/server/sparkd/md/deribit/DeribitInstrumentState.h +++ b/src/app_sparkd/sparkd/md/deribit/DeribitInstrumentState.h @@ -1,8 +1,8 @@ #pragma once -#include "lib/core/FMT_IMPL.h" -#include "lib/core/TimeStamp.h" -#include "server/sparkd/md/deribit/DeribitInstrumentStateType.h" +#include "spark/core/FMT_IMPL.h" +#include "spark/core/TimeStamp.h" +#include "sparkd/md/deribit/DeribitInstrumentStateType.h" #include #include diff --git a/src/server/sparkd/md/deribit/DeribitInstrumentStateType.h b/src/app_sparkd/sparkd/md/deribit/DeribitInstrumentStateType.h similarity index 96% rename from src/server/sparkd/md/deribit/DeribitInstrumentStateType.h rename to src/app_sparkd/sparkd/md/deribit/DeribitInstrumentStateType.h index 2d68d081c..d3e01e193 100644 --- a/src/server/sparkd/md/deribit/DeribitInstrumentStateType.h +++ b/src/app_sparkd/sparkd/md/deribit/DeribitInstrumentStateType.h @@ -1,7 +1,7 @@ #pragma once -#include "lib/core/EnumMacros.h" -#include "lib/core/FMT_IMPL.h" +#include "spark/core/EnumMacros.h" +#include "spark/core/FMT_IMPL.h" #include #include diff --git a/src/server/sparkd/md/deribit/DeribitInstrumentStore.cpp b/src/app_sparkd/sparkd/md/deribit/DeribitInstrumentStore.cpp similarity index 96% rename from src/server/sparkd/md/deribit/DeribitInstrumentStore.cpp rename to src/app_sparkd/sparkd/md/deribit/DeribitInstrumentStore.cpp index dab42a2fe..86cc833e9 100644 --- a/src/server/sparkd/md/deribit/DeribitInstrumentStore.cpp +++ b/src/app_sparkd/sparkd/md/deribit/DeribitInstrumentStore.cpp @@ -1,14 +1,14 @@ #include "DeribitInstrumentStore.h" -#include "lib/api/domain/SecurityType.h" -#include "lib/collections/Contains.h" -#include "lib/collections/Remove.h" -#include "lib/domain/Security.h" -#include "lib/io/JsonReader.h" -#include "lib/logging/logging.h" -#include "lib/persistence/IDGenerator.h" -#include "lib/utils/bts_fatal.h" -#include "server/sparkd/md/deribit/DeribitCombo.h" -#include "server/sparkd/md/deribit/DeribitInstrument.h" +#include "spark/api/domain/SecurityType.h" +#include "spark/collections/Contains.h" +#include "spark/collections/Remove.h" +#include "spark/domain/Security.h" +#include "spark/io/JsonReader.h" +#include "spark/logging/logging.h" +#include "spark/persistence/IDGenerator.h" +#include "spark/utils/bts_fatal.h" +#include "sparkd/md/deribit/DeribitCombo.h" +#include "sparkd/md/deribit/DeribitInstrument.h" #include #include diff --git a/src/server/sparkd/md/deribit/DeribitInstrumentStore.h b/src/app_sparkd/sparkd/md/deribit/DeribitInstrumentStore.h similarity index 93% rename from src/server/sparkd/md/deribit/DeribitInstrumentStore.h rename to src/app_sparkd/sparkd/md/deribit/DeribitInstrumentStore.h index 34295c9d4..1572524c0 100644 --- a/src/server/sparkd/md/deribit/DeribitInstrumentStore.h +++ b/src/app_sparkd/sparkd/md/deribit/DeribitInstrumentStore.h @@ -1,8 +1,8 @@ #pragma once -#include "lib/domain/Security.h" -#include "lib/domain/SecurityID.h" -#include "lib/persistence/IDGenerator.h" +#include "spark/domain/Security.h" +#include "spark/domain/SecurityID.h" +#include "spark/persistence/IDGenerator.h" #include #include diff --git a/src/server/sparkd/md/deribit/DeribitMessageType.h b/src/app_sparkd/sparkd/md/deribit/DeribitMessageType.h similarity index 95% rename from src/server/sparkd/md/deribit/DeribitMessageType.h rename to src/app_sparkd/sparkd/md/deribit/DeribitMessageType.h index 4d87a2339..91006adef 100644 --- a/src/server/sparkd/md/deribit/DeribitMessageType.h +++ b/src/app_sparkd/sparkd/md/deribit/DeribitMessageType.h @@ -1,7 +1,7 @@ #pragma once -#include "lib/core/EnumMacros.h" -#include "lib/core/FMT_IMPL.h" +#include "spark/core/EnumMacros.h" +#include "spark/core/FMT_IMPL.h" #include #include diff --git a/src/server/sparkd/md/deribit/DeribitSecurityRequestor.cpp b/src/app_sparkd/sparkd/md/deribit/DeribitSecurityRequestor.cpp similarity index 94% rename from src/server/sparkd/md/deribit/DeribitSecurityRequestor.cpp rename to src/app_sparkd/sparkd/md/deribit/DeribitSecurityRequestor.cpp index 5b89915c0..820358c51 100644 --- a/src/server/sparkd/md/deribit/DeribitSecurityRequestor.cpp +++ b/src/app_sparkd/sparkd/md/deribit/DeribitSecurityRequestor.cpp @@ -56,26 +56,26 @@ */ #include "DeribitSecurityRequestor.h" -#include "lib/api/domain/SecurityType.pb.h" -#include "lib/api/domain/Venue.pb.h" -#include "lib/domain/Security.h" -#include "lib/domain/SecurityCriteria.h" -#include "lib/io/websocket/JsonRpcError.h" -#include "lib/io/websocket/JsonRpcHandler.h" -#include "lib/io/websocket/JsonRpcRequest.h" -#include "lib/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 "spark/api/domain/SecurityType.pb.h" +#include "spark/api/domain/Venue.pb.h" +#include "spark/domain/Security.h" +#include "spark/domain/SecurityCriteria.h" +#include "spark/io/websocket/JsonRpcError.h" +#include "spark/io/websocket/JsonRpcHandler.h" +#include "spark/io/websocket/JsonRpcRequest.h" +#include "spark/logging/logging.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/server/sparkd/md/deribit/DeribitSecurityRequestor.h b/src/app_sparkd/sparkd/md/deribit/DeribitSecurityRequestor.h similarity index 97% rename from src/server/sparkd/md/deribit/DeribitSecurityRequestor.h rename to src/app_sparkd/sparkd/md/deribit/DeribitSecurityRequestor.h index 4751512c2..a36c8f984 100644 --- a/src/server/sparkd/md/deribit/DeribitSecurityRequestor.h +++ b/src/app_sparkd/sparkd/md/deribit/DeribitSecurityRequestor.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/utils/Delegate.h" +#include "spark/utils/Delegate.h" #include #include diff --git a/src/server/sparkd/md/deribit/DeribitSubscription.cpp b/src/app_sparkd/sparkd/md/deribit/DeribitSubscription.cpp similarity index 89% rename from src/server/sparkd/md/deribit/DeribitSubscription.cpp rename to src/app_sparkd/sparkd/md/deribit/DeribitSubscription.cpp index 7619c7249..f0a267333 100644 --- a/src/server/sparkd/md/deribit/DeribitSubscription.cpp +++ b/src/app_sparkd/sparkd/md/deribit/DeribitSubscription.cpp @@ -1,32 +1,32 @@ #include "DeribitSubscription.h" -#include "lib/api/domain/Venue.pb.h" -#include "lib/api/md/DeribitMarketDataConfig.pb.h" -#include "lib/collections/Chunk.h" -#include "lib/collections/Contains.h" -#include "lib/collections/Remove.h" -#include "lib/collections/Transform.h" -#include "lib/core/FMT.h" -#include "lib/core/TimeStamp.h" -#include "lib/domain/Security.h" -#include "lib/domain/SecurityCriteria.h" -#include "lib/domain_model/Security.pb.h" -#include "lib/io/ProtoPrinter.h" -#include "lib/io/websocket/JsonRpcError.h" -#include "lib/io/websocket/JsonRpcRequest.h" -#include "lib/logging/logging.h" -#include "lib/md/IMarketDataListener.h" -#include "lib/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 "spark/api/domain/Venue.pb.h" +#include "spark/api/md/DeribitMarketDataConfig.pb.h" +#include "spark/collections/Chunk.h" +#include "spark/collections/Contains.h" +#include "spark/collections/Remove.h" +#include "spark/collections/Transform.h" +#include "spark/core/FMT.h" +#include "spark/core/TimeStamp.h" +#include "spark/domain/Security.h" +#include "spark/domain/SecurityCriteria.h" +#include "spark/domain_model/Security.pb.h" +#include "spark/io/ProtoPrinter.h" +#include "spark/io/websocket/JsonRpcError.h" +#include "spark/io/websocket/JsonRpcRequest.h" +#include "spark/logging/logging.h" +#include "spark/md/IMarketDataListener.h" +#include "spark/persistence/IDGenerator.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/server/sparkd/md/deribit/DeribitSubscription.h b/src/app_sparkd/sparkd/md/deribit/DeribitSubscription.h similarity index 96% rename from src/server/sparkd/md/deribit/DeribitSubscription.h rename to src/app_sparkd/sparkd/md/deribit/DeribitSubscription.h index aeabe6cca..3f96280dc 100644 --- a/src/server/sparkd/md/deribit/DeribitSubscription.h +++ b/src/app_sparkd/sparkd/md/deribit/DeribitSubscription.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/md/IMarketDataSource.h" +#include "spark/md/IMarketDataSource.h" #include diff --git a/src/server/sparkd/md/deribit/DeribitSubscriptionFactory.h b/src/app_sparkd/sparkd/md/deribit/DeribitSubscriptionFactory.h similarity index 98% rename from src/server/sparkd/md/deribit/DeribitSubscriptionFactory.h rename to src/app_sparkd/sparkd/md/deribit/DeribitSubscriptionFactory.h index ba667af19..c6ee3779d 100644 --- a/src/server/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/server/sparkd/md/deribit/DeribitTickerAdaptor.cpp b/src/app_sparkd/sparkd/md/deribit/DeribitTickerAdaptor.cpp similarity index 91% rename from src/server/sparkd/md/deribit/DeribitTickerAdaptor.cpp rename to src/app_sparkd/sparkd/md/deribit/DeribitTickerAdaptor.cpp index f5357f6fb..e083b7d56 100644 --- a/src/server/sparkd/md/deribit/DeribitTickerAdaptor.cpp +++ b/src/app_sparkd/sparkd/md/deribit/DeribitTickerAdaptor.cpp @@ -1,8 +1,8 @@ #include "DeribitTickerAdaptor.h" -#include "lib/domain/SecurityID.h" -#include "lib/domain/SecurityMarketDataStatistics.h" -#include "lib/io/JsonReader.h" -#include "lib/md/IMarketDataListener.h" +#include "spark/domain/SecurityID.h" +#include "spark/domain/SecurityMarketDataStatistics.h" +#include "spark/io/JsonReader.h" +#include "spark/md/IMarketDataListener.h" #include diff --git a/src/server/sparkd/md/deribit/DeribitTickerAdaptor.h b/src/app_sparkd/sparkd/md/deribit/DeribitTickerAdaptor.h similarity index 95% rename from src/server/sparkd/md/deribit/DeribitTickerAdaptor.h rename to src/app_sparkd/sparkd/md/deribit/DeribitTickerAdaptor.h index 3d051403d..1acca7594 100644 --- a/src/server/sparkd/md/deribit/DeribitTickerAdaptor.h +++ b/src/app_sparkd/sparkd/md/deribit/DeribitTickerAdaptor.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/domain/SecurityID.h" +#include "spark/domain/SecurityID.h" #include #include diff --git a/src/server/sparkd/md/deribit/DeribitTradeAdaptor.cpp b/src/app_sparkd/sparkd/md/deribit/DeribitTradeAdaptor.cpp similarity index 92% rename from src/server/sparkd/md/deribit/DeribitTradeAdaptor.cpp rename to src/app_sparkd/sparkd/md/deribit/DeribitTradeAdaptor.cpp index e909a1b54..5d88c1f23 100644 --- a/src/server/sparkd/md/deribit/DeribitTradeAdaptor.cpp +++ b/src/app_sparkd/sparkd/md/deribit/DeribitTradeAdaptor.cpp @@ -1,10 +1,10 @@ #include "DeribitTradeAdaptor.h" -#include "lib/core/TimeStamp.h" -#include "lib/domain/AggressorSide.h" -#include "lib/domain/SecurityID.h" -#include "lib/domain/TradeRecord.h" -#include "lib/md/IMarketDataListener.h" -#include "lib/utils/bts_fatal.h" +#include "spark/core/TimeStamp.h" +#include "spark/domain/AggressorSide.h" +#include "spark/domain/SecurityID.h" +#include "spark/domain/TradeRecord.h" +#include "spark/md/IMarketDataListener.h" +#include "spark/utils/bts_fatal.h" #include #include diff --git a/src/server/sparkd/md/deribit/DeribitTradeAdaptor.h b/src/app_sparkd/sparkd/md/deribit/DeribitTradeAdaptor.h similarity index 95% rename from src/server/sparkd/md/deribit/DeribitTradeAdaptor.h rename to src/app_sparkd/sparkd/md/deribit/DeribitTradeAdaptor.h index 17dcb0376..13b079c04 100644 --- a/src/server/sparkd/md/deribit/DeribitTradeAdaptor.h +++ b/src/app_sparkd/sparkd/md/deribit/DeribitTradeAdaptor.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/domain/SecurityID.h" +#include "spark/domain/SecurityID.h" #include #include diff --git a/src/server/sparkd/md/deribit/DeribitWithdrawalPriority.h b/src/app_sparkd/sparkd/md/deribit/DeribitWithdrawalPriority.h similarity index 100% rename from src/server/sparkd/md/deribit/DeribitWithdrawalPriority.h rename to src/app_sparkd/sparkd/md/deribit/DeribitWithdrawalPriority.h diff --git a/src/server/sparkd/md/emumba/EmumbaDeribitData.h b/src/app_sparkd/sparkd/md/emumba/EmumbaDeribitData.h similarity index 77% rename from src/server/sparkd/md/emumba/EmumbaDeribitData.h rename to src/app_sparkd/sparkd/md/emumba/EmumbaDeribitData.h index c35d44075..a457cc978 100644 --- a/src/server/sparkd/md/emumba/EmumbaDeribitData.h +++ b/src/app_sparkd/sparkd/md/emumba/EmumbaDeribitData.h @@ -1,10 +1,11 @@ #pragma once -#include "lib/md/GeneralSecurityIndex.h" -#include "lib/md/MDProducer.h" -#include "lib/md/SecurityIDRecorder.h" -#include "server/sparkd/md/platforms/emumba/EMTradingSession.h" -#include "server/sparkd/md/platforms/emumba/EmMDListener.h" +#include "spark/md/GeneralSecurityIndex.h" +#include "spark/md/MDProducer.h" +#include "spark/md/SecurityIDRecorder.h" +#include "sparkd/md/platforms/emumba/EMTradingSession.h" +#include "sparkd/md/platforms/emumba/EmMDListener.h" + #include namespace bts::md { diff --git a/src/server/sparkd/md/emumba/EmumbaDeribitSubscription.cpp b/src/app_sparkd/sparkd/md/emumba/EmumbaDeribitSubscription.cpp similarity index 93% rename from src/server/sparkd/md/emumba/EmumbaDeribitSubscription.cpp rename to src/app_sparkd/sparkd/md/emumba/EmumbaDeribitSubscription.cpp index 5facdd62e..3e1504adc 100644 --- a/src/server/sparkd/md/emumba/EmumbaDeribitSubscription.cpp +++ b/src/app_sparkd/sparkd/md/emumba/EmumbaDeribitSubscription.cpp @@ -1,8 +1,8 @@ #include "EmumbaDeribitSubscription.h" -#include "lib/api/md/EmumbaDeribitMarketDataConfig.pb.h" -#include "lib/config/protos/system_config.pb.h" -#include "lib/utils/thread_manager.h" -#include "server/sparkd/md/emumba/EmumbaDeribitData.h" +#include "spark/api/md/EmumbaDeribitMarketDataConfig.pb.h" +#include "spark/config/protos/system_config.pb.h" +#include "spark/utils/thread_manager.h" +#include "sparkd/md/emumba/EmumbaDeribitData.h" namespace bts::md { diff --git a/src/server/sparkd/md/emumba/EmumbaDeribitSubscription.h b/src/app_sparkd/sparkd/md/emumba/EmumbaDeribitSubscription.h similarity index 81% rename from src/server/sparkd/md/emumba/EmumbaDeribitSubscription.h rename to src/app_sparkd/sparkd/md/emumba/EmumbaDeribitSubscription.h index 133697e58..471ae0d57 100644 --- a/src/server/sparkd/md/emumba/EmumbaDeribitSubscription.h +++ b/src/app_sparkd/sparkd/md/emumba/EmumbaDeribitSubscription.h @@ -1,7 +1,7 @@ #pragma once -#include "lib/api/md/EmumbaDeribitMarketDataConfig.pb.h" -#include "lib/md/IMarketDataSource.h" +#include "spark/api/md/EmumbaDeribitMarketDataConfig.pb.h" +#include "spark/md/IMarketDataSource.h" #include diff --git a/src/server/sparkd/md/emumba/EmumbaMarketDataProvider.cpp b/src/app_sparkd/sparkd/md/emumba/EmumbaMarketDataProvider.cpp similarity index 83% rename from src/server/sparkd/md/emumba/EmumbaMarketDataProvider.cpp rename to src/app_sparkd/sparkd/md/emumba/EmumbaMarketDataProvider.cpp index 22d8bae61..f11ecbea6 100644 --- a/src/server/sparkd/md/emumba/EmumbaMarketDataProvider.cpp +++ b/src/app_sparkd/sparkd/md/emumba/EmumbaMarketDataProvider.cpp @@ -1,8 +1,8 @@ #include "EmumbaMarketDataProvider.h" -#include "lib/api/md/MarketDataConfig.pb.h" -#include "lib/api/md/MarketDataConfigUtils.h" -#include "lib/md/IMarketDataSource.h" -#include "server/sparkd/md/emumba/EmumbaDeribitSubscription.h" +#include "spark/api/md/MarketDataConfig.pb.h" +#include "spark/api/md/MarketDataConfigUtils.h" +#include "spark/md/IMarketDataSource.h" +#include "sparkd/md/emumba/EmumbaDeribitSubscription.h" #include #include diff --git a/src/server/sparkd/md/emumba/EmumbaMarketDataProvider.h b/src/app_sparkd/sparkd/md/emumba/EmumbaMarketDataProvider.h similarity index 84% rename from src/server/sparkd/md/emumba/EmumbaMarketDataProvider.h rename to src/app_sparkd/sparkd/md/emumba/EmumbaMarketDataProvider.h index b49f93fa2..fd34bf3bf 100644 --- a/src/server/sparkd/md/emumba/EmumbaMarketDataProvider.h +++ b/src/app_sparkd/sparkd/md/emumba/EmumbaMarketDataProvider.h @@ -1,7 +1,7 @@ #pragma once -#include "lib/api/md/MarketDataConfig.pb.h" -#include "lib/md/IMarketDataProvider.h" +#include "spark/api/md/MarketDataConfig.pb.h" +#include "spark/md/IMarketDataProvider.h" #include diff --git a/src/server/sparkd/md/ftx/FTXFuture.cpp b/src/app_sparkd/sparkd/md/ftx/FTXFuture.cpp similarity index 96% rename from src/server/sparkd/md/ftx/FTXFuture.cpp rename to src/app_sparkd/sparkd/md/ftx/FTXFuture.cpp index a2bad2f17..a6372c451 100644 --- a/src/server/sparkd/md/ftx/FTXFuture.cpp +++ b/src/app_sparkd/sparkd/md/ftx/FTXFuture.cpp @@ -1,11 +1,11 @@ #include "FTXFuture.h" -#include "lib/api/domain/Currency.pb.h" -#include "lib/api/domain/Venue.pb.h" -#include "lib/core/TableFormatter.h" -#include "lib/domain/FutureSecurity.h" -#include "lib/domain/Security.h" -#include "lib/io/JsonReader.h" -#include "lib/logging/logging.h" +#include "spark/api/domain/Currency.pb.h" +#include "spark/api/domain/Venue.pb.h" +#include "spark/core/TableFormatter.h" +#include "spark/domain/FutureSecurity.h" +#include "spark/domain/Security.h" +#include "spark/io/JsonReader.h" +#include "spark/logging/logging.h" #include #include diff --git a/src/server/sparkd/md/ftx/FTXFuture.h b/src/app_sparkd/sparkd/md/ftx/FTXFuture.h similarity index 94% rename from src/server/sparkd/md/ftx/FTXFuture.h rename to src/app_sparkd/sparkd/md/ftx/FTXFuture.h index 9c5531e52..22a21cdcc 100644 --- a/src/server/sparkd/md/ftx/FTXFuture.h +++ b/src/app_sparkd/sparkd/md/ftx/FTXFuture.h @@ -1,7 +1,7 @@ #pragma once -#include "lib/core/TimeStamp.h" -#include "server/sparkd/md/ftx/FTXSecurityType.h" +#include "spark/core/TimeStamp.h" +#include "sparkd/md/ftx/FTXSecurityType.h" #include #include diff --git a/src/server/sparkd/md/ftx/FTXHistoricalPriceAdaptor.cpp b/src/app_sparkd/sparkd/md/ftx/FTXHistoricalPriceAdaptor.cpp similarity index 90% rename from src/server/sparkd/md/ftx/FTXHistoricalPriceAdaptor.cpp rename to src/app_sparkd/sparkd/md/ftx/FTXHistoricalPriceAdaptor.cpp index c677a38ac..dc8621e9f 100644 --- a/src/server/sparkd/md/ftx/FTXHistoricalPriceAdaptor.cpp +++ b/src/app_sparkd/sparkd/md/ftx/FTXHistoricalPriceAdaptor.cpp @@ -1,7 +1,7 @@ #include "FTXHistoricalPriceAdaptor.h" -#include "lib/domain/SecurityMarketDataStatistics.h" -#include "lib/md/IMarketDataListener.h" -#include "server/sparkd/md/ftx/FTXHistoricalPriceRecord.h" +#include "spark/domain/SecurityMarketDataStatistics.h" +#include "spark/md/IMarketDataListener.h" +#include "sparkd/md/ftx/FTXHistoricalPriceRecord.h" #include #include diff --git a/src/server/sparkd/md/ftx/FTXHistoricalPriceAdaptor.h b/src/app_sparkd/sparkd/md/ftx/FTXHistoricalPriceAdaptor.h similarity index 86% rename from src/server/sparkd/md/ftx/FTXHistoricalPriceAdaptor.h rename to src/app_sparkd/sparkd/md/ftx/FTXHistoricalPriceAdaptor.h index 131c6a3df..553c15b4c 100644 --- a/src/server/sparkd/md/ftx/FTXHistoricalPriceAdaptor.h +++ b/src/app_sparkd/sparkd/md/ftx/FTXHistoricalPriceAdaptor.h @@ -1,7 +1,7 @@ #pragma once -#include "lib/domain/SecurityID.h" -#include "server/sparkd/md/ccapi/ICCApiMessageHandler.h" +#include "spark/domain/SecurityID.h" +#include "sparkd/md/ccapi/ICCApiMessageHandler.h" namespace bts::md { class IMarketDataListener; diff --git a/src/server/sparkd/md/ftx/FTXHistoricalPriceRecord.cpp b/src/app_sparkd/sparkd/md/ftx/FTXHistoricalPriceRecord.cpp similarity index 93% rename from src/server/sparkd/md/ftx/FTXHistoricalPriceRecord.cpp rename to src/app_sparkd/sparkd/md/ftx/FTXHistoricalPriceRecord.cpp index a3b44f273..a2473f252 100644 --- a/src/server/sparkd/md/ftx/FTXHistoricalPriceRecord.cpp +++ b/src/app_sparkd/sparkd/md/ftx/FTXHistoricalPriceRecord.cpp @@ -1,8 +1,8 @@ #include "FTXHistoricalPriceRecord.h" -#include "lib/domain/Price.h" -#include "lib/domain/SecurityMarketDataStatistics.h" -#include "lib/io/JsonReader.h" -#include "server/sparkd/md/ccapi/CCApiReader.h" +#include "spark/domain/Price.h" +#include "spark/domain/SecurityMarketDataStatistics.h" +#include "spark/io/JsonReader.h" +#include "sparkd/md/ccapi/CCApiReader.h" #include #include diff --git a/src/server/sparkd/md/ftx/FTXHistoricalPriceRecord.h b/src/app_sparkd/sparkd/md/ftx/FTXHistoricalPriceRecord.h similarity index 91% rename from src/server/sparkd/md/ftx/FTXHistoricalPriceRecord.h rename to src/app_sparkd/sparkd/md/ftx/FTXHistoricalPriceRecord.h index f2c42cd43..7dcf3e8ed 100644 --- a/src/server/sparkd/md/ftx/FTXHistoricalPriceRecord.h +++ b/src/app_sparkd/sparkd/md/ftx/FTXHistoricalPriceRecord.h @@ -1,7 +1,7 @@ #pragma once -#include "lib/core/TimeStamp.h" -#include "lib/domain/SecurityID.h" +#include "spark/core/TimeStamp.h" +#include "spark/domain/SecurityID.h" #include diff --git a/src/server/sparkd/md/ftx/FTXMarket.cpp b/src/app_sparkd/sparkd/md/ftx/FTXMarket.cpp similarity index 96% rename from src/server/sparkd/md/ftx/FTXMarket.cpp rename to src/app_sparkd/sparkd/md/ftx/FTXMarket.cpp index 60e4ccb94..48ec4374b 100644 --- a/src/server/sparkd/md/ftx/FTXMarket.cpp +++ b/src/app_sparkd/sparkd/md/ftx/FTXMarket.cpp @@ -1,12 +1,12 @@ #include "FTXMarket.h" -#include "lib/api/domain/Venue.pb.h" -#include "lib/core/NaN.h" -#include "lib/core/TableFormatter.h" -#include "lib/domain/Security.h" -#include "lib/io/JsonReader.h" -#include "lib/logging/logging.h" -#include "lib/utils/bts_fatal.h" -#include "server/sparkd/md/ftx/FTXSecurityType.h" +#include "spark/api/domain/Venue.pb.h" +#include "spark/core/NaN.h" +#include "spark/core/TableFormatter.h" +#include "spark/domain/Security.h" +#include "spark/io/JsonReader.h" +#include "spark/logging/logging.h" +#include "spark/utils/bts_fatal.h" +#include "sparkd/md/ftx/FTXSecurityType.h" #include #include diff --git a/src/server/sparkd/md/ftx/FTXMarket.h b/src/app_sparkd/sparkd/md/ftx/FTXMarket.h similarity index 95% rename from src/server/sparkd/md/ftx/FTXMarket.h rename to src/app_sparkd/sparkd/md/ftx/FTXMarket.h index f0a23c6e6..3f3220302 100644 --- a/src/server/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/server/sparkd/md/ftx/FTXMessageType.h b/src/app_sparkd/sparkd/md/ftx/FTXMessageType.h similarity index 94% rename from src/server/sparkd/md/ftx/FTXMessageType.h rename to src/app_sparkd/sparkd/md/ftx/FTXMessageType.h index bde5119c2..bea5250e1 100644 --- a/src/server/sparkd/md/ftx/FTXMessageType.h +++ b/src/app_sparkd/sparkd/md/ftx/FTXMessageType.h @@ -1,7 +1,7 @@ #pragma once -#include "lib/core/EnumMacros.h" -#include "lib/core/FMT_IMPL.h" +#include "spark/core/EnumMacros.h" +#include "spark/core/FMT_IMPL.h" #include #include diff --git a/src/server/sparkd/md/ftx/FTXSecurityRequestor.cpp b/src/app_sparkd/sparkd/md/ftx/FTXSecurityRequestor.cpp similarity index 93% rename from src/server/sparkd/md/ftx/FTXSecurityRequestor.cpp rename to src/app_sparkd/sparkd/md/ftx/FTXSecurityRequestor.cpp index a6a932950..4e174dd21 100644 --- a/src/server/sparkd/md/ftx/FTXSecurityRequestor.cpp +++ b/src/app_sparkd/sparkd/md/ftx/FTXSecurityRequestor.cpp @@ -1,19 +1,19 @@ #include "FTXSecurityRequestor.h" -#include "lib/api/domain/SecurityType.pb.h" -#include "lib/api/domain/Venue.pb.h" -#include "lib/collections/Contains.h" -#include "lib/collections/Remove.h" -#include "lib/domain/Security.h" -#include "lib/domain/SecurityCriteria.h" -#include "lib/logging/logging.h" -#include "lib/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 "spark/api/domain/SecurityType.pb.h" +#include "spark/api/domain/Venue.pb.h" +#include "spark/collections/Contains.h" +#include "spark/collections/Remove.h" +#include "spark/domain/Security.h" +#include "spark/domain/SecurityCriteria.h" +#include "spark/logging/logging.h" +#include "spark/persistence/IDGenerator.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/server/sparkd/md/ftx/FTXSecurityRequestor.h b/src/app_sparkd/sparkd/md/ftx/FTXSecurityRequestor.h similarity index 97% rename from src/server/sparkd/md/ftx/FTXSecurityRequestor.h rename to src/app_sparkd/sparkd/md/ftx/FTXSecurityRequestor.h index 3afd33bce..148507bbe 100644 --- a/src/server/sparkd/md/ftx/FTXSecurityRequestor.h +++ b/src/app_sparkd/sparkd/md/ftx/FTXSecurityRequestor.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/utils/Delegate.h" +#include "spark/utils/Delegate.h" #include #include diff --git a/src/server/sparkd/md/ftx/FTXSecurityType.h b/src/app_sparkd/sparkd/md/ftx/FTXSecurityType.h similarity index 94% rename from src/server/sparkd/md/ftx/FTXSecurityType.h rename to src/app_sparkd/sparkd/md/ftx/FTXSecurityType.h index ecfb82fd6..e60394671 100644 --- a/src/server/sparkd/md/ftx/FTXSecurityType.h +++ b/src/app_sparkd/sparkd/md/ftx/FTXSecurityType.h @@ -1,8 +1,8 @@ #pragma once -#include "lib/api/domain/SecurityType.pb.h" -#include "lib/core/EnumMacros.h" -#include "lib/core/FMT_IMPL.h" +#include "spark/api/domain/SecurityType.pb.h" +#include "spark/core/EnumMacros.h" +#include "spark/core/FMT_IMPL.h" #include diff --git a/src/server/sparkd/md/ftx/FTXSubscription.cpp b/src/app_sparkd/sparkd/md/ftx/FTXSubscription.cpp similarity index 91% rename from src/server/sparkd/md/ftx/FTXSubscription.cpp rename to src/app_sparkd/sparkd/md/ftx/FTXSubscription.cpp index 0a29419dc..9c60f64aa 100644 --- a/src/server/sparkd/md/ftx/FTXSubscription.cpp +++ b/src/app_sparkd/sparkd/md/ftx/FTXSubscription.cpp @@ -1,21 +1,21 @@ #include "FTXSubscription.h" -#include "lib/api/domain/Venue.pb.h" -#include "lib/api/md/FTXMarketDataConfig.pb.h" -#include "lib/domain/Security.h" -#include "lib/domain/SecurityCriteria.h" -#include "lib/io/ProtoPrinter.h" -#include "lib/logging/logging.h" -#include "lib/md/IMarketDataListener.h" -#include "lib/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 "spark/api/domain/Venue.pb.h" +#include "spark/api/md/FTXMarketDataConfig.pb.h" +#include "spark/domain/Security.h" +#include "spark/domain/SecurityCriteria.h" +#include "spark/io/ProtoPrinter.h" +#include "spark/logging/logging.h" +#include "spark/md/IMarketDataListener.h" +#include "spark/persistence/IDGenerator.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/server/sparkd/md/ftx/FTXSubscription.h b/src/app_sparkd/sparkd/md/ftx/FTXSubscription.h similarity index 96% rename from src/server/sparkd/md/ftx/FTXSubscription.h rename to src/app_sparkd/sparkd/md/ftx/FTXSubscription.h index 88a0b03e8..11dfcebe9 100644 --- a/src/server/sparkd/md/ftx/FTXSubscription.h +++ b/src/app_sparkd/sparkd/md/ftx/FTXSubscription.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/md/IMarketDataSource.h" +#include "spark/md/IMarketDataSource.h" #include diff --git a/src/server/sparkd/md/glbx/DatabentoGlbxSubscription.cpp b/src/app_sparkd/sparkd/md/glbx/DatabentoGlbxSubscription.cpp similarity index 85% rename from src/server/sparkd/md/glbx/DatabentoGlbxSubscription.cpp rename to src/app_sparkd/sparkd/md/glbx/DatabentoGlbxSubscription.cpp index b18818b98..7bf905ad9 100644 --- a/src/server/sparkd/md/glbx/DatabentoGlbxSubscription.cpp +++ b/src/app_sparkd/sparkd/md/glbx/DatabentoGlbxSubscription.cpp @@ -1,8 +1,8 @@ #include "DatabentoGlbxSubscription.h" -#include "lib/api/md/GlbxMarketDataConfig.pb.h" -#include "lib/utils/thread_manager.h" -#include "server/sparkd/md/databento/DatabentoDataHandler.h" -#include "server/sparkd/md/glbx/GlbxMarketDataHandler.h" +#include "spark/api/md/GlbxMarketDataConfig.pb.h" +#include "spark/utils/thread_manager.h" +#include "sparkd/md/databento/DatabentoDataHandler.h" +#include "sparkd/md/glbx/GlbxMarketDataHandler.h" namespace bts::md { diff --git a/src/server/sparkd/md/glbx/DatabentoGlbxSubscription.h b/src/app_sparkd/sparkd/md/glbx/DatabentoGlbxSubscription.h similarity index 96% rename from src/server/sparkd/md/glbx/DatabentoGlbxSubscription.h rename to src/app_sparkd/sparkd/md/glbx/DatabentoGlbxSubscription.h index b28755418..f50cebc0a 100644 --- a/src/server/sparkd/md/glbx/DatabentoGlbxSubscription.h +++ b/src/app_sparkd/sparkd/md/glbx/DatabentoGlbxSubscription.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/md/IMarketDataSource.h" +#include "spark/md/IMarketDataSource.h" #include diff --git a/src/server/sparkd/md/glbx/GlbxMarketDataHandler.cpp b/src/app_sparkd/sparkd/md/glbx/GlbxMarketDataHandler.cpp similarity index 79% rename from src/server/sparkd/md/glbx/GlbxMarketDataHandler.cpp rename to src/app_sparkd/sparkd/md/glbx/GlbxMarketDataHandler.cpp index d89d0d183..b75721f2a 100644 --- a/src/server/sparkd/md/glbx/GlbxMarketDataHandler.cpp +++ b/src/app_sparkd/sparkd/md/glbx/GlbxMarketDataHandler.cpp @@ -1,16 +1,18 @@ #include "GlbxMarketDataHandler.h" -#include "lib/api/domain/Venue.pb.h" -#include "lib/api/md/GlbxMarketDataConfig.pb.h" -#include "lib/config/config.h" -#include "lib/config/protos/system_config.pb.h" -#include "lib/utils/bts_assert.h" -#include "server/sparkd/md/databento/DatabentoDataHandler.h" +#include "spark/api/domain/Venue.pb.h" +#include "spark/api/md/GlbxMarketDataConfig.pb.h" +#include "spark/config/config.h" +#include "spark/config/protos/system_config.pb.h" +#include "spark/utils/bts_assert.h" +#include "sparkd/md/databento/DatabentoDataHandler.h" + #include #include #include #include #include #include + namespace bts::api::md::glbx { void GlbxMarketDatahandler::run( @@ -34,4 +36,4 @@ void GlbxMarketDatahandler::run( config.databento_settings().filter_securities_upto_n_months()); } -} // namespace bts::api::md::glbx \ No newline at end of file +} // namespace bts::api::md::glbx diff --git a/src/server/sparkd/md/glbx/GlbxMarketDataHandler.h b/src/app_sparkd/sparkd/md/glbx/GlbxMarketDataHandler.h similarity index 62% rename from src/server/sparkd/md/glbx/GlbxMarketDataHandler.h rename to src/app_sparkd/sparkd/md/glbx/GlbxMarketDataHandler.h index 7516dc69d..2267b1cc1 100644 --- a/src/server/sparkd/md/glbx/GlbxMarketDataHandler.h +++ b/src/app_sparkd/sparkd/md/glbx/GlbxMarketDataHandler.h @@ -1,7 +1,9 @@ #pragma once -#include "lib/api/md/GlbxMarketDataConfig.pb.h" -#include "lib/md/IMarketDataListener.h" -#include "lib/persistence/IDGenerator.h" + +#include "spark/api/md/GlbxMarketDataConfig.pb.h" +#include "spark/md/IMarketDataListener.h" +#include "spark/persistence/IDGenerator.h" + namespace bts::api::md::glbx { class GlbxMarketDatahandler { public: @@ -10,4 +12,4 @@ class GlbxMarketDatahandler { std::shared_ptr sec_id_store, const GlbxMarketDataConfig& config); }; -} // namespace bts::md::glbx \ No newline at end of file +} // namespace bts::md::glbx diff --git a/src/server/sparkd/md/glbx/OnixsGlbxSubscription.cpp b/src/app_sparkd/sparkd/md/glbx/OnixsGlbxSubscription.cpp similarity index 89% rename from src/server/sparkd/md/glbx/OnixsGlbxSubscription.cpp rename to src/app_sparkd/sparkd/md/glbx/OnixsGlbxSubscription.cpp index 0f69ed0c1..577bedc40 100644 --- a/src/server/sparkd/md/glbx/OnixsGlbxSubscription.cpp +++ b/src/app_sparkd/sparkd/md/glbx/OnixsGlbxSubscription.cpp @@ -1,14 +1,14 @@ #include "OnixsGlbxSubscription.h" -#include "lib/api/md/GlbxMarketDataConfig.pb.h" -#include "lib/core/LOCK_GUARD.h" -#include "lib/logging/logging.h" -#include "lib/md/IMarketDataListener.h" -#include "lib/md/SymbolLoader.h" -#include "lib/os/os.h" -#include "lib/persistence/IDGenerator.h" -#include "lib/utils/Dispatcher.h" -#include "server/sparkd/md/platforms/IMDPlatform.h" -#include "server/sparkd/md/platforms/mdp3_onixs/MDP3Main.h" +#include "spark/api/md/GlbxMarketDataConfig.pb.h" +#include "spark/core/LOCK_GUARD.h" +#include "spark/logging/logging.h" +#include "spark/md/IMarketDataListener.h" +#include "spark/md/SymbolLoader.h" +#include "spark/os/os.h" +#include "spark/persistence/IDGenerator.h" +#include "spark/utils/Dispatcher.h" +#include "sparkd/md/platforms/IMDPlatform.h" +#include "sparkd/md/platforms/mdp3_onixs/MDP3Main.h" #include #include diff --git a/src/server/sparkd/md/glbx/OnixsGlbxSubscription.h b/src/app_sparkd/sparkd/md/glbx/OnixsGlbxSubscription.h similarity index 96% rename from src/server/sparkd/md/glbx/OnixsGlbxSubscription.h rename to src/app_sparkd/sparkd/md/glbx/OnixsGlbxSubscription.h index 70e6a8e3f..cee4ecf24 100644 --- a/src/server/sparkd/md/glbx/OnixsGlbxSubscription.h +++ b/src/app_sparkd/sparkd/md/glbx/OnixsGlbxSubscription.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/md/IMarketDataSource.h" +#include "spark/md/IMarketDataSource.h" #include diff --git a/src/server/sparkd/md/listeners/LiveLadderPrinter.cpp b/src/app_sparkd/sparkd/md/listeners/LiveLadderPrinter.cpp similarity index 98% rename from src/server/sparkd/md/listeners/LiveLadderPrinter.cpp rename to src/app_sparkd/sparkd/md/listeners/LiveLadderPrinter.cpp index e6d4a5201..88ebc9e5c 100644 --- a/src/server/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/server/sparkd/md/listeners/LiveLadderPrinter.h b/src/app_sparkd/sparkd/md/listeners/LiveLadderPrinter.h similarity index 87% rename from src/server/sparkd/md/listeners/LiveLadderPrinter.h rename to src/app_sparkd/sparkd/md/listeners/LiveLadderPrinter.h index 27b3e8569..2a54938f6 100644 --- a/src/server/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/server/sparkd/md/okx/OkxChannel.h b/src/app_sparkd/sparkd/md/okx/OkxChannel.h similarity index 94% rename from src/server/sparkd/md/okx/OkxChannel.h rename to src/app_sparkd/sparkd/md/okx/OkxChannel.h index 51c47633c..ad3be1486 100644 --- a/src/server/sparkd/md/okx/OkxChannel.h +++ b/src/app_sparkd/sparkd/md/okx/OkxChannel.h @@ -1,9 +1,9 @@ #pragma once -#include "lib/collections/HASH_IMPL.h" -#include "lib/core/FMT_IMPL.h" -#include "lib/io/JsonOptional.h" -#include "server/sparkd/md/okx/OkxInstrumentType.h" +#include "spark/collections/HASH_IMPL.h" +#include "spark/core/FMT_IMPL.h" +#include "spark/io/JsonOptional.h" +#include "sparkd/md/okx/OkxInstrumentType.h" #include #include diff --git a/src/server/sparkd/md/okx/OkxChannelDemuxer.cpp b/src/app_sparkd/sparkd/md/okx/OkxChannelDemuxer.cpp similarity index 95% rename from src/server/sparkd/md/okx/OkxChannelDemuxer.cpp rename to src/app_sparkd/sparkd/md/okx/OkxChannelDemuxer.cpp index 896ed46ab..59def83f1 100644 --- a/src/server/sparkd/md/okx/OkxChannelDemuxer.cpp +++ b/src/app_sparkd/sparkd/md/okx/OkxChannelDemuxer.cpp @@ -1,9 +1,9 @@ #include "OkxChannelDemuxer.h" -#include "lib/api/domain/Venue.h" -#include "lib/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 "spark/api/domain/Venue.h" +#include "spark/io/JsonReader.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/server/sparkd/md/okx/OkxChannelDemuxer.h b/src/app_sparkd/sparkd/md/okx/OkxChannelDemuxer.h similarity index 91% rename from src/server/sparkd/md/okx/OkxChannelDemuxer.h rename to src/app_sparkd/sparkd/md/okx/OkxChannelDemuxer.h index 2b460f829..052df0390 100644 --- a/src/server/sparkd/md/okx/OkxChannelDemuxer.h +++ b/src/app_sparkd/sparkd/md/okx/OkxChannelDemuxer.h @@ -1,8 +1,8 @@ #pragma once -#include "lib/utils/Delegate.h" -#include "server/sparkd/md/ccapi/CCApiCorrelationID.h" -#include "server/sparkd/md/ccapi/ICCApiMessageHandler.h" +#include "spark/utils/Delegate.h" +#include "sparkd/md/ccapi/CCApiCorrelationID.h" +#include "sparkd/md/ccapi/ICCApiMessageHandler.h" #include diff --git a/src/server/sparkd/md/okx/OkxDepthAdaptor.cpp b/src/app_sparkd/sparkd/md/okx/OkxDepthAdaptor.cpp similarity index 90% rename from src/server/sparkd/md/okx/OkxDepthAdaptor.cpp rename to src/app_sparkd/sparkd/md/okx/OkxDepthAdaptor.cpp index 9f416c84c..9ea5d4ce0 100644 --- a/src/server/sparkd/md/okx/OkxDepthAdaptor.cpp +++ b/src/app_sparkd/sparkd/md/okx/OkxDepthAdaptor.cpp @@ -1,11 +1,11 @@ #include "OkxDepthAdaptor.h" -#include "lib/domain/Book.h" -#include "lib/domain/BookLevelComp.h" -#include "lib/domain/SecurityID.h" -#include "lib/io/JsonReader.h" -#include "lib/logging/logging.h" -#include "lib/md/IMarketDataListener.h" -#include "server/sparkd/md/ccapi/CCApiCorrelationID.h" +#include "spark/domain/Book.h" +#include "spark/domain/BookLevelComp.h" +#include "spark/domain/SecurityID.h" +#include "spark/io/JsonReader.h" +#include "spark/logging/logging.h" +#include "spark/md/IMarketDataListener.h" +#include "sparkd/md/ccapi/CCApiCorrelationID.h" #include #include diff --git a/src/server/sparkd/md/okx/OkxDepthAdaptor.h b/src/app_sparkd/sparkd/md/okx/OkxDepthAdaptor.h similarity index 95% rename from src/server/sparkd/md/okx/OkxDepthAdaptor.h rename to src/app_sparkd/sparkd/md/okx/OkxDepthAdaptor.h index 4214537e6..526db41a0 100644 --- a/src/server/sparkd/md/okx/OkxDepthAdaptor.h +++ b/src/app_sparkd/sparkd/md/okx/OkxDepthAdaptor.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/domain/SecurityID.h" +#include "spark/domain/SecurityID.h" #include #include diff --git a/src/server/sparkd/md/okx/OkxInstrument.cpp b/src/app_sparkd/sparkd/md/okx/OkxInstrument.cpp similarity index 98% rename from src/server/sparkd/md/okx/OkxInstrument.cpp rename to src/app_sparkd/sparkd/md/okx/OkxInstrument.cpp index 38271b7d6..0d19efb7b 100644 --- a/src/server/sparkd/md/okx/OkxInstrument.cpp +++ b/src/app_sparkd/sparkd/md/okx/OkxInstrument.cpp @@ -1,5 +1,5 @@ #include "OkxInstrument.h" -#include "lib/io/JsonReader.h" +#include "spark/io/JsonReader.h" namespace bts::md::okx { diff --git a/src/server/sparkd/md/okx/OkxInstrument.h b/src/app_sparkd/sparkd/md/okx/OkxInstrument.h similarity index 91% rename from src/server/sparkd/md/okx/OkxInstrument.h rename to src/app_sparkd/sparkd/md/okx/OkxInstrument.h index a2484da82..a1a9fb056 100644 --- a/src/server/sparkd/md/okx/OkxInstrument.h +++ b/src/app_sparkd/sparkd/md/okx/OkxInstrument.h @@ -1,8 +1,8 @@ #pragma once -#include "lib/core/TimeStamp.h" -#include "server/sparkd/md/okx/OkxInstrumentStatus.h" -#include "server/sparkd/md/okx/OkxInstrumentType.h" +#include "spark/core/TimeStamp.h" +#include "sparkd/md/okx/OkxInstrumentStatus.h" +#include "sparkd/md/okx/OkxInstrumentType.h" #include #include diff --git a/src/server/sparkd/md/okx/OkxInstrumentStatus.h b/src/app_sparkd/sparkd/md/okx/OkxInstrumentStatus.h similarity index 93% rename from src/server/sparkd/md/okx/OkxInstrumentStatus.h rename to src/app_sparkd/sparkd/md/okx/OkxInstrumentStatus.h index bb1829932..16b760216 100644 --- a/src/server/sparkd/md/okx/OkxInstrumentStatus.h +++ b/src/app_sparkd/sparkd/md/okx/OkxInstrumentStatus.h @@ -1,8 +1,8 @@ #pragma once -#include "lib/algorithm/StringCaseConverter.h" -#include "lib/core/EnumMacros.h" -#include "lib/core/FMT_IMPL.h" +#include "spark/algorithm/StringCaseConverter.h" +#include "spark/core/EnumMacros.h" +#include "spark/core/FMT_IMPL.h" #include #include diff --git a/src/server/sparkd/md/okx/OkxInstrumentStore.cpp b/src/app_sparkd/sparkd/md/okx/OkxInstrumentStore.cpp similarity index 93% rename from src/server/sparkd/md/okx/OkxInstrumentStore.cpp rename to src/app_sparkd/sparkd/md/okx/OkxInstrumentStore.cpp index 1b324af67..60ab30cb6 100644 --- a/src/server/sparkd/md/okx/OkxInstrumentStore.cpp +++ b/src/app_sparkd/sparkd/md/okx/OkxInstrumentStore.cpp @@ -1,14 +1,14 @@ #include "OkxInstrumentStore.h" -#include "lib/api/domain/SecurityType.h" -#include "lib/core/TimeStamp.h" -#include "lib/domain/Security.h" -#include "lib/domain_model/Security.pb.h" -#include "lib/logging/Common.h" -#include "lib/logging/logging.h" -#include "lib/persistence/IDGenerator.h" -#include "lib/utils/bts_fatal.h" -#include "server/sparkd/md/okx/OkxInstrument.h" -#include "server/sparkd/md/okx/OkxInstrumentType.h" +#include "spark/api/domain/SecurityType.h" +#include "spark/core/TimeStamp.h" +#include "spark/domain/Security.h" +#include "spark/domain_model/Security.pb.h" +#include "spark/logging/Common.h" +#include "spark/logging/logging.h" +#include "spark/persistence/IDGenerator.h" +#include "spark/utils/bts_fatal.h" +#include "sparkd/md/okx/OkxInstrument.h" +#include "sparkd/md/okx/OkxInstrumentType.h" #include #include diff --git a/src/server/sparkd/md/okx/OkxInstrumentStore.h b/src/app_sparkd/sparkd/md/okx/OkxInstrumentStore.h similarity index 92% rename from src/server/sparkd/md/okx/OkxInstrumentStore.h rename to src/app_sparkd/sparkd/md/okx/OkxInstrumentStore.h index 00a19be78..c3dbd13fc 100644 --- a/src/server/sparkd/md/okx/OkxInstrumentStore.h +++ b/src/app_sparkd/sparkd/md/okx/OkxInstrumentStore.h @@ -1,8 +1,8 @@ #pragma once -#include "lib/domain/Security.h" -#include "lib/domain/SecurityID.h" -#include "lib/persistence/IDGenerator.h" +#include "spark/domain/Security.h" +#include "spark/domain/SecurityID.h" +#include "spark/persistence/IDGenerator.h" #include #include diff --git a/src/server/sparkd/md/okx/OkxInstrumentType.h b/src/app_sparkd/sparkd/md/okx/OkxInstrumentType.h similarity index 95% rename from src/server/sparkd/md/okx/OkxInstrumentType.h rename to src/app_sparkd/sparkd/md/okx/OkxInstrumentType.h index 672550d23..4da64e8d5 100644 --- a/src/server/sparkd/md/okx/OkxInstrumentType.h +++ b/src/app_sparkd/sparkd/md/okx/OkxInstrumentType.h @@ -1,7 +1,7 @@ #pragma once -#include "lib/core/EnumMacros.h" -#include "lib/core/FMT_IMPL.h" +#include "spark/core/EnumMacros.h" +#include "spark/core/FMT_IMPL.h" #include #include diff --git a/src/server/sparkd/md/okx/OkxMessageType.h b/src/app_sparkd/sparkd/md/okx/OkxMessageType.h similarity index 95% rename from src/server/sparkd/md/okx/OkxMessageType.h rename to src/app_sparkd/sparkd/md/okx/OkxMessageType.h index 2bf02a730..2af1f9bf7 100644 --- a/src/server/sparkd/md/okx/OkxMessageType.h +++ b/src/app_sparkd/sparkd/md/okx/OkxMessageType.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/core/EnumMacros.h" +#include "spark/core/EnumMacros.h" #include #include diff --git a/src/server/sparkd/md/okx/OkxRequest.h b/src/app_sparkd/sparkd/md/okx/OkxRequest.h similarity index 90% rename from src/server/sparkd/md/okx/OkxRequest.h rename to src/app_sparkd/sparkd/md/okx/OkxRequest.h index 32b84342d..c0835cfeb 100644 --- a/src/server/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/server/sparkd/md/okx/OkxResponse.h b/src/app_sparkd/sparkd/md/okx/OkxResponse.h similarity index 96% rename from src/server/sparkd/md/okx/OkxResponse.h rename to src/app_sparkd/sparkd/md/okx/OkxResponse.h index 9028af6e8..0fb44d517 100644 --- a/src/server/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/server/sparkd/md/okx/OkxSecuritySubscription.cpp b/src/app_sparkd/sparkd/md/okx/OkxSecuritySubscription.cpp similarity index 93% rename from src/server/sparkd/md/okx/OkxSecuritySubscription.cpp rename to src/app_sparkd/sparkd/md/okx/OkxSecuritySubscription.cpp index 47bfd6800..bc455611e 100644 --- a/src/server/sparkd/md/okx/OkxSecuritySubscription.cpp +++ b/src/app_sparkd/sparkd/md/okx/OkxSecuritySubscription.cpp @@ -1,21 +1,21 @@ #include "OkxSecuritySubscription.h" -#include "lib/collections/Contains.h" -#include "lib/collections/Remove.h" -#include "lib/domain/SecurityCriteria.h" -#include "lib/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 "spark/collections/Contains.h" +#include "spark/collections/Remove.h" +#include "spark/domain/SecurityCriteria.h" +#include "spark/io/JsonReader.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/server/sparkd/md/okx/OkxSecuritySubscription.h b/src/app_sparkd/sparkd/md/okx/OkxSecuritySubscription.h similarity index 100% rename from src/server/sparkd/md/okx/OkxSecuritySubscription.h rename to src/app_sparkd/sparkd/md/okx/OkxSecuritySubscription.h diff --git a/src/server/sparkd/md/okx/OkxSide.h b/src/app_sparkd/sparkd/md/okx/OkxSide.h similarity index 93% rename from src/server/sparkd/md/okx/OkxSide.h rename to src/app_sparkd/sparkd/md/okx/OkxSide.h index 5da4c0348..59e894ae3 100644 --- a/src/server/sparkd/md/okx/OkxSide.h +++ b/src/app_sparkd/sparkd/md/okx/OkxSide.h @@ -1,9 +1,9 @@ #pragma once -#include "lib/core/EnumMacros.h" -#include "lib/core/FMT_IMPL.h" -#include "lib/domain/AggressorSide.h" -#include "lib/domain/Side.h" +#include "spark/core/EnumMacros.h" +#include "spark/core/FMT_IMPL.h" +#include "spark/domain/AggressorSide.h" +#include "spark/domain/Side.h" #include #include diff --git a/src/server/sparkd/md/okx/OkxSubscription.cpp b/src/app_sparkd/sparkd/md/okx/OkxSubscription.cpp similarity index 91% rename from src/server/sparkd/md/okx/OkxSubscription.cpp rename to src/app_sparkd/sparkd/md/okx/OkxSubscription.cpp index bcd1e5edf..9ef99c589 100644 --- a/src/server/sparkd/md/okx/OkxSubscription.cpp +++ b/src/app_sparkd/sparkd/md/okx/OkxSubscription.cpp @@ -1,25 +1,25 @@ #include "OkxSubscription.h" -#include "lib/api/domain/Venue.pb.h" -#include "lib/api/md/OkxMarketDataConfig.pb.h" -#include "lib/collections/Chunk.h" -#include "lib/collections/Contains.h" -#include "lib/collections/Transform.h" -#include "lib/core/FMT.h" -#include "lib/domain/Security.h" -#include "lib/domain/SecurityCriteria.h" -#include "lib/io/ProtoPrinter.h" -#include "lib/logging/logging.h" -#include "lib/md/IMarketDataListener.h" -#include "lib/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 "spark/api/domain/Venue.pb.h" +#include "spark/api/md/OkxMarketDataConfig.pb.h" +#include "spark/collections/Chunk.h" +#include "spark/collections/Contains.h" +#include "spark/collections/Transform.h" +#include "spark/core/FMT.h" +#include "spark/domain/Security.h" +#include "spark/domain/SecurityCriteria.h" +#include "spark/io/ProtoPrinter.h" +#include "spark/logging/logging.h" +#include "spark/md/IMarketDataListener.h" +#include "spark/persistence/IDGenerator.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/server/sparkd/md/okx/OkxSubscription.h b/src/app_sparkd/sparkd/md/okx/OkxSubscription.h similarity index 96% rename from src/server/sparkd/md/okx/OkxSubscription.h rename to src/app_sparkd/sparkd/md/okx/OkxSubscription.h index 9842b3f8c..83795da50 100644 --- a/src/server/sparkd/md/okx/OkxSubscription.h +++ b/src/app_sparkd/sparkd/md/okx/OkxSubscription.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/md/IMarketDataSource.h" +#include "spark/md/IMarketDataSource.h" #include diff --git a/src/server/sparkd/md/okx/OkxTicker.cpp b/src/app_sparkd/sparkd/md/okx/OkxTicker.cpp similarity index 98% rename from src/server/sparkd/md/okx/OkxTicker.cpp rename to src/app_sparkd/sparkd/md/okx/OkxTicker.cpp index 026df0583..e1f73da6d 100644 --- a/src/server/sparkd/md/okx/OkxTicker.cpp +++ b/src/app_sparkd/sparkd/md/okx/OkxTicker.cpp @@ -1,5 +1,5 @@ #include "OkxTicker.h" -#include "lib/io/JsonReader.h" +#include "spark/io/JsonReader.h" #include diff --git a/src/server/sparkd/md/okx/OkxTicker.h b/src/app_sparkd/sparkd/md/okx/OkxTicker.h similarity index 85% rename from src/server/sparkd/md/okx/OkxTicker.h rename to src/app_sparkd/sparkd/md/okx/OkxTicker.h index b613396c7..581d2af78 100644 --- a/src/server/sparkd/md/okx/OkxTicker.h +++ b/src/app_sparkd/sparkd/md/okx/OkxTicker.h @@ -1,9 +1,9 @@ #pragma once -#include "lib/core/TimeStamp.h" -#include "lib/domain/Price.h" -#include "lib/domain/Quantity.h" -#include "server/sparkd/md/okx/OkxInstrumentType.h" +#include "spark/core/TimeStamp.h" +#include "spark/domain/Price.h" +#include "spark/domain/Quantity.h" +#include "sparkd/md/okx/OkxInstrumentType.h" #include #include diff --git a/src/server/sparkd/md/okx/OkxTickerAdaptor.cpp b/src/app_sparkd/sparkd/md/okx/OkxTickerAdaptor.cpp similarity index 88% rename from src/server/sparkd/md/okx/OkxTickerAdaptor.cpp rename to src/app_sparkd/sparkd/md/okx/OkxTickerAdaptor.cpp index 107906956..7fd3dc318 100644 --- a/src/server/sparkd/md/okx/OkxTickerAdaptor.cpp +++ b/src/app_sparkd/sparkd/md/okx/OkxTickerAdaptor.cpp @@ -1,11 +1,11 @@ #include "OkxTickerAdaptor.h" -#include "lib/domain/Price.h" -#include "lib/domain/SecurityID.h" -#include "lib/domain/SecurityMarketDataStatistics.h" -#include "lib/io/JsonReader.h" -#include "lib/md/IMarketDataListener.h" -#include "server/sparkd/md/ccapi/CCApiCorrelationID.h" -#include "server/sparkd/md/okx/OkxTicker.h" +#include "spark/domain/Price.h" +#include "spark/domain/SecurityID.h" +#include "spark/domain/SecurityMarketDataStatistics.h" +#include "spark/io/JsonReader.h" +#include "spark/md/IMarketDataListener.h" +#include "sparkd/md/ccapi/CCApiCorrelationID.h" +#include "sparkd/md/okx/OkxTicker.h" #include #include diff --git a/src/server/sparkd/md/okx/OkxTickerAdaptor.h b/src/app_sparkd/sparkd/md/okx/OkxTickerAdaptor.h similarity index 95% rename from src/server/sparkd/md/okx/OkxTickerAdaptor.h rename to src/app_sparkd/sparkd/md/okx/OkxTickerAdaptor.h index 63ca308b3..22896213c 100644 --- a/src/server/sparkd/md/okx/OkxTickerAdaptor.h +++ b/src/app_sparkd/sparkd/md/okx/OkxTickerAdaptor.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/domain/SecurityID.h" +#include "spark/domain/SecurityID.h" #include #include diff --git a/src/server/sparkd/md/okx/OkxTrade.cpp b/src/app_sparkd/sparkd/md/okx/OkxTrade.cpp similarity index 95% rename from src/server/sparkd/md/okx/OkxTrade.cpp rename to src/app_sparkd/sparkd/md/okx/OkxTrade.cpp index ca70f2dc6..367ea89f6 100644 --- a/src/server/sparkd/md/okx/OkxTrade.cpp +++ b/src/app_sparkd/sparkd/md/okx/OkxTrade.cpp @@ -1,5 +1,5 @@ #include "OkxTrade.h" -#include "lib/io/JsonReader.h" +#include "spark/io/JsonReader.h" #include diff --git a/src/server/sparkd/md/okx/OkxTrade.h b/src/app_sparkd/sparkd/md/okx/OkxTrade.h similarity index 80% rename from src/server/sparkd/md/okx/OkxTrade.h rename to src/app_sparkd/sparkd/md/okx/OkxTrade.h index d70d62108..52cd11881 100644 --- a/src/server/sparkd/md/okx/OkxTrade.h +++ b/src/app_sparkd/sparkd/md/okx/OkxTrade.h @@ -1,9 +1,9 @@ #pragma once -#include "lib/core/TimeStamp.h" -#include "lib/domain/Price.h" -#include "lib/domain/Quantity.h" -#include "server/sparkd/md/okx/OkxSide.h" +#include "spark/core/TimeStamp.h" +#include "spark/domain/Price.h" +#include "spark/domain/Quantity.h" +#include "sparkd/md/okx/OkxSide.h" #include #include diff --git a/src/server/sparkd/md/okx/OkxTradeAdaptor.cpp b/src/app_sparkd/sparkd/md/okx/OkxTradeAdaptor.cpp similarity index 88% rename from src/server/sparkd/md/okx/OkxTradeAdaptor.cpp rename to src/app_sparkd/sparkd/md/okx/OkxTradeAdaptor.cpp index 4d43190e5..895e5db08 100644 --- a/src/server/sparkd/md/okx/OkxTradeAdaptor.cpp +++ b/src/app_sparkd/sparkd/md/okx/OkxTradeAdaptor.cpp @@ -1,11 +1,11 @@ #include "OkxTradeAdaptor.h" -#include "lib/domain/SecurityID.h" -#include "lib/domain/TradeRecord.h" -#include "lib/io/JsonReader.h" -#include "lib/md/IMarketDataListener.h" -#include "lib/utils/bts_fatal.h" -#include "server/sparkd/md/ccapi/CCApiCorrelationID.h" -#include "server/sparkd/md/okx/OkxTrade.h" +#include "spark/domain/SecurityID.h" +#include "spark/domain/TradeRecord.h" +#include "spark/io/JsonReader.h" +#include "spark/md/IMarketDataListener.h" +#include "spark/utils/bts_fatal.h" +#include "sparkd/md/ccapi/CCApiCorrelationID.h" +#include "sparkd/md/okx/OkxTrade.h" #include #include diff --git a/src/server/sparkd/md/okx/OkxTradeAdaptor.h b/src/app_sparkd/sparkd/md/okx/OkxTradeAdaptor.h similarity index 95% rename from src/server/sparkd/md/okx/OkxTradeAdaptor.h rename to src/app_sparkd/sparkd/md/okx/OkxTradeAdaptor.h index d3500acee..ca334759d 100644 --- a/src/server/sparkd/md/okx/OkxTradeAdaptor.h +++ b/src/app_sparkd/sparkd/md/okx/OkxTradeAdaptor.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/domain/SecurityID.h" +#include "spark/domain/SecurityID.h" #include #include diff --git a/src/server/sparkd/md/platforms/IMDPlatform.cpp b/src/app_sparkd/sparkd/md/platforms/IMDPlatform.cpp similarity index 100% rename from src/server/sparkd/md/platforms/IMDPlatform.cpp rename to src/app_sparkd/sparkd/md/platforms/IMDPlatform.cpp diff --git a/src/server/sparkd/md/platforms/IMDPlatform.h b/src/app_sparkd/sparkd/md/platforms/IMDPlatform.h similarity index 100% rename from src/server/sparkd/md/platforms/IMDPlatform.h rename to src/app_sparkd/sparkd/md/platforms/IMDPlatform.h diff --git a/src/server/sparkd/md/platforms/emumba/EMTradingSession.h b/src/app_sparkd/sparkd/md/platforms/emumba/EMTradingSession.h similarity index 87% rename from src/server/sparkd/md/platforms/emumba/EMTradingSession.h rename to src/app_sparkd/sparkd/md/platforms/emumba/EMTradingSession.h index 4f85ea848..7be8c43ad 100644 --- a/src/server/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/server/sparkd/md/platforms/emumba/EmMDListener.cpp b/src/app_sparkd/sparkd/md/platforms/emumba/EmMDListener.cpp similarity index 98% rename from src/server/sparkd/md/platforms/emumba/EmMDListener.cpp rename to src/app_sparkd/sparkd/md/platforms/emumba/EmMDListener.cpp index 1cdad5c88..4660deed2 100644 --- a/src/server/sparkd/md/platforms/emumba/EmMDListener.cpp +++ b/src/app_sparkd/sparkd/md/platforms/emumba/EmMDListener.cpp @@ -1,27 +1,28 @@ #include "EmMDListener.h" -#include "lib/api/services/ShellDiagnosticService.server.pb.h" -#include "lib/domain_model/Security.pb.h" -#include "lib/logging/logging.h" -#include "lib/md/GeneralSecurityIndex.h" -#include "lib/md/IntPrice.h" -#include "lib/md/MDProducer.h" -#include "lib/md/PriceSize.h" -#include "lib/md/Shm/FixedSecurity.h" -#include "lib/md/common.h" -#include "lib/md/protos/co2.pb.h" -#include "lib/orderman/gateways/sim/SimExecutionGateway.h" -#include "lib/orderman/gateways/sim/SimExecutionGatewayFactory.h" -#include "lib/os/os.h" -#include "lib/persistence/IDGenerator.h" -#include "lib/utils/PBUtils.h" -#include "lib/utils/TimeStamp.h" -#include "lib/utils/bts_assert.h" -#include "lib/utils/bts_chrono.h" -#include "lib/utils/datetime.h" -#include "lib/utils/overloaded.h" -#include "lib/utils/stats.h" -#include "server/sparkd/md/platforms/emumba/EMTradingSession.h" -#include "server/sparkd/md/platforms/emumba/IEMOrderMuxer.h" +#include "spark/api/services/ShellDiagnosticService.server.pb.h" +#include "spark/domain_model/Security.pb.h" +#include "spark/logging/logging.h" +#include "spark/md/GeneralSecurityIndex.h" +#include "spark/md/IntPrice.h" +#include "spark/md/MDProducer.h" +#include "spark/md/PriceSize.h" +#include "spark/md/Shm/FixedSecurity.h" +#include "spark/md/common.h" +#include "spark/md/protos/co2.pb.h" +#include "spark/orderman/gateways/IEMOrderMuxer.h" +#include "spark/orderman/gateways/sim/SimExecutionGateway.h" +#include "spark/orderman/gateways/sim/SimExecutionGatewayFactory.h" +#include "spark/os/os.h" +#include "spark/persistence/IDGenerator.h" +#include "spark/utils/PBUtils.h" +#include "spark/utils/TimeStamp.h" +#include "spark/utils/bts_assert.h" +#include "spark/utils/bts_chrono.h" +#include "spark/utils/datetime.h" +#include "spark/utils/overloaded.h" +#include "spark/utils/stats.h" +#include "sparkd/md/platforms/emumba/EMTradingSession.h" + #include #include #include diff --git a/src/server/sparkd/md/platforms/emumba/EmMDListener.h b/src/app_sparkd/sparkd/md/platforms/emumba/EmMDListener.h similarity index 96% rename from src/server/sparkd/md/platforms/emumba/EmMDListener.h rename to src/app_sparkd/sparkd/md/platforms/emumba/EmMDListener.h index 000f2b44e..52deed19d 100644 --- a/src/server/sparkd/md/platforms/emumba/EmMDListener.h +++ b/src/app_sparkd/sparkd/md/platforms/emumba/EmMDListener.h @@ -1,11 +1,11 @@ #pragma once #include "EMTradingSession.h" -#include "IEMOrderMuxer.h" -#include "lib/domain_model/Security.pb.h" -#include "lib/domain_model/SecurityKey.h" -#include "lib/md/GeneralSecurityIndex.h" -#include "lib/md/common.h" -#include "server/sparkd/md/platforms/emumba/IEMOrderMuxer.h" +#include "spark/domain_model/Security.pb.h" +#include "spark/domain_model/SecurityKey.h" +#include "spark/md/GeneralSecurityIndex.h" +#include "spark/md/common.h" +#include "spark/orderman/gateways/IEMOrderMuxer.h" + #include #include #include diff --git a/src/server/sparkd/md/platforms/emumba/EmumbaMain.cpp b/src/app_sparkd/sparkd/md/platforms/emumba/EmumbaMain.cpp similarity index 83% rename from src/server/sparkd/md/platforms/emumba/EmumbaMain.cpp rename to src/app_sparkd/sparkd/md/platforms/emumba/EmumbaMain.cpp index 70e8e0eee..cc2de9d55 100644 --- a/src/server/sparkd/md/platforms/emumba/EmumbaMain.cpp +++ b/src/app_sparkd/sparkd/md/platforms/emumba/EmumbaMain.cpp @@ -1,22 +1,22 @@ #include "EmumbaMain.h" #include "EMTradingSession.h" #include "EmMDListener.h" -#include "lib/config/config.h" -#include "lib/config/protos/system_config.pb.h" -#include "lib/logging/logging.h" -#include "lib/md/GeneralSecurityIndex.h" -#include "lib/md/MDProducer.h" -#include "lib/md/SecurityDB.h" -#include "lib/md/coconut2.h" -#include "lib/md/common.h" -#include "lib/md/protos/co2.pb.h" -#include "lib/os/os.h" -#include "lib/utils/Dispatcher.h" -#include "lib/utils/bts_assert.h" -#include "lib/utils/bts_chrono.h" -#include "lib/utils/proto_helper.h" -#include "lib/utils/thread_manager.h" -#include "server/sparkd/cmds/crypto/DeribitDemoConfiguration.h" +#include "spark/config/config.h" +#include "spark/config/protos/system_config.pb.h" +#include "spark/logging/logging.h" +#include "spark/md/GeneralSecurityIndex.h" +#include "spark/md/MDProducer.h" +#include "spark/md/SecurityDB.h" +#include "spark/md/coconut2.h" +#include "spark/md/common.h" +#include "spark/md/protos/co2.pb.h" +#include "spark/os/os.h" +#include "spark/utils/Dispatcher.h" +#include "spark/utils/bts_assert.h" +#include "spark/utils/bts_chrono.h" +#include "spark/utils/proto_helper.h" +#include "spark/utils/thread_manager.h" +#include "sparkd/cmds/crypto/DeribitDemoConfiguration.h" #include #include diff --git a/src/server/sparkd/md/platforms/emumba/EmumbaMain.h b/src/app_sparkd/sparkd/md/platforms/emumba/EmumbaMain.h similarity index 85% rename from src/server/sparkd/md/platforms/emumba/EmumbaMain.h rename to src/app_sparkd/sparkd/md/platforms/emumba/EmumbaMain.h index 70433e15c..5d5fc2b42 100644 --- a/src/server/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/server/sparkd/md/platforms/ice_onixs/ICEListener.cpp b/src/app_sparkd/sparkd/md/platforms/ice_onixs/ICEListener.cpp similarity index 99% rename from src/server/sparkd/md/platforms/ice_onixs/ICEListener.cpp rename to src/app_sparkd/sparkd/md/platforms/ice_onixs/ICEListener.cpp index 0161c7351..2f06e2e00 100644 --- a/src/server/sparkd/md/platforms/ice_onixs/ICEListener.cpp +++ b/src/app_sparkd/sparkd/md/platforms/ice_onixs/ICEListener.cpp @@ -1,8 +1,8 @@ #include "ICEListener.h" -#include "lib/config/protos/market_data.pb.h" -#include "lib/md/protos/co2.pb.h" -#include "lib/utils/datetime.h" -#include "lib/utils/helper_macros.h" +#include "spark/config/protos/market_data.pb.h" +#include "spark/md/protos/co2.pb.h" +#include "spark/utils/datetime.h" +#include "spark/utils/helper_macros.h" #include #include diff --git a/src/server/sparkd/md/platforms/ice_onixs/ICEListener.h b/src/app_sparkd/sparkd/md/platforms/ice_onixs/ICEListener.h similarity index 96% rename from src/server/sparkd/md/platforms/ice_onixs/ICEListener.h rename to src/app_sparkd/sparkd/md/platforms/ice_onixs/ICEListener.h index 7022b8bb8..4a42b46fd 100644 --- a/src/server/sparkd/md/platforms/ice_onixs/ICEListener.h +++ b/src/app_sparkd/sparkd/md/platforms/ice_onixs/ICEListener.h @@ -1,9 +1,9 @@ #pragma once #include "ICESecurityIndex.h" -#include "lib/md/coconut2.h" -#include "lib/tracing/bts_trace.h" -#include "lib/utils/bts_no_copy.h" +#include "spark/md/coconut2.h" +#include "spark/tracing/bts_trace.h" +#include "spark/utils/bts_no_copy.h" #include "ICEListenerHelpers.h" #include "onixs.h" diff --git a/src/server/sparkd/md/platforms/ice_onixs/ICEListenerHelpers.h b/src/app_sparkd/sparkd/md/platforms/ice_onixs/ICEListenerHelpers.h similarity index 86% rename from src/server/sparkd/md/platforms/ice_onixs/ICEListenerHelpers.h rename to src/app_sparkd/sparkd/md/platforms/ice_onixs/ICEListenerHelpers.h index a609bfd38..10cfaea13 100644 --- a/src/server/sparkd/md/platforms/ice_onixs/ICEListenerHelpers.h +++ b/src/app_sparkd/sparkd/md/platforms/ice_onixs/ICEListenerHelpers.h @@ -1,9 +1,9 @@ #pragma once -#include "lib/md/coconut2.h" -#include "lib/md/ice/ICEUtils.h" -#include "lib/utils/bts_assert.h" -#include "lib/utils/helper_macros.h" +#include "spark/md/coconut2.h" +#include "spark/md/ice/ICEUtils.h" +#include "spark/utils/bts_assert.h" +#include "spark/utils/helper_macros.h" #include "onixs.h" diff --git a/src/server/sparkd/md/platforms/ice_onixs/ICEMain.cpp b/src/app_sparkd/sparkd/md/platforms/ice_onixs/ICEMain.cpp similarity index 94% rename from src/server/sparkd/md/platforms/ice_onixs/ICEMain.cpp rename to src/app_sparkd/sparkd/md/platforms/ice_onixs/ICEMain.cpp index 0dc491f5d..a5228445f 100644 --- a/src/server/sparkd/md/platforms/ice_onixs/ICEMain.cpp +++ b/src/app_sparkd/sparkd/md/platforms/ice_onixs/ICEMain.cpp @@ -1,11 +1,21 @@ #include "ICEMain.h" -#include "lib/config/config.h" -#include "lib/config/protos/deployment_type.pb.h" -#include "lib/config/protos/market_data.pb.h" -#include "lib/config/protos/system_config.pb.h" -#include "lib/md/ice/ICEUtils.h" -#include "lib/md/vendor/OnixsUtils.h" +#include "spark/config/config.h" +#include "spark/config/protos/deployment_type.pb.h" +#include "spark/md/SecurityDB.h" +#include "spark/md/coconut2.h" +#include "spark/md/ice/ICEUtils.h" +#include "spark/md/protos/co2.pb.h" +#include "spark/md/vendor/OnixsUtils.h" +#include "spark/os/os.h" +#include "spark/utils/Dispatcher.h" +#include "spark/utils/bts_chrono.h" +#include "spark/utils/helper_macros.h" +#include "spark/utils/proto_helper.h" + +#include "spark/config/protos/market_data.pb.h" +#include "spark/config/protos/system_config.pb.h" +#include "spark/utils/thread_manager.h" #include #include diff --git a/src/server/sparkd/md/platforms/ice_onixs/ICEMain.h b/src/app_sparkd/sparkd/md/platforms/ice_onixs/ICEMain.h similarity index 86% rename from src/server/sparkd/md/platforms/ice_onixs/ICEMain.h rename to src/app_sparkd/sparkd/md/platforms/ice_onixs/ICEMain.h index 8c37f9476..2b5e716fb 100644 --- a/src/server/sparkd/md/platforms/ice_onixs/ICEMain.h +++ b/src/app_sparkd/sparkd/md/platforms/ice_onixs/ICEMain.h @@ -1,7 +1,11 @@ #pragma once #include "ICEListener.h" -#include "server/sparkd/md/platforms/IMDPlatform.h" +#include "ICESecurityIndex.h" +#include "spark/md/coconut2.h" +#include "spark/utils/bts_no_copy.h" +#include "onixs.h" +#include "sparkd/md/platforms/IMDPlatform.h" #include #include diff --git a/src/server/sparkd/md/platforms/ice_onixs/ICESecurityIndex.h b/src/app_sparkd/sparkd/md/platforms/ice_onixs/ICESecurityIndex.h similarity index 90% rename from src/server/sparkd/md/platforms/ice_onixs/ICESecurityIndex.h rename to src/app_sparkd/sparkd/md/platforms/ice_onixs/ICESecurityIndex.h index 5e6460189..8fe45de6e 100644 --- a/src/server/sparkd/md/platforms/ice_onixs/ICESecurityIndex.h +++ b/src/app_sparkd/sparkd/md/platforms/ice_onixs/ICESecurityIndex.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/md/SecurityIndex.h" +#include "spark/md/SecurityIndex.h" #include namespace bts { diff --git a/src/server/sparkd/md/platforms/ice_onixs/onixs.h b/src/app_sparkd/sparkd/md/platforms/ice_onixs/onixs.h similarity index 100% rename from src/server/sparkd/md/platforms/ice_onixs/onixs.h rename to src/app_sparkd/sparkd/md/platforms/ice_onixs/onixs.h diff --git a/src/server/sparkd/md/platforms/ice_onixs/tests/ice_tests.cpp b/src/app_sparkd/sparkd/md/platforms/ice_onixs/tests/ice_tests.cpp similarity index 98% rename from src/server/sparkd/md/platforms/ice_onixs/tests/ice_tests.cpp rename to src/app_sparkd/sparkd/md/platforms/ice_onixs/tests/ice_tests.cpp index f25b58bb7..0a3f10cd3 100644 --- a/src/server/sparkd/md/platforms/ice_onixs/tests/ice_tests.cpp +++ b/src/app_sparkd/sparkd/md/platforms/ice_onixs/tests/ice_tests.cpp @@ -1,7 +1,7 @@ // #include "catch/catch.hpp" -// #include "lib/config/config.h" -// #include "lib/config/protos/market_data.pb.h" +// #include "spark/config/config.h" +// #include "spark/config/protos/market_data.pb.h" // #include // #include diff --git a/src/server/sparkd/md/platforms/mdp3_onixs/CMESecurityIndex.h b/src/app_sparkd/sparkd/md/platforms/mdp3_onixs/CMESecurityIndex.h similarity index 86% rename from src/server/sparkd/md/platforms/mdp3_onixs/CMESecurityIndex.h rename to src/app_sparkd/sparkd/md/platforms/mdp3_onixs/CMESecurityIndex.h index 4575ab89b..99938727f 100644 --- a/src/server/sparkd/md/platforms/mdp3_onixs/CMESecurityIndex.h +++ b/src/app_sparkd/sparkd/md/platforms/mdp3_onixs/CMESecurityIndex.h @@ -1,7 +1,7 @@ #pragma once -#include "lib/md/MBOProcessor.h" -#include "lib/md/SecurityIndex.h" +#include "spark/md/MBOProcessor.h" +#include "spark/md/SecurityIndex.h" #include namespace bts { diff --git a/src/server/sparkd/md/platforms/mdp3_onixs/MDP3Listener.cpp b/src/app_sparkd/sparkd/md/platforms/mdp3_onixs/MDP3Listener.cpp similarity index 95% rename from src/server/sparkd/md/platforms/mdp3_onixs/MDP3Listener.cpp rename to src/app_sparkd/sparkd/md/platforms/mdp3_onixs/MDP3Listener.cpp index 00ba8f746..52cdee7a1 100644 --- a/src/server/sparkd/md/platforms/mdp3_onixs/MDP3Listener.cpp +++ b/src/app_sparkd/sparkd/md/platforms/mdp3_onixs/MDP3Listener.cpp @@ -1,8 +1,8 @@ #include "MDP3Listener.h" -#include "lib/config/protos/market_data.pb.h" -#include "lib/md/protos/co2.pb.h" -#include "lib/utils/datetime.h" -#include "lib/utils/helper_macros.h" +#include "spark/config/protos/market_data.pb.h" +#include "spark/md/protos/co2.pb.h" +#include "spark/utils/datetime.h" +#include "spark/utils/helper_macros.h" #include using namespace std; diff --git a/src/server/sparkd/md/platforms/mdp3_onixs/MDP3Listener.h b/src/app_sparkd/sparkd/md/platforms/mdp3_onixs/MDP3Listener.h similarity index 96% rename from src/server/sparkd/md/platforms/mdp3_onixs/MDP3Listener.h rename to src/app_sparkd/sparkd/md/platforms/mdp3_onixs/MDP3Listener.h index e7a80d126..b16b59044 100644 --- a/src/server/sparkd/md/platforms/mdp3_onixs/MDP3Listener.h +++ b/src/app_sparkd/sparkd/md/platforms/mdp3_onixs/MDP3Listener.h @@ -1,13 +1,13 @@ #pragma once #include "CMESecurityIndex.h" -#include "lib/md/MBOProcessor.h" -#include "lib/md/coconut2.h" -#include "lib/tracing/bts_trace.h" -#include "lib/utils/bts_no_copy.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/server/sparkd/md/platforms/mdp3_onixs/MDP3ListenerHelpers.h b/src/app_sparkd/sparkd/md/platforms/mdp3_onixs/MDP3ListenerHelpers.h similarity index 90% rename from src/server/sparkd/md/platforms/mdp3_onixs/MDP3ListenerHelpers.h rename to src/app_sparkd/sparkd/md/platforms/mdp3_onixs/MDP3ListenerHelpers.h index 141363ffa..d1f5ead1f 100644 --- a/src/server/sparkd/md/platforms/mdp3_onixs/MDP3ListenerHelpers.h +++ b/src/app_sparkd/sparkd/md/platforms/mdp3_onixs/MDP3ListenerHelpers.h @@ -1,6 +1,6 @@ -#include "lib/md/cme/MDP3Utils.h" -#include "lib/md/coconut2.h" -#include "lib/utils/bts_assert.h" +#include "spark/md/cme/MDP3Utils.h" +#include "spark/md/coconut2.h" +#include "spark/utils/bts_assert.h" #include "onixs.h" diff --git a/src/server/sparkd/md/platforms/mdp3_onixs/MDP3Main.cpp b/src/app_sparkd/sparkd/md/platforms/mdp3_onixs/MDP3Main.cpp similarity index 96% rename from src/server/sparkd/md/platforms/mdp3_onixs/MDP3Main.cpp rename to src/app_sparkd/sparkd/md/platforms/mdp3_onixs/MDP3Main.cpp index 0a54040ad..44f22c068 100644 --- a/src/server/sparkd/md/platforms/mdp3_onixs/MDP3Main.cpp +++ b/src/app_sparkd/sparkd/md/platforms/mdp3_onixs/MDP3Main.cpp @@ -1,15 +1,19 @@ #include "MDP3Main.h" -#include "lib/api/md/GlbxMarketDataConfig.pb.h" -#include "lib/config/config.h" -#include "lib/config/protos/deployment_type.pb.h" -#include "lib/logging/logging.h" -#include "lib/md/MBOProcessor.h" -#include "lib/md/SecurityDB.h" -#include "lib/md/cme/MDP3Utils.h" -#include "lib/md/cme/mdp3_data_directory.h" -#include "lib/md/vendor/OnixsUtils.h" -#include "lib/os/spark_data_directory.h" -#include "lib/utils/thread_manager.h" +#include "spark/config/config.h" +#include "spark/config/protos/market_data.pb.h" +#include "spark/config/protos/system_config.pb.h" +#include "spark/logging/logging.h" +#include "spark/md/MBOProcessor.h" +#include "spark/md/SecurityDB.h" +#include "spark/md/cme/MDP3Utils.h" +#include "spark/md/cme/mdp3_data_directory.h" +#include "spark/md/coconut2.h" +#include "spark/md/protos/co2.pb.h" +#include "spark/md/vendor/OnixsUtils.h" +#include "spark/os/os.h" +#include "spark/utils/Dispatcher.h" +#include "spark/utils/proto_helper.h" +#include "spark/utils/thread_manager.h" #include #include diff --git a/src/server/sparkd/md/platforms/mdp3_onixs/MDP3Main.h b/src/app_sparkd/sparkd/md/platforms/mdp3_onixs/MDP3Main.h similarity index 92% rename from src/server/sparkd/md/platforms/mdp3_onixs/MDP3Main.h rename to src/app_sparkd/sparkd/md/platforms/mdp3_onixs/MDP3Main.h index fc3043ac3..9d455a951 100644 --- a/src/server/sparkd/md/platforms/mdp3_onixs/MDP3Main.h +++ b/src/app_sparkd/sparkd/md/platforms/mdp3_onixs/MDP3Main.h @@ -2,10 +2,10 @@ #include "CMESecurityIndex.h" #include "MDP3Listener.h" -#include "lib/md/coconut2.h" -#include "lib/utils/bts_no_copy.h" +#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/server/sparkd/md/platforms/mdp3_onixs/onixs.h b/src/app_sparkd/sparkd/md/platforms/mdp3_onixs/onixs.h similarity index 100% rename from src/server/sparkd/md/platforms/mdp3_onixs/onixs.h rename to src/app_sparkd/sparkd/md/platforms/mdp3_onixs/onixs.h diff --git a/src/server/sparkd/md/platforms/mdp3_onixs/tests/mdp3_tests.cpp b/src/app_sparkd/sparkd/md/platforms/mdp3_onixs/tests/mdp3_tests.cpp similarity index 98% rename from src/server/sparkd/md/platforms/mdp3_onixs/tests/mdp3_tests.cpp rename to src/app_sparkd/sparkd/md/platforms/mdp3_onixs/tests/mdp3_tests.cpp index f25b58bb7..0a3f10cd3 100644 --- a/src/server/sparkd/md/platforms/mdp3_onixs/tests/mdp3_tests.cpp +++ b/src/app_sparkd/sparkd/md/platforms/mdp3_onixs/tests/mdp3_tests.cpp @@ -1,7 +1,7 @@ // #include "catch/catch.hpp" -// #include "lib/config/config.h" -// #include "lib/config/protos/market_data.pb.h" +// #include "spark/config/config.h" +// #include "spark/config/protos/market_data.pb.h" // #include // #include diff --git a/src/server/sparkd/md/recording/DbWriters.h b/src/app_sparkd/sparkd/md/recording/DbWriters.h similarity index 98% rename from src/server/sparkd/md/recording/DbWriters.h rename to src/app_sparkd/sparkd/md/recording/DbWriters.h index de28e1325..13e957858 100644 --- a/src/server/sparkd/md/recording/DbWriters.h +++ b/src/app_sparkd/sparkd/md/recording/DbWriters.h @@ -1,12 +1,13 @@ #ifndef DBWRITERS_H #define DBWRITERS_H -#include "lib/config/config.h" -#include "lib/config/protos/system_config.pb.h" -#include "lib/logging/logging.h" -#include "lib/md/IntPrice.h" -#include "lib/md/protos/co2.pb.h" -#include "lib/utils/PBUtils.h" +#include "spark/config/config.h" +#include "spark/config/protos/system_config.pb.h" +#include "spark/logging/logging.h" +#include "spark/md/IntPrice.h" +#include "spark/md/protos/co2.pb.h" +#include "spark/utils/PBUtils.h" + #include #include #include @@ -454,4 +455,4 @@ class DbWriters { } }; } // namespace bts::md::recording -#endif // DBWRITERS_H \ No newline at end of file +#endif // DBWRITERS_H diff --git a/src/server/sparkd/md/recording/MDBatchWriter.cpp b/src/app_sparkd/sparkd/md/recording/MDBatchWriter.cpp similarity index 98% rename from src/server/sparkd/md/recording/MDBatchWriter.cpp rename to src/app_sparkd/sparkd/md/recording/MDBatchWriter.cpp index 20eee096c..ef62fbd2c 100644 --- a/src/server/sparkd/md/recording/MDBatchWriter.cpp +++ b/src/app_sparkd/sparkd/md/recording/MDBatchWriter.cpp @@ -3,7 +3,7 @@ #include #include #include -#include "lib/utils/bts_assert.h" +#include "spark/utils/bts_assert.h" #include "MDBatchWriter.h" namespace bts::md::recording { MDBatchWriter::MDBatchWriter(size_t buffer_size, std::vector writer_functions) @@ -60,4 +60,4 @@ namespace bts::md::recording { _write(data_to_write); } } -} \ No newline at end of file +} diff --git a/src/server/sparkd/md/recording/MDBatchWriter.h b/src/app_sparkd/sparkd/md/recording/MDBatchWriter.h similarity index 95% rename from src/server/sparkd/md/recording/MDBatchWriter.h rename to src/app_sparkd/sparkd/md/recording/MDBatchWriter.h index 5b6bf8264..cf4d896c4 100644 --- a/src/server/sparkd/md/recording/MDBatchWriter.h +++ b/src/app_sparkd/sparkd/md/recording/MDBatchWriter.h @@ -4,7 +4,7 @@ #include #include #include -#include "lib/md/protos/co2.pb.h" +#include "spark/md/protos/co2.pb.h" namespace bts::md::recording { class MDBatchWriter { @@ -27,4 +27,4 @@ private: void consumeData(); void flushRemainingData(); }; -} \ No newline at end of file +} diff --git a/src/server/sparkd/md/recording/MDRecorder.cpp b/src/app_sparkd/sparkd/md/recording/MDRecorder.cpp similarity index 95% rename from src/server/sparkd/md/recording/MDRecorder.cpp rename to src/app_sparkd/sparkd/md/recording/MDRecorder.cpp index 9c4f214a8..c92929ad9 100644 --- a/src/server/sparkd/md/recording/MDRecorder.cpp +++ b/src/app_sparkd/sparkd/md/recording/MDRecorder.cpp @@ -1,26 +1,27 @@ #include "MDRecorder.h" -#include "lib/api/md/MarketDataConfig.pb.h" -#include "lib/api/md/MarketDataConfigUtils.h" -#include "lib/api/services/MarketDataRelay.client.pb.h" -#include "lib/api/services/MarketDataRelay.pb.h" -#include "lib/config/config.h" -#include "lib/config/protos/system_config.pb.h" -#include "lib/core/TimeStamp.h" -#include "lib/domain_model/Security.pb.h" -#include "lib/logging/logging.h" -#include "lib/md/MDClient.h" -#include "lib/md/MDConsumer.h" -#include "lib/md/MDConsumerHandle.h" -#include "lib/md/PriceSize.h" -#include "lib/md/Shm/MDStructure.h" -#include "lib/md/common.h" -#include "lib/md/protos/co2.pb.h" -#include "lib/utils/PBUtils.h" -#include "lib/utils/bts_assert.h" -#include "lib/utils/datetime.h" -#include "lib/utils/thread_manager.h" -#include "MDBatchWriter.h" -#include "DbWriters.h" +#include "spark/api/md/MarketDataConfig.pb.h" +#include "spark/api/md/MarketDataConfigUtils.h" +#include "spark/api/services/MarketDataRelay.client.pb.h" +#include "spark/api/services/MarketDataRelay.pb.h" +#include "spark/config/config.h" +#include "spark/config/protos/system_config.pb.h" +#include "spark/core/TimeStamp.h" +#include "spark/domain_model/Security.pb.h" +#include "spark/logging/logging.h" +#include "spark/md/MDClient.h" +#include "spark/md/MDConsumer.h" +#include "spark/md/MDConsumerHandle.h" +#include "spark/md/PriceSize.h" +#include "spark/md/Shm/MDStructure.h" +#include "spark/md/common.h" +#include "spark/md/protos/co2.pb.h" +#include "spark/utils/PBUtils.h" +#include "spark/utils/bts_assert.h" +#include "spark/utils/datetime.h" +#include "spark/utils/thread_manager.h" +#include "sparkd/md/recording/MDBatchWriter.h" +#include "sparkd/md/recording/DbWriters.h" + #include #include #include @@ -501,4 +502,4 @@ bool MDRecorder::is_md_recording_file( file_name.find(search_txt) != std::string::npos; } -} // namespace bts::md::recording \ No newline at end of file +} // namespace bts::md::recording diff --git a/src/server/sparkd/md/recording/MDRecorder.h b/src/app_sparkd/sparkd/md/recording/MDRecorder.h similarity index 89% rename from src/server/sparkd/md/recording/MDRecorder.h rename to src/app_sparkd/sparkd/md/recording/MDRecorder.h index d4444a0a1..b4dc6749e 100644 --- a/src/server/sparkd/md/recording/MDRecorder.h +++ b/src/app_sparkd/sparkd/md/recording/MDRecorder.h @@ -1,9 +1,10 @@ #pragma once -#include "lib/api/md/MarketDataRecordingConfig.pb.h" -#include "lib/domain_model/Security.pb.h" -#include "lib/md/MDClient.h" -#include "lib/utils/bts_no_copy.h" +#include "spark/api/md/MarketDataRecordingConfig.pb.h" +#include "spark/domain_model/Security.pb.h" +#include "spark/md/MDClient.h" +#include "spark/utils/bts_no_copy.h" + #include namespace bts::api { diff --git a/src/server/sparkd/md/recording/MDReplayer.cpp b/src/app_sparkd/sparkd/md/recording/MDReplayer.cpp similarity index 89% rename from src/server/sparkd/md/recording/MDReplayer.cpp rename to src/app_sparkd/sparkd/md/recording/MDReplayer.cpp index 9c5abe249..fc5c0dfc5 100644 --- a/src/server/sparkd/md/recording/MDReplayer.cpp +++ b/src/app_sparkd/sparkd/md/recording/MDReplayer.cpp @@ -1,25 +1,21 @@ #include "MDReplayer.h" -#include "lib/core/TimeStamp.h" -#include "lib/domain/Book.h" -#include "lib/domain/Price.h" -#include "lib/domain/Quantity.h" -#include "lib/domain/Security.h" -#include "lib/domain/SecurityCommon.h" -#include "lib/domain/SecurityID.h" -#include "lib/domain/SecurityMarketDataStatistics.h" -#include "lib/domain/Side.h" -#include "lib/domain/TradeRecord.h" -#include "lib/domain_model/Security.pb.h" -#include "lib/logging/logging.h" -#include "lib/md/GeneralMarketDataListener.h" -#include "lib/md/IMarketDataListener.h" -#include "lib/md/MDProducer.h" -#include "lib/md/protos/co2.pb.h" -#include "lib/os/os.h" -#include "lib/persistence/IDGenerator.h" -#include "lib/utils/PBUtils.h" -#include "lib/utils/bts_assert.h" -#include "server/sparkd/md/recording/MDRecorder.h" +#include "spark/core/TimeStamp.h" +#include "spark/domain/Book.h" +#include "spark/domain/Price.h" +#include "spark/domain/Quantity.h" +#include "spark/domain/Security.h" +#include "spark/domain/SecurityID.h" +#include "spark/domain/SecurityMarketDataStatistics.h" +#include "spark/domain/Side.h" +#include "spark/domain/TradeRecord.h" +#include "spark/domain_model/Security.pb.h" +#include "spark/logging/logging.h" +#include "spark/md/IMarketDataListener.h" +#include "spark/md/protos/co2.pb.h" +#include "spark/os/os.h" +#include "spark/utils/PBUtils.h" +#include "spark/utils/bts_assert.h" +#include "sparkd/md/recording/MDRecorder.h" #include #include diff --git a/src/server/sparkd/md/recording/MDReplayer.h b/src/app_sparkd/sparkd/md/recording/MDReplayer.h similarity index 83% rename from src/server/sparkd/md/recording/MDReplayer.h rename to src/app_sparkd/sparkd/md/recording/MDReplayer.h index e88540ad1..99f80f052 100644 --- a/src/server/sparkd/md/recording/MDReplayer.h +++ b/src/app_sparkd/sparkd/md/recording/MDReplayer.h @@ -1,8 +1,8 @@ #pragma once -#include "lib/domain_model/Security.pb.h" -#include "lib/md/IMarketDataListener.h" -#include "lib/md/IMarketDataSource.h" +#include "spark/domain_model/Security.pb.h" +#include "spark/md/IMarketDataListener.h" +#include "spark/md/IMarketDataSource.h" namespace bts::md { class MDProducer; diff --git a/src/server/sparkd/md/taifex/TaifexDataGateway.cpp b/src/app_sparkd/sparkd/md/taifex/TaifexDataGateway.cpp similarity index 98% rename from src/server/sparkd/md/taifex/TaifexDataGateway.cpp rename to src/app_sparkd/sparkd/md/taifex/TaifexDataGateway.cpp index 3cf4c1353..ed1493abb 100644 --- a/src/server/sparkd/md/taifex/TaifexDataGateway.cpp +++ b/src/app_sparkd/sparkd/md/taifex/TaifexDataGateway.cpp @@ -1,19 +1,22 @@ #include "TaifexDataGateway.h" -#include "TaifexDataProcessors.h" -#include "lib/api/md/TaifexMarketDataConfig.pb.h" -#include "lib/config/config.h" -#include "lib/config/protos/system_config.pb.h" -#include "lib/logging/logging.h" -#include "lib/md/IMarketDataListener.h" -#include "lib/persistence/IDGenerator.h" -#include "lib/utils/bts_assert.h" -#include "lib/utils/bts_chrono.h" -#include "lib/utils/overloaded.h" -#include "lib/utils/thread_manager.h" -#include -#include -#include // For opendir, readdir, closedir -#include // For logging +#include "spark/api/domain/Venue.pb.h" +#include "spark/api/md/TaifexMarketDataConfig.pb.h" +#include "spark/config/config.h" +#include "spark/config/protos/system_config.pb.h" +#include "spark/core/TimeStamp.h" +#include "spark/domain/Price.h" +#include "spark/domain/Security.h" +#include "spark/domain/SecurityID.h" +#include "spark/domain/TradeRecord.h" +#include "spark/logging/logging.h" +#include "spark/md/IMarketDataListener.h" +#include "spark/persistence/IDGenerator.h" +#include "spark/utils/thread_manager.h" +#include "sparkd/md/taifex/TaifexDataProcessors.h" +#include "sparkd/md/taifex/TaifexMessages.h" +#include "sparkd/md/taifex/TaifexSecurityDetailsMapper.h" + +#include #include #include #include @@ -25,6 +28,7 @@ #include #include #include + namespace bts::md::taifex { enum class LIVE_DATA_STATES { diff --git a/src/server/sparkd/md/taifex/TaifexDataGateway.h b/src/app_sparkd/sparkd/md/taifex/TaifexDataGateway.h similarity index 90% rename from src/server/sparkd/md/taifex/TaifexDataGateway.h rename to src/app_sparkd/sparkd/md/taifex/TaifexDataGateway.h index 20a81c0e1..8664dc8af 100644 --- a/src/server/sparkd/md/taifex/TaifexDataGateway.h +++ b/src/app_sparkd/sparkd/md/taifex/TaifexDataGateway.h @@ -1,6 +1,7 @@ #pragma once -#include "lib/api/md/TaifexMarketDataConfig.pb.h" +#include "spark/api/md/TaifexMarketDataConfig.pb.h" + #include namespace bts::persistence { diff --git a/src/server/sparkd/md/taifex/TaifexDataProcessors.h b/src/app_sparkd/sparkd/md/taifex/TaifexDataProcessors.h similarity index 97% rename from src/server/sparkd/md/taifex/TaifexDataProcessors.h rename to src/app_sparkd/sparkd/md/taifex/TaifexDataProcessors.h index 5da119a41..3078abbcf 100644 --- a/src/server/sparkd/md/taifex/TaifexDataProcessors.h +++ b/src/app_sparkd/sparkd/md/taifex/TaifexDataProcessors.h @@ -1,15 +1,14 @@ #pragma once #include "TaifexMessages.h" -#include "TaifexSecurityDetailsMapper.h" -#include "lib/core/TimeStamp.h" -#include "lib/domain/AggressorSide.h" -#include "lib/domain/Security.h" -#include "lib/domain/TradeRecord.h" -#include "lib/logging/logging.h" -#include "lib/md/IMarketDataListener.h" -#include "lib/persistence/IDGenerator.h" -#include "lib/utils/bts_assert.h" -#include +#include "spark/config/protos/taifex_reference_data.pb.h" +#include "spark/core/TimeStamp.h" +#include "spark/domain/Security.h" +#include "spark/domain/TradeRecord.h" +#include "spark/md/IMarketDataListener.h" +#include "spark/persistence/IDGenerator.h" +#include "spark/utils/bts_assert.h" +#include "sparkd/md/taifex/TaifexSecurityDetailsMapper.h" + namespace bts::md::taifex { class TaifexDataProcessors { diff --git a/src/server/sparkd/md/taifex/TaifexMarketDataProvider.cpp b/src/app_sparkd/sparkd/md/taifex/TaifexMarketDataProvider.cpp similarity index 87% rename from src/server/sparkd/md/taifex/TaifexMarketDataProvider.cpp rename to src/app_sparkd/sparkd/md/taifex/TaifexMarketDataProvider.cpp index 1ad70c088..a9783d3ee 100644 --- a/src/server/sparkd/md/taifex/TaifexMarketDataProvider.cpp +++ b/src/app_sparkd/sparkd/md/taifex/TaifexMarketDataProvider.cpp @@ -1,8 +1,8 @@ #include "TaifexMarketDataProvider.h" -#include "lib/api/domain/Venue.pb.h" -#include "lib/api/md/MarketDataConfig.pb.h" -#include "lib/persistence/IDGenerator.h" -#include "server/sparkd/md/taifex/TaifexSubscription.h" +#include "spark/api/domain/Venue.pb.h" +#include "spark/api/md/MarketDataConfig.pb.h" +#include "spark/persistence/IDGenerator.h" +#include "sparkd/md/taifex/TaifexSubscription.h" #include #include diff --git a/src/server/sparkd/md/taifex/TaifexMarketDataProvider.h b/src/app_sparkd/sparkd/md/taifex/TaifexMarketDataProvider.h similarity index 93% rename from src/server/sparkd/md/taifex/TaifexMarketDataProvider.h rename to src/app_sparkd/sparkd/md/taifex/TaifexMarketDataProvider.h index 4706eb5b9..b31f20320 100644 --- a/src/server/sparkd/md/taifex/TaifexMarketDataProvider.h +++ b/src/app_sparkd/sparkd/md/taifex/TaifexMarketDataProvider.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/md/IMarketDataProvider.h" +#include "spark/md/IMarketDataProvider.h" #include diff --git a/src/server/sparkd/md/taifex/TaifexMessages.h b/src/app_sparkd/sparkd/md/taifex/TaifexMessages.h similarity index 99% rename from src/server/sparkd/md/taifex/TaifexMessages.h rename to src/app_sparkd/sparkd/md/taifex/TaifexMessages.h index 64d067332..1622929e5 100644 --- a/src/server/sparkd/md/taifex/TaifexMessages.h +++ b/src/app_sparkd/sparkd/md/taifex/TaifexMessages.h @@ -1,13 +1,17 @@ +#pragma once + #include "TaifexUtils.h" -#include "lib/logging/logging.h" -#include "lib/utils/bts_assert.h" -#include "lib/utils/helper_macros.h" +#include "spark/logging/logging.h" +#include "spark/utils/bts_assert.h" +#include "spark/utils/helper_macros.h" + #include #include // Include the correct header for trim functions #include #include #include #include + namespace bts::md::taifex { using UNPROCESSED_MSG = std::vector; class TaifexMessages { @@ -1084,4 +1088,4 @@ class TaifexMessages { }; }; -} // namespace bts::md::taifex \ No newline at end of file +} // namespace bts::md::taifex diff --git a/src/server/sparkd/md/taifex/TaifexSecurityDetailsMapper.h b/src/app_sparkd/sparkd/md/taifex/TaifexSecurityDetailsMapper.h similarity index 98% rename from src/server/sparkd/md/taifex/TaifexSecurityDetailsMapper.h rename to src/app_sparkd/sparkd/md/taifex/TaifexSecurityDetailsMapper.h index 8429dfdcd..109654d73 100644 --- a/src/server/sparkd/md/taifex/TaifexSecurityDetailsMapper.h +++ b/src/app_sparkd/sparkd/md/taifex/TaifexSecurityDetailsMapper.h @@ -1,9 +1,12 @@ #pragma once -#include "lib/domain/SecurityID.h" -#include "lib/logging/logging.h" + +#include "spark/domain/SecurityID.h" +#include "spark/logging/logging.h" + #include #include #include + namespace bts::md::taifex { class TaifexSecurityDetailsMapper { @@ -158,4 +161,4 @@ class TaifexSecurityDetailsMapper { std::unordered_map sec_deets_map; }; -} // namespace bts::md::taifex \ No newline at end of file +} // namespace bts::md::taifex diff --git a/src/server/sparkd/md/taifex/TaifexSubscription.cpp b/src/app_sparkd/sparkd/md/taifex/TaifexSubscription.cpp similarity index 89% rename from src/server/sparkd/md/taifex/TaifexSubscription.cpp rename to src/app_sparkd/sparkd/md/taifex/TaifexSubscription.cpp index 11a7e04f5..50b012423 100644 --- a/src/server/sparkd/md/taifex/TaifexSubscription.cpp +++ b/src/app_sparkd/sparkd/md/taifex/TaifexSubscription.cpp @@ -1,7 +1,7 @@ #include "TaifexSubscription.h" -#include "lib/api/md/TaifexMarketDataConfig.pb.h" -#include "lib/utils/thread_manager.h" -#include "server/sparkd/md/taifex/TaifexDataGateway.h" +#include "spark/api/md/TaifexMarketDataConfig.pb.h" +#include "spark/utils/thread_manager.h" +#include "sparkd/md/taifex/TaifexDataGateway.h" namespace bts::md { diff --git a/src/server/sparkd/md/taifex/TaifexSubscription.h b/src/app_sparkd/sparkd/md/taifex/TaifexSubscription.h similarity index 96% rename from src/server/sparkd/md/taifex/TaifexSubscription.h rename to src/app_sparkd/sparkd/md/taifex/TaifexSubscription.h index 19a55ec2d..5e8c61835 100644 --- a/src/server/sparkd/md/taifex/TaifexSubscription.h +++ b/src/app_sparkd/sparkd/md/taifex/TaifexSubscription.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/md/IMarketDataSource.h" +#include "spark/md/IMarketDataSource.h" #include diff --git a/src/server/sparkd/md/taifex/TaifexUtils.h b/src/app_sparkd/sparkd/md/taifex/TaifexUtils.h similarity index 98% rename from src/server/sparkd/md/taifex/TaifexUtils.h rename to src/app_sparkd/sparkd/md/taifex/TaifexUtils.h index c68463f41..acc455d2f 100644 --- a/src/server/sparkd/md/taifex/TaifexUtils.h +++ b/src/app_sparkd/sparkd/md/taifex/TaifexUtils.h @@ -1,7 +1,10 @@ -#include "lib/config/config.h" -#include "lib/config/protos/taifex_reference_data.pb.h" -#include "lib/logging/logging.h" -#include "lib/utils/bts_assert.h" +#pragma once + +#include "spark/config/config.h" +#include "spark/config/protos/taifex_reference_data.pb.h" +#include "spark/logging/logging.h" +#include "spark/utils/bts_assert.h" + #include #include #include @@ -504,4 +507,4 @@ static std::string convertToISO(const std::string &match_time, const std::string }; -} //namespace bts::md::taifex \ No newline at end of file +} //namespace bts::md::taifex diff --git a/src/server/sparkd/md/twse/TwseDataGateway.cpp b/src/app_sparkd/sparkd/md/twse/TwseDataGateway.cpp similarity index 98% rename from src/server/sparkd/md/twse/TwseDataGateway.cpp rename to src/app_sparkd/sparkd/md/twse/TwseDataGateway.cpp index f741e1ac9..b613d6fa2 100644 --- a/src/server/sparkd/md/twse/TwseDataGateway.cpp +++ b/src/app_sparkd/sparkd/md/twse/TwseDataGateway.cpp @@ -1,14 +1,16 @@ #include "TwseDataGateway.h" -#include "TwseMessages.h" -#include "lib/api/domain/SecurityType.pb.h" -#include "lib/domain/Security.h" -#include "lib/domain/TradeRecord.h" -#include "lib/logging/logging.h" -#include "lib/md/IMarketDataListener.h" -#include "lib/persistence/IDGenerator.h" -#include "lib/utils/helper_macros.h" +#include "spark/api/domain/SecurityType.pb.h" +#include "spark/domain/Security.h" +#include "spark/domain/TradeRecord.h" +#include "spark/logging/logging.h" +#include "spark/md/IMarketDataListener.h" +#include "spark/persistence/IDGenerator.h" +#include "spark/utils/bts_assert.h" +#include "spark/utils/helper_macros.h" +#include "sparkd/md/twse/TwseMessages.h" + #include -#include + namespace bts::md::twse { using UNPROCESSED_DATA = std::vector; diff --git a/src/server/sparkd/md/twse/TwseDataGateway.h b/src/app_sparkd/sparkd/md/twse/TwseDataGateway.h similarity index 89% rename from src/server/sparkd/md/twse/TwseDataGateway.h rename to src/app_sparkd/sparkd/md/twse/TwseDataGateway.h index 4d34091f5..541bec4bc 100644 --- a/src/server/sparkd/md/twse/TwseDataGateway.h +++ b/src/app_sparkd/sparkd/md/twse/TwseDataGateway.h @@ -1,4 +1,7 @@ -#include "lib/api/md/TwseMarketDataConfig.pb.h" +#pragma once + +#include "spark/api/md/TwseMarketDataConfig.pb.h" + #include // Add this line for std::shared_ptr diff --git a/src/server/sparkd/md/twse/TwseDataProcessors.h b/src/app_sparkd/sparkd/md/twse/TwseDataProcessors.h similarity index 88% rename from src/server/sparkd/md/twse/TwseDataProcessors.h rename to src/app_sparkd/sparkd/md/twse/TwseDataProcessors.h index ed3620578..10eb25c29 100644 --- a/src/server/sparkd/md/twse/TwseDataProcessors.h +++ b/src/app_sparkd/sparkd/md/twse/TwseDataProcessors.h @@ -2,9 +2,9 @@ #ifndef TWSE_DATA_PROCESSORS_H #define TWSE_DATA_PROCESSORS_H -#include "TwseMessages.h" -#include "lib/domain/Security.h" -#include "lib/md/IMarketDataListener.h" +#include "spark/domain/Security.h" +#include "spark/md/IMarketDataListener.h" +#include "sparkd/md/twse/TwseMessages.h" namespace bts::md::twse { class TwseDataProcessors { diff --git a/src/server/sparkd/md/twse/TwseMessages.h b/src/app_sparkd/sparkd/md/twse/TwseMessages.h similarity index 99% rename from src/server/sparkd/md/twse/TwseMessages.h rename to src/app_sparkd/sparkd/md/twse/TwseMessages.h index 8909a384e..fab255d76 100644 --- a/src/server/sparkd/md/twse/TwseMessages.h +++ b/src/app_sparkd/sparkd/md/twse/TwseMessages.h @@ -1,6 +1,9 @@ -// TwseMessages.h -#include "TwseUtils.h" -#include "lib/logging/logging.h" +// TwseSecurityDetailsMapper.h +#pragma once + +#include "spark/logging/logging.h" +#include "sparkd/md/twse/TwseUtils.h" + #include #include #include diff --git a/src/server/sparkd/md/twse/TwseSecurityDetailsMapper.h b/src/app_sparkd/sparkd/md/twse/TwseSecurityDetailsMapper.h similarity index 100% rename from src/server/sparkd/md/twse/TwseSecurityDetailsMapper.h rename to src/app_sparkd/sparkd/md/twse/TwseSecurityDetailsMapper.h diff --git a/src/server/sparkd/md/twse/TwseUtils.h b/src/app_sparkd/sparkd/md/twse/TwseUtils.h similarity index 100% rename from src/server/sparkd/md/twse/TwseUtils.h rename to src/app_sparkd/sparkd/md/twse/TwseUtils.h diff --git a/src/server/sparkd/position/MarginServiceCore.cpp b/src/app_sparkd/sparkd/position/MarginServiceCore.cpp similarity index 95% rename from src/server/sparkd/position/MarginServiceCore.cpp rename to src/app_sparkd/sparkd/position/MarginServiceCore.cpp index 372013973..9d237e7f4 100644 --- a/src/server/sparkd/position/MarginServiceCore.cpp +++ b/src/app_sparkd/sparkd/position/MarginServiceCore.cpp @@ -1,11 +1,11 @@ #include "MarginServiceCore.h" -#include "Position.h" -#include "lib/config/config.h" -#include "lib/config/protos/span.pb.h" -#include "lib/logging/logging.h" -#include "lib/utils/Dispatcher.h" -#include "lib/utils/Uuid.h" -#include "lib/utils/helper_macros.h" +#include "spark/config/config.h" +#include "spark/config/protos/span.pb.h" +#include "spark/logging/logging.h" +#include "spark/utils/Dispatcher.h" +#include "spark/utils/Uuid.h" +#include "spark/utils/helper_macros.h" +#include "sparkd/position/Position.h" #include #include diff --git a/src/server/sparkd/position/MarginServiceCore.h b/src/app_sparkd/sparkd/position/MarginServiceCore.h similarity index 85% rename from src/server/sparkd/position/MarginServiceCore.h rename to src/app_sparkd/sparkd/position/MarginServiceCore.h index c27e9a557..21de9b670 100644 --- a/src/server/sparkd/position/MarginServiceCore.h +++ b/src/app_sparkd/sparkd/position/MarginServiceCore.h @@ -1,8 +1,8 @@ #pragma once -#include "lib/api/services/MarginService.pb.h" -#include "lib/utils/bts_no_copy.h" -#include "server/sparkd/position/Position.h" +#include "spark/api/services/MarginService.pb.h" +#include "spark/utils/bts_no_copy.h" +#include "sparkd/position/Position.h" #include diff --git a/src/server/sparkd/position/MarginServiceServer.cpp b/src/app_sparkd/sparkd/position/MarginServiceServer.cpp similarity index 94% rename from src/server/sparkd/position/MarginServiceServer.cpp rename to src/app_sparkd/sparkd/position/MarginServiceServer.cpp index 2cda56a2a..b05858984 100644 --- a/src/server/sparkd/position/MarginServiceServer.cpp +++ b/src/app_sparkd/sparkd/position/MarginServiceServer.cpp @@ -1,15 +1,14 @@ #include "MarginServiceServer.h" -#include "MarginServiceCore.h" -#include "Position.h" -#include "PositionAggregator.h" - -#include "lib/api/service_helpers/AdminServiceUtils.h" -#include "lib/config/config.h" -#include "lib/config/protos/span.pb.h" -#include "lib/logging/logging.h" -#include "lib/os/os.h" -#include "lib/utils/Dispatcher.h" -#include "lib/utils/bts_assert.h" +#include "spark/api/service_helpers/AdminServiceUtils.h" +#include "spark/config/config.h" +#include "spark/config/protos/span.pb.h" +#include "spark/logging/logging.h" +#include "spark/os/os.h" +#include "spark/utils/Dispatcher.h" +#include "spark/utils/bts_assert.h" +#include "sparkd/position/MarginServiceCore.h" +#include "sparkd/position/Position.h" +#include "sparkd/position/PositionAggregator.h" #include diff --git a/src/server/sparkd/position/MarginServiceServer.h b/src/app_sparkd/sparkd/position/MarginServiceServer.h similarity index 83% rename from src/server/sparkd/position/MarginServiceServer.h rename to src/app_sparkd/sparkd/position/MarginServiceServer.h index e9a1eaa87..d26c3f65c 100644 --- a/src/server/sparkd/position/MarginServiceServer.h +++ b/src/app_sparkd/sparkd/position/MarginServiceServer.h @@ -1,13 +1,13 @@ #pragma once -#include "lib/api/public/ServiceContext.h" -#include "lib/api/services/AdminService.client.pb.h" -#include "lib/api/services/AdminService.pb.h" -#include "lib/api/services/MarginService.server.pb.h" -#include "lib/api/services/PositionService.client.pb.h" -#include "lib/api/services/PositionService.pb.h" -#include "lib/md/SecurityOracle.h" -#include "lib/utils/datetime.h" +#include "spark/api/public/ServiceContext.h" +#include "spark/api/services/AdminService.client.pb.h" +#include "spark/api/services/AdminService.pb.h" +#include "spark/api/services/MarginService.server.pb.h" +#include "spark/api/services/PositionService.client.pb.h" +#include "spark/api/services/PositionService.pb.h" +#include "spark/md/SecurityOracle.h" +#include "spark/utils/datetime.h" #include #include diff --git a/src/server/sparkd/position/Position.h b/src/app_sparkd/sparkd/position/Position.h similarity index 68% rename from src/server/sparkd/position/Position.h rename to src/app_sparkd/sparkd/position/Position.h index 7341d73f0..46c5de721 100644 --- a/src/server/sparkd/position/Position.h +++ b/src/app_sparkd/sparkd/position/Position.h @@ -1,7 +1,7 @@ #pragma once -#include "lib/domain_model/Security.pb.h" -#include "lib/domain_model/common.h" +#include "spark/domain_model/Security.pb.h" +#include "spark/domain_model/common.h" namespace bts { namespace position { diff --git a/src/server/sparkd/position/PositionAggregator.cpp b/src/app_sparkd/sparkd/position/PositionAggregator.cpp similarity index 94% rename from src/server/sparkd/position/PositionAggregator.cpp rename to src/app_sparkd/sparkd/position/PositionAggregator.cpp index c20b48c06..1c8c814a1 100644 --- a/src/server/sparkd/position/PositionAggregator.cpp +++ b/src/app_sparkd/sparkd/position/PositionAggregator.cpp @@ -1,7 +1,7 @@ #include "PositionAggregator.h" -#include "lib/domain_model/Security.h" -#include "lib/md/MDClient.h" -#include "server/sparkd/position/Position.h" +#include "spark/domain_model/Security.h" +#include "spark/md/MDClient.h" +#include "sparkd/position/Position.h" #include diff --git a/src/server/sparkd/position/PositionAggregator.h b/src/app_sparkd/sparkd/position/PositionAggregator.h similarity index 79% rename from src/server/sparkd/position/PositionAggregator.h rename to src/app_sparkd/sparkd/position/PositionAggregator.h index 70a583f3f..6d96dd6f1 100644 --- a/src/server/sparkd/position/PositionAggregator.h +++ b/src/app_sparkd/sparkd/position/PositionAggregator.h @@ -1,9 +1,9 @@ #pragma once -#include "lib/api/services/PositionService.client.pb.h" -#include "lib/api/services/PositionService.pb.h" -#include "lib/md/SecurityOracle.h" -#include "lib/utils/datetime.h" +#include "spark/api/services/PositionService.client.pb.h" +#include "spark/api/services/PositionService.pb.h" +#include "spark/md/SecurityOracle.h" +#include "spark/utils/datetime.h" #include #include diff --git a/src/server/sparkd/position/PositionMap.cpp b/src/app_sparkd/sparkd/position/PositionMap.cpp similarity index 96% rename from src/server/sparkd/position/PositionMap.cpp rename to src/app_sparkd/sparkd/position/PositionMap.cpp index 69bbfc181..09c7bc084 100644 --- a/src/server/sparkd/position/PositionMap.cpp +++ b/src/app_sparkd/sparkd/position/PositionMap.cpp @@ -1,11 +1,11 @@ #include "PositionMap.h" -#include "lib/api/service_helpers/PositionUtilities.h" -#include "lib/api/services/AdminService.client.pb.h" -#include "lib/api/services/AdminService.pb.h" -#include "lib/domain_model/Side.h" -#include "lib/logging/logging.h" -#include "lib/orderman/actors/SODPosition.h" -#include "lib/utils/PBUtils.h" +#include "spark/api/service_helpers/PositionUtilities.h" +#include "spark/api/services/AdminService.client.pb.h" +#include "spark/api/services/AdminService.pb.h" +#include "spark/domain_model/Side.h" +#include "spark/logging/logging.h" +#include "spark/orderman/actors/SODPosition.h" +#include "spark/utils/PBUtils.h" #include #include diff --git a/src/server/sparkd/position/PositionMap.h b/src/app_sparkd/sparkd/position/PositionMap.h similarity index 92% rename from src/server/sparkd/position/PositionMap.h rename to src/app_sparkd/sparkd/position/PositionMap.h index 31f5e0645..ccd53cf3b 100644 --- a/src/server/sparkd/position/PositionMap.h +++ b/src/app_sparkd/sparkd/position/PositionMap.h @@ -1,10 +1,9 @@ - #pragma once -#include "lib/api/services/OrderService.client.pb.h" -#include "lib/api/services/OrderService.pb.h" -#include "lib/api/services/PositionService.server.pb.h" -#include "lib/orderman/actors/SODPosition.h" +#include "spark/api/services/OrderService.client.pb.h" +#include "spark/api/services/OrderService.pb.h" +#include "spark/api/services/PositionService.server.pb.h" +#include "spark/orderman/actors/SODPosition.h" #include #include diff --git a/src/server/sparkd/position/PositionServicePNLHelper.cpp b/src/app_sparkd/sparkd/position/PositionServicePNLHelper.cpp similarity index 97% rename from src/server/sparkd/position/PositionServicePNLHelper.cpp rename to src/app_sparkd/sparkd/position/PositionServicePNLHelper.cpp index 064937c77..aead602e4 100644 --- a/src/server/sparkd/position/PositionServicePNLHelper.cpp +++ b/src/app_sparkd/sparkd/position/PositionServicePNLHelper.cpp @@ -1,11 +1,11 @@ #include "PositionServicePNLHelper.h" -#include "lib/config/config.h" -#include "lib/config/protos/toggles.pb.h" -#include "lib/domain_model/Security.h" -#include "lib/logging/logging.h" -#include "lib/md/MDClient.h" -#include "lib/os/os.h" -#include "lib/utils/LockBox.h" +#include "spark/config/config.h" +#include "spark/config/protos/toggles.pb.h" +#include "spark/domain_model/Security.h" +#include "spark/logging/logging.h" +#include "spark/md/MDClient.h" +#include "spark/os/os.h" +#include "spark/utils/LockBox.h" #include #include diff --git a/src/server/sparkd/position/PositionServicePNLHelper.h b/src/app_sparkd/sparkd/position/PositionServicePNLHelper.h similarity index 95% rename from src/server/sparkd/position/PositionServicePNLHelper.h rename to src/app_sparkd/sparkd/position/PositionServicePNLHelper.h index 52717526e..edc7c00fb 100644 --- a/src/server/sparkd/position/PositionServicePNLHelper.h +++ b/src/app_sparkd/sparkd/position/PositionServicePNLHelper.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/api/services/PositionService.server.pb.h" +#include "spark/api/services/PositionService.server.pb.h" #include diff --git a/src/server/sparkd/position/PositionServiceServer.cpp b/src/app_sparkd/sparkd/position/PositionServiceServer.cpp similarity index 96% rename from src/server/sparkd/position/PositionServiceServer.cpp rename to src/app_sparkd/sparkd/position/PositionServiceServer.cpp index 36040a12d..da9694058 100644 --- a/src/server/sparkd/position/PositionServiceServer.cpp +++ b/src/app_sparkd/sparkd/position/PositionServiceServer.cpp @@ -1,16 +1,16 @@ #include "PositionServiceServer.h" -#include "lib/api/public/ServiceContext.h" -#include "lib/api/services/AdminService.client.pb.h" -#include "lib/api/services/AdminService.pb.h" -#include "lib/api/services/OrderService.client.pb.h" -#include "lib/api/services/OrderService.pb.h" -#include "lib/api/services/PositionService.pb.h" -#include "lib/logging/logging.h" -#include "lib/persistence/SqliteStore.h" -#include "lib/utils/PBUtils.h" -#include "lib/utils/Puid.h" -#include "server/sparkd/position/PositionMap.h" -#include "server/sparkd/position/PositionServicePNLHelper.h" +#include "spark/api/public/ServiceContext.h" +#include "spark/api/services/AdminService.client.pb.h" +#include "spark/api/services/AdminService.pb.h" +#include "spark/api/services/OrderService.client.pb.h" +#include "spark/api/services/OrderService.pb.h" +#include "spark/api/services/PositionService.pb.h" +#include "spark/logging/logging.h" +#include "spark/persistence/SqliteStore.h" +#include "spark/utils/PBUtils.h" +#include "spark/utils/Puid.h" +#include "sparkd/position/PositionMap.h" +#include "sparkd/position/PositionServicePNLHelper.h" #include #include diff --git a/src/server/sparkd/position/PositionServiceServer.h b/src/app_sparkd/sparkd/position/PositionServiceServer.h similarity index 97% rename from src/server/sparkd/position/PositionServiceServer.h rename to src/app_sparkd/sparkd/position/PositionServiceServer.h index fb6ca5392..5671daa2e 100644 --- a/src/server/sparkd/position/PositionServiceServer.h +++ b/src/app_sparkd/sparkd/position/PositionServiceServer.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/api/services/PositionService.server.pb.h" +#include "spark/api/services/PositionService.server.pb.h" #include diff --git a/src/server/sparkd/position/import/BasePositionServiceServer.cpp b/src/app_sparkd/sparkd/position/import/BasePositionServiceServer.cpp similarity index 92% rename from src/server/sparkd/position/import/BasePositionServiceServer.cpp rename to src/app_sparkd/sparkd/position/import/BasePositionServiceServer.cpp index bc9fd22eb..d4d0342ae 100644 --- a/src/server/sparkd/position/import/BasePositionServiceServer.cpp +++ b/src/app_sparkd/sparkd/position/import/BasePositionServiceServer.cpp @@ -1,16 +1,16 @@ #include "BasePositionServiceServer.h" -#include "lib/api/public/ServiceContext.h" -#include "lib/api/services/AdminService.client.pb.h" -#include "lib/api/services/PositionService.client.pb.h" -#include "lib/config/config.h" -#include "lib/config/protos/orders_fills_cleanup.pb.h" -#include "lib/config/protos/position_cfg.pb.h" -#include "lib/logging/logging.h" -#include "lib/utils/PBUtils.h" -#include "lib/utils/bts_assert.h" -#include "lib/utils/datetime.h" -#include "server/sparkd/position/import/DownloadCommonStateMachine.h" -#include "server/sparkd/position/import/parsing/gmi_parser.h" +#include "spark/api/public/ServiceContext.h" +#include "spark/api/services/AdminService.client.pb.h" +#include "spark/api/services/PositionService.client.pb.h" +#include "spark/config/config.h" +#include "spark/config/protos/orders_fills_cleanup.pb.h" +#include "spark/config/protos/position_cfg.pb.h" +#include "spark/logging/logging.h" +#include "spark/utils/PBUtils.h" +#include "spark/utils/bts_assert.h" +#include "spark/utils/datetime.h" +#include "sparkd/position/import/DownloadCommonStateMachine.h" +#include "sparkd/position/import/parsing/gmi_parser.h" #include #include diff --git a/src/server/sparkd/position/import/BasePositionServiceServer.h b/src/app_sparkd/sparkd/position/import/BasePositionServiceServer.h similarity index 93% rename from src/server/sparkd/position/import/BasePositionServiceServer.h rename to src/app_sparkd/sparkd/position/import/BasePositionServiceServer.h index 096b0dfc6..9a1ce83bb 100644 --- a/src/server/sparkd/position/import/BasePositionServiceServer.h +++ b/src/app_sparkd/sparkd/position/import/BasePositionServiceServer.h @@ -1,7 +1,7 @@ #pragma once -#include "lib/api/services/BasePositionService.server.pb.h" -#include "lib/utils/datetime.h" +#include "spark/api/services/BasePositionService.server.pb.h" +#include "spark/utils/datetime.h" #include #include #include diff --git a/src/server/sparkd/position/import/DownloadCommonStateMachine.cpp b/src/app_sparkd/sparkd/position/import/DownloadCommonStateMachine.cpp similarity index 97% rename from src/server/sparkd/position/import/DownloadCommonStateMachine.cpp rename to src/app_sparkd/sparkd/position/import/DownloadCommonStateMachine.cpp index 61b7a9d03..62bd63c5e 100644 --- a/src/server/sparkd/position/import/DownloadCommonStateMachine.cpp +++ b/src/app_sparkd/sparkd/position/import/DownloadCommonStateMachine.cpp @@ -1,11 +1,11 @@ #include "DownloadCommonStateMachine.h" -#include "lib/config/config.h" -#include "lib/config/protos/position_cfg.pb.h" -#include "lib/utils/bts_assert.h" -#include "lib/utils/datetime.h" -#include "lib/utils/sftp.h" -#include "server/sparkd/position/import/DownloadWindow.h" +#include "spark/config/config.h" +#include "spark/config/protos/position_cfg.pb.h" +#include "spark/utils/bts_assert.h" +#include "spark/utils/datetime.h" +#include "spark/utils/sftp.h" +#include "sparkd/position/import/DownloadWindow.h" namespace bts { namespace position { diff --git a/src/server/sparkd/position/import/DownloadCommonStateMachine.h b/src/app_sparkd/sparkd/position/import/DownloadCommonStateMachine.h similarity index 97% rename from src/server/sparkd/position/import/DownloadCommonStateMachine.h rename to src/app_sparkd/sparkd/position/import/DownloadCommonStateMachine.h index 8546c9241..f8c60858d 100644 --- a/src/server/sparkd/position/import/DownloadCommonStateMachine.h +++ b/src/app_sparkd/sparkd/position/import/DownloadCommonStateMachine.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/utils/datetime.h" +#include "spark/utils/datetime.h" #include #include #include diff --git a/src/server/sparkd/position/import/DownloadWindow.cpp b/src/app_sparkd/sparkd/position/import/DownloadWindow.cpp similarity index 96% rename from src/server/sparkd/position/import/DownloadWindow.cpp rename to src/app_sparkd/sparkd/position/import/DownloadWindow.cpp index d3509ab00..5ebc8bac6 100644 --- a/src/server/sparkd/position/import/DownloadWindow.cpp +++ b/src/app_sparkd/sparkd/position/import/DownloadWindow.cpp @@ -1,5 +1,5 @@ -#include "server/sparkd/position/import/DownloadWindow.h" -#include "lib/utils/bts_assert.h" +#include "DownloadWindow.h" +#include "spark/utils/bts_assert.h" #include diff --git a/src/server/sparkd/position/import/DownloadWindow.h b/src/app_sparkd/sparkd/position/import/DownloadWindow.h similarity index 92% rename from src/server/sparkd/position/import/DownloadWindow.h rename to src/app_sparkd/sparkd/position/import/DownloadWindow.h index 65f684854..3aee271d6 100644 --- a/src/server/sparkd/position/import/DownloadWindow.h +++ b/src/app_sparkd/sparkd/position/import/DownloadWindow.h @@ -1,7 +1,7 @@ #pragma once -#include "lib/core/FMT_IMPL.h" -#include "lib/utils/datetime.h" +#include "spark/core/FMT_IMPL.h" +#include "spark/utils/datetime.h" #include #include diff --git a/src/server/sparkd/position/import/MoneyFileServiceServer.cpp b/src/app_sparkd/sparkd/position/import/MoneyFileServiceServer.cpp similarity index 92% rename from src/server/sparkd/position/import/MoneyFileServiceServer.cpp rename to src/app_sparkd/sparkd/position/import/MoneyFileServiceServer.cpp index c217ca8d9..c716b65f4 100644 --- a/src/server/sparkd/position/import/MoneyFileServiceServer.cpp +++ b/src/app_sparkd/sparkd/position/import/MoneyFileServiceServer.cpp @@ -1,14 +1,14 @@ #include "MoneyFileServiceServer.h" -#include "lib/api/public/ServiceContext.h" -#include "lib/api/service_helpers/AdminServiceUtils.h" -#include "lib/api/services/AdminService.client.pb.h" -#include "lib/api/services/MarginService.client.pb.h" -#include "lib/config/config.h" -#include "lib/config/protos/position_cfg.pb.h" -#include "lib/logging/logging.h" -#include "lib/utils/bts_assert.h" -#include "server/sparkd/position/import/DownloadCommonStateMachine.h" -#include "server/sparkd/position/import/parsing/money_parser.h" +#include "spark/api/public/ServiceContext.h" +#include "spark/api/service_helpers/AdminServiceUtils.h" +#include "spark/api/services/AdminService.client.pb.h" +#include "spark/api/services/MarginService.client.pb.h" +#include "spark/config/config.h" +#include "spark/config/protos/position_cfg.pb.h" +#include "spark/logging/logging.h" +#include "spark/utils/bts_assert.h" +#include "sparkd/position/import/DownloadCommonStateMachine.h" +#include "sparkd/position/import/parsing/money_parser.h" #include #include diff --git a/src/server/sparkd/position/import/MoneyFileServiceServer.h b/src/app_sparkd/sparkd/position/import/MoneyFileServiceServer.h similarity index 95% rename from src/server/sparkd/position/import/MoneyFileServiceServer.h rename to src/app_sparkd/sparkd/position/import/MoneyFileServiceServer.h index d2e0ab879..9e71665b1 100644 --- a/src/server/sparkd/position/import/MoneyFileServiceServer.h +++ b/src/app_sparkd/sparkd/position/import/MoneyFileServiceServer.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/api/services/MoneyFileService.server.pb.h" +#include "spark/api/services/MoneyFileService.server.pb.h" #include #include diff --git a/src/server/sparkd/position/import/docs/data/04/a77600-afc9-4929-ae2c-c68f32e137e7/sftp_credentials_encrypted.txt.gpg b/src/app_sparkd/sparkd/position/import/docs/data/04/a77600-afc9-4929-ae2c-c68f32e137e7/sftp_credentials_encrypted.txt.gpg similarity index 100% rename from src/server/sparkd/position/import/docs/data/04/a77600-afc9-4929-ae2c-c68f32e137e7/sftp_credentials_encrypted.txt.gpg rename to src/app_sparkd/sparkd/position/import/docs/data/04/a77600-afc9-4929-ae2c-c68f32e137e7/sftp_credentials_encrypted.txt.gpg diff --git a/src/server/sparkd/position/import/docs/data/e1/57ae24-efe5-4ea2-a997-a595a7a82eb9/btsmny_20190813.csv b/src/app_sparkd/sparkd/position/import/docs/data/e1/57ae24-efe5-4ea2-a997-a595a7a82eb9/btsmny_20190813.csv similarity index 100% rename from src/server/sparkd/position/import/docs/data/e1/57ae24-efe5-4ea2-a997-a595a7a82eb9/btsmny_20190813.csv rename to src/app_sparkd/sparkd/position/import/docs/data/e1/57ae24-efe5-4ea2-a997-a595a7a82eb9/btsmny_20190813.csv diff --git a/src/server/sparkd/position/import/docs/data/e1/57ae24-efe5-4ea2-a997-a595a7a82eb9/btspos_20190814.csv b/src/app_sparkd/sparkd/position/import/docs/data/e1/57ae24-efe5-4ea2-a997-a595a7a82eb9/btspos_20190814.csv similarity index 100% rename from src/server/sparkd/position/import/docs/data/e1/57ae24-efe5-4ea2-a997-a595a7a82eb9/btspos_20190814.csv rename to src/app_sparkd/sparkd/position/import/docs/data/e1/57ae24-efe5-4ea2-a997-a595a7a82eb9/btspos_20190814.csv diff --git a/src/server/sparkd/position/import/docs/download_state_machine.pdf b/src/app_sparkd/sparkd/position/import/docs/download_state_machine.pdf similarity index 100% rename from src/server/sparkd/position/import/docs/download_state_machine.pdf rename to src/app_sparkd/sparkd/position/import/docs/download_state_machine.pdf diff --git a/src/server/sparkd/position/import/docs/import.org b/src/app_sparkd/sparkd/position/import/docs/import.org similarity index 100% rename from src/server/sparkd/position/import/docs/import.org rename to src/app_sparkd/sparkd/position/import/docs/import.org diff --git a/src/server/sparkd/position/import/docs/reference/2019-07-08.File_Layout_Money.pdf b/src/app_sparkd/sparkd/position/import/docs/reference/2019-07-08.File_Layout_Money.pdf similarity index 100% rename from src/server/sparkd/position/import/docs/reference/2019-07-08.File_Layout_Money.pdf rename to src/app_sparkd/sparkd/position/import/docs/reference/2019-07-08.File_Layout_Money.pdf diff --git a/src/server/sparkd/position/import/docs/reference/2019-07-08.File_Layout_Positions.pdf b/src/app_sparkd/sparkd/position/import/docs/reference/2019-07-08.File_Layout_Positions.pdf similarity index 100% rename from src/server/sparkd/position/import/docs/reference/2019-07-08.File_Layout_Positions.pdf rename to src/app_sparkd/sparkd/position/import/docs/reference/2019-07-08.File_Layout_Positions.pdf diff --git a/src/server/sparkd/position/import/docs/reference/GMI Mapping spreadsheet.xlsx b/src/app_sparkd/sparkd/position/import/docs/reference/GMI Mapping spreadsheet.xlsx similarity index 100% rename from src/server/sparkd/position/import/docs/reference/GMI Mapping spreadsheet.xlsx rename to src/app_sparkd/sparkd/position/import/docs/reference/GMI Mapping spreadsheet.xlsx diff --git a/src/server/sparkd/position/import/docs/reference/Gmail - Money and Position files.pdf b/src/app_sparkd/sparkd/position/import/docs/reference/Gmail - Money and Position files.pdf similarity index 100% rename from src/server/sparkd/position/import/docs/reference/Gmail - Money and Position files.pdf rename to src/app_sparkd/sparkd/position/import/docs/reference/Gmail - Money and Position files.pdf diff --git a/src/server/sparkd/position/import/docs/reference/adatmny.docx b/src/app_sparkd/sparkd/position/import/docs/reference/adatmny.docx similarity index 100% rename from src/server/sparkd/position/import/docs/reference/adatmny.docx rename to src/app_sparkd/sparkd/position/import/docs/reference/adatmny.docx diff --git a/src/server/sparkd/position/import/docs/reference/adatpos.docx b/src/app_sparkd/sparkd/position/import/docs/reference/adatpos.docx similarity index 100% rename from src/server/sparkd/position/import/docs/reference/adatpos.docx rename to src/app_sparkd/sparkd/position/import/docs/reference/adatpos.docx diff --git a/src/server/sparkd/position/import/docs/reference/btsmny_20190813.csv b/src/app_sparkd/sparkd/position/import/docs/reference/btsmny_20190813.csv similarity index 100% rename from src/server/sparkd/position/import/docs/reference/btsmny_20190813.csv rename to src/app_sparkd/sparkd/position/import/docs/reference/btsmny_20190813.csv diff --git a/src/server/sparkd/position/import/docs/reference/btspos_20190814.csv b/src/app_sparkd/sparkd/position/import/docs/reference/btspos_20190814.csv similarity index 100% rename from src/server/sparkd/position/import/docs/reference/btspos_20190814.csv rename to src/app_sparkd/sparkd/position/import/docs/reference/btspos_20190814.csv diff --git a/src/server/sparkd/position/import/docs/reference/sftp_credentials_encrypted.txt.gpg b/src/app_sparkd/sparkd/position/import/docs/reference/sftp_credentials_encrypted.txt.gpg similarity index 100% rename from src/server/sparkd/position/import/docs/reference/sftp_credentials_encrypted.txt.gpg rename to src/app_sparkd/sparkd/position/import/docs/reference/sftp_credentials_encrypted.txt.gpg diff --git a/src/server/sparkd/position/import/parsing/gmi_parser.cpp b/src/app_sparkd/sparkd/position/import/parsing/gmi_parser.cpp similarity index 96% rename from src/server/sparkd/position/import/parsing/gmi_parser.cpp rename to src/app_sparkd/sparkd/position/import/parsing/gmi_parser.cpp index d6b7d79e9..457cac7c4 100644 --- a/src/server/sparkd/position/import/parsing/gmi_parser.cpp +++ b/src/app_sparkd/sparkd/position/import/parsing/gmi_parser.cpp @@ -1,15 +1,15 @@ #include "gmi_parser.h" -#include "lib/api/service_helpers/AdminServiceUtils.h" -#include "lib/config/config.h" -#include "lib/config/protos/position_cfg.pb.h" -#include "lib/domain_model/Security.h" -#include "lib/domain_model/Security.pb.h" -#include "lib/md/SecurityDB.h" -#include "lib/md/UserSymbol.h" -#include "lib/os/os.h" -#include "lib/utils/PBUtils.h" +#include "spark/api/service_helpers/AdminServiceUtils.h" +#include "spark/config/config.h" +#include "spark/config/protos/position_cfg.pb.h" +#include "spark/domain_model/Security.h" +#include "spark/domain_model/Security.pb.h" +#include "spark/md/SecurityDB.h" +#include "spark/md/UserSymbol.h" +#include "spark/os/os.h" +#include "spark/utils/PBUtils.h" +#include "sparkd/position/import/parsing/parser_common.h" -#include "server/sparkd/position/import/parsing/parser_common.h" #include #include #include diff --git a/src/server/sparkd/position/import/parsing/gmi_parser.h b/src/app_sparkd/sparkd/position/import/parsing/gmi_parser.h similarity index 93% rename from src/server/sparkd/position/import/parsing/gmi_parser.h rename to src/app_sparkd/sparkd/position/import/parsing/gmi_parser.h index 4f715c95c..17a0c547b 100644 --- a/src/server/sparkd/position/import/parsing/gmi_parser.h +++ b/src/app_sparkd/sparkd/position/import/parsing/gmi_parser.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/api/services/PositionService.pb.h" +#include "spark/api/services/PositionService.pb.h" #include #include #include diff --git a/src/server/sparkd/position/import/parsing/money_parser.cpp b/src/app_sparkd/sparkd/position/import/parsing/money_parser.cpp similarity index 94% rename from src/server/sparkd/position/import/parsing/money_parser.cpp rename to src/app_sparkd/sparkd/position/import/parsing/money_parser.cpp index d946f0008..97dd20a21 100644 --- a/src/server/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 "lib/api/service_helpers/AdminServiceUtils.h" -#include "lib/logging/logging.h" -#include "server/sparkd/position/import/parsing/parser_common.h" +#include "sparkd/position/import/parsing/money_parser.h" +#include "spark/api/service_helpers/AdminServiceUtils.h" +#include "spark/logging/logging.h" +#include "sparkd/position/import/parsing/parser_common.h" #include #include diff --git a/src/server/sparkd/position/import/parsing/money_parser.h b/src/app_sparkd/sparkd/position/import/parsing/money_parser.h similarity index 90% rename from src/server/sparkd/position/import/parsing/money_parser.h rename to src/app_sparkd/sparkd/position/import/parsing/money_parser.h index 1a8e375e3..8d080d10d 100644 --- a/src/server/sparkd/position/import/parsing/money_parser.h +++ b/src/app_sparkd/sparkd/position/import/parsing/money_parser.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/api/services/MarginService.server.pb.h" +#include "spark/api/services/MarginService.server.pb.h" #include #include #include diff --git a/src/server/sparkd/position/import/parsing/parser_common.cpp b/src/app_sparkd/sparkd/position/import/parsing/parser_common.cpp similarity index 92% rename from src/server/sparkd/position/import/parsing/parser_common.cpp rename to src/app_sparkd/sparkd/position/import/parsing/parser_common.cpp index fc4c1d003..2eaea215d 100644 --- a/src/server/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/server/sparkd/position/import/parsing/parser_common.h b/src/app_sparkd/sparkd/position/import/parsing/parser_common.h similarity index 100% rename from src/server/sparkd/position/import/parsing/parser_common.h rename to src/app_sparkd/sparkd/position/import/parsing/parser_common.h diff --git a/src/server/sparkd/position/tests/PositionTests.cpp b/src/app_sparkd/sparkd/position/tests/PositionTests.cpp similarity index 96% rename from src/server/sparkd/position/tests/PositionTests.cpp rename to src/app_sparkd/sparkd/position/tests/PositionTests.cpp index 2f683fd7b..63b6772b5 100644 --- a/src/server/sparkd/position/tests/PositionTests.cpp +++ b/src/app_sparkd/sparkd/position/tests/PositionTests.cpp @@ -1,5 +1,5 @@ -#include "lib/utils/datetime.h" -#include "server/sparkd/position/import/DownloadWindow.h" +#include "spark/utils/datetime.h" +#include "sparkd/position/import/DownloadWindow.h" #include #include diff --git a/src/server/sparkd/position/tests/position_tests_internal.cpp b/src/app_sparkd/sparkd/position/tests/position_tests_internal.cpp similarity index 99% rename from src/server/sparkd/position/tests/position_tests_internal.cpp rename to src/app_sparkd/sparkd/position/tests/position_tests_internal.cpp index e918e448a..bbab47dce 100644 --- a/src/server/sparkd/position/tests/position_tests_internal.cpp +++ b/src/app_sparkd/sparkd/position/tests/position_tests_internal.cpp @@ -1,5 +1,5 @@ -#include "lib/orderman/actors/SODPosition.h" -#include "server/sparkd/position/PositionMap.h" +#include "spark/orderman/actors/SODPosition.h" +#include "sparkd/position/PositionMap.h" #include #include diff --git a/src/server/sparkd/subprocess/SubProcessRunner.cpp b/src/app_sparkd/sparkd/subprocess/SubProcessRunner.cpp similarity index 89% rename from src/server/sparkd/subprocess/SubProcessRunner.cpp rename to src/app_sparkd/sparkd/subprocess/SubProcessRunner.cpp index 7d309bd34..09bdde084 100644 --- a/src/server/sparkd/subprocess/SubProcessRunner.cpp +++ b/src/app_sparkd/sparkd/subprocess/SubProcessRunner.cpp @@ -1,7 +1,7 @@ #include "SubProcessRunner.h" -#include "lib/config/config.h" -#include "lib/config/protos/subprocess.pb.h" -#include "lib/logging/logging.h" +#include "spark/config/config.h" +#include "spark/config/protos/subprocess.pb.h" +#include "spark/logging/logging.h" // #include #include #include diff --git a/src/server/sparkd/subprocess/SubProcessRunner.h b/src/app_sparkd/sparkd/subprocess/SubProcessRunner.h similarity index 100% rename from src/server/sparkd/subprocess/SubProcessRunner.h rename to src/app_sparkd/sparkd/subprocess/SubProcessRunner.h diff --git a/src/server/sparkd/support/ErrorReportService.cpp b/src/app_sparkd/sparkd/support/ErrorReportService.cpp similarity index 90% rename from src/server/sparkd/support/ErrorReportService.cpp rename to src/app_sparkd/sparkd/support/ErrorReportService.cpp index 803a9a321..7a3ed92b4 100644 --- a/src/server/sparkd/support/ErrorReportService.cpp +++ b/src/app_sparkd/sparkd/support/ErrorReportService.cpp @@ -1,10 +1,10 @@ #include "ErrorReportService.h" -#include "lib/config/config.h" -#include "lib/config/protos/system_config.pb.h" -#include "lib/logging/logging.h" -#include "lib/utils/bts_assert.h" -#include "lib/utils/datetime.h" +#include "spark/config/config.h" +#include "spark/config/protos/system_config.pb.h" +#include "spark/logging/logging.h" +#include "spark/utils/bts_assert.h" +#include "spark/utils/datetime.h" #include #include #include diff --git a/src/server/sparkd/support/ErrorReportService.h b/src/app_sparkd/sparkd/support/ErrorReportService.h similarity index 72% rename from src/server/sparkd/support/ErrorReportService.h rename to src/app_sparkd/sparkd/support/ErrorReportService.h index bb79774ae..39d2fc95f 100644 --- a/src/server/sparkd/support/ErrorReportService.h +++ b/src/app_sparkd/sparkd/support/ErrorReportService.h @@ -1,7 +1,7 @@ #pragma once -#include "lib/api/services/ErrorReportService.pb.h" -#include "lib/api/services/ErrorReportService.server.pb.h" +#include "spark/api/services/ErrorReportService.pb.h" +#include "spark/api/services/ErrorReportService.server.pb.h" namespace bts { namespace support { diff --git a/src/server/sparkd/support/ShellLatencyServer.cpp b/src/app_sparkd/sparkd/support/ShellLatencyServer.cpp similarity index 95% rename from src/server/sparkd/support/ShellLatencyServer.cpp rename to src/app_sparkd/sparkd/support/ShellLatencyServer.cpp index 988338bc7..0ea4578f8 100644 --- a/src/server/sparkd/support/ShellLatencyServer.cpp +++ b/src/app_sparkd/sparkd/support/ShellLatencyServer.cpp @@ -1,5 +1,5 @@ #include "ShellLatencyServer.h" -#include "lib/utils/TimeStamp.h" +#include "spark/utils/TimeStamp.h" namespace bts { namespace metrics { diff --git a/src/server/sparkd/support/ShellLatencyServer.h b/src/app_sparkd/sparkd/support/ShellLatencyServer.h similarity index 78% rename from src/server/sparkd/support/ShellLatencyServer.h rename to src/app_sparkd/sparkd/support/ShellLatencyServer.h index 3471e1736..4977aeed2 100644 --- a/src/server/sparkd/support/ShellLatencyServer.h +++ b/src/app_sparkd/sparkd/support/ShellLatencyServer.h @@ -1,9 +1,9 @@ #pragma once -#include "lib/api/services/ShellLatencyService.pb.h" -#include "lib/api/services/ShellLatencyService.server.pb.h" -#include "lib/metrics/metrics.h" -#include "lib/utils/Dispatcher.h" +#include "spark/api/services/ShellLatencyService.pb.h" +#include "spark/api/services/ShellLatencyService.server.pb.h" +#include "spark/metrics/metrics.h" +#include "spark/utils/Dispatcher.h" #include #include diff --git a/src/server/sparkd/user/AdminServiceDB.cpp b/src/app_sparkd/sparkd/user/AdminServiceDB.cpp similarity index 86% rename from src/server/sparkd/user/AdminServiceDB.cpp rename to src/app_sparkd/sparkd/user/AdminServiceDB.cpp index 5f5e2c028..2ba80e100 100644 --- a/src/server/sparkd/user/AdminServiceDB.cpp +++ b/src/app_sparkd/sparkd/user/AdminServiceDB.cpp @@ -1,7 +1,7 @@ -#include "server/sparkd/user/AdminServiceDB.h" -#include "lib/api/services/AdminService.server.pb.h" -#include "lib/persistence/SqliteStore.h" -#include "lib/utils/helper_macros.h" +#include "spark/api/services/AdminService.server.pb.h" +#include "spark/persistence/SqliteStore.h" +#include "spark/utils/helper_macros.h" +#include "sparkd/user/AdminServiceDB.h" namespace bts { namespace admin { diff --git a/src/server/sparkd/user/AdminServiceDB.h b/src/app_sparkd/sparkd/user/AdminServiceDB.h similarity index 100% rename from src/server/sparkd/user/AdminServiceDB.h rename to src/app_sparkd/sparkd/user/AdminServiceDB.h diff --git a/src/server/sparkd/user/AdminServiceServer.cpp b/src/app_sparkd/sparkd/user/AdminServiceServer.cpp similarity index 98% rename from src/server/sparkd/user/AdminServiceServer.cpp rename to src/app_sparkd/sparkd/user/AdminServiceServer.cpp index e55f74d81..99d98e68b 100644 --- a/src/server/sparkd/user/AdminServiceServer.cpp +++ b/src/app_sparkd/sparkd/user/AdminServiceServer.cpp @@ -1,11 +1,11 @@ #include "AdminServiceServer.h" -#include "lib/api/service_helpers/AdminServiceUtils.h" -#include "lib/logging/logging.h" -#include "lib/orderman/orderman_utils/orderman_utils.h" -#include "lib/utils/AuthToken.h" -#include "lib/utils/TimeStamp.h" -#include "lib/utils/bts_assert.h" -#include "server/sparkd/user/AdminServiceDB.h" +#include "spark/api/service_helpers/AdminServiceUtils.h" +#include "spark/logging/logging.h" +#include "spark/orderman/orderman_utils/orderman_utils.h" +#include "spark/utils/AuthToken.h" +#include "spark/utils/TimeStamp.h" +#include "spark/utils/bts_assert.h" +#include "sparkd/user/AdminServiceDB.h" #include #include diff --git a/src/server/sparkd/user/AdminServiceServer.h b/src/app_sparkd/sparkd/user/AdminServiceServer.h similarity index 93% rename from src/server/sparkd/user/AdminServiceServer.h rename to src/app_sparkd/sparkd/user/AdminServiceServer.h index 3df87f457..57d7015cc 100644 --- a/src/server/sparkd/user/AdminServiceServer.h +++ b/src/app_sparkd/sparkd/user/AdminServiceServer.h @@ -1,10 +1,10 @@ #pragma once -#include "lib/api/public/ServiceContext.h" -#include "lib/api/services/AdminService.server.pb.h" -#include "lib/api/services/OrderService.client.pb.h" -#include "lib/api/services/OrderService.pb.h" -#include "server/sparkd/user/AdminServiceDB.h" +#include "spark/api/public/ServiceContext.h" +#include "spark/api/services/AdminService.server.pb.h" +#include "spark/api/services/OrderService.client.pb.h" +#include "spark/api/services/OrderService.pb.h" +#include "sparkd/user/AdminServiceDB.h" #include diff --git a/src/server/sparkd/user/AuthServiceServer.cpp b/src/app_sparkd/sparkd/user/AuthServiceServer.cpp similarity index 95% rename from src/server/sparkd/user/AuthServiceServer.cpp rename to src/app_sparkd/sparkd/user/AuthServiceServer.cpp index 6703df4d9..7e61e5527 100644 --- a/src/server/sparkd/user/AuthServiceServer.cpp +++ b/src/app_sparkd/sparkd/user/AuthServiceServer.cpp @@ -1,8 +1,8 @@ #include "AuthServiceServer.h" -#include "lib/api/services/AdminService.client.pb.h" -#include "lib/api/services/AuthService.pb.h" -#include "lib/logging/logging.h" -#include "lib/utils/AuthToken.h" +#include "spark/api/services/AdminService.client.pb.h" +#include "spark/api/services/AuthService.pb.h" +#include "spark/logging/logging.h" +#include "spark/utils/AuthToken.h" #include #include diff --git a/src/server/sparkd/user/AuthServiceServer.h b/src/app_sparkd/sparkd/user/AuthServiceServer.h similarity index 90% rename from src/server/sparkd/user/AuthServiceServer.h rename to src/app_sparkd/sparkd/user/AuthServiceServer.h index 5a87c3843..2fbed8a35 100644 --- a/src/server/sparkd/user/AuthServiceServer.h +++ b/src/app_sparkd/sparkd/user/AuthServiceServer.h @@ -1,8 +1,8 @@ #pragma once #ifndef _WIN32 -#include "lib/api/services/AuthService.server.pb.h" -#include "lib/utils/bts_no_copy.h" +#include "spark/api/services/AuthService.server.pb.h" +#include "spark/utils/bts_no_copy.h" #include diff --git a/src/server/sparkd/user/tests/admin_service_tests.cpp b/src/app_sparkd/sparkd/user/tests/admin_service_tests.cpp similarity index 98% rename from src/server/sparkd/user/tests/admin_service_tests.cpp rename to src/app_sparkd/sparkd/user/tests/admin_service_tests.cpp index 71c525fde..c8ce2b655 100644 --- a/src/server/sparkd/user/tests/admin_service_tests.cpp +++ b/src/app_sparkd/sparkd/user/tests/admin_service_tests.cpp @@ -1,9 +1,8 @@ - -#include "lib/api/service_helpers/AdminServiceUtils.h" -#include "lib/api/services/AdminService.server.pb.h" -#include "lib/config/config.h" -#include "lib/utils/bts_chrono.h" -#include "lib/utils/helper_macros.h" +#include "spark/api/service_helpers/AdminServiceUtils.h" +#include "spark/api/services/AdminService.server.pb.h" +#include "spark/config/config.h" +#include "spark/utils/bts_chrono.h" +#include "spark/utils/helper_macros.h" #include #include diff --git a/src/client/spark/Spark.csproj b/src/client/spark/Spark.csproj index af4acef0b..2f38d4985 100644 --- a/src/client/spark/Spark.csproj +++ b/src/client/spark/Spark.csproj @@ -60,7 +60,7 @@ - + diff --git a/src/client/spark_api/spark_api.csproj b/src/client/spark_api/spark_api.csproj index e19a9ddd1..3fb968f21 100644 --- a/src/client/spark_api/spark_api.csproj +++ b/src/client/spark_api/spark_api.csproj @@ -31,175 +31,175 @@ - - - $(ProtoOutputPath)/lib/api + + + $(ProtoOutputPath)/lib_spark/spark/api - - $(ProtoOutputPath)/lib/api + + $(ProtoOutputPath)/lib_spark/spark/api - - $(ProtoOutputPath)/lib/api + + $(ProtoOutputPath)/lib_spark/spark/api - - $(ProtoOutputPath)/lib/api + + $(ProtoOutputPath)/lib_spark/spark/api - - $(ProtoOutputPath)/lib/api + + $(ProtoOutputPath)/lib_spark/spark/api - - - $(ProtoOutputPath)/lib/api/domain + + + $(ProtoOutputPath)/lib_spark/spark/api/domain - - $(ProtoOutputPath)/lib/api/domain + + $(ProtoOutputPath)/lib_spark/spark/api/domain - - $(ProtoOutputPath)/lib/api/domain + + $(ProtoOutputPath)/lib_spark/spark/api/domain - - $(ProtoOutputPath)/lib/api/domain + + $(ProtoOutputPath)/lib_spark/spark/api/domain - - $(ProtoOutputPath)/lib/api/domain + + $(ProtoOutputPath)/lib_spark/spark/api/domain - - $(ProtoOutputPath)/lib/api/domain + + $(ProtoOutputPath)/lib_spark/spark/api/domain - - $(ProtoOutputPath)/lib/api/domain + + $(ProtoOutputPath)/lib_spark/spark/api/domain - - $(ProtoOutputPath)/lib/api/domain + + $(ProtoOutputPath)/lib_spark/spark/api/domain - - $(ProtoOutputPath)/lib/api/domain + + $(ProtoOutputPath)/lib_spark/spark/api/domain - - $(ProtoOutputPath)/lib/api/domain + + $(ProtoOutputPath)/lib_spark/spark/api/domain - - $(ProtoOutputPath)/lib/api/domain + + $(ProtoOutputPath)/lib_spark/spark/api/domain - - $(ProtoOutputPath)/lib/api/domain + + $(ProtoOutputPath)/lib_spark/spark/api/domain - - $(ProtoOutputPath)/lib/api/domain + + $(ProtoOutputPath)/lib_spark/spark/api/domain - - - $(ProtoOutputPath)/lib/api/services + + + $(ProtoOutputPath)/lib_spark/spark/api/services - - $(ProtoOutputPath)/lib/api/services + + $(ProtoOutputPath)/lib_spark/spark/api/services - - $(ProtoOutputPath)/lib/api/services + + $(ProtoOutputPath)/lib_spark/spark/api/services - - $(ProtoOutputPath)/lib/api/services + + $(ProtoOutputPath)/lib_spark/spark/api/services - - $(ProtoOutputPath)/lib/api/services + + $(ProtoOutputPath)/lib_spark/spark/api/services - - $(ProtoOutputPath)/lib/api/services + + $(ProtoOutputPath)/lib_spark/spark/api/services - - $(ProtoOutputPath)/lib/api/services + + $(ProtoOutputPath)/lib_spark/spark/api/services - - $(ProtoOutputPath)/lib/api/services + + $(ProtoOutputPath)/lib_spark/spark/api/services - - $(ProtoOutputPath)/lib/api/services + + $(ProtoOutputPath)/lib_spark/spark/api/services - - $(ProtoOutputPath)/lib/api/services + + $(ProtoOutputPath)/lib_spark/spark/api/services - - $(ProtoOutputPath)/lib/api/services + + $(ProtoOutputPath)/lib_spark/spark/api/services - - $(ProtoOutputPath)/lib/api/services + + $(ProtoOutputPath)/lib_spark/spark/api/services - - $(ProtoOutputPath)/lib/api/services + + $(ProtoOutputPath)/lib_spark/spark/api/services - - $(ProtoOutputPath)/lib/api/services + + $(ProtoOutputPath)/lib_spark/spark/api/services - - $(ProtoOutputPath)/lib/api/services + + $(ProtoOutputPath)/lib_spark/spark/api/services - - $(ProtoOutputPath)/lib/api/services + + $(ProtoOutputPath)/lib_spark/spark/api/services - - $(ProtoOutputPath)/lib/api/services + + $(ProtoOutputPath)/lib_spark/spark/api/services - - $(ProtoOutputPath)/lib/api/services + + $(ProtoOutputPath)/lib_spark/spark/api/services - - $(ProtoOutputPath)/lib/api/services + + $(ProtoOutputPath)/lib_spark/spark/api/services - - $(ProtoOutputPath)/lib/api/services + + $(ProtoOutputPath)/lib_spark/spark/api/services - - $(ProtoOutputPath)/lib/api/services + + $(ProtoOutputPath)/lib_spark/spark/api/services - - $(ProtoOutputPath)/lib/api/services + + $(ProtoOutputPath)/lib_spark/spark/api/services - - $(ProtoOutputPath)/lib/api/services + + $(ProtoOutputPath)/lib_spark/spark/api/services - - $(ProtoOutputPath)/lib/md/protos + + $(ProtoOutputPath)/lib_spark/spark/md/protos Co2 - - $(ProtoOutputPath)/lib/domain_model + + $(ProtoOutputPath)/lib_spark/spark/domain_model - - $(ProtoOutputPath)/lib/sparkproto + + $(ProtoOutputPath)/lib_spark/spark/sparkproto - - - $(ProtoOutputPath)/lib/config/protos + + + $(ProtoOutputPath)/lib_spark/spark/config/protos - - $(ProtoOutputPath)/lib/config/protos + + $(ProtoOutputPath)/lib_spark/spark/config/protos - - $(ProtoOutputPath)/lib/config/protos + + $(ProtoOutputPath)/lib_spark/spark/config/protos - - $(ProtoOutputPath)/lib/config/protos + + $(ProtoOutputPath)/lib_spark/spark/config/protos - - $(ProtoOutputPath)/lib/config/protos + + $(ProtoOutputPath)/lib_spark/spark/config/protos - - $(ProtoOutputPath)/lib/config/protos + + $(ProtoOutputPath)/lib_spark/spark/config/protos - - $(ProtoOutputPath)/lib/config/protos + + $(ProtoOutputPath)/lib_spark/spark/config/protos - - $(ProtoOutputPath)/lib/config/protos + + $(ProtoOutputPath)/lib_spark/spark/config/protos - - $(ProtoOutputPath)/lib/config/protos + + $(ProtoOutputPath)/lib_spark/spark/config/protos diff --git a/src/client/spark_core/spark_core.csproj b/src/client/spark_core/spark_core.csproj index 24829ec0a..5e2719681 100644 --- a/src/client/spark_core/spark_core.csproj +++ b/src/client/spark_core/spark_core.csproj @@ -20,13 +20,13 @@ - + $(ProtoOutputPath)/lib/config/protos - + $(ProtoOutputPath)/lib/config/protos - + $(ProtoOutputPath)/lib/config/protos diff --git a/src/client/spark_sdk/doc/Threading.md b/src/client/spark_sdk/doc/Threading.md index 33ab4b160..c49f48e47 100644 --- a/src/client/spark_sdk/doc/Threading.md +++ b/src/client/spark_sdk/doc/Threading.md @@ -60,8 +60,8 @@ In this example the `Where` and `SelectMany` operators will execute on `ServiceC The C++ subscription callbacks use the [RxCpp](https://github.com/ReactiveX/RxCpp) library which implements the [ReactiveX](http://reactivex.io) operators. The subscribe call will return an `rxcpp::composite_subscription` which implements [RAII](https://en.wikipedia.org/wiki/Resource_acquisition_is_initialization) and will unsubscribe when it is destroyed. ```cpp -#include "lib/api/public/ServiceContext.h" -#include "lib/api/services/OrderService.client.pb.h" +#include "spark/api/public/ServiceContext.h" +#include "spark/api/services/OrderService.client.pb.h" #include #include //... @@ -76,4 +76,4 @@ auto sub = } }); -``` \ No newline at end of file +``` diff --git a/src/client/spark_websocket/Core/WebsocketConnectionGateway.cs b/src/client/spark_websocket/Core/WebsocketConnectionGateway.cs index f5e49cee2..b7ae1044f 100644 --- a/src/client/spark_websocket/Core/WebsocketConnectionGateway.cs +++ b/src/client/spark_websocket/Core/WebsocketConnectionGateway.cs @@ -454,7 +454,7 @@ namespace bts.websocket_core { // context.Response.Headers.Add("Access-Control-Allow-Headers", "*"); // await next(); // }); - app.Map(_server_params.DefaultEndPoint, async context => { + app.Map(_server_params.DefaultEndPoint ?? string.Empty, async context => { if (context.WebSockets.IsWebSocketRequest) { using (var ws = await context.WebSockets.AcceptWebSocketAsync()) { await _WebSocketHandler.ProcessWebSocketConnectionAsync(ws); diff --git a/src/client/spark_websocket/Core/WebsocketServerConfig.cs b/src/client/spark_websocket/Core/WebsocketServerConfig.cs new file mode 100644 index 000000000..9d51b538c --- /dev/null +++ b/src/client/spark_websocket/Core/WebsocketServerConfig.cs @@ -0,0 +1,9 @@ +namespace Bts.Websocket; + +public class WebsocketServerConfig { + public string? Host { get; set; } + public string? Port { get; set; } + public string? Scheme { get; set; } + public string? DefaultEndPoint { get; set; } + public double KeepAliveIntervalSecs { get; set; } +} diff --git a/src/client/spark_websocket/spark_websocket.csproj b/src/client/spark_websocket/spark_websocket.csproj index 394a20b6e..2c2be4618 100644 --- a/src/client/spark_websocket/spark_websocket.csproj +++ b/src/client/spark_websocket/spark_websocket.csproj @@ -30,10 +30,4 @@ - - - $(ProtoOutputPath)/spark_websocket - - - diff --git a/src/lib/CMakeLists.txt b/src/lib/CMakeLists.txt deleted file mode 100644 index 0fb83acf8..000000000 --- a/src/lib/CMakeLists.txt +++ /dev/null @@ -1,128 +0,0 @@ -cmake_minimum_required(VERSION 3.10) -project(libspark) -set(CMAKE_SHARED_LIBRARY_PREFIX "") -include(GNUInstallDirs) -include(${CMAKE_SOURCE_DIR}/cmake/safe_dep_glob.cmake) -include(${CMAKE_SOURCE_DIR}/cmake/ProtobufGenerateCpp.cmake) -include(${CMAKE_SOURCE_DIR}/cmake/ProtobufGenerateCppConfig.cmake) -include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/ProtobufGenerateCppService.cmake) -include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/GenerateDefaultConfig.cmake) -include(${CMAKE_SOURCE_DIR}/cmake/PrintList.cmake) - -configure_file( - "${CMAKE_SOURCE_DIR}/cmake/version.h.in" - "${CMAKE_CURRENT_BINARY_DIR}/version.h" -) - -if (DEFINED DOTNET_BINARY_DIR OR DEFINED DOTNET_WINDOWS_BINARY_DIR) - include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/AddCopyBinariesTarget.cmake) -endif() - -if(WIN32) - if(BUILD_SPARKD) - message(FATAL_ERROR "Cannot build sparkd on Windows (Please set BUILD_SPARKD to False)") - endif() - - include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/GetWindowsClientSources.cmake) - include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/GetWindowsClientLinkLibraries.cmake) -elseif(${BUILD_SPARKD}) - include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/GetLinuxServerSources.cmake) - include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/GetLinuxServerLinkLibraries.cmake) -else() - include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/GetLinuxClientSources.cmake) - include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/GetLinuxClientLinkLibraries.cmake) -endif() - -# Cpp sources -set(${PROJECT_NAME}_Sources) -get_cpp_sources(${PROJECT_NAME}_Sources) -print_list(${PROJECT_NAME}_Sources VERBOSE) - -# Proto sources -get_proto_sources(_cfg_protos _non_cfg_protos _service_protos _cfg_defaults) -print_list(_cfg_protos VERBOSE) -print_list(_non_cfg_protos VERBOSE) -print_list(_service_protos VERBOSE) -print_list(_cfg_defaults VERBOSE) - -update_deps_file("${${PROJECT_NAME}_Sources};${_cfg_protos};${_service_protos};${_non_cfg_protos};${_cfg_defaults}") - -# Generate proto cpp -message(STATUS "Generating proto cpp") -protobuf_generate_cpp( - CXX_SOURCES _proto_srcs - CXX_HEADERS _proto_hdrs - CXX_OUT_DIR ${CMAKE_BINARY_DIR}/src - PROTO_INCLUDE_DIRS - ${SPARK_INCLUDE} - ${CMAKE_SOURCE_DIR}/src - PROTO_SOURCES - ${_non_cfg_protos} - ${_cfg_protos} -) - -protobuf_generate_cpp_service( - CXX_SOURCES SERVICE_COMPILER_SRCS - CXX_HEADERS SERVICE_COMPILER_HDRS - CXX_OUT_DIR ${CMAKE_BINARY_DIR}/src - PROTO_INCLUDE_DIRS - ${SPARK_INCLUDE} - ${CMAKE_SOURCE_DIR}/src - PROTO_SOURCES - ${_service_protos} -) - -# Generate headers for config protos. One header provides the list of proto files in an array to be -# read at runtime in order to generate the aggregated config message type. The other header provides -# an array of strings whose items are lines representing the defaults for this aggregated config -# message type. -set(_cfg_defaults) -foreach(cfg_path ${CONFIG_DEFAULTS_PATH}) - file( - GLOB_RECURSE cfg_files - RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - ${cfg_path}) - list(APPEND _cfg_defaults ${cfg_files}) -endforeach() -protobuf_generate_cpp_config( - PROTO_SOURCES - ${_cfg_protos} - PROTO_SOURCES_HEADER - ${CMAKE_CURRENT_BINARY_DIR}/config_proto_files.h - PROTO_DEFAULTS - ${_cfg_defaults} - PROTO_DEFAULTS_HEADER - ${CMAKE_CURRENT_BINARY_DIR}/config_defaults.h -) - - -add_library(${PROJECT_NAME} SHARED ${${PROJECT_NAME}_Sources} ${_proto_srcs} ${SERVICE_COMPILER_SRCS}) - -target_include_directories( - ${PROJECT_NAME} PUBLIC - ${CMAKE_SOURCE_DIR}/src - ${CMAKE_BINARY_DIR}/src) - -get_link_libraries(_link_libs) -print_list(_link_libs VERBOSE) -target_link_libraries(${PROJECT_NAME} ${_link_libs}) - -# Copy binaries to Dotnet build dirs (for csprojs that depend on libspark) -if (DEFINED DOTNET_BINARY_DIR) - add_copy_binaries_target( - copy_to_dotnet_binary_dir - ${DOTNET_BINARY_DIR} - "Copy ${PROJECT_NAME} bins to Dotnet build dir") -endif() -if (DEFINED DOTNET_WINDOWS_BINARY_DIR) - add_copy_binaries_target( - copy_to_dotnet_windows_binary_dir - ${DOTNET_WINDOWS_BINARY_DIR} - "Copy ${PROJECT_NAME} bins to Dotnet Windows build dir") -endif() - -install(TARGETS ${PROJECT_NAME} DESTINATION "${CMAKE_INSTALL_BINDIR}") - -if(WIN32) - include(${CMAKE_SOURCE_DIR}/cmake/vs_filters.cmake) -endif() diff --git a/src/lib/cmake/AddCopyBinariesTarget.cmake b/src/lib/cmake/AddCopyBinariesTarget.cmake deleted file mode 100644 index d21883a4b..000000000 --- a/src/lib/cmake/AddCopyBinariesTarget.cmake +++ /dev/null @@ -1,11 +0,0 @@ -function(add_copy_binaries_target tgt_name dest_dir) - set(_output ${dest_dir}/${PROJECT_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX}) - add_custom_command( - OUTPUT ${_output} - COMMAND ${CMAKE_COMMAND} - ARGS -E copy - ${CMAKE_CURRENT_BINARY_DIR}/$/${PROJECT_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX} - ${dest_dir}/${PROJECT_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX} - DEPENDS ${PROJECT_NAME}) - add_custom_target(${tgt_name} ALL DEPENDS ${_output} COMMENT ${ARGN}) -endfunction() diff --git a/src/lib/cmake/GetLinuxClientSources.cmake b/src/lib/cmake/GetLinuxClientSources.cmake deleted file mode 100644 index 14aefb4ee..000000000 --- a/src/lib/cmake/GetLinuxClientSources.cmake +++ /dev/null @@ -1,169 +0,0 @@ -function(get_proto_sources cfg_srcs non_cfg_srcs service_srcs cfg_defaults) - file( - GLOB_RECURSE _cfg_srcs - RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - config/protos/*.proto - api/domain/SecurityMetadataCollection.proto) - file( - GLOB_RECURSE _service_srcs - RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - api/services/*.proto) - file( - GLOB_RECURSE _non_cfg_srcs - RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - *.proto) - list(REMOVE_ITEM _non_cfg_srcs ${_service_srcs} ${_cfg_srcs}) - - file( - GLOB_RECURSE _cfg_defaults - RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - ${CONFIG_DEFAULTS_PATH}) - - set(_cfg_defaults) - - foreach(cfg_path ${CONFIG_DEFAULTS_PATH}) - file( - GLOB_RECURSE cfg_files - RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - ${cfg_path}) - list(APPEND _cfg_defaults ${cfg_files}) - endforeach() - - set(${cfg_srcs} ${_cfg_srcs} PARENT_SCOPE) - set(${non_cfg_srcs} ${_non_cfg_srcs} PARENT_SCOPE) - set(${service_srcs} ${_service_srcs} PARENT_SCOPE) - set(${cfg_defaults} ${_cfg_defaults} PARENT_SCOPE) -endfunction() - -function(get_cpp_sources dest) - set(${dest} - api/core/ApiClientInterop.cpp - api/core/ApiServerInterop.cpp - api/md/MarketDataConfigUtils.cpp - api/public/ApiServer.cpp - api/public/ClientChannel.cpp - api/public/QuickbusClientChannel.cpp - api/public/ServerChannel.cpp - api/public/ServiceContext.cpp - api/test/ApiTests.cpp - api/test/HelloServiceServer.cpp - config/ConfigDownloader.cpp - config/ConfigErrorCollector.cpp - config/ConfigPropertyEvaluator.cpp - config/ConfigQuerier.cpp - config/ConfigValueQueue.cpp - config/ConfigurationException.cpp - config/ConfigurationState.cpp - config/PreprocessInputStream.cpp - config/config.cpp - config/tests/HTTPServer.cpp - config/tests/config_ref_tests.cpp - config/tests/config_tests.cpp - config/text_format/text_format.cpp - core/TimeSpan.cpp - core/TimeStamp.cpp - domain/DomainSecurityUtils.cpp - domain/SecurityCriteria.cpp - domain/SecurityCriteriaClause.cpp - domain/synthetic_book_side.cpp - domain_model/Security.cpp - domain_model/SecurityTests.cpp - domain_model/sod.cpp - domain_model/tests/domain_tests.cpp - expression/BooleanGrammar.cpp - expression/ExpressionEvaluator.cpp - expression/ParserExceptions.cpp - expression/Value.cpp - expression/tests/expression_parser_tests.cpp - io/JsonReader.cpp - logging/LoggerHub.cpp - logging/Sink.cpp - logging/logging.cpp - logging/tests/logging_tests.cpp - md/Diag/MDPeriodicDumper.cpp - md/Diag/ShmDumper.cpp - md/MBOProcessor.cpp - md/MBOServiceServer.cpp - md/MDClient.cpp - md/MDConsumer.cpp - md/MDConsumerHandle.cpp - md/MDConsumerInterop.cpp - md/MDProducer.cpp - md/MDProducerHandle.cpp - md/MemorySegmentUtils.cpp - md/PriceSize.cpp - md/Product.cpp - md/SecurityCache.cpp - md/SecurityDB.cpp - md/SecurityIDRecorder.cpp - md/SecurityMapper.cpp - md/SecurityMarketState.cpp - md/SecurityOracle.cpp - md/SecurityStore.cpp - md/SettlementRecorder.cpp - md/Shm/FixedSecurity.cpp - md/SyntheticSecurityService.cpp - md/cme/MDP3Utils.cpp - md/common.cpp - md/ice/ICEUtils.cpp - md/relay/QueryServer.cpp - md/relay/RelayClient.cpp - md/relay/RelayRecorder.cpp - md/service/MarketDataServiceServer.cpp - md/test/Co2ManagedTestHelper.cpp - md/test/Co2TestInstrument.cpp - md/test/mbo_tests.cpp - md/test/md2_tests.cpp - md/test/md_test_utils.cpp - md/test/synthetic_book_merge_tests.cpp - os/os.cpp - os/tests/os_tests.cpp - quickbus/core/LocalNode.cpp - quickbus/core/Quickbus.cpp - quickbus/core/SubscriptionID.cpp - quickbus/core/TableID.cpp - quickbus/message_model/Update.cpp - quickbus/message_model/merge_updates.cpp - quickbus/network/QBConnection.cpp - quickbus/network/QBConnectionManager.cpp - quickbus/network/endpoint_description.cpp - quickbus/pubsub/TablePublisher.cpp - quickbus/pubsub/TableSubscriber.cpp - quickbus/pubsub/tests/qb_pubsub_tests.cpp - quickbus/routing/INode.cpp - quickbus/routing/NodeID.cpp - quickbus/routing/Router.cpp - quickbus/rpc/RPCClient.cpp - quickbus/rpc/RPCServer.cpp - quickbus/rpc/RPCSessionID.cpp - quickbus/rpc/rpc_utils.cpp - quickbus/rpc/tests/qb_rpc_tests.cpp - quickbus/tests/quickbus_tests.cpp - testing/catch_test_runner.cpp - utils/AuthSessionManager.cpp - utils/AuthToken.cpp - utils/Dispatcher.cpp - utils/FileUtils.cpp - utils/GrowableSPSCQueue.cpp - utils/HTTPStream.cpp - utils/MathUtils.cpp - utils/PBUtils.cpp - utils/Puid.cpp - utils/SecureLogon.cpp - utils/SharedMemory.cpp - utils/Sqlite_utils.cpp - utils/Uuid.cpp - utils/datetime.cpp - utils/download.cpp - utils/file_utils.cpp - utils/init_spark_lib.cpp - utils/is_unittest_environment.cpp - utils/sftp.cpp - utils/stats.cpp - utils/tests/AuthTokenTests.cpp - utils/tests/IDGeneratorTests.cpp - utils/tests/MathUtilsTests.cpp - utils/tests/SingleWriterConcurrentVectorTests.cpp - utils/thread_manager.cpp - PARENT_SCOPE) -endfunction() diff --git a/src/lib/cmake/GetWindowsClientSources.cmake b/src/lib/cmake/GetWindowsClientSources.cmake deleted file mode 100644 index e110ac5a5..000000000 --- a/src/lib/cmake/GetWindowsClientSources.cmake +++ /dev/null @@ -1,164 +0,0 @@ -function(get_proto_sources cfg_srcs non_cfg_srcs service_srcs cfg_defaults) - file( - GLOB_RECURSE _cfg_srcs - RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - config/protos/*.proto - api/domain/SecurityMetadataCollection.proto) - file( - GLOB_RECURSE _service_srcs - RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - api/services/*.proto) - file( - GLOB_RECURSE _non_cfg_srcs - RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - *.proto) - list(REMOVE_ITEM _non_cfg_srcs ${_service_srcs} ${_cfg_srcs}) - - file( - GLOB_RECURSE _cfg_defaults - RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - ${CONFIG_DEFAULTS_PATH}) - - set(_cfg_defaults) - - foreach(cfg_path ${CONFIG_DEFAULTS_PATH}) - file( - GLOB_RECURSE cfg_files - RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - ${cfg_path}) - list(APPEND _cfg_defaults ${cfg_files}) - endforeach() - - set(${cfg_srcs} ${_cfg_srcs} PARENT_SCOPE) - set(${non_cfg_srcs} ${_non_cfg_srcs} PARENT_SCOPE) - set(${service_srcs} ${_service_srcs} PARENT_SCOPE) - set(${cfg_defaults} ${_cfg_defaults} PARENT_SCOPE) -endfunction() - -function(get_cpp_sources dest) - set(${dest} - api/core/ApiClientInterop.cpp - api/core/ApiServerInterop.cpp - api/public/ApiServer.cpp - api/public/ClientChannel.cpp - api/public/QuickbusClientChannel.cpp - api/public/ServerChannel.cpp - api/public/ServiceContext.cpp - api/test/ApiTests.cpp - api/test/HelloServiceServer.cpp - config/ConfigDownloader.cpp - config/ConfigErrorCollector.cpp - config/ConfigPropertyEvaluator.cpp - config/ConfigQuerier.cpp - config/ConfigValueQueue.cpp - config/ConfigurationException.cpp - config/ConfigurationState.cpp - config/PreprocessInputStream.cpp - config/config.cpp - config/tests/HTTPServer.cpp - config/tests/config_ref_tests.cpp - config/tests/config_tests.cpp - config/text_format/text_format.cpp - core/TimeSpan.cpp - core/TimeStamp.cpp - domain/DomainSecurityUtils.cpp - domain/SecurityCriteria.cpp - domain/SecurityCriteriaClause.cpp - domain/synthetic_book_side.cpp - domain_model/Security.cpp - domain_model/SecurityTests.cpp - domain_model/sod.cpp - domain_model/tests/domain_tests.cpp - expression/BooleanGrammar.cpp - expression/ExpressionEvaluator.cpp - expression/ParserExceptions.cpp - expression/Value.cpp - expression/tests/expression_parser_tests.cpp - io/JsonReader.cpp - logging/LoggerHub.cpp - logging/Sink.cpp - logging/logging.cpp - logging/tests/logging_tests.cpp - md/Diag/MDPeriodicDumper.cpp - md/Diag/ShmDumper.cpp - md/MBOProcessor.cpp - md/MBOServiceServer.cpp - md/MDClient.cpp - md/MDConsumer.cpp - md/MDConsumerHandle.cpp - md/MDConsumerInterop.cpp - md/MDProducer.cpp - md/MDProducerHandle.cpp - md/MemorySegmentUtils.cpp - md/PriceSize.cpp - md/Product.cpp - md/SecurityCache.cpp - md/SecurityDB.cpp - md/SecurityMapper.cpp - md/SecurityMarketState.cpp - md/SecurityOracle.cpp - md/SecurityStore.cpp - md/Shm/FixedSecurity.cpp - md/SyntheticSecurityService.cpp - md/cme/MDP3Utils.cpp - md/common.cpp - md/ice/ICEUtils.cpp - md/relay/QueryServer.cpp - md/relay/RelayClient.cpp - md/relay/RelayRecorder.cpp - md/service/MarketDataServiceServer.cpp - md/test/Co2ManagedTestHelper.cpp - md/test/Co2TestInstrument.cpp - md/test/mbo_tests.cpp - md/test/md2_tests.cpp - md/test/md_test_utils.cpp - md/test/synthetic_book_merge_tests.cpp - os/os.cpp - os/tests/os_tests.cpp - quickbus/core/LocalNode.cpp - quickbus/core/Quickbus.cpp - quickbus/core/SubscriptionID.cpp - quickbus/core/TableID.cpp - quickbus/message_model/Update.cpp - quickbus/message_model/merge_updates.cpp - quickbus/network/QBConnection.cpp - quickbus/network/QBConnectionManager.cpp - quickbus/network/endpoint_description.cpp - quickbus/pubsub/TablePublisher.cpp - quickbus/pubsub/TableSubscriber.cpp - quickbus/pubsub/tests/qb_pubsub_tests.cpp - quickbus/routing/INode.cpp - quickbus/routing/NodeID.cpp - quickbus/routing/Router.cpp - quickbus/rpc/RPCClient.cpp - quickbus/rpc/RPCServer.cpp - quickbus/rpc/RPCSessionID.cpp - quickbus/rpc/rpc_utils.cpp - quickbus/rpc/tests/qb_rpc_tests.cpp - quickbus/tests/quickbus_tests.cpp - testing/catch_test_runner.cpp - utils/AuthSessionManager.cpp - utils/AuthToken.cpp - utils/Dispatcher.cpp - utils/FileUtils.cpp - utils/GrowableSPSCQueue.cpp - utils/HTTPStream.cpp - utils/MathUtils.cpp - utils/PBUtils.cpp - utils/Puid.cpp - utils/SecureLogon.cpp - utils/SharedMemory.cpp - utils/Uuid.cpp - utils/datetime.cpp - utils/download.cpp - utils/file_utils.cpp - utils/init_spark_lib.cpp - utils/is_unittest_environment.cpp - utils/sftp.cpp - utils/stats.cpp - utils/tests/AuthTokenTests.cpp - utils/tests/MathUtilsTests.cpp - utils/tests/SingleWriterConcurrentVectorTests.cpp - utils/thread_manager.cpp - PARENT_SCOPE) -endfunction() diff --git a/src/lib/jetfix/jetfix.h b/src/lib/jetfix/jetfix.h deleted file mode 100644 index e0c7f4ccf..000000000 --- a/src/lib/jetfix/jetfix.h +++ /dev/null @@ -1,5 +0,0 @@ -#pragma once -#include "lib/jetfix/codec/FIXFragment.h" -#include "lib/jetfix/codec/FieldDefinitions.h" -#include "lib/jetfix/codec/MessageDefinitions.h" -#include "lib/jetfix/gateway/JetFIXGateway.h" diff --git a/src/lib/orderman/events/TradeSignalEvent.cpp b/src/lib/orderman/events/TradeSignalEvent.cpp deleted file mode 100644 index 4f9890c06..000000000 --- a/src/lib/orderman/events/TradeSignalEvent.cpp +++ /dev/null @@ -1 +0,0 @@ -#include "TradeSignalEvent.h" diff --git a/src/lib/orderman/events/TradeSummarySignalDispatcher.cpp b/src/lib/orderman/events/TradeSummarySignalDispatcher.cpp deleted file mode 100644 index 23e06cb76..000000000 --- a/src/lib/orderman/events/TradeSummarySignalDispatcher.cpp +++ /dev/null @@ -1 +0,0 @@ -#include "TradeSummarySignalDispatcher.h" diff --git a/src/lib/orderman/orders/algo/IAlgoServices.cpp b/src/lib/orderman/orders/algo/IAlgoServices.cpp deleted file mode 100644 index 787077bf7..000000000 --- a/src/lib/orderman/orders/algo/IAlgoServices.cpp +++ /dev/null @@ -1 +0,0 @@ -#include "lib/orderman/orders/algo/IAlgoServices.h" diff --git a/src/lib/quickbus/quickbus.h b/src/lib/quickbus/quickbus.h deleted file mode 100644 index 21371b3be..000000000 --- a/src/lib/quickbus/quickbus.h +++ /dev/null @@ -1,11 +0,0 @@ -#pragma once - -#include "lib/quickbus/core/Quickbus.h" -#include "lib/quickbus/core/Topic.h" -#include "lib/quickbus/pubsub/TableEvent.h" -#include "lib/quickbus/pubsub/TablePublisher.h" -#include "lib/quickbus/pubsub/TableSubscriber.h" -#include "lib/quickbus/rpc/RPCClient.h" -#include "lib/quickbus/rpc/RPCServer.h" - -#include "lib/config/protos/quickbus_cfg.pb.h" diff --git a/src/lib/tracing/bts_trace.cpp b/src/lib/tracing/bts_trace.cpp deleted file mode 100644 index 786166a1c..000000000 --- a/src/lib/tracing/bts_trace.cpp +++ /dev/null @@ -1 +0,0 @@ -#include "lib/tracing/bts_trace_c.c" diff --git a/src/lib_binance_execution/CMakeLists.txt b/src/lib_binance_execution/CMakeLists.txt index 165951d9d..c546df4b4 100644 --- a/src/lib_binance_execution/CMakeLists.txt +++ b/src/lib_binance_execution/CMakeLists.txt @@ -14,4 +14,4 @@ target_include_directories( ${CMAKE_CURRENT_SOURCE_DIR} ) -target_link_libraries(${PROJECT_NAME} PUBLIC libspark) +target_link_libraries(${PROJECT_NAME} PUBLIC spark) diff --git a/src/lib_binance_execution/binance_execution/cross_margin/cross_margin_gateway.cpp b/src/lib_binance_execution/binance_execution/cross_margin/cross_margin_gateway.cpp index 4eec36b3b..3cf8a6a7f 100644 --- a/src/lib_binance_execution/binance_execution/cross_margin/cross_margin_gateway.cpp +++ b/src/lib_binance_execution/binance_execution/cross_margin/cross_margin_gateway.cpp @@ -10,26 +10,26 @@ #include "binance_execution/order_key_map.h" #include "binance_execution/rest_api_result.h" #include "binance_execution/type_validators.h" -#include "lib/api/service_helpers/AdminServiceUtils.h" -#include "lib/api/services/AdminService.pb.h" -#include "lib/api/services/OrderService.h" -#include "lib/config/protos/jetfix.pb.h" -#include "lib/domain_model/Security.h" -#include "lib/domain_model/Security.pb.h" -#include "lib/io/json_formatter.h" -#include "lib/logging/logging.h" -#include "lib/md/SecurityOracle.h" -#include "lib/mercury/events/Update.h" -#include "lib/orderman/CancelOrderMsg.h" -#include "lib/orderman/CancelReplaceOrderMsg.h" -#include "lib/orderman/CreateOrderMsg.h" -#include "lib/orderman/RFQMsg.h" -#include "lib/orderman/events/NewAdminDataEvent.h" -#include "lib/orderman/events/NewSecuritiesEvent.h" -#include "lib/orderman/orderman_utils/ExchangePosition.h" -#include "lib/orderman/orderman_utils/ExecutionReport.h" -#include "lib/orderman/orderman_utils/orderman_common.h" -#include "lib/utils/overloaded.h" +#include "spark/api/service_helpers/AdminServiceUtils.h" +#include "spark/api/services/AdminService.pb.h" +#include "spark/api/services/OrderService.h" +#include "spark/config/protos/jetfix.pb.h" +#include "spark/domain_model/Security.h" +#include "spark/domain_model/Security.pb.h" +#include "spark/io/json_formatter.h" +#include "spark/logging/logging.h" +#include "spark/md/SecurityOracle.h" +#include "spark/mercury/events/Update.h" +#include "spark/orderman/CancelOrderMsg.h" +#include "spark/orderman/CancelReplaceOrderMsg.h" +#include "spark/orderman/CreateOrderMsg.h" +#include "spark/orderman/RFQMsg.h" +#include "spark/orderman/events/NewAdminDataEvent.h" +#include "spark/orderman/events/NewSecuritiesEvent.h" +#include "spark/orderman/orderman_utils/ExchangePosition.h" +#include "spark/orderman/orderman_utils/ExecutionReport.h" +#include "spark/orderman/orderman_utils/orderman_common.h" +#include "spark/utils/overloaded.h" #include #include diff --git a/src/lib_binance_execution/binance_execution/cross_margin/cross_margin_gateway.h b/src/lib_binance_execution/binance_execution/cross_margin/cross_margin_gateway.h index 52bc150ff..e9a759cb8 100644 --- a/src/lib_binance_execution/binance_execution/cross_margin/cross_margin_gateway.h +++ b/src/lib_binance_execution/binance_execution/cross_margin/cross_margin_gateway.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/orderman/gateways/IExecutionGateway.h" +#include "spark/orderman/gateways/IExecutionGateway.h" #include diff --git a/src/lib_binance_execution/binance_execution/cross_margin/messages/cancel_order_request.cpp b/src/lib_binance_execution/binance_execution/cross_margin/messages/cancel_order_request.cpp index 42b7044bc..688bf94a6 100644 --- a/src/lib_binance_execution/binance_execution/cross_margin/messages/cancel_order_request.cpp +++ b/src/lib_binance_execution/binance_execution/cross_margin/messages/cancel_order_request.cpp @@ -3,9 +3,9 @@ #include "binance_execution/order_key_map.h" #include "binance_execution/type_converters.h" #include "binance_execution/type_validators.h" -#include "lib/io/JsonReader.h" -#include "lib/orderman/CancelOrderMsg.h" -#include "lib/utils/checked_arithmetic.h" +#include "spark/io/JsonReader.h" +#include "spark/orderman/CancelOrderMsg.h" +#include "spark/utils/checked_arithmetic.h" namespace binance_execution::cross_margin { diff --git a/src/lib_binance_execution/binance_execution/cross_margin/messages/cancel_order_response.cpp b/src/lib_binance_execution/binance_execution/cross_margin/messages/cancel_order_response.cpp index 20feba845..360d8e69a 100644 --- a/src/lib_binance_execution/binance_execution/cross_margin/messages/cancel_order_response.cpp +++ b/src/lib_binance_execution/binance_execution/cross_margin/messages/cancel_order_response.cpp @@ -2,7 +2,7 @@ #include "binance_execution/enums/order_status.h" #include "binance_execution/enums/order_type.h" #include "binance_execution/enums/time_in_force.h" -#include "lib/io/JsonReader.h" +#include "spark/io/JsonReader.h" namespace binance_execution::cross_margin { diff --git a/src/lib_binance_execution/binance_execution/cross_margin/messages/create_order_request.cpp b/src/lib_binance_execution/binance_execution/cross_margin/messages/create_order_request.cpp index c82aad8fd..7cda25a0c 100644 --- a/src/lib_binance_execution/binance_execution/cross_margin/messages/create_order_request.cpp +++ b/src/lib_binance_execution/binance_execution/cross_margin/messages/create_order_request.cpp @@ -4,8 +4,8 @@ #include "binance_execution/quantity.h" #include "binance_execution/type_converters.h" #include "binance_execution/type_validators.h" -#include "lib/io/JsonReader.h" -#include "lib/orderman/CreateOrderMsg.h" +#include "spark/io/JsonReader.h" +#include "spark/orderman/CreateOrderMsg.h" namespace binance_execution::cross_margin { diff --git a/src/lib_binance_execution/binance_execution/cross_margin/messages/create_order_response.h b/src/lib_binance_execution/binance_execution/cross_margin/messages/create_order_response.h index 1af6cfff3..bfa840240 100644 --- a/src/lib_binance_execution/binance_execution/cross_margin/messages/create_order_response.h +++ b/src/lib_binance_execution/binance_execution/cross_margin/messages/create_order_response.h @@ -5,7 +5,7 @@ #include "binance_execution/enums/self_trade_prevention_mode.h" #include "binance_execution/enums/side.h" #include "binance_execution/enums/time_in_force.h" -#include "lib/io/JsonReader.h" +#include "spark/io/JsonReader.h" #include #include diff --git a/src/lib_binance_execution/binance_execution/cross_margin/rest_api_client.cpp b/src/lib_binance_execution/binance_execution/cross_margin/rest_api_client.cpp index c8cd8ecb2..e00fdaaf1 100644 --- a/src/lib_binance_execution/binance_execution/cross_margin/rest_api_client.cpp +++ b/src/lib_binance_execution/binance_execution/cross_margin/rest_api_client.cpp @@ -1,8 +1,8 @@ #include "rest_api_client.h" -#include "lib/io/http/http_client.h" -#include "lib/io/http/http_response.h" -#include "lib/utils/crypto/hmac.h" -#include "lib/utils/type_name.h" +#include "spark/io/http/http_client.h" +#include "spark/io/http/http_response.h" +#include "spark/utils/crypto/hmac.h" +#include "spark/utils/type_name.h" namespace binance_execution::cross_margin { diff --git a/src/lib_binance_execution/binance_execution/cross_margin/rest_api_client.h b/src/lib_binance_execution/binance_execution/cross_margin/rest_api_client.h index 7bbca966b..250871240 100644 --- a/src/lib_binance_execution/binance_execution/cross_margin/rest_api_client.h +++ b/src/lib_binance_execution/binance_execution/cross_margin/rest_api_client.h @@ -9,7 +9,7 @@ #include "binance_execution/messages/refresh_listen_key_request.h" #include "binance_execution/messages/refresh_listen_key_response.h" #include "binance_execution/rest_api_result.h" -#include "lib/io/http/HttpMethod.h" +#include "spark/io/http/HttpMethod.h" #include #include diff --git a/src/lib_binance_execution/binance_execution/cross_margin/side_effect_type.h b/src/lib_binance_execution/binance_execution/cross_margin/side_effect_type.h index 4b24d1225..dada531ac 100644 --- a/src/lib_binance_execution/binance_execution/cross_margin/side_effect_type.h +++ b/src/lib_binance_execution/binance_execution/cross_margin/side_effect_type.h @@ -1,7 +1,7 @@ #pragma once -#include "lib/core/EnumMacros.h" -#include "lib/core/FMT_IMPL.h" +#include "spark/core/EnumMacros.h" +#include "spark/core/FMT_IMPL.h" #include #include diff --git a/src/lib_binance_execution/binance_execution/cross_margin/trade_data_stream/account_update.h b/src/lib_binance_execution/binance_execution/cross_margin/trade_data_stream/account_update.h index 06fd67c0e..0de59cf72 100644 --- a/src/lib_binance_execution/binance_execution/cross_margin/trade_data_stream/account_update.h +++ b/src/lib_binance_execution/binance_execution/cross_margin/trade_data_stream/account_update.h @@ -1,7 +1,7 @@ #pragma once #include "binance_execution/cross_margin/trade_data_stream/event_type.h" -#include "lib/io/JsonReader.h" +#include "spark/io/JsonReader.h" #include #include diff --git a/src/lib_binance_execution/binance_execution/cross_margin/trade_data_stream/balance_update.h b/src/lib_binance_execution/binance_execution/cross_margin/trade_data_stream/balance_update.h index 114fa23e7..9d1530c93 100644 --- a/src/lib_binance_execution/binance_execution/cross_margin/trade_data_stream/balance_update.h +++ b/src/lib_binance_execution/binance_execution/cross_margin/trade_data_stream/balance_update.h @@ -1,7 +1,7 @@ #pragma once #include "binance_execution/cross_margin/trade_data_stream/event_type.h" -#include "lib/io/JsonReader.h" +#include "spark/io/JsonReader.h" #include #include diff --git a/src/lib_binance_execution/binance_execution/cross_margin/trade_data_stream/event_type.h b/src/lib_binance_execution/binance_execution/cross_margin/trade_data_stream/event_type.h index fee7bd169..d819366dc 100644 --- a/src/lib_binance_execution/binance_execution/cross_margin/trade_data_stream/event_type.h +++ b/src/lib_binance_execution/binance_execution/cross_margin/trade_data_stream/event_type.h @@ -1,7 +1,7 @@ #pragma once -#include "lib/core/EnumMacros.h" -#include "lib/core/FMT_IMPL.h" +#include "spark/core/EnumMacros.h" +#include "spark/core/FMT_IMPL.h" #include #include diff --git a/src/lib_binance_execution/binance_execution/cross_margin/trade_data_stream/order_update.cpp b/src/lib_binance_execution/binance_execution/cross_margin/trade_data_stream/order_update.cpp index f114244b4..e4855accf 100644 --- a/src/lib_binance_execution/binance_execution/cross_margin/trade_data_stream/order_update.cpp +++ b/src/lib_binance_execution/binance_execution/cross_margin/trade_data_stream/order_update.cpp @@ -1,11 +1,11 @@ #include "order_update.h" #include "binance_execution/type_converters.h" -#include "lib/config/protos/jetfix.pb.h" -#include "lib/domain_model/Security.pb.h" -#include "lib/io/JsonReader.h" -#include "lib/orderman/orderman_utils/ExecutionReport.h" -#include "lib/utils/checked_arithmetic.h" -#include "lib/utils/string_utils.h" +#include "spark/config/protos/jetfix.pb.h" +#include "spark/domain_model/Security.pb.h" +#include "spark/io/JsonReader.h" +#include "spark/orderman/orderman_utils/ExecutionReport.h" +#include "spark/utils/checked_arithmetic.h" +#include "spark/utils/string_utils.h" #include diff --git a/src/lib_binance_execution/binance_execution/cross_margin/trade_data_stream/trade_data_subscription.cpp b/src/lib_binance_execution/binance_execution/cross_margin/trade_data_stream/trade_data_subscription.cpp index 51f7b038a..15cf9f105 100644 --- a/src/lib_binance_execution/binance_execution/cross_margin/trade_data_stream/trade_data_subscription.cpp +++ b/src/lib_binance_execution/binance_execution/cross_margin/trade_data_stream/trade_data_subscription.cpp @@ -3,10 +3,10 @@ #include "binance_execution/cross_margin/trade_data_stream/balance_update.h" #include "binance_execution/cross_margin/trade_data_stream/event_type.h" #include "binance_execution/cross_margin/trade_data_stream/order_update.h" -#include "lib/core/TimeStamp.h" -#include "lib/io/websocket/websocket_client.h" -#include "lib/logging/logging.h" -#include "lib/utils/type_name.h" +#include "spark/core/TimeStamp.h" +#include "spark/io/websocket/websocket_client.h" +#include "spark/logging/logging.h" +#include "spark/utils/type_name.h" #include #include diff --git a/src/lib_binance_execution/binance_execution/cross_margin/trade_data_stream/trade_data_subscription.h b/src/lib_binance_execution/binance_execution/cross_margin/trade_data_stream/trade_data_subscription.h index 07b9a14fd..cd36342f6 100644 --- a/src/lib_binance_execution/binance_execution/cross_margin/trade_data_stream/trade_data_subscription.h +++ b/src/lib_binance_execution/binance_execution/cross_margin/trade_data_stream/trade_data_subscription.h @@ -3,7 +3,7 @@ #include "binance_execution/cross_margin/trade_data_stream/account_update.h" #include "binance_execution/cross_margin/trade_data_stream/balance_update.h" #include "binance_execution/cross_margin/trade_data_stream/order_update.h" -#include "lib/utils/Delegate.h" +#include "spark/utils/Delegate.h" #include diff --git a/src/lib_binance_execution/binance_execution/enums/api_key_type.h b/src/lib_binance_execution/binance_execution/enums/api_key_type.h index 51057068e..17740bbc2 100644 --- a/src/lib_binance_execution/binance_execution/enums/api_key_type.h +++ b/src/lib_binance_execution/binance_execution/enums/api_key_type.h @@ -1,7 +1,7 @@ #pragma once -#include "lib/core/EnumMacros.h" -#include "lib/core/FMT_IMPL.h" +#include "spark/core/EnumMacros.h" +#include "spark/core/FMT_IMPL.h" #include #include diff --git a/src/lib_binance_execution/binance_execution/enums/cancel_replace_mode.h b/src/lib_binance_execution/binance_execution/enums/cancel_replace_mode.h index 5241c0135..bc3c213ef 100644 --- a/src/lib_binance_execution/binance_execution/enums/cancel_replace_mode.h +++ b/src/lib_binance_execution/binance_execution/enums/cancel_replace_mode.h @@ -1,7 +1,7 @@ #pragma once -#include "lib/core/EnumMacros.h" -#include "lib/core/FMT_IMPL.h" +#include "spark/core/EnumMacros.h" +#include "spark/core/FMT_IMPL.h" #include #include diff --git a/src/lib_binance_execution/binance_execution/enums/event_reason_type.h b/src/lib_binance_execution/binance_execution/enums/event_reason_type.h index a3a4068a1..f18a1ad1e 100644 --- a/src/lib_binance_execution/binance_execution/enums/event_reason_type.h +++ b/src/lib_binance_execution/binance_execution/enums/event_reason_type.h @@ -1,7 +1,7 @@ #pragma once -#include "lib/core/EnumMacros.h" -#include "lib/core/FMT_IMPL.h" +#include "spark/core/EnumMacros.h" +#include "spark/core/FMT_IMPL.h" #include #include diff --git a/src/lib_binance_execution/binance_execution/enums/execution_type.h b/src/lib_binance_execution/binance_execution/enums/execution_type.h index 72a4e73ea..c17748d74 100644 --- a/src/lib_binance_execution/binance_execution/enums/execution_type.h +++ b/src/lib_binance_execution/binance_execution/enums/execution_type.h @@ -1,7 +1,7 @@ #pragma once -#include "lib/core/EnumMacros.h" -#include "lib/core/FMT_IMPL.h" +#include "spark/core/EnumMacros.h" +#include "spark/core/FMT_IMPL.h" #include #include diff --git a/src/lib_binance_execution/binance_execution/enums/internal_order_ack_type.h b/src/lib_binance_execution/binance_execution/enums/internal_order_ack_type.h index 48a7122dc..e6b2056de 100644 --- a/src/lib_binance_execution/binance_execution/enums/internal_order_ack_type.h +++ b/src/lib_binance_execution/binance_execution/enums/internal_order_ack_type.h @@ -1,7 +1,7 @@ #pragma once -#include "lib/core/EnumMacros.h" -#include "lib/core/FMT_IMPL.h" +#include "spark/core/EnumMacros.h" +#include "spark/core/FMT_IMPL.h" #include #include diff --git a/src/lib_binance_execution/binance_execution/enums/internal_order_status.h b/src/lib_binance_execution/binance_execution/enums/internal_order_status.h index 52ba9c56c..ef631ef3f 100644 --- a/src/lib_binance_execution/binance_execution/enums/internal_order_status.h +++ b/src/lib_binance_execution/binance_execution/enums/internal_order_status.h @@ -1,7 +1,7 @@ #pragma once -#include "lib/core/EnumMacros.h" -#include "lib/core/FMT_IMPL.h" +#include "spark/core/EnumMacros.h" +#include "spark/core/FMT_IMPL.h" #include #include diff --git a/src/lib_binance_execution/binance_execution/enums/new_order_response_type.h b/src/lib_binance_execution/binance_execution/enums/new_order_response_type.h index fea2f54c1..76504a015 100644 --- a/src/lib_binance_execution/binance_execution/enums/new_order_response_type.h +++ b/src/lib_binance_execution/binance_execution/enums/new_order_response_type.h @@ -1,7 +1,7 @@ #pragma once -#include "lib/core/EnumMacros.h" -#include "lib/core/FMT_IMPL.h" +#include "spark/core/EnumMacros.h" +#include "spark/core/FMT_IMPL.h" #include #include diff --git a/src/lib_binance_execution/binance_execution/enums/op_success.h b/src/lib_binance_execution/binance_execution/enums/op_success.h index ba15d0b7a..a7de967ae 100644 --- a/src/lib_binance_execution/binance_execution/enums/op_success.h +++ b/src/lib_binance_execution/binance_execution/enums/op_success.h @@ -1,7 +1,7 @@ #pragma once -#include "lib/core/EnumMacros.h" -#include "lib/core/FMT_IMPL.h" +#include "spark/core/EnumMacros.h" +#include "spark/core/FMT_IMPL.h" #include #include diff --git a/src/lib_binance_execution/binance_execution/enums/order_cancel_restriction.h b/src/lib_binance_execution/binance_execution/enums/order_cancel_restriction.h index be0b65646..b35c8054d 100644 --- a/src/lib_binance_execution/binance_execution/enums/order_cancel_restriction.h +++ b/src/lib_binance_execution/binance_execution/enums/order_cancel_restriction.h @@ -1,7 +1,7 @@ #pragma once -#include "lib/core/EnumMacros.h" -#include "lib/core/FMT_IMPL.h" +#include "spark/core/EnumMacros.h" +#include "spark/core/FMT_IMPL.h" #include #include diff --git a/src/lib_binance_execution/binance_execution/enums/order_rate_limit_exceeded_mode.h b/src/lib_binance_execution/binance_execution/enums/order_rate_limit_exceeded_mode.h index 2bcd0d337..9ee2b6f5a 100644 --- a/src/lib_binance_execution/binance_execution/enums/order_rate_limit_exceeded_mode.h +++ b/src/lib_binance_execution/binance_execution/enums/order_rate_limit_exceeded_mode.h @@ -1,7 +1,7 @@ #pragma once -#include "lib/core/EnumMacros.h" -#include "lib/core/FMT_IMPL.h" +#include "spark/core/EnumMacros.h" +#include "spark/core/FMT_IMPL.h" #include #include diff --git a/src/lib_binance_execution/binance_execution/enums/order_status.h b/src/lib_binance_execution/binance_execution/enums/order_status.h index 5716139af..eb28be2bb 100644 --- a/src/lib_binance_execution/binance_execution/enums/order_status.h +++ b/src/lib_binance_execution/binance_execution/enums/order_status.h @@ -1,7 +1,7 @@ #pragma once -#include "lib/core/EnumMacros.h" -#include "lib/core/FMT_IMPL.h" +#include "spark/core/EnumMacros.h" +#include "spark/core/FMT_IMPL.h" #include #include diff --git a/src/lib_binance_execution/binance_execution/enums/order_type.h b/src/lib_binance_execution/binance_execution/enums/order_type.h index a753f15e0..6bd009949 100644 --- a/src/lib_binance_execution/binance_execution/enums/order_type.h +++ b/src/lib_binance_execution/binance_execution/enums/order_type.h @@ -1,7 +1,7 @@ #pragma once -#include "lib/core/EnumMacros.h" -#include "lib/core/FMT_IMPL.h" +#include "spark/core/EnumMacros.h" +#include "spark/core/FMT_IMPL.h" #include #include diff --git a/src/lib_binance_execution/binance_execution/enums/position_side.h b/src/lib_binance_execution/binance_execution/enums/position_side.h index c18edfe1b..139d3af5d 100644 --- a/src/lib_binance_execution/binance_execution/enums/position_side.h +++ b/src/lib_binance_execution/binance_execution/enums/position_side.h @@ -1,7 +1,7 @@ #pragma once -#include "lib/core/EnumMacros.h" -#include "lib/core/FMT_IMPL.h" +#include "spark/core/EnumMacros.h" +#include "spark/core/FMT_IMPL.h" #include #include diff --git a/src/lib_binance_execution/binance_execution/enums/price_match_mode.h b/src/lib_binance_execution/binance_execution/enums/price_match_mode.h index 1aae2baf7..a66747c9e 100644 --- a/src/lib_binance_execution/binance_execution/enums/price_match_mode.h +++ b/src/lib_binance_execution/binance_execution/enums/price_match_mode.h @@ -1,7 +1,7 @@ #pragma once -#include "lib/core/EnumMacros.h" -#include "lib/core/FMT_IMPL.h" +#include "spark/core/EnumMacros.h" +#include "spark/core/FMT_IMPL.h" #include #include diff --git a/src/lib_binance_execution/binance_execution/enums/self_trade_prevention_mode.h b/src/lib_binance_execution/binance_execution/enums/self_trade_prevention_mode.h index a55147891..9fdbe578f 100644 --- a/src/lib_binance_execution/binance_execution/enums/self_trade_prevention_mode.h +++ b/src/lib_binance_execution/binance_execution/enums/self_trade_prevention_mode.h @@ -1,7 +1,7 @@ #pragma once -#include "lib/core/EnumMacros.h" -#include "lib/core/FMT_IMPL.h" +#include "spark/core/EnumMacros.h" +#include "spark/core/FMT_IMPL.h" #include #include diff --git a/src/lib_binance_execution/binance_execution/enums/side.h b/src/lib_binance_execution/binance_execution/enums/side.h index 2933eea86..a2eb4987f 100644 --- a/src/lib_binance_execution/binance_execution/enums/side.h +++ b/src/lib_binance_execution/binance_execution/enums/side.h @@ -1,7 +1,7 @@ #pragma once -#include "lib/core/EnumMacros.h" -#include "lib/core/FMT_IMPL.h" +#include "spark/core/EnumMacros.h" +#include "spark/core/FMT_IMPL.h" #include #include diff --git a/src/lib_binance_execution/binance_execution/enums/time_in_force.h b/src/lib_binance_execution/binance_execution/enums/time_in_force.h index ab6ebd53c..2ba3cb58a 100644 --- a/src/lib_binance_execution/binance_execution/enums/time_in_force.h +++ b/src/lib_binance_execution/binance_execution/enums/time_in_force.h @@ -1,7 +1,7 @@ #pragma once -#include "lib/core/EnumMacros.h" -#include "lib/core/FMT_IMPL.h" +#include "spark/core/EnumMacros.h" +#include "spark/core/FMT_IMPL.h" #include #include diff --git a/src/lib_binance_execution/binance_execution/enums/working_type.h b/src/lib_binance_execution/binance_execution/enums/working_type.h index 0a4886c67..4c9f20d72 100644 --- a/src/lib_binance_execution/binance_execution/enums/working_type.h +++ b/src/lib_binance_execution/binance_execution/enums/working_type.h @@ -1,7 +1,7 @@ #pragma once -#include "lib/core/EnumMacros.h" -#include "lib/core/FMT_IMPL.h" +#include "spark/core/EnumMacros.h" +#include "spark/core/FMT_IMPL.h" #include #include diff --git a/src/lib_binance_execution/binance_execution/execution_report_store.cpp b/src/lib_binance_execution/binance_execution/execution_report_store.cpp index 605d150b9..d64af0823 100644 --- a/src/lib_binance_execution/binance_execution/execution_report_store.cpp +++ b/src/lib_binance_execution/binance_execution/execution_report_store.cpp @@ -1,8 +1,8 @@ #include "execution_report_store.h" -#include "lib/core/TimeStamp.h" -#include "lib/orderman/CreateOrderMsg.h" -#include "lib/orderman/orderman_utils/ExecutionReport.h" -#include "lib/utils/string_utils.h" +#include "spark/core/TimeStamp.h" +#include "spark/orderman/CreateOrderMsg.h" +#include "spark/orderman/orderman_utils/ExecutionReport.h" +#include "spark/utils/string_utils.h" #include diff --git a/src/lib_binance_execution/binance_execution/execution_report_store.h b/src/lib_binance_execution/binance_execution/execution_report_store.h index 1f24141ed..43ab22005 100644 --- a/src/lib_binance_execution/binance_execution/execution_report_store.h +++ b/src/lib_binance_execution/binance_execution/execution_report_store.h @@ -1,8 +1,8 @@ #pragma once -#include "lib/collections/concurrent_factory.h" -#include "lib/domain_model/Security.pb.h" -#include "lib/orderman/orderman_utils/orderman_common.h" +#include "spark/collections/concurrent_factory.h" +#include "spark/domain_model/Security.pb.h" +#include "spark/orderman/orderman_utils/orderman_common.h" #include diff --git a/src/lib_binance_execution/binance_execution/gateway_config.h b/src/lib_binance_execution/binance_execution/gateway_config.h index 58c3e5a11..fbd063ce5 100644 --- a/src/lib_binance_execution/binance_execution/gateway_config.h +++ b/src/lib_binance_execution/binance_execution/gateway_config.h @@ -1,8 +1,8 @@ #pragma once #include "binance_execution/enums/api_key_type.h" -#include "lib/io/JsonReader.h" -#include "lib/os/os.h" +#include "spark/io/JsonReader.h" +#include "spark/os/os.h" #include #include diff --git a/src/lib_binance_execution/binance_execution/listen_key_requestor.cpp b/src/lib_binance_execution/binance_execution/listen_key_requestor.cpp index a51d300cf..132aa236b 100644 --- a/src/lib_binance_execution/binance_execution/listen_key_requestor.cpp +++ b/src/lib_binance_execution/binance_execution/listen_key_requestor.cpp @@ -1,5 +1,5 @@ #include "listen_key_requestor.h" -#include "lib/core/TimeStamp.h" +#include "spark/core/TimeStamp.h" #include #include diff --git a/src/lib_binance_execution/binance_execution/listen_key_requestor.h b/src/lib_binance_execution/binance_execution/listen_key_requestor.h index fdae0d5a1..d9b8e2af0 100644 --- a/src/lib_binance_execution/binance_execution/listen_key_requestor.h +++ b/src/lib_binance_execution/binance_execution/listen_key_requestor.h @@ -5,7 +5,7 @@ #include "binance_execution/messages/refresh_listen_key_request.h" #include "binance_execution/messages/refresh_listen_key_response.h" #include "binance_execution/rest_api_result.h" -#include "lib/utils/Delegate.h" +#include "spark/utils/Delegate.h" #include #include diff --git a/src/lib_binance_execution/binance_execution/messages/refresh_listen_key_request.h b/src/lib_binance_execution/binance_execution/messages/refresh_listen_key_request.h index b06c83f4a..6a2e166a6 100644 --- a/src/lib_binance_execution/binance_execution/messages/refresh_listen_key_request.h +++ b/src/lib_binance_execution/binance_execution/messages/refresh_listen_key_request.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/io/JsonReader.h" +#include "spark/io/JsonReader.h" #include #include diff --git a/src/lib_binance_execution/binance_execution/messages/refresh_listen_key_response.h b/src/lib_binance_execution/binance_execution/messages/refresh_listen_key_response.h index 3971e3892..ca082e1c5 100644 --- a/src/lib_binance_execution/binance_execution/messages/refresh_listen_key_response.h +++ b/src/lib_binance_execution/binance_execution/messages/refresh_listen_key_response.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/io/JsonReader.h" +#include "spark/io/JsonReader.h" #include #include diff --git a/src/lib_binance_execution/binance_execution/order_key_map.h b/src/lib_binance_execution/binance_execution/order_key_map.h index 357ed3ab5..5aa002802 100644 --- a/src/lib_binance_execution/binance_execution/order_key_map.h +++ b/src/lib_binance_execution/binance_execution/order_key_map.h @@ -1,8 +1,8 @@ #pragma once -#include "lib/orderman/orderman_utils/orderman_common.h" -#include "lib/utils/checked_arithmetic.h" -#include "lib/utils/string_utils.h" +#include "spark/orderman/orderman_utils/orderman_common.h" +#include "spark/utils/checked_arithmetic.h" +#include "spark/utils/string_utils.h" #include #include diff --git a/src/lib_binance_execution/binance_execution/order_store.cpp b/src/lib_binance_execution/binance_execution/order_store.cpp index fee470d93..750358a00 100644 --- a/src/lib_binance_execution/binance_execution/order_store.cpp +++ b/src/lib_binance_execution/binance_execution/order_store.cpp @@ -6,10 +6,10 @@ #include "binance_execution/spots/messages/cancel_order_request.h" #include "binance_execution/spots/messages/create_order_request.h" #include "binance_execution/type_converters.h" -#include "lib/core/TimeStamp.h" -#include "lib/orderman/CancelOrderMsg.h" -#include "lib/orderman/CreateOrderMsg.h" -#include "lib/utils/bts_lock_guard.h" +#include "spark/core/TimeStamp.h" +#include "spark/orderman/CancelOrderMsg.h" +#include "spark/orderman/CreateOrderMsg.h" +#include "spark/utils/bts_lock_guard.h" #include diff --git a/src/lib_binance_execution/binance_execution/order_store.h b/src/lib_binance_execution/binance_execution/order_store.h index b0a703d6e..2836eeca0 100644 --- a/src/lib_binance_execution/binance_execution/order_store.h +++ b/src/lib_binance_execution/binance_execution/order_store.h @@ -1,9 +1,9 @@ #pragma once #include "binance_execution/order_transaction_chain.h" -#include "lib/orderman/CancelOrderMsg.h" -#include "lib/orderman/CancelReplaceOrderMsg.h" -#include "lib/orderman/CreateOrderMsg.h" +#include "spark/orderman/CancelOrderMsg.h" +#include "spark/orderman/CancelReplaceOrderMsg.h" +#include "spark/orderman/CreateOrderMsg.h" #include diff --git a/src/lib_binance_execution/binance_execution/order_transaction.cpp b/src/lib_binance_execution/binance_execution/order_transaction.cpp index 528f59c17..8110fd42b 100644 --- a/src/lib_binance_execution/binance_execution/order_transaction.cpp +++ b/src/lib_binance_execution/binance_execution/order_transaction.cpp @@ -1,6 +1,6 @@ #include "order_transaction.h" -#include "lib/core/TimeStamp.h" -#include "lib/utils/Uuid.h" +#include "spark/core/TimeStamp.h" +#include "spark/utils/Uuid.h" #include diff --git a/src/lib_binance_execution/binance_execution/order_transaction.h b/src/lib_binance_execution/binance_execution/order_transaction.h index 4b80fad5a..8ffb12be7 100644 --- a/src/lib_binance_execution/binance_execution/order_transaction.h +++ b/src/lib_binance_execution/binance_execution/order_transaction.h @@ -2,8 +2,8 @@ #include "binance_execution/enums/internal_order_ack_type.h" #include "binance_execution/enums/internal_order_status.h" -#include "lib/core/FMT_IMPL.h" -#include "lib/core/TimeStamp.h" +#include "spark/core/FMT_IMPL.h" +#include "spark/core/TimeStamp.h" #include #include diff --git a/src/lib_binance_execution/binance_execution/order_transaction_chain.cpp b/src/lib_binance_execution/binance_execution/order_transaction_chain.cpp index 17880b872..7bd2df909 100644 --- a/src/lib_binance_execution/binance_execution/order_transaction_chain.cpp +++ b/src/lib_binance_execution/binance_execution/order_transaction_chain.cpp @@ -2,10 +2,10 @@ #include "binance_execution/enums/internal_order_status.h" #include "binance_execution/enums/order_status.h" #include "binance_execution/order_transaction.h" -#include "lib/core/TimeStamp.h" -#include "lib/io/json_formatter.h" -#include "lib/utils/Uuid.h" -#include "lib/utils/bts_assert.h" +#include "spark/core/TimeStamp.h" +#include "spark/io/json_formatter.h" +#include "spark/utils/Uuid.h" +#include "spark/utils/bts_assert.h" #include #include diff --git a/src/lib_binance_execution/binance_execution/order_transaction_chain.h b/src/lib_binance_execution/binance_execution/order_transaction_chain.h index b75103f3d..224f16ad9 100644 --- a/src/lib_binance_execution/binance_execution/order_transaction_chain.h +++ b/src/lib_binance_execution/binance_execution/order_transaction_chain.h @@ -3,7 +3,7 @@ #include "binance_execution/enums/internal_order_status.h" #include "binance_execution/enums/order_status.h" #include "binance_execution/order_transaction.h" -#include "lib/core/FMT_IMPL.h" +#include "spark/core/FMT_IMPL.h" #include #include diff --git a/src/lib_binance_execution/binance_execution/position_calculator.cpp b/src/lib_binance_execution/binance_execution/position_calculator.cpp index a8927fe35..16e6f734e 100644 --- a/src/lib_binance_execution/binance_execution/position_calculator.cpp +++ b/src/lib_binance_execution/binance_execution/position_calculator.cpp @@ -1,10 +1,10 @@ #include "position_calculator.h" #include "binance_execution/enums/position_side.h" -#include "lib/api/services/OrderService.h" -#include "lib/domain_model/Security.pb.h" -#include "lib/md/SecurityOracle.h" -#include "lib/orderman/orderman_utils/ExchangePosition.h" -#include "lib/utils/bts_assert.h" +#include "spark/api/services/OrderService.h" +#include "spark/domain_model/Security.pb.h" +#include "spark/md/SecurityOracle.h" +#include "spark/orderman/orderman_utils/ExchangePosition.h" +#include "spark/utils/bts_assert.h" #include diff --git a/src/lib_binance_execution/binance_execution/position_calculator.h b/src/lib_binance_execution/binance_execution/position_calculator.h index 044968432..a8619b578 100644 --- a/src/lib_binance_execution/binance_execution/position_calculator.h +++ b/src/lib_binance_execution/binance_execution/position_calculator.h @@ -1,7 +1,7 @@ #pragma once #include "binance_execution/enums/position_side.h" -#include "lib/domain_model/Security.pb.h" +#include "spark/domain_model/Security.pb.h" namespace bts::md { class SecurityOracle; diff --git a/src/lib_binance_execution/binance_execution/simple_order_key_map.cpp b/src/lib_binance_execution/binance_execution/simple_order_key_map.cpp index e982b3552..bad8bcc0d 100644 --- a/src/lib_binance_execution/binance_execution/simple_order_key_map.cpp +++ b/src/lib_binance_execution/binance_execution/simple_order_key_map.cpp @@ -1,7 +1,7 @@ #include "simple_order_key_map.h" -#include "lib/orderman/order_key.h" -#include "lib/utils/Uuid.h" -#include "lib/utils/bts_assert.h" +#include "spark/orderman/order_key.h" +#include "spark/utils/Uuid.h" +#include "spark/utils/bts_assert.h" #include #include diff --git a/src/lib_binance_execution/binance_execution/simple_order_key_map.h b/src/lib_binance_execution/binance_execution/simple_order_key_map.h index 4b9855a65..e2c79f23d 100644 --- a/src/lib_binance_execution/binance_execution/simple_order_key_map.h +++ b/src/lib_binance_execution/binance_execution/simple_order_key_map.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/orderman/order_key.h" +#include "spark/orderman/order_key.h" #include #include diff --git a/src/lib_binance_execution/binance_execution/spots/messages/cancel_order_request.cpp b/src/lib_binance_execution/binance_execution/spots/messages/cancel_order_request.cpp index 783ac74ad..9338676ec 100644 --- a/src/lib_binance_execution/binance_execution/spots/messages/cancel_order_request.cpp +++ b/src/lib_binance_execution/binance_execution/spots/messages/cancel_order_request.cpp @@ -3,8 +3,8 @@ #include "binance_execution/type_converters.h" #include "binance_execution/type_validators.h" #include "binance_execution/websocket_api_request.h" -#include "lib/core/TimeStamp.h" -#include "lib/orderman/CancelOrderMsg.h" +#include "spark/core/TimeStamp.h" +#include "spark/orderman/CancelOrderMsg.h" namespace binance_execution::spots { diff --git a/src/lib_binance_execution/binance_execution/spots/messages/cancel_order_response.h b/src/lib_binance_execution/binance_execution/spots/messages/cancel_order_response.h index f6af072af..3d1711bb5 100644 --- a/src/lib_binance_execution/binance_execution/spots/messages/cancel_order_response.h +++ b/src/lib_binance_execution/binance_execution/spots/messages/cancel_order_response.h @@ -5,7 +5,7 @@ #include "binance_execution/enums/self_trade_prevention_mode.h" #include "binance_execution/enums/side.h" #include "binance_execution/enums/time_in_force.h" -#include "lib/io/JsonReader.h" +#include "spark/io/JsonReader.h" #include #include diff --git a/src/lib_binance_execution/binance_execution/spots/messages/create_order_request.cpp b/src/lib_binance_execution/binance_execution/spots/messages/create_order_request.cpp index 278f24d56..6ddee31cc 100644 --- a/src/lib_binance_execution/binance_execution/spots/messages/create_order_request.cpp +++ b/src/lib_binance_execution/binance_execution/spots/messages/create_order_request.cpp @@ -5,7 +5,7 @@ #include "binance_execution/type_converters.h" #include "binance_execution/type_validators.h" #include "binance_execution/websocket_api_request.h" -#include "lib/orderman/CreateOrderMsg.h" +#include "spark/orderman/CreateOrderMsg.h" namespace binance_execution::spots { diff --git a/src/lib_binance_execution/binance_execution/spots/messages/logon_request.cpp b/src/lib_binance_execution/binance_execution/spots/messages/logon_request.cpp index 734080fb0..edbb27444 100644 --- a/src/lib_binance_execution/binance_execution/spots/messages/logon_request.cpp +++ b/src/lib_binance_execution/binance_execution/spots/messages/logon_request.cpp @@ -1,7 +1,7 @@ #include "logon_request.h" #include "binance_execution/type_converters.h" -#include "lib/core/TimeStamp.h" -#include "lib/utils/crypto/ed25519.h" +#include "spark/core/TimeStamp.h" +#include "spark/utils/crypto/ed25519.h" #include #include diff --git a/src/lib_binance_execution/binance_execution/spots/messages/logon_request.h b/src/lib_binance_execution/binance_execution/spots/messages/logon_request.h index 9a2ebdc4e..0700d16b6 100644 --- a/src/lib_binance_execution/binance_execution/spots/messages/logon_request.h +++ b/src/lib_binance_execution/binance_execution/spots/messages/logon_request.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/core/FMT_IMPL.h" +#include "spark/core/FMT_IMPL.h" #include #include diff --git a/src/lib_binance_execution/binance_execution/spots/messages/modify_order_request.cpp b/src/lib_binance_execution/binance_execution/spots/messages/modify_order_request.cpp index c6e235dcb..617b390f4 100644 --- a/src/lib_binance_execution/binance_execution/spots/messages/modify_order_request.cpp +++ b/src/lib_binance_execution/binance_execution/spots/messages/modify_order_request.cpp @@ -7,8 +7,8 @@ #include "binance_execution/type_converters.h" #include "binance_execution/type_validators.h" #include "binance_execution/websocket_api_request.h" -#include "lib/io/JsonReader.h" -#include "lib/orderman/CancelReplaceOrderMsg.h" +#include "spark/io/JsonReader.h" +#include "spark/orderman/CancelReplaceOrderMsg.h" namespace binance_execution::spots { diff --git a/src/lib_binance_execution/binance_execution/spots/messages/modify_order_request.h b/src/lib_binance_execution/binance_execution/spots/messages/modify_order_request.h index a6ce71d2b..64cb5d719 100644 --- a/src/lib_binance_execution/binance_execution/spots/messages/modify_order_request.h +++ b/src/lib_binance_execution/binance_execution/spots/messages/modify_order_request.h @@ -8,7 +8,7 @@ #include "binance_execution/enums/self_trade_prevention_mode.h" #include "binance_execution/enums/side.h" #include "binance_execution/enums/time_in_force.h" -#include "lib/orderman/CancelReplaceOrderMsg.h" +#include "spark/orderman/CancelReplaceOrderMsg.h" #include #include diff --git a/src/lib_binance_execution/binance_execution/spots/messages/order_record.h b/src/lib_binance_execution/binance_execution/spots/messages/order_record.h index 18e662461..b55702c9e 100644 --- a/src/lib_binance_execution/binance_execution/spots/messages/order_record.h +++ b/src/lib_binance_execution/binance_execution/spots/messages/order_record.h @@ -5,7 +5,7 @@ #include "binance_execution/enums/self_trade_prevention_mode.h" #include "binance_execution/enums/side.h" #include "binance_execution/enums/time_in_force.h" -#include "lib/io/JsonReader.h" +#include "spark/io/JsonReader.h" #include #include diff --git a/src/lib_binance_execution/binance_execution/spots/messages/position_info.h b/src/lib_binance_execution/binance_execution/spots/messages/position_info.h index 1b3a15f4c..ad1a2d1bf 100644 --- a/src/lib_binance_execution/binance_execution/spots/messages/position_info.h +++ b/src/lib_binance_execution/binance_execution/spots/messages/position_info.h @@ -1,7 +1,7 @@ #pragma once #include "binance_execution/enums/position_side.h" -#include "lib/io/JsonReader.h" +#include "spark/io/JsonReader.h" #include #include diff --git a/src/lib_binance_execution/binance_execution/spots/rest_api_client.cpp b/src/lib_binance_execution/binance_execution/spots/rest_api_client.cpp index 7e2ecaea7..51f667135 100644 --- a/src/lib_binance_execution/binance_execution/spots/rest_api_client.cpp +++ b/src/lib_binance_execution/binance_execution/spots/rest_api_client.cpp @@ -1,10 +1,10 @@ #include "rest_api_client.h" #include "binance_execution/rest_api_error.h" -#include "lib/io/http/http_client.h" -#include "lib/io/http/http_response.h" -#include "lib/io/json_formatter.h" -#include "lib/utils/crypto/hmac.h" -#include "lib/utils/type_name.h" +#include "spark/io/http/http_client.h" +#include "spark/io/http/http_response.h" +#include "spark/io/json_formatter.h" +#include "spark/utils/crypto/hmac.h" +#include "spark/utils/type_name.h" namespace binance_execution::spots { diff --git a/src/lib_binance_execution/binance_execution/spots/rest_api_client.h b/src/lib_binance_execution/binance_execution/spots/rest_api_client.h index 79c748a4b..30ac0880d 100644 --- a/src/lib_binance_execution/binance_execution/spots/rest_api_client.h +++ b/src/lib_binance_execution/binance_execution/spots/rest_api_client.h @@ -12,7 +12,7 @@ #include "binance_execution/spots/messages/modify_order_response.h" #include "binance_execution/spots/messages/open_orders_request.h" #include "binance_execution/spots/messages/order_record.h" -#include "lib/io/http/HttpMethod.h" +#include "spark/io/http/HttpMethod.h" #include #include diff --git a/src/lib_binance_execution/binance_execution/spots/signature_test.h b/src/lib_binance_execution/binance_execution/spots/signature_test.h index 66c183900..04a10b76c 100644 --- a/src/lib_binance_execution/binance_execution/spots/signature_test.h +++ b/src/lib_binance_execution/binance_execution/spots/signature_test.h @@ -1,8 +1,8 @@ #pragma once -#include "lib/utils/crypto/ed25519.h" -#include "lib/utils/crypto/ed25519_test.h" -#include "lib/utils/crypto/ed25519_test2.h" +#include "spark/utils/crypto/ed25519.h" +#include "spark/utils/crypto/ed25519_test.h" +#include "spark/utils/crypto/ed25519_test2.h" #include #include diff --git a/src/lib_binance_execution/binance_execution/spots/spots_gateway.cpp b/src/lib_binance_execution/binance_execution/spots/spots_gateway.cpp index ba87fc4cd..6f081da46 100644 --- a/src/lib_binance_execution/binance_execution/spots/spots_gateway.cpp +++ b/src/lib_binance_execution/binance_execution/spots/spots_gateway.cpp @@ -16,39 +16,39 @@ #include "binance_execution/type_converters.h" #include "binance_execution/type_validators.h" #include "binance_execution/websocket_api_request.h" -#include "lib/api/service_helpers/AdminServiceUtils.h" -#include "lib/api/services/AdminService.pb.h" -#include "lib/api/services/OrderService.h" -#include "lib/api/services/OrderService.pb.h" -#include "lib/collections/concurrent_queue.h" -#include "lib/config/protos/jetfix.pb.h" -#include "lib/domain_model/Security.h" -#include "lib/domain_model/Security.pb.h" -#include "lib/domain_model/Side.h" -#include "lib/io/json_formatter.h" -#include "lib/io/websocket/websocket_client.h" -#include "lib/logging/logging.h" -#include "lib/md/SecurityOracle.h" -#include "lib/mercury/events/Update.h" -#include "lib/orderman/CancelOrderMsg.h" -#include "lib/orderman/CancelReplaceOrderMsg.h" -#include "lib/orderman/CreateOrderMsg.h" -#include "lib/orderman/RFQMsg.h" -#include "lib/orderman/events/NewAdminDataEvent.h" -#include "lib/orderman/events/NewSecuritiesEvent.h" -#include "lib/orderman/log_messages/cancel_order_log.h" -#include "lib/orderman/log_messages/create_order_log.h" -#include "lib/orderman/log_messages/execution_report_log.h" -#include "lib/orderman/log_messages/modify_order_log.h" -#include "lib/orderman/orderman_utils/ExchangePosition.h" -#include "lib/orderman/orderman_utils/ExecutionReport.h" -#include "lib/orderman/orderman_utils/orderman_common.h" -#include "lib/utils/Delegate.h" -#include "lib/utils/Uuid.h" -#include "lib/utils/bts_lock_guard.h" -#include "lib/utils/crypto/ed25519.h" -#include "lib/utils/overloaded.h" -#include "lib/utils/thread_manager.h" +#include "spark/api/service_helpers/AdminServiceUtils.h" +#include "spark/api/services/AdminService.pb.h" +#include "spark/api/services/OrderService.h" +#include "spark/api/services/OrderService.pb.h" +#include "spark/collections/concurrent_queue.h" +#include "spark/config/protos/jetfix.pb.h" +#include "spark/domain_model/Security.h" +#include "spark/domain_model/Security.pb.h" +#include "spark/domain_model/Side.h" +#include "spark/io/json_formatter.h" +#include "spark/io/websocket/websocket_client.h" +#include "spark/logging/logging.h" +#include "spark/md/SecurityOracle.h" +#include "spark/mercury/events/Update.h" +#include "spark/orderman/CancelOrderMsg.h" +#include "spark/orderman/CancelReplaceOrderMsg.h" +#include "spark/orderman/CreateOrderMsg.h" +#include "spark/orderman/RFQMsg.h" +#include "spark/orderman/events/NewAdminDataEvent.h" +#include "spark/orderman/events/NewSecuritiesEvent.h" +#include "spark/orderman/log_messages/cancel_order_log.h" +#include "spark/orderman/log_messages/create_order_log.h" +#include "spark/orderman/log_messages/execution_report_log.h" +#include "spark/orderman/log_messages/modify_order_log.h" +#include "spark/orderman/orderman_utils/ExchangePosition.h" +#include "spark/orderman/orderman_utils/ExecutionReport.h" +#include "spark/orderman/orderman_utils/orderman_common.h" +#include "spark/utils/Delegate.h" +#include "spark/utils/Uuid.h" +#include "spark/utils/bts_lock_guard.h" +#include "spark/utils/crypto/ed25519.h" +#include "spark/utils/overloaded.h" +#include "spark/utils/thread_manager.h" #include #include diff --git a/src/lib_binance_execution/binance_execution/spots/spots_gateway.h b/src/lib_binance_execution/binance_execution/spots/spots_gateway.h index 71e77105a..da1734827 100644 --- a/src/lib_binance_execution/binance_execution/spots/spots_gateway.h +++ b/src/lib_binance_execution/binance_execution/spots/spots_gateway.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/orderman/gateways/IExecutionGateway.h" +#include "spark/orderman/gateways/IExecutionGateway.h" #include diff --git a/src/lib_binance_execution/binance_execution/spots/user_data_stream/account_update.h b/src/lib_binance_execution/binance_execution/spots/user_data_stream/account_update.h index d81ae2723..4b5c81e37 100644 --- a/src/lib_binance_execution/binance_execution/spots/user_data_stream/account_update.h +++ b/src/lib_binance_execution/binance_execution/spots/user_data_stream/account_update.h @@ -1,7 +1,7 @@ #pragma once #include "binance_execution/spots/user_data_stream/event_type.h" -#include "lib/io/JsonReader.h" +#include "spark/io/JsonReader.h" #include #include diff --git a/src/lib_binance_execution/binance_execution/spots/user_data_stream/balance_update.h b/src/lib_binance_execution/binance_execution/spots/user_data_stream/balance_update.h index 0bfbfb59e..1e15d4fa1 100644 --- a/src/lib_binance_execution/binance_execution/spots/user_data_stream/balance_update.h +++ b/src/lib_binance_execution/binance_execution/spots/user_data_stream/balance_update.h @@ -1,7 +1,7 @@ #pragma once #include "binance_execution/spots/user_data_stream/event_type.h" -#include "lib/io/JsonReader.h" +#include "spark/io/JsonReader.h" #include #include diff --git a/src/lib_binance_execution/binance_execution/spots/user_data_stream/event_type.h b/src/lib_binance_execution/binance_execution/spots/user_data_stream/event_type.h index 2f7286803..dcd50fd9a 100644 --- a/src/lib_binance_execution/binance_execution/spots/user_data_stream/event_type.h +++ b/src/lib_binance_execution/binance_execution/spots/user_data_stream/event_type.h @@ -1,7 +1,7 @@ #pragma once -#include "lib/core/EnumMacros.h" -#include "lib/core/FMT_IMPL.h" +#include "spark/core/EnumMacros.h" +#include "spark/core/FMT_IMPL.h" #include #include diff --git a/src/lib_binance_execution/binance_execution/spots/user_data_stream/order_update.cpp b/src/lib_binance_execution/binance_execution/spots/user_data_stream/order_update.cpp index 6370a7144..8ce66b015 100644 --- a/src/lib_binance_execution/binance_execution/spots/user_data_stream/order_update.cpp +++ b/src/lib_binance_execution/binance_execution/spots/user_data_stream/order_update.cpp @@ -1,12 +1,12 @@ #include "order_update.h" #include "binance_execution/type_converters.h" -#include "lib/config/protos/jetfix.pb.h" -#include "lib/domain_model/Security.pb.h" -#include "lib/io/JsonReader.h" -#include "lib/orderman/orderman_utils/ExecutionReport.h" -#include "lib/orderman/orderman_utils/orderman_common.h" -#include "lib/utils/checked_arithmetic.h" -#include "lib/utils/string_utils.h" +#include "spark/config/protos/jetfix.pb.h" +#include "spark/domain_model/Security.pb.h" +#include "spark/io/JsonReader.h" +#include "spark/orderman/orderman_utils/ExecutionReport.h" +#include "spark/orderman/orderman_utils/orderman_common.h" +#include "spark/utils/checked_arithmetic.h" +#include "spark/utils/string_utils.h" #include diff --git a/src/lib_binance_execution/binance_execution/spots/user_data_stream/order_update_log.cpp b/src/lib_binance_execution/binance_execution/spots/user_data_stream/order_update_log.cpp index 7cd30b8f5..e71f0b98d 100644 --- a/src/lib_binance_execution/binance_execution/spots/user_data_stream/order_update_log.cpp +++ b/src/lib_binance_execution/binance_execution/spots/user_data_stream/order_update_log.cpp @@ -1,5 +1,5 @@ #include "order_update_log.h" -#include "lib/core/TimeStamp.h" +#include "spark/core/TimeStamp.h" #include diff --git a/src/lib_binance_execution/binance_execution/spots/user_data_stream/order_update_log.h b/src/lib_binance_execution/binance_execution/spots/user_data_stream/order_update_log.h index 804976d67..e8ed2f863 100644 --- a/src/lib_binance_execution/binance_execution/spots/user_data_stream/order_update_log.h +++ b/src/lib_binance_execution/binance_execution/spots/user_data_stream/order_update_log.h @@ -1,7 +1,7 @@ #pragma once #include "binance_execution/spots/user_data_stream/order_update.h" -#include "lib/core/FMT_IMPL.h" +#include "spark/core/FMT_IMPL.h" #include #include diff --git a/src/lib_binance_execution/binance_execution/spots/user_data_stream/user_data_subscription.cpp b/src/lib_binance_execution/binance_execution/spots/user_data_stream/user_data_subscription.cpp index a5124e833..d72d24616 100644 --- a/src/lib_binance_execution/binance_execution/spots/user_data_stream/user_data_subscription.cpp +++ b/src/lib_binance_execution/binance_execution/spots/user_data_stream/user_data_subscription.cpp @@ -3,10 +3,10 @@ #include "binance_execution/spots/user_data_stream/balance_update.h" #include "binance_execution/spots/user_data_stream/event_type.h" #include "binance_execution/spots/user_data_stream/order_update.h" -#include "lib/core/TimeStamp.h" -#include "lib/io/websocket/websocket_client.h" -#include "lib/logging/logging.h" -#include "lib/utils/type_name.h" +#include "spark/core/TimeStamp.h" +#include "spark/io/websocket/websocket_client.h" +#include "spark/logging/logging.h" +#include "spark/utils/type_name.h" #include #include diff --git a/src/lib_binance_execution/binance_execution/spots/user_data_stream/user_data_subscription.h b/src/lib_binance_execution/binance_execution/spots/user_data_stream/user_data_subscription.h index 32352d5d4..5d0e6fb51 100644 --- a/src/lib_binance_execution/binance_execution/spots/user_data_stream/user_data_subscription.h +++ b/src/lib_binance_execution/binance_execution/spots/user_data_stream/user_data_subscription.h @@ -3,7 +3,7 @@ #include "binance_execution/spots/user_data_stream/account_update.h" #include "binance_execution/spots/user_data_stream/balance_update.h" #include "binance_execution/spots/user_data_stream/order_update.h" -#include "lib/utils/Delegate.h" +#include "spark/utils/Delegate.h" #include diff --git a/src/lib_binance_execution/binance_execution/type_converters.h b/src/lib_binance_execution/binance_execution/type_converters.h index c1f722d0d..1be29048e 100644 --- a/src/lib_binance_execution/binance_execution/type_converters.h +++ b/src/lib_binance_execution/binance_execution/type_converters.h @@ -6,10 +6,10 @@ #include "binance_execution/enums/side.h" #include "binance_execution/enums/time_in_force.h" #include "binance_execution/error_list.h" -#include "lib/api/services/OrderService.pb.h" -#include "lib/core/TimeStamp.h" -#include "lib/domain/Side.h" -#include "lib/utils/bts_assert.h" +#include "spark/api/services/OrderService.pb.h" +#include "spark/core/TimeStamp.h" +#include "spark/domain/Side.h" +#include "spark/utils/bts_assert.h" namespace binance_execution { diff --git a/src/lib_binance_execution/binance_execution/type_validators.h b/src/lib_binance_execution/binance_execution/type_validators.h index 27a1cf68a..958f60772 100644 --- a/src/lib_binance_execution/binance_execution/type_validators.h +++ b/src/lib_binance_execution/binance_execution/type_validators.h @@ -1,9 +1,9 @@ #pragma once #include "binance_execution/error_list.h" -#include "lib/domain_model/Security.pb.h" -#include "lib/orderman/orderman_utils/ExecutionReport.h" -#include "lib/orderman/orderman_utils/orderman_common.h" +#include "spark/domain_model/Security.pb.h" +#include "spark/orderman/orderman_utils/ExecutionReport.h" +#include "spark/orderman/orderman_utils/orderman_common.h" #include #include diff --git a/src/lib_binance_execution/binance_execution/usds_futures/messages/cancel_order_request.cpp b/src/lib_binance_execution/binance_execution/usds_futures/messages/cancel_order_request.cpp index b8c254b04..61f94c6b2 100644 --- a/src/lib_binance_execution/binance_execution/usds_futures/messages/cancel_order_request.cpp +++ b/src/lib_binance_execution/binance_execution/usds_futures/messages/cancel_order_request.cpp @@ -2,9 +2,9 @@ #include "binance_execution/error_list.h" #include "binance_execution/type_converters.h" #include "binance_execution/type_validators.h" -#include "lib/domain_model/Security.pb.h" -#include "lib/orderman/CancelOrderMsg.h" -#include "lib/utils/checked_arithmetic.h" +#include "spark/domain_model/Security.pb.h" +#include "spark/orderman/CancelOrderMsg.h" +#include "spark/utils/checked_arithmetic.h" namespace binance_execution::usds_futures { diff --git a/src/lib_binance_execution/binance_execution/usds_futures/messages/cancel_order_response.h b/src/lib_binance_execution/binance_execution/usds_futures/messages/cancel_order_response.h index 7846ed032..64ce3da8e 100644 --- a/src/lib_binance_execution/binance_execution/usds_futures/messages/cancel_order_response.h +++ b/src/lib_binance_execution/binance_execution/usds_futures/messages/cancel_order_response.h @@ -8,7 +8,7 @@ #include "binance_execution/enums/side.h" #include "binance_execution/enums/time_in_force.h" #include "binance_execution/enums/working_type.h" -#include "lib/io/JsonReader.h" +#include "spark/io/JsonReader.h" #include #include diff --git a/src/lib_binance_execution/binance_execution/usds_futures/messages/create_order_request.cpp b/src/lib_binance_execution/binance_execution/usds_futures/messages/create_order_request.cpp index 4061a61de..517ad2f54 100644 --- a/src/lib_binance_execution/binance_execution/usds_futures/messages/create_order_request.cpp +++ b/src/lib_binance_execution/binance_execution/usds_futures/messages/create_order_request.cpp @@ -3,10 +3,10 @@ #include "binance_execution/quantity.h" #include "binance_execution/type_converters.h" #include "binance_execution/type_validators.h" -#include "lib/io/JsonReader.h" -#include "lib/orderman/CreateOrderMsg.h" -#include "lib/utils/Uuid.h" -#include "lib/utils/crypto/hmac.h" +#include "spark/io/JsonReader.h" +#include "spark/orderman/CreateOrderMsg.h" +#include "spark/utils/Uuid.h" +#include "spark/utils/crypto/hmac.h" #include diff --git a/src/lib_binance_execution/binance_execution/usds_futures/messages/create_order_response.h b/src/lib_binance_execution/binance_execution/usds_futures/messages/create_order_response.h index fdc85fba5..0995bce9c 100644 --- a/src/lib_binance_execution/binance_execution/usds_futures/messages/create_order_response.h +++ b/src/lib_binance_execution/binance_execution/usds_futures/messages/create_order_response.h @@ -8,7 +8,7 @@ #include "binance_execution/enums/side.h" #include "binance_execution/enums/time_in_force.h" #include "binance_execution/enums/working_type.h" -#include "lib/io/JsonReader.h" +#include "spark/io/JsonReader.h" #include #include diff --git a/src/lib_binance_execution/binance_execution/usds_futures/messages/modify_order_request.cpp b/src/lib_binance_execution/binance_execution/usds_futures/messages/modify_order_request.cpp index b888b1381..ab7b1d70c 100644 --- a/src/lib_binance_execution/binance_execution/usds_futures/messages/modify_order_request.cpp +++ b/src/lib_binance_execution/binance_execution/usds_futures/messages/modify_order_request.cpp @@ -1,8 +1,8 @@ #include "modify_order_request.h" #include "binance_execution/error_list.h" #include "binance_execution/type_converters.h" -#include "lib/orderman/CancelReplaceOrderMsg.h" -#include "lib/utils/checked_arithmetic.h" +#include "spark/orderman/CancelReplaceOrderMsg.h" +#include "spark/utils/checked_arithmetic.h" namespace binance_execution::usds_futures { diff --git a/src/lib_binance_execution/binance_execution/usds_futures/messages/modify_order_response.h b/src/lib_binance_execution/binance_execution/usds_futures/messages/modify_order_response.h index e4645b81c..1214a7cff 100644 --- a/src/lib_binance_execution/binance_execution/usds_futures/messages/modify_order_response.h +++ b/src/lib_binance_execution/binance_execution/usds_futures/messages/modify_order_response.h @@ -8,7 +8,7 @@ #include "binance_execution/enums/side.h" #include "binance_execution/enums/time_in_force.h" #include "binance_execution/enums/working_type.h" -#include "lib/io/JsonReader.h" +#include "spark/io/JsonReader.h" #include #include diff --git a/src/lib_binance_execution/binance_execution/usds_futures/messages/position_info.h b/src/lib_binance_execution/binance_execution/usds_futures/messages/position_info.h index 053e4ad75..0c783f5dd 100644 --- a/src/lib_binance_execution/binance_execution/usds_futures/messages/position_info.h +++ b/src/lib_binance_execution/binance_execution/usds_futures/messages/position_info.h @@ -1,7 +1,7 @@ #pragma once #include "binance_execution/enums/position_side.h" -#include "lib/io/JsonReader.h" +#include "spark/io/JsonReader.h" #include #include diff --git a/src/lib_binance_execution/binance_execution/usds_futures/messages/position_info_request.cpp b/src/lib_binance_execution/binance_execution/usds_futures/messages/position_info_request.cpp index 459561666..f43dbb46f 100644 --- a/src/lib_binance_execution/binance_execution/usds_futures/messages/position_info_request.cpp +++ b/src/lib_binance_execution/binance_execution/usds_futures/messages/position_info_request.cpp @@ -1,6 +1,6 @@ #include "position_info_request.h" #include "binance_execution/type_converters.h" -#include "lib/core/TimeStamp.h" +#include "spark/core/TimeStamp.h" namespace binance_execution::usds_futures { diff --git a/src/lib_binance_execution/binance_execution/usds_futures/messages/position_info_request.h b/src/lib_binance_execution/binance_execution/usds_futures/messages/position_info_request.h index 7894aa413..b23298759 100644 --- a/src/lib_binance_execution/binance_execution/usds_futures/messages/position_info_request.h +++ b/src/lib_binance_execution/binance_execution/usds_futures/messages/position_info_request.h @@ -1,7 +1,7 @@ #pragma once -#include "lib/core/FMT_IMPL.h" -#include "lib/io/json_formatter.h" +#include "spark/core/FMT_IMPL.h" +#include "spark/io/json_formatter.h" #include #include diff --git a/src/lib_binance_execution/binance_execution/usds_futures/rest_api_client.cpp b/src/lib_binance_execution/binance_execution/usds_futures/rest_api_client.cpp index 2b71471a3..758c166be 100644 --- a/src/lib_binance_execution/binance_execution/usds_futures/rest_api_client.cpp +++ b/src/lib_binance_execution/binance_execution/usds_futures/rest_api_client.cpp @@ -1,8 +1,8 @@ #include "rest_api_client.h" -#include "lib/io/http/http_client.h" -#include "lib/io/http/http_response.h" -#include "lib/utils/crypto/hmac.h" -#include "lib/utils/type_name.h" +#include "spark/io/http/http_client.h" +#include "spark/io/http/http_response.h" +#include "spark/utils/crypto/hmac.h" +#include "spark/utils/type_name.h" namespace binance_execution::usds_futures { diff --git a/src/lib_binance_execution/binance_execution/usds_futures/rest_api_client.h b/src/lib_binance_execution/binance_execution/usds_futures/rest_api_client.h index 4008d67dc..0d16465ad 100644 --- a/src/lib_binance_execution/binance_execution/usds_futures/rest_api_client.h +++ b/src/lib_binance_execution/binance_execution/usds_futures/rest_api_client.h @@ -15,7 +15,7 @@ #include "binance_execution/usds_futures/messages/order_record.h" #include "binance_execution/usds_futures/messages/position_info.h" #include "binance_execution/usds_futures/messages/position_info_request.h" -#include "lib/io/http/HttpMethod.h" +#include "spark/io/http/HttpMethod.h" #include #include diff --git a/src/lib_binance_execution/binance_execution/usds_futures/usds_futures_gateway.cpp b/src/lib_binance_execution/binance_execution/usds_futures/usds_futures_gateway.cpp index 43146211e..07b210555 100644 --- a/src/lib_binance_execution/binance_execution/usds_futures/usds_futures_gateway.cpp +++ b/src/lib_binance_execution/binance_execution/usds_futures/usds_futures_gateway.cpp @@ -16,42 +16,42 @@ #include "binance_execution/usds_futures/user_data_stream/user_data_subscription.h" #include "binance_execution/websocket_api_request.h" #include "binance_execution/websocket_api_response.h" -#include "lib/api/service_helpers/AdminServiceUtils.h" -#include "lib/api/services/AdminService.pb.h" -#include "lib/api/services/OrderService.h" -#include "lib/collections/concurrent_queue.h" -#include "lib/collections/concurrent_unordered_map.h" -#include "lib/config/protos/jetfix.pb.h" -#include "lib/core/TimeStamp.h" -#include "lib/core/start_stop_state_machine.h" -#include "lib/domain_model/Security.h" -#include "lib/domain_model/Security.pb.h" -#include "lib/domain_model/Side.h" -#include "lib/io/JsonReader.h" -#include "lib/io/json_formatter.h" -#include "lib/io/websocket/websocket_client.h" -#include "lib/logging/logging.h" -#include "lib/logging/trace_log.h" -#include "lib/md/SecurityOracle.h" -#include "lib/mercury/events/Update.h" -#include "lib/orderman/CancelOrderMsg.h" -#include "lib/orderman/CancelReplaceOrderMsg.h" -#include "lib/orderman/CreateOrderMsg.h" -#include "lib/orderman/RFQMsg.h" -#include "lib/orderman/events/NewAdminDataEvent.h" -#include "lib/orderman/events/NewSecuritiesEvent.h" -#include "lib/orderman/log_messages/cancel_order_log.h" -#include "lib/orderman/log_messages/create_order_log.h" -#include "lib/orderman/log_messages/execution_report_log.h" -#include "lib/orderman/log_messages/modify_order_log.h" -#include "lib/orderman/orderman_utils/ExchangePosition.h" -#include "lib/orderman/orderman_utils/ExecutionReport.h" -#include "lib/orderman/orderman_utils/orderman_common.h" -#include "lib/utils/Uuid.h" -#include "lib/utils/bts_lock_guard.h" -#include "lib/utils/observable_value_store.h" -#include "lib/utils/overloaded.h" -#include "lib/utils/thread_manager.h" +#include "spark/api/service_helpers/AdminServiceUtils.h" +#include "spark/api/services/AdminService.pb.h" +#include "spark/api/services/OrderService.h" +#include "spark/collections/concurrent_queue.h" +#include "spark/collections/concurrent_unordered_map.h" +#include "spark/config/protos/jetfix.pb.h" +#include "spark/core/TimeStamp.h" +#include "spark/core/start_stop_state_machine.h" +#include "spark/domain_model/Security.h" +#include "spark/domain_model/Security.pb.h" +#include "spark/domain_model/Side.h" +#include "spark/io/JsonReader.h" +#include "spark/io/json_formatter.h" +#include "spark/io/websocket/websocket_client.h" +#include "spark/logging/logging.h" +#include "spark/logging/trace_log.h" +#include "spark/md/SecurityOracle.h" +#include "spark/mercury/events/Update.h" +#include "spark/orderman/CancelOrderMsg.h" +#include "spark/orderman/CancelReplaceOrderMsg.h" +#include "spark/orderman/CreateOrderMsg.h" +#include "spark/orderman/RFQMsg.h" +#include "spark/orderman/events/NewAdminDataEvent.h" +#include "spark/orderman/events/NewSecuritiesEvent.h" +#include "spark/orderman/log_messages/cancel_order_log.h" +#include "spark/orderman/log_messages/create_order_log.h" +#include "spark/orderman/log_messages/execution_report_log.h" +#include "spark/orderman/log_messages/modify_order_log.h" +#include "spark/orderman/orderman_utils/ExchangePosition.h" +#include "spark/orderman/orderman_utils/ExecutionReport.h" +#include "spark/orderman/orderman_utils/orderman_common.h" +#include "spark/utils/Uuid.h" +#include "spark/utils/bts_lock_guard.h" +#include "spark/utils/observable_value_store.h" +#include "spark/utils/overloaded.h" +#include "spark/utils/thread_manager.h" #include #include diff --git a/src/lib_binance_execution/binance_execution/usds_futures/usds_futures_gateway.h b/src/lib_binance_execution/binance_execution/usds_futures/usds_futures_gateway.h index 2ef9b9666..a0df55b31 100644 --- a/src/lib_binance_execution/binance_execution/usds_futures/usds_futures_gateway.h +++ b/src/lib_binance_execution/binance_execution/usds_futures/usds_futures_gateway.h @@ -1,8 +1,8 @@ #pragma once -#include "lib/config/protos/jetfix.pb.h" -#include "lib/md/SecurityOracle.h" -#include "lib/orderman/gateways/IExecutionGateway.h" +#include "spark/config/protos/jetfix.pb.h" +#include "spark/md/SecurityOracle.h" +#include "spark/orderman/gateways/IExecutionGateway.h" #include diff --git a/src/lib_binance_execution/binance_execution/usds_futures/user_data_stream/account_update.h b/src/lib_binance_execution/binance_execution/usds_futures/user_data_stream/account_update.h index de023ffe1..1f77d2b93 100644 --- a/src/lib_binance_execution/binance_execution/usds_futures/user_data_stream/account_update.h +++ b/src/lib_binance_execution/binance_execution/usds_futures/user_data_stream/account_update.h @@ -2,7 +2,7 @@ #include "binance_execution/enums/event_reason_type.h" #include "binance_execution/enums/position_side.h" -#include "lib/io/JsonReader.h" +#include "spark/io/JsonReader.h" #include #include diff --git a/src/lib_binance_execution/binance_execution/usds_futures/user_data_stream/order_update.cpp b/src/lib_binance_execution/binance_execution/usds_futures/user_data_stream/order_update.cpp index f6fa9d306..91a58f8c5 100644 --- a/src/lib_binance_execution/binance_execution/usds_futures/user_data_stream/order_update.cpp +++ b/src/lib_binance_execution/binance_execution/usds_futures/user_data_stream/order_update.cpp @@ -1,10 +1,10 @@ #include "order_update.h" #include "binance_execution/type_converters.h" -#include "lib/domain_model/Security.pb.h" -#include "lib/io/JsonReader.h" -#include "lib/orderman/orderman_utils/ExecutionReport.h" -#include "lib/utils/checked_arithmetic.h" -#include "lib/utils/string_utils.h" +#include "spark/domain_model/Security.pb.h" +#include "spark/io/JsonReader.h" +#include "spark/orderman/orderman_utils/ExecutionReport.h" +#include "spark/utils/checked_arithmetic.h" +#include "spark/utils/string_utils.h" namespace binance_execution::usds_futures::user_data_stream { diff --git a/src/lib_binance_execution/binance_execution/usds_futures/user_data_stream/user_data_subscription.cpp b/src/lib_binance_execution/binance_execution/usds_futures/user_data_stream/user_data_subscription.cpp index 37bcdae76..e7bcd8508 100644 --- a/src/lib_binance_execution/binance_execution/usds_futures/user_data_stream/user_data_subscription.cpp +++ b/src/lib_binance_execution/binance_execution/usds_futures/user_data_stream/user_data_subscription.cpp @@ -1,9 +1,9 @@ #include "user_data_subscription.h" #include "binance_execution/usds_futures/user_data_stream/account_update.h" #include "binance_execution/usds_futures/user_data_stream/order_update.h" -#include "lib/core/TimeStamp.h" -#include "lib/io/websocket/websocket_client.h" -#include "lib/logging/logging.h" +#include "spark/core/TimeStamp.h" +#include "spark/io/websocket/websocket_client.h" +#include "spark/logging/logging.h" #include #include diff --git a/src/lib_binance_execution/binance_execution/usds_futures/user_data_stream/user_data_subscription.h b/src/lib_binance_execution/binance_execution/usds_futures/user_data_stream/user_data_subscription.h index bec8bdb15..28b8ea39e 100644 --- a/src/lib_binance_execution/binance_execution/usds_futures/user_data_stream/user_data_subscription.h +++ b/src/lib_binance_execution/binance_execution/usds_futures/user_data_stream/user_data_subscription.h @@ -2,7 +2,7 @@ #include "binance_execution/usds_futures/user_data_stream/account_update.h" #include "binance_execution/usds_futures/user_data_stream/order_update.h" -#include "lib/utils/Delegate.h" +#include "spark/utils/Delegate.h" #include diff --git a/src/lib_binance_execution/binance_execution/websocket_api_request.cpp b/src/lib_binance_execution/binance_execution/websocket_api_request.cpp index c4ef1e958..1a80356d9 100644 --- a/src/lib_binance_execution/binance_execution/websocket_api_request.cpp +++ b/src/lib_binance_execution/binance_execution/websocket_api_request.cpp @@ -6,9 +6,9 @@ #include "binance_execution/usds_futures/messages/create_order_request.h" #include "binance_execution/usds_futures/messages/modify_order_request.h" #include "binance_execution/usds_futures/messages/position_info_request.h" -#include "lib/core/TimeStamp.h" -#include "lib/logging/logging.h" -#include "lib/utils/crypto/hmac.h" +#include "spark/core/TimeStamp.h" +#include "spark/logging/logging.h" +#include "spark/utils/crypto/hmac.h" namespace binance_execution { diff --git a/src/lib_binance_execution/binance_execution/websocket_api_request.h b/src/lib_binance_execution/binance_execution/websocket_api_request.h index 5d68426b4..3cfc268cb 100644 --- a/src/lib_binance_execution/binance_execution/websocket_api_request.h +++ b/src/lib_binance_execution/binance_execution/websocket_api_request.h @@ -1,7 +1,7 @@ #pragma once -#include "lib/core/FMT_IMPL.h" -#include "lib/io/json_formatter.h" +#include "spark/core/FMT_IMPL.h" +#include "spark/io/json_formatter.h" #include diff --git a/src/lib_binance_execution/binance_execution/websocket_api_response.h b/src/lib_binance_execution/binance_execution/websocket_api_response.h index fb1b0c161..1662561fe 100644 --- a/src/lib_binance_execution/binance_execution/websocket_api_response.h +++ b/src/lib_binance_execution/binance_execution/websocket_api_response.h @@ -1,7 +1,7 @@ #pragma once -#include "lib/core/FMT_IMPL.h" -#include "lib/io/json_formatter.h" +#include "spark/core/FMT_IMPL.h" +#include "spark/io/json_formatter.h" #include diff --git a/src/lib_spark/CMakeLists.txt b/src/lib_spark/CMakeLists.txt new file mode 100644 index 000000000..ed11c1946 --- /dev/null +++ b/src/lib_spark/CMakeLists.txt @@ -0,0 +1,161 @@ +cmake_minimum_required(VERSION 3.5) +project(spark) +include(GNUInstallDirs) +include(${CMAKE_SOURCE_DIR}/cmake/safe_dep_glob.cmake) +include(${CMAKE_SOURCE_DIR}/cmake/ProtobufGenerateCpp.cmake) +include(${CMAKE_SOURCE_DIR}/cmake/ProtobufGenerateCppConfig.cmake) +include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/ProtobufGenerateCppService.cmake) +include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/GenerateConfigProfile.cmake) +include(${CMAKE_SOURCE_DIR}/cmake/InstallBasic.cmake) +include(${CMAKE_SOURCE_DIR}/cmake/PrintList.cmake) + +configure_file( + "${CMAKE_SOURCE_DIR}/cmake/version.h.in" + "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}/version.h" +) + +if(WIN32) + if(BUILD_SPARKD) + message(FATAL_ERROR "Cannot build sparkd on Windows (Please set BUILD_SPARKD to False)") + endif() + + include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/GetWindowsClientSources.cmake) + include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/GetWindowsClientLinkLibraries.cmake) +elseif(${BUILD_SPARKD}) + include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/GetLinuxServerSources.cmake) + include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/GetLinuxServerLinkLibraries.cmake) +else() + include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/GetLinuxClientSources.cmake) + include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/GetLinuxClientLinkLibraries.cmake) +endif() + +get_proto_sources( + ${PROJECT_NAME}_PROTO_CONFIGS + ${PROJECT_NAME}_PROTO_SOURCES + ${PROJECT_NAME}_PROTO_SERVICES +) +get_cpp_sources(${PROJECT_NAME}_SOURCES ${PROJECT_NAME}_TEST_SOURCES) +protobuf_generate_cpp( + CXX_SOURCES ${PROJECT_NAME}_CXX_PROTO_SOURCES + CXX_HEADERS ${PROJECT_NAME}_CXX_PROTO_HEADERS + CXX_OUT_DIR ${CMAKE_CURRENT_BINARY_DIR} + PROTO_INCLUDE_DIRS + ${EXTERNALS_INCLUDE} + ${CMAKE_CURRENT_SOURCE_DIR} + PROTO_SOURCES + ${${PROJECT_NAME}_PROTO_SOURCES} +) + +protobuf_generate_cpp_service( + CXX_SOURCES ${PROJECT_NAME}_CXX_PROTO_SERVICE_SOURCES + CXX_HEADERS ${PROJECT_NAME}_CXX_PROTO_SERVICE_HEADERS + CXX_OUT_DIR ${CMAKE_CURRENT_BINARY_DIR} + PROTO_INCLUDE_DIRS + ${EXTERNALS_INCLUDE} + ${CMAKE_CURRENT_SOURCE_DIR} + PROTO_SOURCES + ${${PROJECT_NAME}_PROTO_SERVICES} +) + +# Generate headers for config protos. One header provides the list of proto files in an array to be +# read at runtime in order to generate the aggregated config message type. The other header provides +# an array of strings whose items are lines representing the defaults for this aggregated config +# message type. +set(${PROJECT_NAME}_PROTO_DEFAULTS) +foreach(cfg_path ${CONFIG_DEFAULTS_PATH}) + file( + GLOB_RECURSE cfg_files + RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} + ${cfg_path}) + list(APPEND ${PROJECT_NAME}_PROTO_DEFAULTS ${cfg_files}) +endforeach() +protobuf_generate_cpp_config( + PROTO_SOURCES + ${${PROJECT_NAME}_PROTO_CONFIGS} + PROTO_SOURCES_HEADER + ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}/protobufs/config_proto_files.h + PROTO_DEFAULTS + ${${PROJECT_NAME}_PROTO_DEFAULTS} + PROTO_DEFAULTS_HEADER + ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}/protobufs/config_defaults.h +) + +add_library( + ${PROJECT_NAME} + SHARED + ${${PROJECT_NAME}_SOURCES} + ${${PROJECT_NAME}_CXX_PROTO_SOURCES} + ${${PROJECT_NAME}_CXX_PROTO_SERVICE_SOURCES} +) + +if (WIN32) + set_target_properties(${PROJECT_NAME} PROPERTIES PREFIX "lib") +endif() + +if (DEFINED DOTNET_BINARY_DIR OR DEFINED DOTNET_WINDOWS_BINARY_DIR) + include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/AddCopyBinariesTarget.cmake) +endif() + +target_include_directories( + ${PROJECT_NAME} PUBLIC + $ + $ + $ +) + +get_link_libraries(_link_libs) +print_list(_link_libs VERBOSE) +target_link_directories( + ${PROJECT_NAME} PUBLIC + $ + $ +) +target_link_libraries(${PROJECT_NAME} ${_link_libs}) + +# Copy binaries to Dotnet build dirs (for csprojs that depend on libspark) +if (DEFINED DOTNET_BINARY_DIR) + add_copy_binaries_target( + copy_to_dotnet_binary_dir + "${DOTNET_BINARY_DIR}" + "Copy ${PROJECT_NAME} bins to Dotnet build dir") +endif() + +install(TARGETS ${PROJECT_NAME} DESTINATION "${CMAKE_INSTALL_BINDIR}") + +foreach(_hdr ${${PROJECT_NAME}_CXX_PROTO_HEADERS}) + file(RELATIVE_PATH _relative_path ${CMAKE_CURRENT_BINARY_DIR} ${_hdr}) + install(FILES ${_hdr} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${_relative_path}) +endforeach() + +foreach(_hdr ${${PROJECT_NAME}_CXX_PROTO_SERVICE_HEADERS}) + file(RELATIVE_PATH _relative_path ${CMAKE_CURRENT_BINARY_DIR} ${_hdr}) + install(FILES ${_hdr} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${_relative_path}) +endforeach() + +install_basic() + +# Add tests executable (if there are any) +if (${PROJECT_NAME}_TEST_SOURCES AND NOT WIN32) + add_executable(${PROJECT_NAME}-tests ${${PROJECT_NAME}_TEST_SOURCES}) + + # Set RPATH so the tests exe knows where to find the shared lib. + set_target_properties( + ${PROJECT_NAME}-tests + PROPERTIES + BUILD_RPATH "$ORIGIN" + INSTALL_RPATH "$ORIGIN/../${CMAKE_INSTALL_LIBDIR}" + ) + + # Link main lib + target_link_directories( + ${PROJECT_NAME}-tests + PRIVATE + $ + $ + ) + target_link_libraries(${PROJECT_NAME}-tests PRIVATE ${PROJECT_NAME}) + + # Catch2 + find_package(Catch2 CONFIG REQUIRED COMPONENTS Catch2WithMain) + target_link_libraries(${PROJECT_NAME}-tests PRIVATE Catch2::Catch2WithMain) +endif() diff --git a/src/lib_spark/Config.cmake.in b/src/lib_spark/Config.cmake.in new file mode 100644 index 000000000..8c9ad12aa --- /dev/null +++ b/src/lib_spark/Config.cmake.in @@ -0,0 +1,5 @@ +@PACKAGE_INIT@ + +include("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake") + +check_required_components(@PROJECT_NAME@) diff --git a/src/lib_spark/cmake/AddCopyBinariesTarget.cmake b/src/lib_spark/cmake/AddCopyBinariesTarget.cmake new file mode 100644 index 000000000..d74cee091 --- /dev/null +++ b/src/lib_spark/cmake/AddCopyBinariesTarget.cmake @@ -0,0 +1,17 @@ +function(add_copy_binaries_target tgt_name dest_dir) + get_target_property(_prefix ${PROJECT_NAME} PREFIX) + set(_dest_files) + foreach (_dest_dir ${dest_dir}) + set(_dest_file ${_dest_dir}/${_prefix}${PROJECT_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX}) + list(APPEND _dest_files ${_dest_file}) + add_custom_command( + OUTPUT ${_dest_file} + COMMAND ${CMAKE_COMMAND} + ARGS -E copy + ${CMAKE_CURRENT_BINARY_DIR}/$/${_prefix}${PROJECT_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX} + ${_dest_file} + DEPENDS ${PROJECT_NAME}) + endforeach() + message(WARNING "dest files: ${_dest_files}") + add_custom_target(${tgt_name} ALL DEPENDS ${_dest_files} COMMENT ${ARGN}) +endfunction() diff --git a/src/lib_spark/cmake/GenerateConfigProfile.cmake b/src/lib_spark/cmake/GenerateConfigProfile.cmake new file mode 100644 index 000000000..ba99fe26c --- /dev/null +++ b/src/lib_spark/cmake/GenerateConfigProfile.cmake @@ -0,0 +1,62 @@ +include_guard(DIRECTORY) + +function(generate_config_profile profile_dir cfg_protos) + # Glob .conf files in profile dir (they define config defaults for this profile) + file( + GLOB_RECURSE _cfg_profile_defaults + RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} + ${PROJECT_NAME}/config/profiles/${profile_dir}/*.conf) + + set(_out_dir ${CMAKE_CURRENT_BINARY_DIR}/include/${PROJECT_NAME}) + # generate list of config protos + set(_cfg_proto_file ${_out_dir}/config_proto_files.h) + + # generate a string with the current config files + set(_cfg_proto_str "const char * config_proto_files[] = { // generated file\n") + + foreach(_proto_path ${${cfg_protos}}) + get_filename_component(_proto_name ${_proto_path} NAME) + string(APPEND _cfg_proto_str "\"${_proto_name}\",\n") + endforeach(_proto_path) + + string(APPEND _cfg_proto_str "} ;\n") + + # compare with file and if there is any difference update the file + set(_old_cfg_proto_str "") + + if(EXISTS "${_cfg_proto_file}") + file(READ "${_cfg_proto_file}" _old_cfg_proto_str) + endif() + + if(NOT _old_cfg_proto_str STREQUAL _cfg_proto_str) + file(WRITE "${_cfg_proto_file}" "${_cfg_proto_str}") + endif() + + # generate static defaults + set(_cfg_defaults_file ${_out_dir}/config/profiles/${profile_dir}/config_defaults.h) + + # Defaults cannot be a single string because the compiler complains about a + # string longer than 65k + set(_cfg_defaults_str "const char * config_static_defaults[] = { ") + + foreach(_cfg_file_path ${_cfg_profile_defaults}) + file(READ ${_cfg_file_path} _cfg_file_content) + string(REPLACE "\"" "\\\"" _cfg_file_content_escaped ${_cfg_file_content}) + string(REPLACE "\n" ";" _cfg_lines ${_cfg_file_content_escaped}) + + foreach(_line ${_cfg_lines}) + string(APPEND _cfg_defaults_str "\n \"${_line}\",") + endforeach(_line) + endforeach(_cfg_file_path) + + string(APPEND _cfg_defaults_str "};") + set(_old_cfg_defaults_str "") + + if(EXISTS ${_cfg_defaults_file}) + file(READ ${_cfg_defaults_file} _old_cfg_defaults_str) + endif() + + if(NOT _cfg_defaults_str STREQUAL _old_cfg_defaults_str) + file(WRITE "${_cfg_defaults_file}" "${_cfg_defaults_str}") + endif() +endfunction() diff --git a/src/lib/cmake/GenerateDefaultConfig.cmake b/src/lib_spark/cmake/GenerateDefaultConfig.cmake similarity index 90% rename from src/lib/cmake/GenerateDefaultConfig.cmake rename to src/lib_spark/cmake/GenerateDefaultConfig.cmake index de23b323b..213bf0667 100644 --- a/src/lib/cmake/GenerateDefaultConfig.cmake +++ b/src/lib_spark/cmake/GenerateDefaultConfig.cmake @@ -1,6 +1,7 @@ function(generate_default_config cfg_protos cfg_defaults) + set(_out_dir ${CMAKE_CURRENT_BINARY_DIR}/include/${PROJECT_NAME}) # generate list of config protos - set(_cfg_proto_file ${CMAKE_CURRENT_BINARY_DIR}/config_proto_files.h) + set(_cfg_proto_file ${_out_dir}/config_proto_files.h) # generate a string with the current config files set(_cfg_proto_str "const char * config_proto_files[] = { // generated file\n") @@ -24,7 +25,7 @@ function(generate_default_config cfg_protos cfg_defaults) endif() # generate static defaults - set(_cfg_defaults_file ${CMAKE_CURRENT_BINARY_DIR}/config_defaults.h) + set(_cfg_defaults_file ${_out_dir}/config_defaults.h) # Defaults cannot be a single string because the compiler complains about a # string longer than 65k diff --git a/src/lib/cmake/GetLinuxClientLinkLibraries.cmake b/src/lib_spark/cmake/GetLinuxClientLinkLibraries.cmake similarity index 100% rename from src/lib/cmake/GetLinuxClientLinkLibraries.cmake rename to src/lib_spark/cmake/GetLinuxClientLinkLibraries.cmake diff --git a/src/lib/cmake/GetLinuxServerSources.cmake b/src/lib_spark/cmake/GetLinuxClientSources.cmake similarity index 63% rename from src/lib/cmake/GetLinuxServerSources.cmake rename to src/lib_spark/cmake/GetLinuxClientSources.cmake index 950ba2012..0831dbb23 100644 --- a/src/lib/cmake/GetLinuxServerSources.cmake +++ b/src/lib_spark/cmake/GetLinuxClientSources.cmake @@ -2,23 +2,20 @@ function(get_proto_sources cfg_srcs non_cfg_srcs service_srcs cfg_defaults) file( GLOB_RECURSE _cfg_srcs RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - config/protos/*.proto - api/domain/SecurityMetadataCollection.proto - api/md/MarketDataConfig.proto) + ${PROJECT_NAME}/config/protos/*.proto + ${PROJECT_NAME}/api/md/*.proto + ) file( GLOB_RECURSE _service_srcs RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - api/services/*.proto) + ${PROJECT_NAME}/api/services/*.proto + ) file( GLOB_RECURSE _non_cfg_srcs RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - *.proto) - list(REMOVE_ITEM _non_cfg_srcs ${_service_srcs} ${_cfg_srcs}) - - file( - GLOB_RECURSE _cfg_defaults - RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - ${CONFIG_DEFAULTS_PATH}) + ${PROJECT_NAME}/*.proto + ) + list(REMOVE_ITEM _non_cfg_srcs ${_service_srcs}) set(_cfg_defaults) @@ -26,10 +23,10 @@ function(get_proto_sources cfg_srcs non_cfg_srcs service_srcs cfg_defaults) file( GLOB_RECURSE cfg_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - ${cfg_path}) + ${PROJECT_NAME}/${cfg_path}) list(APPEND _cfg_defaults ${cfg_files}) endforeach() - + set(${cfg_srcs} ${_cfg_srcs} PARENT_SCOPE) set(${non_cfg_srcs} ${_non_cfg_srcs} PARENT_SCOPE) set(${service_srcs} ${_service_srcs} PARENT_SCOPE) @@ -40,6 +37,14 @@ function(get_cpp_sources dest) file( GLOB_RECURSE _dest RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - *.cpp) + ${PROJECT_NAME}/api/*.cpp + ${PROJECT_NAME}/config/*.cpp + ${PROJECT_NAME}/domain/*.cpp + ${PROJECT_NAME}/domain_model/*.cpp + ${PROJECT_NAME}/md/*.cpp + ${PROJECT_NAME}/quickbus/*.cpp + ${PROJECT_NAME}/testing/*.cpp + ${PROJECT_NAME}/utils/*.cpp + ) set(${dest} ${_dest} PARENT_SCOPE) endfunction() diff --git a/src/lib/cmake/GetLinuxServerLinkLibraries.cmake b/src/lib_spark/cmake/GetLinuxServerLinkLibraries.cmake similarity index 100% rename from src/lib/cmake/GetLinuxServerLinkLibraries.cmake rename to src/lib_spark/cmake/GetLinuxServerLinkLibraries.cmake diff --git a/src/lib_spark/cmake/GetLinuxServerSources.cmake b/src/lib_spark/cmake/GetLinuxServerSources.cmake new file mode 100644 index 000000000..41729b1d2 --- /dev/null +++ b/src/lib_spark/cmake/GetLinuxServerSources.cmake @@ -0,0 +1,45 @@ +function(get_proto_sources cfg_srcs non_cfg_srcs service_srcs) + file( + GLOB_RECURSE _cfg_srcs + RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} + ${PROJECT_NAME}/config/protos/*.proto + ${PROJECT_NAME}/api/domain/SecurityMetadataCollection.proto + ${PROJECT_NAME}/api/md/MarketDataConfig.proto + ) + file( + GLOB_RECURSE _service_srcs + RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} + ${PROJECT_NAME}/api/services/*.proto + ) + file( + GLOB_RECURSE _non_cfg_srcs + RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} + ${PROJECT_NAME}/*.proto + ) + list(REMOVE_ITEM _non_cfg_srcs ${_service_srcs}) + set(${cfg_srcs} ${_cfg_srcs} PARENT_SCOPE) + set(${non_cfg_srcs} ${_non_cfg_srcs} PARENT_SCOPE) + set(${service_srcs} ${_service_srcs} PARENT_SCOPE) +endfunction() + +function(get_cpp_sources srcs test_srcs) + file( + GLOB_RECURSE _srcs + RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} + ${PROJECT_NAME}/*.cpp + ) + + # Note: cpp files inside 'tests' dir(s) are considered tests. + # Remove tests from main sources, and add them to test sources + foreach(item ${_srcs}) + if(${item} MATCHES "tests/.*\.cpp$") + list(APPEND _test_srcs ${item}) + endif() + endforeach() + foreach(item ${_test_srcs}) + list(REMOVE_ITEM ${_srcs} ${item}) + endforeach() + + set(${srcs} ${_srcs} PARENT_SCOPE) + set(${test_srcs} ${_test_srcs} PARENT_SCOPE) +endfunction() diff --git a/src/lib/cmake/GetWindowsClientLinkLibraries.cmake b/src/lib_spark/cmake/GetWindowsClientLinkLibraries.cmake similarity index 100% rename from src/lib/cmake/GetWindowsClientLinkLibraries.cmake rename to src/lib_spark/cmake/GetWindowsClientLinkLibraries.cmake diff --git a/src/lib_spark/cmake/GetWindowsClientSources.cmake b/src/lib_spark/cmake/GetWindowsClientSources.cmake new file mode 100644 index 000000000..05148eb4a --- /dev/null +++ b/src/lib_spark/cmake/GetWindowsClientSources.cmake @@ -0,0 +1,150 @@ +function(get_proto_sources cfg_srcs non_cfg_srcs service_srcs) + file( + GLOB_RECURSE _cfg_srcs + RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} + ${PROJECT_NAME}/config/protos/*.proto + ${PROJECT_NAME}/api/domain/SecurityMetadataCollection.proto + ) + file( + GLOB_RECURSE _service_srcs + RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} + ${PROJECT_NAME}/api/services/*.proto + ) + file( + GLOB_RECURSE _non_cfg_srcs + RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} + ${PROJECT_NAME}/*.proto + ) + list(REMOVE_ITEM _non_cfg_srcs ${_service_srcs}) + set(${cfg_srcs} ${_cfg_srcs} PARENT_SCOPE) + set(${non_cfg_srcs} ${_non_cfg_srcs} PARENT_SCOPE) + set(${service_srcs} ${_service_srcs} PARENT_SCOPE) +endfunction() + +function(get_cpp_sources dest) + set(${dest} + ${PROJECT_NAME}/api/core/ApiClientInterop.cpp + ${PROJECT_NAME}/api/core/ApiServerInterop.cpp + ${PROJECT_NAME}/api/public/ApiServer.cpp + ${PROJECT_NAME}/api/public/ClientChannel.cpp + ${PROJECT_NAME}/api/public/QuickbusClientChannel.cpp + ${PROJECT_NAME}/api/public/ServerChannel.cpp + ${PROJECT_NAME}/api/public/ServiceContext.cpp + ${PROJECT_NAME}/api/test/ApiTests.cpp + ${PROJECT_NAME}/api/test/HelloServiceServer.cpp + ${PROJECT_NAME}/config/ConfigDownloader.cpp + ${PROJECT_NAME}/config/ConfigErrorCollector.cpp + ${PROJECT_NAME}/config/ConfigPropertyEvaluator.cpp + ${PROJECT_NAME}/config/ConfigQuerier.cpp + ${PROJECT_NAME}/config/ConfigValueQueue.cpp + ${PROJECT_NAME}/config/ConfigurationException.cpp + ${PROJECT_NAME}/config/ConfigurationState.cpp + ${PROJECT_NAME}/config/PreprocessInputStream.cpp + ${PROJECT_NAME}/config/config.cpp + ${PROJECT_NAME}/config/tests/HTTPServer.cpp + ${PROJECT_NAME}/config/tests/config_ref_tests.cpp + ${PROJECT_NAME}/config/tests/config_tests.cpp + ${PROJECT_NAME}/config/text_format/text_format.cpp + ${PROJECT_NAME}/core/TimeSpan.cpp + ${PROJECT_NAME}/core/TimeStamp.cpp + ${PROJECT_NAME}/domain/DomainSecurityUtils.cpp + ${PROJECT_NAME}/domain/SecurityCriteria.cpp + ${PROJECT_NAME}/domain/SecurityCriteriaClause.cpp + ${PROJECT_NAME}/domain/synthetic_book_side.cpp + ${PROJECT_NAME}/domain_model/Security.cpp + ${PROJECT_NAME}/domain_model/SecurityTests.cpp + ${PROJECT_NAME}/domain_model/sod.cpp + ${PROJECT_NAME}/domain_model/tests/domain_tests.cpp + ${PROJECT_NAME}/expression/BooleanGrammar.cpp + ${PROJECT_NAME}/expression/ExpressionEvaluator.cpp + ${PROJECT_NAME}/expression/ParserExceptions.cpp + ${PROJECT_NAME}/expression/Value.cpp + ${PROJECT_NAME}/expression/tests/expression_parser_tests.cpp + ${PROJECT_NAME}/io/JsonReader.cpp + ${PROJECT_NAME}/logging/LoggerHub.cpp + ${PROJECT_NAME}/logging/Sink.cpp + ${PROJECT_NAME}/logging/logging.cpp + ${PROJECT_NAME}/logging/tests/logging_tests.cpp + ${PROJECT_NAME}/md/Diag/MDPeriodicDumper.cpp + ${PROJECT_NAME}/md/Diag/ShmDumper.cpp + ${PROJECT_NAME}/md/MBOProcessor.cpp + ${PROJECT_NAME}/md/MBOServiceServer.cpp + ${PROJECT_NAME}/md/MDClient.cpp + ${PROJECT_NAME}/md/MDConsumer.cpp + ${PROJECT_NAME}/md/MDConsumerHandle.cpp + ${PROJECT_NAME}/md/MDConsumerInterop.cpp + ${PROJECT_NAME}/md/MDProducer.cpp + ${PROJECT_NAME}/md/MDProducerHandle.cpp + ${PROJECT_NAME}/md/MemorySegmentUtils.cpp + ${PROJECT_NAME}/md/PriceSize.cpp + ${PROJECT_NAME}/md/Product.cpp + ${PROJECT_NAME}/md/SecurityCache.cpp + ${PROJECT_NAME}/md/SecurityDB.cpp + ${PROJECT_NAME}/md/SecurityMapper.cpp + ${PROJECT_NAME}/md/SecurityMarketState.cpp + ${PROJECT_NAME}/md/SecurityOracle.cpp + ${PROJECT_NAME}/md/SecurityStore.cpp + ${PROJECT_NAME}/md/Shm/FixedSecurity.cpp + ${PROJECT_NAME}/md/SyntheticSecurityService.cpp + ${PROJECT_NAME}/md/cme/MDP3Utils.cpp + ${PROJECT_NAME}/md/common.cpp + ${PROJECT_NAME}/md/ice/ICEUtils.cpp + ${PROJECT_NAME}/md/relay/QueryServer.cpp + ${PROJECT_NAME}/md/relay/RelayClient.cpp + ${PROJECT_NAME}/md/relay/RelayRecorder.cpp + ${PROJECT_NAME}/md/service/MarketDataServiceServer.cpp + ${PROJECT_NAME}/md/test/Co2ManagedTestHelper.cpp + ${PROJECT_NAME}/md/test/Co2TestInstrument.cpp + ${PROJECT_NAME}/md/test/mbo_tests.cpp + ${PROJECT_NAME}/md/test/md2_tests.cpp + ${PROJECT_NAME}/md/test/md_test_utils.cpp + ${PROJECT_NAME}/md/test/synthetic_book_merge_tests.cpp + ${PROJECT_NAME}/os/os.cpp + ${PROJECT_NAME}/os/tests/os_tests.cpp + ${PROJECT_NAME}/quickbus/core/LocalNode.cpp + ${PROJECT_NAME}/quickbus/core/Quickbus.cpp + ${PROJECT_NAME}/quickbus/core/SubscriptionID.cpp + ${PROJECT_NAME}/quickbus/core/TableID.cpp + ${PROJECT_NAME}/quickbus/message_model/Update.cpp + ${PROJECT_NAME}/quickbus/message_model/merge_updates.cpp + ${PROJECT_NAME}/quickbus/network/QBConnection.cpp + ${PROJECT_NAME}/quickbus/network/QBConnectionManager.cpp + ${PROJECT_NAME}/quickbus/network/endpoint_description.cpp + ${PROJECT_NAME}/quickbus/pubsub/TablePublisher.cpp + ${PROJECT_NAME}/quickbus/pubsub/TableSubscriber.cpp + ${PROJECT_NAME}/quickbus/pubsub/tests/qb_pubsub_tests.cpp + ${PROJECT_NAME}/quickbus/routing/INode.cpp + ${PROJECT_NAME}/quickbus/routing/NodeID.cpp + ${PROJECT_NAME}/quickbus/routing/Router.cpp + ${PROJECT_NAME}/quickbus/rpc/RPCClient.cpp + ${PROJECT_NAME}/quickbus/rpc/RPCServer.cpp + ${PROJECT_NAME}/quickbus/rpc/RPCSessionID.cpp + ${PROJECT_NAME}/quickbus/rpc/rpc_utils.cpp + ${PROJECT_NAME}/quickbus/rpc/tests/qb_rpc_tests.cpp + ${PROJECT_NAME}/quickbus/tests/quickbus_tests.cpp + ${PROJECT_NAME}/testing/catch_test_runner.cpp + ${PROJECT_NAME}/utils/AuthSessionManager.cpp + ${PROJECT_NAME}/utils/AuthToken.cpp + ${PROJECT_NAME}/utils/Dispatcher.cpp + ${PROJECT_NAME}/utils/FileUtils.cpp + ${PROJECT_NAME}/utils/GrowableSPSCQueue.cpp + ${PROJECT_NAME}/utils/HTTPStream.cpp + ${PROJECT_NAME}/utils/MathUtils.cpp + ${PROJECT_NAME}/utils/PBUtils.cpp + ${PROJECT_NAME}/utils/Puid.cpp + ${PROJECT_NAME}/utils/SecureLogon.cpp + ${PROJECT_NAME}/utils/SharedMemory.cpp + ${PROJECT_NAME}/utils/Uuid.cpp + ${PROJECT_NAME}/utils/datetime.cpp + ${PROJECT_NAME}/utils/download.cpp + ${PROJECT_NAME}/utils/file_utils.cpp + ${PROJECT_NAME}/utils/init_spark_lib.cpp + ${PROJECT_NAME}/utils/is_unittest_environment.cpp + ${PROJECT_NAME}/utils/sftp.cpp + ${PROJECT_NAME}/utils/stats.cpp + ${PROJECT_NAME}/utils/tests/AuthTokenTests.cpp + ${PROJECT_NAME}/utils/tests/MathUtilsTests.cpp + ${PROJECT_NAME}/utils/tests/SingleWriterConcurrentVectorTests.cpp + ${PROJECT_NAME}/utils/thread_manager.cpp + PARENT_SCOPE) +endfunction() diff --git a/src/lib/cmake/ProtobufGenerateCppService.cmake b/src/lib_spark/cmake/ProtobufGenerateCppService.cmake similarity index 87% rename from src/lib/cmake/ProtobufGenerateCppService.cmake rename to src/lib_spark/cmake/ProtobufGenerateCppService.cmake index be75f0ecf..279479934 100644 --- a/src/lib/cmake/ProtobufGenerateCppService.cmake +++ b/src/lib_spark/cmake/ProtobufGenerateCppService.cmake @@ -37,15 +37,15 @@ function(protobuf_generate_cpp_service) list(APPEND ${_ARGS_CXX_HEADERS} "${_ARGS_CXX_OUT_DIR}/${_fil_we}.server.pb.h") set(_templates - ${CMAKE_CURRENT_SOURCE_DIR}/api/service_compiler/templates/cpp/client.pb.cc - ${CMAKE_CURRENT_SOURCE_DIR}/api/service_compiler/templates/cpp/client.pb.h - ${CMAKE_CURRENT_SOURCE_DIR}/api/service_compiler/templates/cpp/server.pb.cc - ${CMAKE_CURRENT_SOURCE_DIR}/api/service_compiler/templates/cpp/server.pb.h + ${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME}/api/service_compiler/templates/cpp/client.pb.cc + ${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME}/api/service_compiler/templates/cpp/client.pb.h + ${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME}/api/service_compiler/templates/cpp/server.pb.cc + ${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME}/api/service_compiler/templates/cpp/server.pb.h ) - set(_plugin_py ${CMAKE_CURRENT_SOURCE_DIR}/api/service_compiler/plugin.py) + set(_plugin_py ${CMAKE_CURRENT_SOURCE_DIR}/spark/api/service_compiler/plugin.py) if(WIN32) - set(_plugin_cmd ${CMAKE_CURRENT_SOURCE_DIR}/api/service_compiler/plugin.cmd) + set(_plugin_cmd ${CMAKE_CURRENT_SOURCE_DIR}/spark/api/service_compiler/plugin.cmd) set(_venv_activate_bat ${CMAKE_SOURCE_DIR}/.venv/Scripts/activate.bat) add_custom_command( OUTPUT @@ -123,4 +123,3 @@ function(protobuf_generate_cpp_service) set(${_ARGS_CXX_SOURCES} ${${_ARGS_CXX_SOURCES}} PARENT_SCOPE) set(${_ARGS_CXX_HEADERS} ${${_ARGS_CXX_HEADERS}} PARENT_SCOPE) endfunction() - diff --git a/src/lib/algorithm/PlusX.h b/src/lib_spark/spark/algorithm/PlusX.h similarity index 100% rename from src/lib/algorithm/PlusX.h rename to src/lib_spark/spark/algorithm/PlusX.h diff --git a/src/lib/algorithm/StringCaseConverter.h b/src/lib_spark/spark/algorithm/StringCaseConverter.h similarity index 100% rename from src/lib/algorithm/StringCaseConverter.h rename to src/lib_spark/spark/algorithm/StringCaseConverter.h diff --git a/src/lib/algorithm/TryCatch.h b/src/lib_spark/spark/algorithm/TryCatch.h similarity index 100% rename from src/lib/algorithm/TryCatch.h rename to src/lib_spark/spark/algorithm/TryCatch.h diff --git a/src/lib/api/analytics/ExpirationDriver.proto b/src/lib_spark/spark/api/analytics/ExpirationDriver.proto similarity index 70% rename from src/lib/api/analytics/ExpirationDriver.proto rename to src/lib_spark/spark/api/analytics/ExpirationDriver.proto index d3362c61d..7374ab2df 100644 --- a/src/lib/api/analytics/ExpirationDriver.proto +++ b/src/lib_spark/spark/api/analytics/ExpirationDriver.proto @@ -1,8 +1,8 @@ syntax = "proto3"; package bts.api.analytics; -import "lib/api/analytics/TimeWeightedInterpolatedDriver.proto"; -import "lib/api/domain/SecurityExpiration.proto"; +import "spark/api/analytics/TimeWeightedInterpolatedDriver.proto"; +import "spark/api/domain/SecurityExpiration.proto"; option csharp_namespace = "bts.api.analytics"; diff --git a/src/lib/api/analytics/TimeWeightedInterpolatedDriver.proto b/src/lib_spark/spark/api/analytics/TimeWeightedInterpolatedDriver.proto similarity index 80% rename from src/lib/api/analytics/TimeWeightedInterpolatedDriver.proto rename to src/lib_spark/spark/api/analytics/TimeWeightedInterpolatedDriver.proto index 84b1fbfce..49ce49c38 100644 --- a/src/lib/api/analytics/TimeWeightedInterpolatedDriver.proto +++ b/src/lib_spark/spark/api/analytics/TimeWeightedInterpolatedDriver.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package bts.api.analytics; -import "lib/domain_model/Security.proto"; +import "spark/domain_model/Security.proto"; option csharp_namespace = "bts.api.analytics"; diff --git a/src/lib/api/apicore.proto b/src/lib_spark/spark/api/apicore.proto similarity index 100% rename from src/lib/api/apicore.proto rename to src/lib_spark/spark/api/apicore.proto diff --git a/src/lib/api/apigateway.proto b/src/lib_spark/spark/api/apigateway.proto similarity index 94% rename from src/lib/api/apigateway.proto rename to src/lib_spark/spark/api/apigateway.proto index 1463f8354..85d527731 100644 --- a/src/lib/api/apigateway.proto +++ b/src/lib_spark/spark/api/apigateway.proto @@ -1,7 +1,7 @@ syntax="proto3"; package bts.api.gateway; option csharp_namespace="bts.api.gateway"; -import "lib/api/apicore.proto"; +import "spark/api/apicore.proto"; message GatewayLogin { string username = 1; @@ -73,4 +73,4 @@ message GatewayResponse { SubscriptionUpdate tick = 3; string error = 10; } -} \ No newline at end of file +} diff --git a/src/lib/api/apioptions.proto b/src/lib_spark/spark/api/apioptions.proto similarity index 100% rename from src/lib/api/apioptions.proto rename to src/lib_spark/spark/api/apioptions.proto diff --git a/src/lib/api/build_apioptions.sh b/src/lib_spark/spark/api/build_apioptions.sh similarity index 100% rename from src/lib/api/build_apioptions.sh rename to src/lib_spark/spark/api/build_apioptions.sh diff --git a/src/lib/api/core/ApiClientInterop.cpp b/src/lib_spark/spark/api/core/ApiClientInterop.cpp similarity index 96% rename from src/lib/api/core/ApiClientInterop.cpp rename to src/lib_spark/spark/api/core/ApiClientInterop.cpp index 328d8f680..dec1dd840 100644 --- a/src/lib/api/core/ApiClientInterop.cpp +++ b/src/lib_spark/spark/api/core/ApiClientInterop.cpp @@ -1,17 +1,17 @@ #include "ApiClientInterop.h" -#include "lib/config/config.h" -#include "lib/logging/logging.h" -#include "lib/quickbus/quickbus.h" -#include "lib/utils/Dispatcher.h" -#include "lib/utils/bts_assert.h" +#include "spark/config/config.h" +#include "spark/logging/logging.h" +#include "spark/quickbus/quickbus.h" +#include "spark/utils/Dispatcher.h" +#include "spark/utils/bts_assert.h" #include "../public/Result.h" #include "../public/ServiceContext.h" -#include "lib/api/apicore.pb.h" -#include "lib/config/protos/ports.pb.h" -#include "lib/config/protos/quickbus_cfg.pb.h" -#include "lib/config/protos/system_config.pb.h" +#include "spark/api/apicore.pb.h" +#include "spark/config/protos/ports.pb.h" +#include "spark/config/protos/quickbus_cfg.pb.h" +#include "spark/config/protos/system_config.pb.h" #ifdef _WIN32 #include diff --git a/src/lib/api/core/ApiClientInterop.h b/src/lib_spark/spark/api/core/ApiClientInterop.h similarity index 100% rename from src/lib/api/core/ApiClientInterop.h rename to src/lib_spark/spark/api/core/ApiClientInterop.h diff --git a/src/lib/api/core/ApiInteropCommon.h b/src/lib_spark/spark/api/core/ApiInteropCommon.h similarity index 86% rename from src/lib/api/core/ApiInteropCommon.h rename to src/lib_spark/spark/api/core/ApiInteropCommon.h index 8a264b8cc..bf7cdc816 100644 --- a/src/lib/api/core/ApiInteropCommon.h +++ b/src/lib_spark/spark/api/core/ApiInteropCommon.h @@ -1,7 +1,7 @@ #pragma once -#include "lib/api/apicore.pb.h" -#include "lib/utils/bts_export.h" +#include "spark/api/apicore.pb.h" +#include "spark/utils/bts_export.h" #include #include diff --git a/src/lib/api/core/ApiServerInterop.cpp b/src/lib_spark/spark/api/core/ApiServerInterop.cpp similarity index 94% rename from src/lib/api/core/ApiServerInterop.cpp rename to src/lib_spark/spark/api/core/ApiServerInterop.cpp index a290f23fa..94331ea69 100644 --- a/src/lib/api/core/ApiServerInterop.cpp +++ b/src/lib_spark/spark/api/core/ApiServerInterop.cpp @@ -1,7 +1,7 @@ #include "ApiServerInterop.h" -#include "lib/logging/logging.h" -#include "lib/quickbus/quickbus.h" -#include "lib/utils/bts_assert.h" +#include "spark/logging/logging.h" +#include "spark/quickbus/quickbus.h" +#include "spark/utils/bts_assert.h" namespace bts { namespace api { diff --git a/src/lib/api/core/ApiServerInterop.h b/src/lib_spark/spark/api/core/ApiServerInterop.h similarity index 100% rename from src/lib/api/core/ApiServerInterop.h rename to src/lib_spark/spark/api/core/ApiServerInterop.h diff --git a/src/lib/api/core/RegexFormatting.proto b/src/lib_spark/spark/api/core/RegexFormatting.proto similarity index 100% rename from src/lib/api/core/RegexFormatting.proto rename to src/lib_spark/spark/api/core/RegexFormatting.proto diff --git a/src/lib/api/domain/CallPut.h b/src/lib_spark/spark/api/domain/CallPut.h similarity index 52% rename from src/lib/api/domain/CallPut.h rename to src/lib_spark/spark/api/domain/CallPut.h index 6c711850c..5e4403111 100644 --- a/src/lib/api/domain/CallPut.h +++ b/src/lib_spark/spark/api/domain/CallPut.h @@ -1,8 +1,8 @@ #pragma once -#include "lib/api/domain/CallPut.pb.h" -#include "lib/core/EnumMacros.h" -#include "lib/io/JsonReader.h" -#include "lib/logging/logging.h" +#include "spark/api/domain/CallPut.pb.h" +#include "spark/core/EnumMacros.h" +#include "spark/io/JsonReader.h" +#include "spark/logging/logging.h" #include namespace bts::api::domain { diff --git a/src/lib/api/domain/CallPut.proto b/src/lib_spark/spark/api/domain/CallPut.proto similarity index 100% rename from src/lib/api/domain/CallPut.proto rename to src/lib_spark/spark/api/domain/CallPut.proto diff --git a/src/lib/api/domain/Currency.h b/src/lib_spark/spark/api/domain/Currency.h similarity index 52% rename from src/lib/api/domain/Currency.h rename to src/lib_spark/spark/api/domain/Currency.h index 09f628808..827377478 100644 --- a/src/lib/api/domain/Currency.h +++ b/src/lib_spark/spark/api/domain/Currency.h @@ -1,8 +1,8 @@ #pragma once -#include "lib/api/domain/Currency.pb.h" -#include "lib/core/EnumMacros.h" -#include "lib/io/JsonReader.h" -#include "lib/logging/logging.h" +#include "spark/api/domain/Currency.pb.h" +#include "spark/core/EnumMacros.h" +#include "spark/io/JsonReader.h" +#include "spark/logging/logging.h" #include namespace bts::api::domain { diff --git a/src/lib/api/domain/Currency.proto b/src/lib_spark/spark/api/domain/Currency.proto similarity index 100% rename from src/lib/api/domain/Currency.proto rename to src/lib_spark/spark/api/domain/Currency.proto diff --git a/src/lib/api/domain/SecurityCriteria.proto b/src/lib_spark/spark/api/domain/SecurityCriteria.proto similarity index 76% rename from src/lib/api/domain/SecurityCriteria.proto rename to src/lib_spark/spark/api/domain/SecurityCriteria.proto index 0d001f0c8..3d6e8ece1 100644 --- a/src/lib/api/domain/SecurityCriteria.proto +++ b/src/lib_spark/spark/api/domain/SecurityCriteria.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package bts.api.domain; -import "lib/api/domain/SecurityCriteriaClause.proto"; +import "spark/api/domain/SecurityCriteriaClause.proto"; option csharp_namespace = "bts.api.domain"; diff --git a/src/lib/api/domain/SecurityCriteriaClause.proto b/src/lib_spark/spark/api/domain/SecurityCriteriaClause.proto similarity index 81% rename from src/lib/api/domain/SecurityCriteriaClause.proto rename to src/lib_spark/spark/api/domain/SecurityCriteriaClause.proto index fbd6da0d9..7e2b1fd2f 100644 --- a/src/lib/api/domain/SecurityCriteriaClause.proto +++ b/src/lib_spark/spark/api/domain/SecurityCriteriaClause.proto @@ -1,8 +1,8 @@ syntax = "proto3"; package bts.api.domain; -import "lib/api/domain/Venue.proto"; -import "lib/api/domain/SecurityType.proto"; +import "spark/api/domain/Venue.proto"; +import "spark/api/domain/SecurityType.proto"; option csharp_namespace = "bts.api.domain"; diff --git a/src/lib/api/domain/SecurityExpiration.proto b/src/lib_spark/spark/api/domain/SecurityExpiration.proto similarity index 75% rename from src/lib/api/domain/SecurityExpiration.proto rename to src/lib_spark/spark/api/domain/SecurityExpiration.proto index ce0af34a8..c900ec440 100644 --- a/src/lib/api/domain/SecurityExpiration.proto +++ b/src/lib_spark/spark/api/domain/SecurityExpiration.proto @@ -1,8 +1,8 @@ syntax = "proto3"; package bts.api.domain; -import "lib/api/domain/Venue.proto"; -import "lib/domain_model/Security.proto"; +import "spark/api/domain/Venue.proto"; +import "spark/domain_model/Security.proto"; option csharp_namespace = "bts.api.domain"; diff --git a/src/lib/api/domain/SecurityMetadata.proto b/src/lib_spark/spark/api/domain/SecurityMetadata.proto similarity index 74% rename from src/lib/api/domain/SecurityMetadata.proto rename to src/lib_spark/spark/api/domain/SecurityMetadata.proto index bb6a1b151..6ffa57341 100644 --- a/src/lib/api/domain/SecurityMetadata.proto +++ b/src/lib_spark/spark/api/domain/SecurityMetadata.proto @@ -1,8 +1,8 @@ syntax = "proto3"; package bts.api.domain; -import "lib/api/domain/TickDisplayRule.proto"; -import "lib/api/domain/TickDisplaySettings.proto"; +import "spark/api/domain/TickDisplayRule.proto"; +import "spark/api/domain/TickDisplaySettings.proto"; option csharp_namespace = "bts.api.domain"; diff --git a/src/lib/api/domain/SecurityMetadataCollection.proto b/src/lib_spark/spark/api/domain/SecurityMetadataCollection.proto similarity index 77% rename from src/lib/api/domain/SecurityMetadataCollection.proto rename to src/lib_spark/spark/api/domain/SecurityMetadataCollection.proto index 4a88032e2..d08a4d7ca 100644 --- a/src/lib/api/domain/SecurityMetadataCollection.proto +++ b/src/lib_spark/spark/api/domain/SecurityMetadataCollection.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package bts.api.domain; -import "lib/api/domain/SecurityMetadataItem.proto"; +import "spark/api/domain/SecurityMetadataItem.proto"; option csharp_namespace = "bts.api.domain"; diff --git a/src/lib/api/domain/SecurityMetadataItem.proto b/src/lib_spark/spark/api/domain/SecurityMetadataItem.proto similarity index 68% rename from src/lib/api/domain/SecurityMetadataItem.proto rename to src/lib_spark/spark/api/domain/SecurityMetadataItem.proto index 483242735..fb793d88b 100644 --- a/src/lib/api/domain/SecurityMetadataItem.proto +++ b/src/lib_spark/spark/api/domain/SecurityMetadataItem.proto @@ -1,8 +1,8 @@ syntax = "proto3"; package bts.api.domain; -import "lib/api/domain/SecurityCriteria.proto"; -import "lib/api/domain/SecurityMetadata.proto"; +import "spark/api/domain/SecurityCriteria.proto"; +import "spark/api/domain/SecurityMetadata.proto"; option csharp_namespace = "bts.api.domain"; diff --git a/src/lib/api/domain/SecurityType.h b/src/lib_spark/spark/api/domain/SecurityType.h similarity index 73% rename from src/lib/api/domain/SecurityType.h rename to src/lib_spark/spark/api/domain/SecurityType.h index 04f00c1d6..61e528529 100644 --- a/src/lib/api/domain/SecurityType.h +++ b/src/lib_spark/spark/api/domain/SecurityType.h @@ -1,10 +1,10 @@ #pragma once -#include "lib/api/domain/SecurityType.pb.h" -#include "lib/core/EnumMacros.h" -#include "lib/core/FMT_IMPL.h" -#include "lib/io/JsonReader.h" -#include "lib/logging/logging.h" +#include "spark/api/domain/SecurityType.pb.h" +#include "spark/core/EnumMacros.h" +#include "spark/core/FMT_IMPL.h" +#include "spark/io/JsonReader.h" +#include "spark/logging/logging.h" #include diff --git a/src/lib/api/domain/SecurityType.proto b/src/lib_spark/spark/api/domain/SecurityType.proto similarity index 100% rename from src/lib/api/domain/SecurityType.proto rename to src/lib_spark/spark/api/domain/SecurityType.proto diff --git a/src/lib/api/domain/TickDisplayRule.proto b/src/lib_spark/spark/api/domain/TickDisplayRule.proto similarity index 77% rename from src/lib/api/domain/TickDisplayRule.proto rename to src/lib_spark/spark/api/domain/TickDisplayRule.proto index 5b69677ee..e70a67a59 100644 --- a/src/lib/api/domain/TickDisplayRule.proto +++ b/src/lib_spark/spark/api/domain/TickDisplayRule.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package bts.api.domain; -import "lib/api/domain/TickDisplaySettings.proto"; +import "spark/api/domain/TickDisplaySettings.proto"; option csharp_namespace = "bts.api.domain"; diff --git a/src/lib/api/domain/TickDisplaySettings.proto b/src/lib_spark/spark/api/domain/TickDisplaySettings.proto similarity index 88% rename from src/lib/api/domain/TickDisplaySettings.proto rename to src/lib_spark/spark/api/domain/TickDisplaySettings.proto index 3952a4268..6f536d6a0 100644 --- a/src/lib/api/domain/TickDisplaySettings.proto +++ b/src/lib_spark/spark/api/domain/TickDisplaySettings.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package bts.api.domain; -import "lib/api/domain/TickFactors.proto"; +import "spark/api/domain/TickFactors.proto"; option csharp_namespace = "bts.api.domain"; diff --git a/src/lib/api/domain/TickFactors.proto b/src/lib_spark/spark/api/domain/TickFactors.proto similarity index 100% rename from src/lib/api/domain/TickFactors.proto rename to src/lib_spark/spark/api/domain/TickFactors.proto diff --git a/src/lib/api/domain/Venue.h b/src/lib_spark/spark/api/domain/Venue.h similarity index 71% rename from src/lib/api/domain/Venue.h rename to src/lib_spark/spark/api/domain/Venue.h index 69ce5f1f0..6e1748c04 100644 --- a/src/lib/api/domain/Venue.h +++ b/src/lib_spark/spark/api/domain/Venue.h @@ -1,10 +1,10 @@ #pragma once -#include "lib/api/domain/Venue.pb.h" -#include "lib/core/EnumMacros.h" -#include "lib/core/FMT_IMPL.h" -#include "lib/io/JsonReader.h" -#include "lib/logging/logging.h" +#include "spark/api/domain/Venue.pb.h" +#include "spark/core/EnumMacros.h" +#include "spark/core/FMT_IMPL.h" +#include "spark/io/JsonReader.h" +#include "spark/logging/logging.h" #include diff --git a/src/lib/api/domain/Venue.proto b/src/lib_spark/spark/api/domain/Venue.proto similarity index 100% rename from src/lib/api/domain/Venue.proto rename to src/lib_spark/spark/api/domain/Venue.proto diff --git a/src/lib/api/io/URL.proto b/src/lib_spark/spark/api/io/URL.proto similarity index 100% rename from src/lib/api/io/URL.proto rename to src/lib_spark/spark/api/io/URL.proto diff --git a/src/lib/api/md/BinanceCoinFuturesMarketDataConfig.proto b/src/lib_spark/spark/api/md/BinanceCoinFuturesMarketDataConfig.proto similarity index 92% rename from src/lib/api/md/BinanceCoinFuturesMarketDataConfig.proto rename to src/lib_spark/spark/api/md/BinanceCoinFuturesMarketDataConfig.proto index 492cb784f..51107ed1b 100644 --- a/src/lib/api/md/BinanceCoinFuturesMarketDataConfig.proto +++ b/src/lib_spark/spark/api/md/BinanceCoinFuturesMarketDataConfig.proto @@ -1,7 +1,7 @@ syntax = "proto3"; -import "lib/api/domain/SecurityCriteria.proto"; -import "lib/api/core/RegexFormatting.proto"; +import "spark/api/domain/SecurityCriteria.proto"; +import "spark/api/core/RegexFormatting.proto"; package bts.api.md; diff --git a/src/lib/api/md/BinanceMarketDataConfig.proto b/src/lib_spark/spark/api/md/BinanceMarketDataConfig.proto similarity index 92% rename from src/lib/api/md/BinanceMarketDataConfig.proto rename to src/lib_spark/spark/api/md/BinanceMarketDataConfig.proto index b8989d2c8..b97ff0738 100644 --- a/src/lib/api/md/BinanceMarketDataConfig.proto +++ b/src/lib_spark/spark/api/md/BinanceMarketDataConfig.proto @@ -1,6 +1,6 @@ syntax = "proto3"; -import "lib/api/domain/SecurityCriteria.proto"; +import "spark/api/domain/SecurityCriteria.proto"; package bts.api.md; diff --git a/src/lib/api/md/BinanceUsMarketDataConfig.proto b/src/lib_spark/spark/api/md/BinanceUsMarketDataConfig.proto similarity index 92% rename from src/lib/api/md/BinanceUsMarketDataConfig.proto rename to src/lib_spark/spark/api/md/BinanceUsMarketDataConfig.proto index 4412b9786..c125ce5be 100644 --- a/src/lib/api/md/BinanceUsMarketDataConfig.proto +++ b/src/lib_spark/spark/api/md/BinanceUsMarketDataConfig.proto @@ -1,6 +1,6 @@ syntax = "proto3"; -import "lib/api/domain/SecurityCriteria.proto"; +import "spark/api/domain/SecurityCriteria.proto"; package bts.api.md; diff --git a/src/lib/api/md/BinanceUsdsFuturesMarketDataConfig.proto b/src/lib_spark/spark/api/md/BinanceUsdsFuturesMarketDataConfig.proto similarity index 94% rename from src/lib/api/md/BinanceUsdsFuturesMarketDataConfig.proto rename to src/lib_spark/spark/api/md/BinanceUsdsFuturesMarketDataConfig.proto index bf55096eb..644eace8f 100644 --- a/src/lib/api/md/BinanceUsdsFuturesMarketDataConfig.proto +++ b/src/lib_spark/spark/api/md/BinanceUsdsFuturesMarketDataConfig.proto @@ -1,6 +1,6 @@ syntax = "proto3"; -import "lib/api/domain/SecurityCriteria.proto"; +import "spark/api/domain/SecurityCriteria.proto"; package bts.api.md; diff --git a/src/lib/api/md/CboeMarketDataConfig.proto b/src/lib_spark/spark/api/md/CboeMarketDataConfig.proto similarity index 67% rename from src/lib/api/md/CboeMarketDataConfig.proto rename to src/lib_spark/spark/api/md/CboeMarketDataConfig.proto index 2cf87fa0b..3da36f637 100644 --- a/src/lib/api/md/CboeMarketDataConfig.proto +++ b/src/lib_spark/spark/api/md/CboeMarketDataConfig.proto @@ -1,12 +1,12 @@ syntax = "proto3"; -import "lib/api/domain/SecurityCriteria.proto"; -import "lib/api/md/DatabentoMarketDataConfig.proto"; +import "spark/api/domain/SecurityCriteria.proto"; +import "spark/api/md/DatabentoMarketDataConfig.proto"; package bts.api.md; option csharp_namespace = "bts.api.md"; - +option cc_enable_arenas = true; message CboeMarketDataConfig { uint32 unique_check_value = 1; diff --git a/src/lib/api/md/CoinbaseMarketDataConfig.proto b/src/lib_spark/spark/api/md/CoinbaseMarketDataConfig.proto similarity index 92% rename from src/lib/api/md/CoinbaseMarketDataConfig.proto rename to src/lib_spark/spark/api/md/CoinbaseMarketDataConfig.proto index c10fd7832..4241ee238 100644 --- a/src/lib/api/md/CoinbaseMarketDataConfig.proto +++ b/src/lib_spark/spark/api/md/CoinbaseMarketDataConfig.proto @@ -1,6 +1,6 @@ syntax = "proto3"; -import "lib/api/domain/SecurityCriteria.proto"; +import "spark/api/domain/SecurityCriteria.proto"; package bts.api.md; diff --git a/src/lib/api/md/DatabentoMarketDataConfig.proto b/src/lib_spark/spark/api/md/DatabentoMarketDataConfig.proto similarity index 100% rename from src/lib/api/md/DatabentoMarketDataConfig.proto rename to src/lib_spark/spark/api/md/DatabentoMarketDataConfig.proto diff --git a/src/lib/api/md/DeribitMarketDataConfig.proto b/src/lib_spark/spark/api/md/DeribitMarketDataConfig.proto similarity index 88% rename from src/lib/api/md/DeribitMarketDataConfig.proto rename to src/lib_spark/spark/api/md/DeribitMarketDataConfig.proto index 3e2cead54..105cc6fda 100644 --- a/src/lib/api/md/DeribitMarketDataConfig.proto +++ b/src/lib_spark/spark/api/md/DeribitMarketDataConfig.proto @@ -1,6 +1,6 @@ syntax = "proto3"; -import "lib/api/domain/SecurityCriteria.proto"; +import "spark/api/domain/SecurityCriteria.proto"; package bts.api.md; diff --git a/src/lib/api/md/EmumbaDeribitMarketDataConfig.proto b/src/lib_spark/spark/api/md/EmumbaDeribitMarketDataConfig.proto similarity index 100% rename from src/lib/api/md/EmumbaDeribitMarketDataConfig.proto rename to src/lib_spark/spark/api/md/EmumbaDeribitMarketDataConfig.proto diff --git a/src/lib/api/md/FTXMarketDataConfig.proto b/src/lib_spark/spark/api/md/FTXMarketDataConfig.proto similarity index 82% rename from src/lib/api/md/FTXMarketDataConfig.proto rename to src/lib_spark/spark/api/md/FTXMarketDataConfig.proto index 9b320a129..01bcc40d8 100644 --- a/src/lib/api/md/FTXMarketDataConfig.proto +++ b/src/lib_spark/spark/api/md/FTXMarketDataConfig.proto @@ -1,6 +1,6 @@ syntax = "proto3"; -import "lib/api/domain/SecurityCriteria.proto"; +import "spark/api/domain/SecurityCriteria.proto"; package bts.api.md; diff --git a/src/lib/api/md/GlbxMarketDataConfig.proto b/src/lib_spark/spark/api/md/GlbxMarketDataConfig.proto similarity index 87% rename from src/lib/api/md/GlbxMarketDataConfig.proto rename to src/lib_spark/spark/api/md/GlbxMarketDataConfig.proto index 486fd6cbc..aef97a714 100644 --- a/src/lib/api/md/GlbxMarketDataConfig.proto +++ b/src/lib_spark/spark/api/md/GlbxMarketDataConfig.proto @@ -1,7 +1,8 @@ syntax = "proto3"; -import "lib/api/domain/SecurityCriteria.proto"; -import "lib/api/md/DatabentoMarketDataConfig.proto"; +import "spark/api/domain/SecurityCriteria.proto"; +import "spark/api/md/DatabentoMarketDataConfig.proto"; + package bts.api.md; option csharp_namespace = "bts.api.md"; diff --git a/src/lib/api/md/MarketDataConfig.proto b/src/lib_spark/spark/api/md/MarketDataConfig.proto similarity index 54% rename from src/lib/api/md/MarketDataConfig.proto rename to src/lib_spark/spark/api/md/MarketDataConfig.proto index 1e705efeb..61aa5a3ac 100644 --- a/src/lib/api/md/MarketDataConfig.proto +++ b/src/lib_spark/spark/api/md/MarketDataConfig.proto @@ -1,20 +1,20 @@ syntax = "proto3"; -import "lib/api/md/FTXMarketDataConfig.proto"; -import "lib/api/md/BinanceMarketDataConfig.proto"; -import "lib/api/md/BinanceCoinFuturesMarketDataConfig.proto"; -import "lib/api/md/BinanceUsMarketDataConfig.proto"; -import "lib/api/md/CoinbaseMarketDataConfig.proto"; -import "lib/api/md/BinanceUsdsFuturesMarketDataConfig.proto"; -import "lib/api/md/MarketDataRecordingConfig.proto"; -import "lib/api/md/MarketDataReplayConfig.proto"; -import "lib/api/md/DeribitMarketDataConfig.proto"; -import "lib/api/md/EmumbaDeribitMarketDataConfig.proto"; -import "lib/api/md/OkxMarketDataConfig.proto"; -import "lib/api/md/GlbxMarketDataConfig.proto"; -import "lib/api/md/TaifexMarketDataConfig.proto"; -import "lib/api/md/TwseMarketDataConfig.proto"; -import "lib/api/md/CboeMarketDataConfig.proto"; +import "spark/api/md/FTXMarketDataConfig.proto"; +import "spark/api/md/BinanceMarketDataConfig.proto"; +import "spark/api/md/BinanceCoinFuturesMarketDataConfig.proto"; +import "spark/api/md/BinanceUsMarketDataConfig.proto"; +import "spark/api/md/CoinbaseMarketDataConfig.proto"; +import "spark/api/md/BinanceUsdsFuturesMarketDataConfig.proto"; +import "spark/api/md/MarketDataRecordingConfig.proto"; +import "spark/api/md/MarketDataReplayConfig.proto"; +import "spark/api/md/DeribitMarketDataConfig.proto"; +import "spark/api/md/EmumbaDeribitMarketDataConfig.proto"; +import "spark/api/md/OkxMarketDataConfig.proto"; +import "spark/api/md/GlbxMarketDataConfig.proto"; +import "spark/api/md/TaifexMarketDataConfig.proto"; +import "spark/api/md/TwseMarketDataConfig.proto"; +import "spark/api/md/CboeMarketDataConfig.proto"; option csharp_namespace = "bts.api.md"; diff --git a/src/lib/api/md/MarketDataConfigUtils.cpp b/src/lib_spark/spark/api/md/MarketDataConfigUtils.cpp similarity index 95% rename from src/lib/api/md/MarketDataConfigUtils.cpp rename to src/lib_spark/spark/api/md/MarketDataConfigUtils.cpp index fc32c62c1..4ba1c7757 100644 --- a/src/lib/api/md/MarketDataConfigUtils.cpp +++ b/src/lib_spark/spark/api/md/MarketDataConfigUtils.cpp @@ -1,8 +1,8 @@ #if !defined(_WIN32) && defined(SPARK_ENABLE_CCAPI) #include "MarketDataConfigUtils.h" -#include "lib/api/md/MarketDataConfig.pb.h" -#include "lib/domain_model/Security.pb.h" -#include "lib/logging/logging.h" +#include "spark/api/md/MarketDataConfig.pb.h" +#include "spark/domain_model/Security.pb.h" +#include "spark/logging/logging.h" //#if !defined(_WIN32) && defined(SPARK_ENABLE_CCAPI) namespace bts::md { diff --git a/src/lib/api/md/MarketDataConfigUtils.h b/src/lib_spark/spark/api/md/MarketDataConfigUtils.h similarity index 90% rename from src/lib/api/md/MarketDataConfigUtils.h rename to src/lib_spark/spark/api/md/MarketDataConfigUtils.h index 08ba01519..602103ba9 100644 --- a/src/lib/api/md/MarketDataConfigUtils.h +++ b/src/lib_spark/spark/api/md/MarketDataConfigUtils.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/api/md/MarketDataConfig.pb.h" -#include "lib/domain_model/Security.pb.h" +#include "spark/api/md/MarketDataConfig.pb.h" +#include "spark/domain_model/Security.pb.h" #if !defined(_WIN32) && defined(SPARK_ENABLE_CCAPI) #include diff --git a/src/lib/api/md/MarketDataRecordingConfig.proto b/src/lib_spark/spark/api/md/MarketDataRecordingConfig.proto similarity index 91% rename from src/lib/api/md/MarketDataRecordingConfig.proto rename to src/lib_spark/spark/api/md/MarketDataRecordingConfig.proto index adf4fcc42..452124334 100644 --- a/src/lib/api/md/MarketDataRecordingConfig.proto +++ b/src/lib_spark/spark/api/md/MarketDataRecordingConfig.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package bts.api.md; -import "lib/domain_model/Security.proto"; +import "spark/domain_model/Security.proto"; option csharp_namespace = "bts.api.md"; option cc_enable_arenas = true; diff --git a/src/lib/api/md/MarketDataReplayConfig.proto b/src/lib_spark/spark/api/md/MarketDataReplayConfig.proto similarity index 91% rename from src/lib/api/md/MarketDataReplayConfig.proto rename to src/lib_spark/spark/api/md/MarketDataReplayConfig.proto index a03ef00d0..553dde5cc 100644 --- a/src/lib/api/md/MarketDataReplayConfig.proto +++ b/src/lib_spark/spark/api/md/MarketDataReplayConfig.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package bts.api.md; -import "lib/domain_model/Security.proto"; +import "spark/domain_model/Security.proto"; option csharp_namespace = "bts.api.md"; option cc_enable_arenas = true; diff --git a/src/lib/api/md/OkxMarketDataConfig.proto b/src/lib_spark/spark/api/md/OkxMarketDataConfig.proto similarity index 92% rename from src/lib/api/md/OkxMarketDataConfig.proto rename to src/lib_spark/spark/api/md/OkxMarketDataConfig.proto index b18c796f3..15f31dd9a 100644 --- a/src/lib/api/md/OkxMarketDataConfig.proto +++ b/src/lib_spark/spark/api/md/OkxMarketDataConfig.proto @@ -1,6 +1,6 @@ syntax = "proto3"; -import "lib/api/domain/SecurityCriteria.proto"; +import "spark/api/domain/SecurityCriteria.proto"; package bts.api.md; diff --git a/src/lib/api/md/TaifexMarketDataConfig.proto b/src/lib_spark/spark/api/md/TaifexMarketDataConfig.proto similarity index 93% rename from src/lib/api/md/TaifexMarketDataConfig.proto rename to src/lib_spark/spark/api/md/TaifexMarketDataConfig.proto index d31a3d4ac..26a48a3c0 100644 --- a/src/lib/api/md/TaifexMarketDataConfig.proto +++ b/src/lib_spark/spark/api/md/TaifexMarketDataConfig.proto @@ -1,6 +1,6 @@ syntax = "proto3"; -import "lib/api/domain/SecurityCriteria.proto"; +import "spark/api/domain/SecurityCriteria.proto"; package bts.api.md; diff --git a/src/lib/api/md/TwseMarketDataConfig.proto b/src/lib_spark/spark/api/md/TwseMarketDataConfig.proto similarity index 88% rename from src/lib/api/md/TwseMarketDataConfig.proto rename to src/lib_spark/spark/api/md/TwseMarketDataConfig.proto index 2ce5f529f..fb737f9c0 100644 --- a/src/lib/api/md/TwseMarketDataConfig.proto +++ b/src/lib_spark/spark/api/md/TwseMarketDataConfig.proto @@ -1,6 +1,6 @@ syntax = "proto3"; -import "lib/api/domain/SecurityCriteria.proto"; +import "spark/api/domain/SecurityCriteria.proto"; package bts.api.md; diff --git a/src/lib/api/public/ApiException.h b/src/lib_spark/spark/api/public/ApiException.h similarity index 90% rename from src/lib/api/public/ApiException.h rename to src/lib_spark/spark/api/public/ApiException.h index 87028c39f..d1d566c09 100644 --- a/src/lib/api/public/ApiException.h +++ b/src/lib_spark/spark/api/public/ApiException.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/utils/bts_export.h" +#include "spark/utils/bts_export.h" #include #include diff --git a/src/lib/api/public/ApiServer.cpp b/src/lib_spark/spark/api/public/ApiServer.cpp similarity index 100% rename from src/lib/api/public/ApiServer.cpp rename to src/lib_spark/spark/api/public/ApiServer.cpp diff --git a/src/lib/api/public/ApiServer.h b/src/lib_spark/spark/api/public/ApiServer.h similarity index 93% rename from src/lib/api/public/ApiServer.h rename to src/lib_spark/spark/api/public/ApiServer.h index d2b87f5ee..368c31ecb 100644 --- a/src/lib/api/public/ApiServer.h +++ b/src/lib_spark/spark/api/public/ApiServer.h @@ -4,8 +4,8 @@ #include "ApiUtils.h" #include "ServerChannel.h" #include "StatefulPublisher.h" -#include "lib/api/apicore.pb.h" -#include "lib/utils/bts_export.h" +#include "spark/api/apicore.pb.h" +#include "spark/utils/bts_export.h" #include #include diff --git a/src/lib/api/public/ApiUtils.h b/src/lib_spark/spark/api/public/ApiUtils.h similarity index 100% rename from src/lib/api/public/ApiUtils.h rename to src/lib_spark/spark/api/public/ApiUtils.h diff --git a/src/lib/api/public/ClientChannel.cpp b/src/lib_spark/spark/api/public/ClientChannel.cpp similarity index 100% rename from src/lib/api/public/ClientChannel.cpp rename to src/lib_spark/spark/api/public/ClientChannel.cpp diff --git a/src/lib/api/public/ClientChannel.h b/src/lib_spark/spark/api/public/ClientChannel.h similarity index 99% rename from src/lib/api/public/ClientChannel.h rename to src/lib_spark/spark/api/public/ClientChannel.h index a59dcd052..844e54910 100644 --- a/src/lib/api/public/ClientChannel.h +++ b/src/lib_spark/spark/api/public/ClientChannel.h @@ -5,7 +5,7 @@ #include "RawUpdate.h" #include "Result.h" #include "ServiceContext.h" -#include "lib/logging/logging.h" +#include "spark/logging/logging.h" #include #include diff --git a/src/lib/api/public/QuickbusClientChannel.cpp b/src/lib_spark/spark/api/public/QuickbusClientChannel.cpp similarity index 100% rename from src/lib/api/public/QuickbusClientChannel.cpp rename to src/lib_spark/spark/api/public/QuickbusClientChannel.cpp diff --git a/src/lib/api/public/QuickbusClientChannel.h b/src/lib_spark/spark/api/public/QuickbusClientChannel.h similarity index 95% rename from src/lib/api/public/QuickbusClientChannel.h rename to src/lib_spark/spark/api/public/QuickbusClientChannel.h index 2159a02c0..ca02d49bf 100644 --- a/src/lib/api/public/QuickbusClientChannel.h +++ b/src/lib_spark/spark/api/public/QuickbusClientChannel.h @@ -1,7 +1,7 @@ #pragma once #include "ClientChannel.h" -#include "lib/utils/bts_no_copy.h" +#include "spark/utils/bts_no_copy.h" namespace bts { namespace api { diff --git a/src/lib/api/public/RawUpdate.h b/src/lib_spark/spark/api/public/RawUpdate.h similarity index 100% rename from src/lib/api/public/RawUpdate.h rename to src/lib_spark/spark/api/public/RawUpdate.h diff --git a/src/lib/api/public/Result.h b/src/lib_spark/spark/api/public/Result.h similarity index 97% rename from src/lib/api/public/Result.h rename to src/lib_spark/spark/api/public/Result.h index 203332ac2..1fee4f158 100644 --- a/src/lib/api/public/Result.h +++ b/src/lib_spark/spark/api/public/Result.h @@ -2,7 +2,7 @@ #include "ApiException.h" -#include "lib/api/apicore.pb.h" +#include "spark/api/apicore.pb.h" #include #include diff --git a/src/lib/api/public/ServerChannel.cpp b/src/lib_spark/spark/api/public/ServerChannel.cpp similarity index 100% rename from src/lib/api/public/ServerChannel.cpp rename to src/lib_spark/spark/api/public/ServerChannel.cpp diff --git a/src/lib/api/public/ServerChannel.h b/src/lib_spark/spark/api/public/ServerChannel.h similarity index 91% rename from src/lib/api/public/ServerChannel.h rename to src/lib_spark/spark/api/public/ServerChannel.h index e841da697..015144913 100644 --- a/src/lib/api/public/ServerChannel.h +++ b/src/lib_spark/spark/api/public/ServerChannel.h @@ -2,7 +2,7 @@ #include "../core/ApiClientInterop.h" #include "../core/ApiServerInterop.h" -#include "lib/api/apicore.pb.h" +#include "spark/api/apicore.pb.h" namespace bts { namespace api { diff --git a/src/lib/api/public/ServiceContext.cpp b/src/lib_spark/spark/api/public/ServiceContext.cpp similarity index 96% rename from src/lib/api/public/ServiceContext.cpp rename to src/lib_spark/spark/api/public/ServiceContext.cpp index 3c8d95f3e..a95b5ded2 100644 --- a/src/lib/api/public/ServiceContext.cpp +++ b/src/lib_spark/spark/api/public/ServiceContext.cpp @@ -2,8 +2,8 @@ #include "ServiceContext.h" #include "ApiServer.h" #include "QuickbusClientChannel.h" -#include "lib/api/services/AuthService.client.pb.h" -#include "lib/logging/logging.h" +#include "spark/api/services/AuthService.client.pb.h" +#include "spark/logging/logging.h" #include namespace bts { diff --git a/src/lib/api/public/ServiceContext.h b/src/lib_spark/spark/api/public/ServiceContext.h similarity index 97% rename from src/lib/api/public/ServiceContext.h rename to src/lib_spark/spark/api/public/ServiceContext.h index 24d87edd8..004887e03 100644 --- a/src/lib/api/public/ServiceContext.h +++ b/src/lib_spark/spark/api/public/ServiceContext.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/utils/bts_export.h" +#include "spark/utils/bts_export.h" // client #include "../core/ApiClientInterop.h" diff --git a/src/lib/api/public/StatefulPublisher.h b/src/lib_spark/spark/api/public/StatefulPublisher.h similarity index 100% rename from src/lib/api/public/StatefulPublisher.h rename to src/lib_spark/spark/api/public/StatefulPublisher.h diff --git a/src/lib/api/public/Update.h b/src/lib_spark/spark/api/public/Update.h similarity index 100% rename from src/lib/api/public/Update.h rename to src/lib_spark/spark/api/public/Update.h diff --git a/src/lib/api/public/api.h b/src/lib_spark/spark/api/public/api.h similarity index 100% rename from src/lib/api/public/api.h rename to src/lib_spark/spark/api/public/api.h diff --git a/src/lib/api/service_compiler/apioptions_pb2.py b/src/lib_spark/spark/api/service_compiler/apioptions_pb2.py similarity index 100% rename from src/lib/api/service_compiler/apioptions_pb2.py rename to src/lib_spark/spark/api/service_compiler/apioptions_pb2.py diff --git a/src/lib/api/service_compiler/plugin.cmd b/src/lib_spark/spark/api/service_compiler/plugin.cmd similarity index 94% rename from src/lib/api/service_compiler/plugin.cmd rename to src/lib_spark/spark/api/service_compiler/plugin.cmd index e4f87d273..2f3cd1f5a 100755 --- a/src/lib/api/service_compiler/plugin.cmd +++ b/src/lib_spark/spark/api/service_compiler/plugin.cmd @@ -1,2 +1,2 @@ -@setlocal -@python -u %~dp0\plugin.py +@setlocal +@python -u %~dp0\plugin.py diff --git a/src/lib/api/service_compiler/plugin.py b/src/lib_spark/spark/api/service_compiler/plugin.py similarity index 100% rename from src/lib/api/service_compiler/plugin.py rename to src/lib_spark/spark/api/service_compiler/plugin.py diff --git a/src/lib/api/service_compiler/plugin.sh b/src/lib_spark/spark/api/service_compiler/plugin.sh similarity index 80% rename from src/lib/api/service_compiler/plugin.sh rename to src/lib_spark/spark/api/service_compiler/plugin.sh index d4fad1680..cb6b213a1 100755 --- a/src/lib/api/service_compiler/plugin.sh +++ b/src/lib_spark/spark/api/service_compiler/plugin.sh @@ -5,7 +5,7 @@ this_dir=$(dirname $(readlink -f "${BASH_SOURCE[0]:-$0}")); plugin_py="${this_dir}/plugin.py" -tools_dir=$(realpath "${this_dir}/../../../../tools") +tools_dir=$(realpath "${this_dir}/../../../../../tools") venv_exec_sh="${tools_dir}/venv_exec.sh" eval "${venv_exec_sh} python ${plugin_py} $@" diff --git a/src/lib/api/service_compiler/templates/c#/client.pb.cs b/src/lib_spark/spark/api/service_compiler/templates/c#/client.pb.cs similarity index 100% rename from src/lib/api/service_compiler/templates/c#/client.pb.cs rename to src/lib_spark/spark/api/service_compiler/templates/c#/client.pb.cs diff --git a/src/lib/api/service_compiler/templates/c#/immutable.pb.cs b/src/lib_spark/spark/api/service_compiler/templates/c#/immutable.pb.cs similarity index 96% rename from src/lib/api/service_compiler/templates/c#/immutable.pb.cs rename to src/lib_spark/spark/api/service_compiler/templates/c#/immutable.pb.cs index e8a997f06..e6140e2e6 100644 --- a/src/lib/api/service_compiler/templates/c#/immutable.pb.cs +++ b/src/lib_spark/spark/api/service_compiler/templates/c#/immutable.pb.cs @@ -1,189 +1,189 @@ -#region Generated code -#nullable enable -namespace {{package}} { - using Spark.Api; - - using System; - using System.Collections.Generic; - using System.Linq; - using Google.Protobuf; - using Google.Protobuf.Reflection; - using Google.Protobuf.WellKnownTypes; - - {{#each message_type}} - public partial class {{name}} : bts.api.IImmutableMessage{{#if has_key}}, IKeyedData<{{name}}, {{key_type}}>{{/if}} { - {{#if has_key}} - public static Func<{{name}}, {{key_type}}> key_fn => - x => x.{{key_name}}; - - {{/if}} - MessageDescriptor bts.api.IImmutableMessage.Descriptor => {{name}}.Descriptor; - - public {{name}}Immutable immutable() => - new {{name}}Immutable(this); - } - - public readonly partial struct {{name}}Immutable : bts.api.IImmutableMessage{{#if has_key}}, IKeyedData<{{name}}Immutable, {{key_type}}>{{/if}} { - readonly {{name}} _impl; - - {{name}}Immutable({{name}} src, bool clone) { - if (src is null) { - throw new NullReferenceException("{{name}}"); - } - _impl = clone ? src.Clone() : src; - } - - {{#if has_key}} - public static Func<{{name}}Immutable, {{key_type}}> key_fn => - x => x.{{key_name}}; - - {{/if}} - public static MessageDescriptor Descriptor => - {{name}}.Descriptor; - - MessageDescriptor bts.api.IImmutableMessage.Descriptor => - {{name}}.Descriptor; - - public int CalculateSize() => - _impl.CalculateSize(); - - public void WriteTo(CodedOutputStream output) => - _impl.WriteTo(output); - - public {{name}}Immutable({{name}} src) { - if (src is null) { - throw new NullReferenceException("{{name}}"); - } - _impl = src.Clone(); - } - - public {{name}} CloneToMutable() => - _impl.Clone(); - - public bool Equals({{name}}Immutable other) => - _impl.Equals(other._impl); - - public override bool Equals(object? obj) => - obj is {{name}}Immutable other && Equals(other); - - public bool Equals({{name}}Immutable? other) { - if (other is null) { - return false; - } - bool didrun = false; - bool result = false; - EqualsOverride(ref didrun, ref result, other.Value); - return didrun ? result : - _impl.Equals(other.Value._impl); - } - - public override int GetHashCode() => - _impl.GetHashCode(); - - public override string? ToString() { - bool didrun = false; - string? result = null; - ToStringOverride(ref didrun, ref result); - if(didrun) return result; - return _impl.ToString(); - } - - partial void EqualsOverride( - ref bool didrun, ref bool result, {{name}}Immutable other); - - partial void ToStringOverride(ref bool didrun, ref string? result); - - // Implicit conversion operator - public static implicit operator Nullable<{{name}}Immutable>({{name}} other) => - other is null ? null : - new {{name}}Immutable(other, false); - - public static bool operator ==( - {{name}}Immutable left, {{name}}Immutable right) => - Equals(left, right); - - public static bool operator !=( - {{name}}Immutable left, {{name}}Immutable right) => - !(left == right); - - // Immutable field wrappers - {{#each field}} - {{#if type.isdict}} - public IReadOnlyDictionary<{{type.keytype.cstype}},{{type.cstype}}> {{Name}} => - _impl.{{Name}}; - {{else}} - {{#if type.islist}} - // Can remove the cast if immutable==cstype - public IEnumerable<{{type.immutable}}> {{Name}} => - _impl.{{Name}}.Select(t => ({{type.immutable}})t!); - {{else}} - {{#if type.ismessage}} - public {{type.immutable}} {{Name}} => - _impl.{{Name}} is null ? throw new NullReferenceException("{{Name}}") : - ({{type.immutable}})_impl.{{Name}}!; - - public bool Has{{Name}} => - _impl.{{Name}} != null; - {{else}} - public {{type.immutable}} {{Name}} => ({{type.immutable}})_impl.{{Name}}; - {{/if}} - {{/if}} - {{/if}} - {{#unless @last}} - - {{/unless}} - {{/each}} - - // oneof enums - {{#each oneof}} - public {{../name}}.{{Name}}OneofCase {{Name}}Case => _impl.{{Name}}Case; - {{/each}} - - public {{name}}Immutable with( - // Arguments -{{#each field}} - {{#if type.isdict}} - IReadOnlyDictionary<{{type.keytype.cstype}},{{type.cstype}}>? {{name}} = null, - IDictionary<{{type.keytype.cstype}},{{type.cstype}}>? {{name}}_mut = null{{#unless @last}},{{/unless}} - {{else}}{{#if type.islist}} - IEnumerable<{{type.cstype}}>? {{name}} = null{{#unless @last}},{{/unless}} - {{else}} - {{{type.cstype}}}? {{name}} = null{{#unless @last}},{{/unless}} - {{/if}} - {{/if}} -{{/each}} - ) { - var temp = new {{name}}(); - // populate temp internal object - {{#each field}} - {{#if type.isdict}} - if ({{name}} is not null) { - foreach(var pair in {{name}}) { - temp.{{Name}}.Add(pair.Key, pair.Value); - } - } else if ({{name}}_mut is not null) { - temp.{{Name}}.Add({{name}}_mut); - } - else { - temp.{{Name}}.Add(_impl.{{Name}}); - } - {{else}} - {{#if type.islist}} - temp.{{Name}}.AddRange({{name}} ?? _impl.{{Name}}); - {{else}} - temp.{{Name}} = {{name}} ?? _impl.{{Name}}; - {{/if}} - {{/if}} - {{/each}} - return new(temp, false); - } - {{#unless @last}} - - {{/unless}} - } - {{#unless @last}} - - {{/unless}} - {{/each}} -} -#endregion +#region Generated code +#nullable enable +namespace {{package}} { + using Spark.Api; + + using System; + using System.Collections.Generic; + using System.Linq; + using Google.Protobuf; + using Google.Protobuf.Reflection; + using Google.Protobuf.WellKnownTypes; + + {{#each message_type}} + public partial class {{name}} : bts.api.IImmutableMessage{{#if has_key}}, IKeyedData<{{name}}, {{key_type}}>{{/if}} { + {{#if has_key}} + public static Func<{{name}}, {{key_type}}> key_fn => + x => x.{{key_name}}; + + {{/if}} + MessageDescriptor bts.api.IImmutableMessage.Descriptor => {{name}}.Descriptor; + + public {{name}}Immutable immutable() => + new {{name}}Immutable(this); + } + + public readonly partial struct {{name}}Immutable : bts.api.IImmutableMessage{{#if has_key}}, IKeyedData<{{name}}Immutable, {{key_type}}>{{/if}} { + readonly {{name}} _impl; + + {{name}}Immutable({{name}} src, bool clone) { + if (src is null) { + throw new NullReferenceException("{{name}}"); + } + _impl = clone ? src.Clone() : src; + } + + {{#if has_key}} + public static Func<{{name}}Immutable, {{key_type}}> key_fn => + x => x.{{key_name}}; + + {{/if}} + public static MessageDescriptor Descriptor => + {{name}}.Descriptor; + + MessageDescriptor bts.api.IImmutableMessage.Descriptor => + {{name}}.Descriptor; + + public int CalculateSize() => + _impl.CalculateSize(); + + public void WriteTo(CodedOutputStream output) => + _impl.WriteTo(output); + + public {{name}}Immutable({{name}} src) { + if (src is null) { + throw new NullReferenceException("{{name}}"); + } + _impl = src.Clone(); + } + + public {{name}} CloneToMutable() => + _impl.Clone(); + + public bool Equals({{name}}Immutable other) => + _impl.Equals(other._impl); + + public override bool Equals(object? obj) => + obj is {{name}}Immutable other && Equals(other); + + public bool Equals({{name}}Immutable? other) { + if (other is null) { + return false; + } + bool didrun = false; + bool result = false; + EqualsOverride(ref didrun, ref result, other.Value); + return didrun ? result : + _impl.Equals(other.Value._impl); + } + + public override int GetHashCode() => + _impl.GetHashCode(); + + public override string? ToString() { + bool didrun = false; + string? result = null; + ToStringOverride(ref didrun, ref result); + if(didrun) return result; + return _impl.ToString(); + } + + partial void EqualsOverride( + ref bool didrun, ref bool result, {{name}}Immutable other); + + partial void ToStringOverride(ref bool didrun, ref string? result); + + // Implicit conversion operator + public static implicit operator Nullable<{{name}}Immutable>({{name}} other) => + other is null ? null : + new {{name}}Immutable(other, false); + + public static bool operator ==( + {{name}}Immutable left, {{name}}Immutable right) => + Equals(left, right); + + public static bool operator !=( + {{name}}Immutable left, {{name}}Immutable right) => + !(left == right); + + // Immutable field wrappers + {{#each field}} + {{#if type.isdict}} + public IReadOnlyDictionary<{{type.keytype.cstype}},{{type.cstype}}> {{Name}} => + _impl.{{Name}}; + {{else}} + {{#if type.islist}} + // Can remove the cast if immutable==cstype + public IEnumerable<{{type.immutable}}> {{Name}} => + _impl.{{Name}}.Select(t => ({{type.immutable}})t!); + {{else}} + {{#if type.ismessage}} + public {{type.immutable}} {{Name}} => + _impl.{{Name}} is null ? throw new NullReferenceException("{{Name}}") : + ({{type.immutable}})_impl.{{Name}}!; + + public bool Has{{Name}} => + _impl.{{Name}} != null; + {{else}} + public {{type.immutable}} {{Name}} => ({{type.immutable}})_impl.{{Name}}; + {{/if}} + {{/if}} + {{/if}} + {{#unless @last}} + + {{/unless}} + {{/each}} + + // oneof enums + {{#each oneof}} + public {{../name}}.{{Name}}OneofCase {{Name}}Case => _impl.{{Name}}Case; + {{/each}} + + public {{name}}Immutable with( + // Arguments +{{#each field}} + {{#if type.isdict}} + IReadOnlyDictionary<{{type.keytype.cstype}},{{type.cstype}}>? {{name}} = null, + IDictionary<{{type.keytype.cstype}},{{type.cstype}}>? {{name}}_mut = null{{#unless @last}},{{/unless}} + {{else}}{{#if type.islist}} + IEnumerable<{{type.cstype}}>? {{name}} = null{{#unless @last}},{{/unless}} + {{else}} + {{{type.cstype}}}? {{name}} = null{{#unless @last}},{{/unless}} + {{/if}} + {{/if}} +{{/each}} + ) { + var temp = new {{name}}(); + // populate temp internal object + {{#each field}} + {{#if type.isdict}} + if ({{name}} is not null) { + foreach(var pair in {{name}}) { + temp.{{Name}}.Add(pair.Key, pair.Value); + } + } else if ({{name}}_mut is not null) { + temp.{{Name}}.Add({{name}}_mut); + } + else { + temp.{{Name}}.Add(_impl.{{Name}}); + } + {{else}} + {{#if type.islist}} + temp.{{Name}}.AddRange({{name}} ?? _impl.{{Name}}); + {{else}} + temp.{{Name}} = {{name}} ?? _impl.{{Name}}; + {{/if}} + {{/if}} + {{/each}} + return new(temp, false); + } + {{#unless @last}} + + {{/unless}} + } + {{#unless @last}} + + {{/unless}} + {{/each}} +} +#endregion diff --git a/src/lib/api/service_compiler/templates/c#/server.pb.cs b/src/lib_spark/spark/api/service_compiler/templates/c#/server.pb.cs similarity index 97% rename from src/lib/api/service_compiler/templates/c#/server.pb.cs rename to src/lib_spark/spark/api/service_compiler/templates/c#/server.pb.cs index 49edd6689..388d30155 100644 --- a/src/lib/api/service_compiler/templates/c#/server.pb.cs +++ b/src/lib_spark/spark/api/service_compiler/templates/c#/server.pb.cs @@ -1,209 +1,209 @@ -#region Generated code -namespace {{package}} { - using bts.api; - using bts.api.core; - - using Google.Protobuf; - - using System; - using System.Collections.Generic; - using System.IO; - using System.Linq; - using System.Runtime.InteropServices; - using System.Threading.Tasks; - {{#each service}} - - // {{comment}} - abstract class Authenticated{{name}}Base : ApiServer, IDisposable { - readonly ServerChannel _channel; - - public Authenticated{{name}}Base(ServiceContext context, string qualifier = "") => - _channel = context.publish(this, "{{name}}", qualifier); - - enum ServiceMethods { - SYS_PING = -1, - {{#each method}} - {{upper name}} = {{@index}}, - {{/each}} - } - - public override void dispatch( - RequestHeader header, Stream request_stream, Action on_response) { - switch((ServiceMethods)header.Method) { - case ServiceMethods.SYS_PING: { - var msg = PingPong.Parser.ParseFrom(request_stream); - respond(header.RequestId, Task.FromResult(msg), on_response); - break; - } - {{#each method}} - case ServiceMethods.{{upper name}}: { - {{#if server_streaming}} - var msg = bts.api.StreamAccessRequest.Parser.ParseFrom(request_stream); - var result = allow_{{name}}(header.Token, msg.Qualifier); - {{else}} - var msg = {{input_type_full}}.Parser.ParseFrom(request_stream); - var result = {{name}}(header.Token, msg); - {{/if}} - var id = header.RequestId; - result.ContinueWith(t => respond(id, t, on_response)); - break; - } - {{/each}} - default: { - var buffer = new ResponseHeader() { - RequestId = header.RequestId, - Code = ApiError.MissingMethod - }.serialize(); - on_response(buffer); - break; - } - } - } - - public virtual void Dispose() => - _channel.Dispose(); - - {{#each method}} - {{#if server_streaming}} - public virtual Task allow_{{name}}( - AuthTokenImmutable? token, string qualifier) { - var r = new StreamAccessResponse() { Authorized = true }; - return Task.FromResult(r); - } - - protected static {{key_type.cstype}} {{name}}_key({{output_type_full}} row) => - row.{{camel key_field}}; - - //{{comment}} - protected {{cap name}}Publisher make_{{name}}_publisher(string qualifier = null) { - var table = _channel.create_table("{{name}}", qualifier); - return new {{cap name}}Publisher(table); - } - - protected struct {{cap name}}Publisher { - readonly IntPtr _table; - {{#unless key_type.natural_key}} - - int _next_key; - Dictionary<{{key_type.cstype}}, int> _keys; - {{/unless}} - - public {{cap name}}Publisher(IntPtr table) { - _table = table; - {{#unless key_type.natural_key}} - _next_key = 0; - _keys = new(); - {{/unless}} - } - - public void publish( - List<{{output_type_full}}> added = null, - HashSet<{{key_type.cstype}}> removed = null, - List<{{output_type_full}}> changed = null) { - int add_count = added is null ? 0 : added.Count; - int change_count = changed is null ? 0 : changed.Count; - int remove_count = removed is null ? 0 : removed.Count; - var changes = new ApiNativeMethods.StreamUpdate[add_count + change_count + remove_count]; - int change_index = 0; - var pinned_buffers = new List(add_count + change_count); - - try { - // Added - if (added is not null) { - foreach (var a in added) { - var key = {{name}}_key(a); - var is_change = removed == null ? false : removed.Contains(key); - if (is_change) { removed.Remove(key); } - changes[change_index++] = _pack(a, is_change, pinned_buffers); - } - } - - // Changed - if (changed is not null) { - foreach(var ch in changed) { - changes[change_index++] = _pack(ch, true, pinned_buffers); - } - } - - // Removed - if (removed is not null) { - foreach(var r in removed) { - changes[change_index++] = new() { - type = ApiNativeMethods.ChangeType.REMOVE, - {{#unless key_type.natural_key}} - key = _hash_key(r), - {{else}} - key = (int)r, - {{/unless}} - buffer_len = 0 - }; - } - } - - ApiNativeMethods.api_server_update_table(_table, changes, change_index); - } finally { - foreach (var handle in pinned_buffers) { - handle.Free(); - } - } - } - - public void append({{output_type_full}} single) => - publish(added: new List<{{output_type_full}}> { single }); - - ApiNativeMethods.StreamUpdate _pack({{output_type_full}} item, bool is_change, List pinned_buffers) { - var data = MessageExtensions.ToByteArray(item); - var handle = GCHandle.Alloc(data, GCHandleType.Pinned); - pinned_buffers.Add(handle); - return new() { - type = is_change ? ApiNativeMethods.ChangeType.REPLACE : ApiNativeMethods.ChangeType.CREATE, - {{#unless key_type.natural_key}} - key = _hash_key({{name}}_key(item)), - {{else}} - key = (int){{name}}_key(item), - {{/unless}} - buffer_len = data.Length, - buffer = handle.AddrOfPinnedObject() - }; - } - {{#unless key_type.natural_key}} - - int _hash_key({{key_type.cstype}} key) { - lock(_keys) { - if (!_keys.TryGetValue(key, out var int_key)) { - int_key = ++_next_key; - _keys[key] = int_key; - } - return int_key; - } - } - {{/unless}} - } - - {{else}} - //{{comment}} - public abstract Task<{{output_type_full}}> {{name}}(AuthTokenImmutable? token, {{input_type_full}} request); - - {{/if}} - {{/each}} - } - - // {{comment}} - abstract class {{name}}Base : Authenticated{{name}}Base , IDisposable { - public {{name}}Base(ServiceContext context, string qualifier="") - : base(context, qualifier) { } - {{#each method}} - {{#unless server_streaming}} - - public override Task<{{output_type_full}}> {{name}}( - bts.api.AuthTokenImmutable? token, {{input_type_full}} request) => - {{name}}(request); - - // {{comment}} - public abstract Task<{{output_type_full}}> {{name}}({{input_type_full}} request); - {{/unless}} - {{/each}} - } -{{/each}} -} -#endregion +#region Generated code +namespace {{package}} { + using bts.api; + using bts.api.core; + + using Google.Protobuf; + + using System; + using System.Collections.Generic; + using System.IO; + using System.Linq; + using System.Runtime.InteropServices; + using System.Threading.Tasks; + {{#each service}} + + // {{comment}} + abstract class Authenticated{{name}}Base : ApiServer, IDisposable { + readonly ServerChannel _channel; + + public Authenticated{{name}}Base(ServiceContext context, string qualifier = "") => + _channel = context.publish(this, "{{name}}", qualifier); + + enum ServiceMethods { + SYS_PING = -1, + {{#each method}} + {{upper name}} = {{@index}}, + {{/each}} + } + + public override void dispatch( + RequestHeader header, Stream request_stream, Action on_response) { + switch((ServiceMethods)header.Method) { + case ServiceMethods.SYS_PING: { + var msg = PingPong.Parser.ParseFrom(request_stream); + respond(header.RequestId, Task.FromResult(msg), on_response); + break; + } + {{#each method}} + case ServiceMethods.{{upper name}}: { + {{#if server_streaming}} + var msg = bts.api.StreamAccessRequest.Parser.ParseFrom(request_stream); + var result = allow_{{name}}(header.Token, msg.Qualifier); + {{else}} + var msg = {{input_type_full}}.Parser.ParseFrom(request_stream); + var result = {{name}}(header.Token, msg); + {{/if}} + var id = header.RequestId; + result.ContinueWith(t => respond(id, t, on_response)); + break; + } + {{/each}} + default: { + var buffer = new ResponseHeader() { + RequestId = header.RequestId, + Code = ApiError.MissingMethod + }.serialize(); + on_response(buffer); + break; + } + } + } + + public virtual void Dispose() => + _channel.Dispose(); + + {{#each method}} + {{#if server_streaming}} + public virtual Task allow_{{name}}( + AuthTokenImmutable? token, string qualifier) { + var r = new StreamAccessResponse() { Authorized = true }; + return Task.FromResult(r); + } + + protected static {{key_type.cstype}} {{name}}_key({{output_type_full}} row) => + row.{{camel key_field}}; + + //{{comment}} + protected {{cap name}}Publisher make_{{name}}_publisher(string qualifier = null) { + var table = _channel.create_table("{{name}}", qualifier); + return new {{cap name}}Publisher(table); + } + + protected struct {{cap name}}Publisher { + readonly IntPtr _table; + {{#unless key_type.natural_key}} + + int _next_key; + Dictionary<{{key_type.cstype}}, int> _keys; + {{/unless}} + + public {{cap name}}Publisher(IntPtr table) { + _table = table; + {{#unless key_type.natural_key}} + _next_key = 0; + _keys = new(); + {{/unless}} + } + + public void publish( + List<{{output_type_full}}> added = null, + HashSet<{{key_type.cstype}}> removed = null, + List<{{output_type_full}}> changed = null) { + int add_count = added is null ? 0 : added.Count; + int change_count = changed is null ? 0 : changed.Count; + int remove_count = removed is null ? 0 : removed.Count; + var changes = new ApiNativeMethods.StreamUpdate[add_count + change_count + remove_count]; + int change_index = 0; + var pinned_buffers = new List(add_count + change_count); + + try { + // Added + if (added is not null) { + foreach (var a in added) { + var key = {{name}}_key(a); + var is_change = removed == null ? false : removed.Contains(key); + if (is_change) { removed.Remove(key); } + changes[change_index++] = _pack(a, is_change, pinned_buffers); + } + } + + // Changed + if (changed is not null) { + foreach(var ch in changed) { + changes[change_index++] = _pack(ch, true, pinned_buffers); + } + } + + // Removed + if (removed is not null) { + foreach(var r in removed) { + changes[change_index++] = new() { + type = ApiNativeMethods.ChangeType.REMOVE, + {{#unless key_type.natural_key}} + key = _hash_key(r), + {{else}} + key = (int)r, + {{/unless}} + buffer_len = 0 + }; + } + } + + ApiNativeMethods.api_server_update_table(_table, changes, change_index); + } finally { + foreach (var handle in pinned_buffers) { + handle.Free(); + } + } + } + + public void append({{output_type_full}} single) => + publish(added: new List<{{output_type_full}}> { single }); + + ApiNativeMethods.StreamUpdate _pack({{output_type_full}} item, bool is_change, List pinned_buffers) { + var data = MessageExtensions.ToByteArray(item); + var handle = GCHandle.Alloc(data, GCHandleType.Pinned); + pinned_buffers.Add(handle); + return new() { + type = is_change ? ApiNativeMethods.ChangeType.REPLACE : ApiNativeMethods.ChangeType.CREATE, + {{#unless key_type.natural_key}} + key = _hash_key({{name}}_key(item)), + {{else}} + key = (int){{name}}_key(item), + {{/unless}} + buffer_len = data.Length, + buffer = handle.AddrOfPinnedObject() + }; + } + {{#unless key_type.natural_key}} + + int _hash_key({{key_type.cstype}} key) { + lock(_keys) { + if (!_keys.TryGetValue(key, out var int_key)) { + int_key = ++_next_key; + _keys[key] = int_key; + } + return int_key; + } + } + {{/unless}} + } + + {{else}} + //{{comment}} + public abstract Task<{{output_type_full}}> {{name}}(AuthTokenImmutable? token, {{input_type_full}} request); + + {{/if}} + {{/each}} + } + + // {{comment}} + abstract class {{name}}Base : Authenticated{{name}}Base , IDisposable { + public {{name}}Base(ServiceContext context, string qualifier="") + : base(context, qualifier) { } + {{#each method}} + {{#unless server_streaming}} + + public override Task<{{output_type_full}}> {{name}}( + bts.api.AuthTokenImmutable? token, {{input_type_full}} request) => + {{name}}(request); + + // {{comment}} + public abstract Task<{{output_type_full}}> {{name}}({{input_type_full}} request); + {{/unless}} + {{/each}} + } +{{/each}} +} +#endregion diff --git a/src/lib/api/service_compiler/templates/cpp/client.pb.cc b/src/lib_spark/spark/api/service_compiler/templates/cpp/client.pb.cc similarity index 98% rename from src/lib/api/service_compiler/templates/cpp/client.pb.cc rename to src/lib_spark/spark/api/service_compiler/templates/cpp/client.pb.cc index eed42eaf4..4ab7e1362 100644 --- a/src/lib/api/service_compiler/templates/cpp/client.pb.cc +++ b/src/lib_spark/spark/api/service_compiler/templates/cpp/client.pb.cc @@ -1,6 +1,6 @@ {{#if service}} #include "{{filename name}}.client.pb.h" -#include "lib/api/public/ApiUtils.h" +#include "spark/api/public/ApiUtils.h" #include using namespace rxcpp; diff --git a/src/lib/api/service_compiler/templates/cpp/client.pb.h b/src/lib_spark/spark/api/service_compiler/templates/cpp/client.pb.h similarity index 89% rename from src/lib/api/service_compiler/templates/cpp/client.pb.h rename to src/lib_spark/spark/api/service_compiler/templates/cpp/client.pb.h index d8b8d5f7b..7d1d89566 100644 --- a/src/lib/api/service_compiler/templates/cpp/client.pb.h +++ b/src/lib_spark/spark/api/service_compiler/templates/cpp/client.pb.h @@ -1,10 +1,10 @@ #pragma once #include "{{filename name}}.pb.h" -#include "lib/api/public/ServiceContext.h" -#include "lib/api/public/ClientChannel.h" -#include "lib/api/public/Result.h" -#include "lib/api/public/Update.h" -#include "lib/utils/bts_export.h" +#include "spark/api/public/ServiceContext.h" +#include "spark/api/public/ClientChannel.h" +#include "spark/api/public/Result.h" +#include "spark/api/public/Update.h" +#include "spark/utils/bts_export.h" #include #include diff --git a/src/lib/api/service_compiler/templates/cpp/server.pb.cc b/src/lib_spark/spark/api/service_compiler/templates/cpp/server.pb.cc similarity index 98% rename from src/lib/api/service_compiler/templates/cpp/server.pb.cc rename to src/lib_spark/spark/api/service_compiler/templates/cpp/server.pb.cc index 5260619b0..8543d6c15 100644 --- a/src/lib/api/service_compiler/templates/cpp/server.pb.cc +++ b/src/lib_spark/spark/api/service_compiler/templates/cpp/server.pb.cc @@ -1,8 +1,8 @@ {{#if service}} #include "{{filename name}}.server.pb.h" -#include "lib/api/public/ServiceContext.h" -#include "lib/api/public/ApiUtils.h" -#include "lib/api/core/ApiServerInterop.h" +#include "spark/api/public/ServiceContext.h" +#include "spark/api/public/ApiUtils.h" +#include "spark/api/core/ApiServerInterop.h" #include #include {{ns-open package}} diff --git a/src/lib/api/service_compiler/templates/cpp/server.pb.h b/src/lib_spark/spark/api/service_compiler/templates/cpp/server.pb.h similarity index 94% rename from src/lib/api/service_compiler/templates/cpp/server.pb.h rename to src/lib_spark/spark/api/service_compiler/templates/cpp/server.pb.h index 3e2a3c3e2..9d80d717c 100644 --- a/src/lib/api/service_compiler/templates/cpp/server.pb.h +++ b/src/lib_spark/spark/api/service_compiler/templates/cpp/server.pb.h @@ -1,7 +1,7 @@ #pragma once #include "{{filename name}}.pb.h" -#include "lib/api/public/ApiServer.h" -#include "lib/utils/bts_export.h" +#include "spark/api/public/ApiServer.h" +#include "spark/utils/bts_export.h" #include #include #include diff --git a/src/lib/api/service_compiler/templates/fs/fable.fs b/src/lib_spark/spark/api/service_compiler/templates/fs/fable.fs similarity index 100% rename from src/lib/api/service_compiler/templates/fs/fable.fs rename to src/lib_spark/spark/api/service_compiler/templates/fs/fable.fs diff --git a/src/lib/api/service_compiler/templates/js/ts b/src/lib_spark/spark/api/service_compiler/templates/js/ts similarity index 100% rename from src/lib/api/service_compiler/templates/js/ts rename to src/lib_spark/spark/api/service_compiler/templates/js/ts diff --git a/src/lib/api/service_helpers/AdminServiceUtils.cpp b/src/lib_spark/spark/api/service_helpers/AdminServiceUtils.cpp similarity index 99% rename from src/lib/api/service_helpers/AdminServiceUtils.cpp rename to src/lib_spark/spark/api/service_helpers/AdminServiceUtils.cpp index 7c2cb7ff9..2d0a91f74 100644 --- a/src/lib/api/service_helpers/AdminServiceUtils.cpp +++ b/src/lib_spark/spark/api/service_helpers/AdminServiceUtils.cpp @@ -1,13 +1,13 @@ -#include "lib/api/service_helpers/AdminServiceUtils.h" -#include "lib/api/services/AdminService.server.pb.h" -#include "lib/config/config.h" -#include "lib/config/protos/cme_reference_data.pb.h" -#include "lib/config/protos/deployment_type.pb.h" -#include "lib/config/protos/jetfix.pb.h" -#include "lib/domain/DomainSecurityUtils.h" -#include "lib/domain/SecurityCriteria.h" -#include "lib/domain_model/Security.pb.h" -#include "lib/md/SymbolLoader.h" +#include "spark/api/service_helpers/AdminServiceUtils.h" +#include "spark/api/services/AdminService.server.pb.h" +#include "spark/config/config.h" +#include "spark/config/protos/cme_reference_data.pb.h" +#include "spark/config/protos/deployment_type.pb.h" +#include "spark/config/protos/jetfix.pb.h" +#include "spark/domain/DomainSecurityUtils.h" +#include "spark/domain/SecurityCriteria.h" +#include "spark/domain_model/Security.pb.h" +#include "spark/md/SymbolLoader.h" #include #include diff --git a/src/lib/api/service_helpers/AdminServiceUtils.h b/src/lib_spark/spark/api/service_helpers/AdminServiceUtils.h similarity index 96% rename from src/lib/api/service_helpers/AdminServiceUtils.h rename to src/lib_spark/spark/api/service_helpers/AdminServiceUtils.h index 825c51c96..47f9df18b 100644 --- a/src/lib/api/service_helpers/AdminServiceUtils.h +++ b/src/lib_spark/spark/api/service_helpers/AdminServiceUtils.h @@ -1,10 +1,10 @@ #pragma once -#include "lib/api/services/AdminService.server.pb.h" -#include "lib/api/services/OrderService.server.pb.h" -#include "lib/config/config.h" -#include "lib/config/protos/toggles.pb.h" -#include "lib/utils/PBUtils.h" +#include "spark/api/services/AdminService.server.pb.h" +#include "spark/api/services/OrderService.server.pb.h" +#include "spark/config/config.h" +#include "spark/config/protos/toggles.pb.h" +#include "spark/utils/PBUtils.h" namespace bts { namespace admin { diff --git a/src/lib/api/service_helpers/AlgoServiceUtils.cpp b/src/lib_spark/spark/api/service_helpers/AlgoServiceUtils.cpp similarity index 82% rename from src/lib/api/service_helpers/AlgoServiceUtils.cpp rename to src/lib_spark/spark/api/service_helpers/AlgoServiceUtils.cpp index 7b2b7c577..ade1885da 100644 --- a/src/lib/api/service_helpers/AlgoServiceUtils.cpp +++ b/src/lib_spark/spark/api/service_helpers/AlgoServiceUtils.cpp @@ -1,6 +1,6 @@ //#include "AlgoServiceUtils.h" -//#include "lib/api/services/AlgoService.server.pb.h" -//#include "lib/api/services/OrderService.server.pb.h" +//#include "spark/api/services/AlgoService.server.pb.h" +//#include "spark/api/services/OrderService.server.pb.h" //#include // // namespace bts { diff --git a/src/lib/api/service_helpers/AlgoServiceUtils.h b/src/lib_spark/spark/api/service_helpers/AlgoServiceUtils.h similarity index 100% rename from src/lib/api/service_helpers/AlgoServiceUtils.h rename to src/lib_spark/spark/api/service_helpers/AlgoServiceUtils.h diff --git a/src/lib/api/service_helpers/PositionUtilities.cpp b/src/lib_spark/spark/api/service_helpers/PositionUtilities.cpp similarity index 96% rename from src/lib/api/service_helpers/PositionUtilities.cpp rename to src/lib_spark/spark/api/service_helpers/PositionUtilities.cpp index 69bbf43b4..6ca788b0a 100644 --- a/src/lib/api/service_helpers/PositionUtilities.cpp +++ b/src/lib_spark/spark/api/service_helpers/PositionUtilities.cpp @@ -1,8 +1,8 @@ #include "PositionUtilities.h" -#include "lib/api/services/OrderService.client.pb.h" -#include "lib/api/services/OrderService.pb.h" -#include "lib/api/services/PositionService.server.pb.h" -#include "lib/logging/logging.h" +#include "spark/api/services/OrderService.client.pb.h" +#include "spark/api/services/OrderService.pb.h" +#include "spark/api/services/PositionService.server.pb.h" +#include "spark/logging/logging.h" namespace bts { namespace position { diff --git a/src/lib/api/service_helpers/PositionUtilities.h b/src/lib_spark/spark/api/service_helpers/PositionUtilities.h similarity index 87% rename from src/lib/api/service_helpers/PositionUtilities.h rename to src/lib_spark/spark/api/service_helpers/PositionUtilities.h index 88e2de92d..29b406361 100644 --- a/src/lib/api/service_helpers/PositionUtilities.h +++ b/src/lib_spark/spark/api/service_helpers/PositionUtilities.h @@ -1,9 +1,9 @@ #pragma once -#include "lib/api/services/OrderService.client.pb.h" -#include "lib/api/services/OrderService.pb.h" -#include "lib/api/services/PositionService.server.pb.h" -#include "lib/logging/logging.h" +#include "spark/api/services/OrderService.client.pb.h" +#include "spark/api/services/OrderService.pb.h" +#include "spark/api/services/PositionService.server.pb.h" +#include "spark/logging/logging.h" namespace bts { namespace position { diff --git a/src/lib/api/services/AdminService.proto b/src/lib_spark/spark/api/services/AdminService.proto similarity index 98% rename from src/lib/api/services/AdminService.proto rename to src/lib_spark/spark/api/services/AdminService.proto index eb1aa1491..9211734eb 100644 --- a/src/lib/api/services/AdminService.proto +++ b/src/lib_spark/spark/api/services/AdminService.proto @@ -1,11 +1,11 @@ syntax="proto3"; package bts.api.admin; option csharp_namespace="bts.api.admin"; -import "lib/api/apioptions.proto"; -import "lib/api/apicore.proto"; +import "spark/api/apioptions.proto"; +import "spark/api/apicore.proto"; //import "google/protobuf/timestamp.proto"; -import "lib/domain_model/Security.proto"; -import "lib/api/services/OrderService.proto"; +import "spark/domain_model/Security.proto"; +import "spark/api/services/OrderService.proto"; /************************************************************************/ /********************************Gen (temp)******************************/ @@ -502,4 +502,4 @@ service AdminService { rpc md_entitlement_data(bts.api.VoidMessage) returns (stream MDEntitlementReportUnit); // misc rpc md_permissions_data(bts.api.VoidMessage) returns (stream UserSymbolMDPermissionUnit); -} \ No newline at end of file +} diff --git a/src/lib/api/services/AlgoDefinitionService.proto b/src/lib_spark/spark/api/services/AlgoDefinitionService.proto similarity index 89% rename from src/lib/api/services/AlgoDefinitionService.proto rename to src/lib_spark/spark/api/services/AlgoDefinitionService.proto index 2f8133238..8fa6a65a1 100644 --- a/src/lib/api/services/AlgoDefinitionService.proto +++ b/src/lib_spark/spark/api/services/AlgoDefinitionService.proto @@ -2,9 +2,9 @@ syntax="proto3"; package bts.api.orderman.algo; option csharp_namespace="bts.api.orderman.algo"; -import "lib/api/apioptions.proto"; -import "lib/api/apicore.proto"; -import "lib/api/services/OrderService.proto"; +import "spark/api/apioptions.proto"; +import "spark/api/apicore.proto"; +import "spark/api/services/OrderService.proto"; import "google/protobuf/timestamp.proto"; message AlgoDefinitionRecordMetadata { @@ -59,4 +59,4 @@ service AlgoDefinitionService { // streams rpc algo_definitions(bts.api.VoidMessage) returns (stream AlgoDefinitionRecord); -} \ No newline at end of file +} diff --git a/src/lib/api/services/AlgoService.proto b/src/lib_spark/spark/api/services/AlgoService.proto similarity index 91% rename from src/lib/api/services/AlgoService.proto rename to src/lib_spark/spark/api/services/AlgoService.proto index 85b290095..1e4363ed2 100644 --- a/src/lib/api/services/AlgoService.proto +++ b/src/lib_spark/spark/api/services/AlgoService.proto @@ -2,9 +2,9 @@ syntax="proto3"; package bts.api.orderman; option csharp_namespace="bts.api.orderman"; -import "lib/api/apioptions.proto"; -import "lib/api/apicore.proto"; -import "lib/api/services/OrderService.proto"; +import "spark/api/apioptions.proto"; +import "spark/api/apicore.proto"; +import "spark/api/services/OrderService.proto"; import "google/protobuf/timestamp.proto"; @@ -94,4 +94,4 @@ service AlgoService { // streams rpc algos(bts.api.VoidMessage) returns (stream CompositeAlgoRecord); rpc algo_templates(bts.api.VoidMessage) returns (stream AlgoTemplateRecord); -} \ No newline at end of file +} diff --git a/src/lib/api/services/AnalyticsService.proto b/src/lib_spark/spark/api/services/AnalyticsService.proto similarity index 94% rename from src/lib/api/services/AnalyticsService.proto rename to src/lib_spark/spark/api/services/AnalyticsService.proto index c101f3175..7377791cb 100644 --- a/src/lib/api/services/AnalyticsService.proto +++ b/src/lib_spark/spark/api/services/AnalyticsService.proto @@ -1,12 +1,12 @@ syntax = "proto3"; package bts.api.analytics; -import "lib/api/apioptions.proto"; -import "lib/api/apicore.proto"; -import "lib/api/analytics/ExpirationDriver.proto"; -import "lib/api/domain/SecurityExpiration.proto"; -import "lib/api/domain/SecurityCriteria.proto"; -import "lib/domain_model/Security.proto"; +import "spark/api/apioptions.proto"; +import "spark/api/apicore.proto"; +import "spark/api/analytics/ExpirationDriver.proto"; +import "spark/api/domain/SecurityExpiration.proto"; +import "spark/api/domain/SecurityCriteria.proto"; +import "spark/domain_model/Security.proto"; option csharp_namespace = "bts.api.analytics"; diff --git a/src/lib/api/services/ApiUnitTestService.proto b/src/lib_spark/spark/api/services/ApiUnitTestService.proto similarity index 100% rename from src/lib/api/services/ApiUnitTestService.proto rename to src/lib_spark/spark/api/services/ApiUnitTestService.proto diff --git a/src/lib/api/services/AuthService.proto b/src/lib_spark/spark/api/services/AuthService.proto similarity index 96% rename from src/lib/api/services/AuthService.proto rename to src/lib_spark/spark/api/services/AuthService.proto index f7b984497..e92a37137 100644 --- a/src/lib/api/services/AuthService.proto +++ b/src/lib_spark/spark/api/services/AuthService.proto @@ -1,8 +1,8 @@ syntax="proto3"; package bts.api.user; option csharp_namespace="bts.api.user"; -import "lib/api/apicore.proto"; -import "lib/api/apioptions.proto"; +import "spark/api/apicore.proto"; +import "spark/api/apioptions.proto"; message OperatorID { string tag50 = 10; } diff --git a/src/lib/api/services/BasePositionService.proto b/src/lib_spark/spark/api/services/BasePositionService.proto similarity index 85% rename from src/lib/api/services/BasePositionService.proto rename to src/lib_spark/spark/api/services/BasePositionService.proto index e6dc77d2f..e316e72a0 100644 --- a/src/lib/api/services/BasePositionService.proto +++ b/src/lib_spark/spark/api/services/BasePositionService.proto @@ -1,8 +1,8 @@ syntax="proto3"; package bts.api.position; option csharp_namespace="bts.api.position"; -import "lib/api/apioptions.proto"; -import "lib/api/services/PositionService.proto"; +import "spark/api/apioptions.proto"; +import "spark/api/services/PositionService.proto"; message GMI_ParseResult { oneof result { @@ -19,4 +19,4 @@ service BasePositionService { option (bts.api.service_description) = "Obtains an initial position from an external source and invokes the Position Service with it. Also provides on demand parsing of the GMI format"; rpc parse_gmi_csv (GMI_CSVBlock) returns (GMI_ParseResult); -} \ No newline at end of file +} diff --git a/src/lib/api/services/ErrorReportService.proto b/src/lib_spark/spark/api/services/ErrorReportService.proto similarity index 90% rename from src/lib/api/services/ErrorReportService.proto rename to src/lib_spark/spark/api/services/ErrorReportService.proto index d5d382d9d..c42d16200 100644 --- a/src/lib/api/services/ErrorReportService.proto +++ b/src/lib_spark/spark/api/services/ErrorReportService.proto @@ -1,7 +1,7 @@ syntax="proto3"; package bts.support; option csharp_namespace="bts.support"; -import "lib/api/apioptions.proto"; +import "spark/api/apioptions.proto"; import "google/protobuf/timestamp.proto"; message FileData { @@ -26,4 +26,4 @@ message ErrorResponse { service ErrorReportService { option (bts.api.service_description) = "User reported errors from the shell"; rpc send_report(ErrorReport) returns (ErrorResponse); -} \ No newline at end of file +} diff --git a/src/lib/api/services/HelloService.proto b/src/lib_spark/spark/api/services/HelloService.proto similarity index 96% rename from src/lib/api/services/HelloService.proto rename to src/lib_spark/spark/api/services/HelloService.proto index 3e9cbf7a2..b68108153 100644 --- a/src/lib/api/services/HelloService.proto +++ b/src/lib_spark/spark/api/services/HelloService.proto @@ -1,7 +1,7 @@ syntax="proto3"; package bts.api.test; option csharp_namespace="bts.api.test"; -import "lib/api/apioptions.proto"; +import "spark/api/apioptions.proto"; message HelloRequest { string name = 1; diff --git a/src/lib/api/services/MBOService.proto b/src/lib_spark/spark/api/services/MBOService.proto similarity index 86% rename from src/lib/api/services/MBOService.proto rename to src/lib_spark/spark/api/services/MBOService.proto index ea1fab488..a99564d35 100644 --- a/src/lib/api/services/MBOService.proto +++ b/src/lib_spark/spark/api/services/MBOService.proto @@ -1,8 +1,8 @@ syntax="proto3"; package bts.md; option csharp_namespace="bts.md"; -import "lib/api/apioptions.proto"; -import "lib/api/apicore.proto"; +import "spark/api/apioptions.proto"; +import "spark/api/apicore.proto"; message OrderPIQ { uint32 order_id = 1 [(bts.api.key)=true]; diff --git a/src/lib/api/services/MarginService.proto b/src/lib_spark/spark/api/services/MarginService.proto similarity index 94% rename from src/lib/api/services/MarginService.proto rename to src/lib_spark/spark/api/services/MarginService.proto index d2d9d67b5..7ef478196 100644 --- a/src/lib/api/services/MarginService.proto +++ b/src/lib_spark/spark/api/services/MarginService.proto @@ -1,9 +1,9 @@ syntax="proto3"; package bts.api.position; option csharp_namespace="bts.api.position"; -import "lib/api/apioptions.proto"; -import "lib/api/apicore.proto"; -import "lib/api/services/PositionService.proto"; +import "spark/api/apioptions.proto"; +import "spark/api/apicore.proto"; +import "spark/api/services/PositionService.proto"; message MarginResult { enum ResultStatus { NewValid = 0; CachedValid = 1; Error = 2; } @@ -74,4 +74,4 @@ service MarginService { rpc margin_data(bts.api.VoidMessage) returns (stream MarginResult); rpc excess_liquidity_report(bts.api.VoidMessage) returns (stream ExcessLiquidityReport); -} \ No newline at end of file +} diff --git a/src/lib/api/services/MarketDataAuxiliaryService.proto b/src/lib_spark/spark/api/services/MarketDataAuxiliaryService.proto similarity index 88% rename from src/lib/api/services/MarketDataAuxiliaryService.proto rename to src/lib_spark/spark/api/services/MarketDataAuxiliaryService.proto index 559f4f3f4..7077e37cd 100644 --- a/src/lib/api/services/MarketDataAuxiliaryService.proto +++ b/src/lib_spark/spark/api/services/MarketDataAuxiliaryService.proto @@ -1,8 +1,8 @@ syntax="proto3"; package bts.api.md.auxiliary; option csharp_namespace="bts.api.md.auxiliary"; -import "lib/api/apioptions.proto"; -import "lib/api/apicore.proto"; +import "spark/api/apioptions.proto"; +import "spark/api/apicore.proto"; message VolumeAtPriceLevel{ int32 record_id = 1 [(bts.api.key)=true]; diff --git a/src/lib/api/services/MarketDataRelay.proto b/src/lib_spark/spark/api/services/MarketDataRelay.proto similarity index 81% rename from src/lib/api/services/MarketDataRelay.proto rename to src/lib_spark/spark/api/services/MarketDataRelay.proto index 2d23f8e13..46350b53c 100644 --- a/src/lib/api/services/MarketDataRelay.proto +++ b/src/lib_spark/spark/api/services/MarketDataRelay.proto @@ -1,10 +1,10 @@ syntax="proto3"; package bts.co2; option csharp_namespace="bts.co2"; -import "lib/api/apioptions.proto"; -import "lib/api/apicore.proto"; -import "lib/domain_model/Security.proto"; -import "lib/md/protos/co2.proto"; +import "spark/api/apioptions.proto"; +import "spark/api/apicore.proto"; +import "spark/domain_model/Security.proto"; +import "spark/md/protos/co2.proto"; message ProductListReply { repeated bts.api.Product products = 1; diff --git a/src/lib/api/services/MarketDataService.proto b/src/lib_spark/spark/api/services/MarketDataService.proto similarity index 83% rename from src/lib/api/services/MarketDataService.proto rename to src/lib_spark/spark/api/services/MarketDataService.proto index cf0441a89..74492508a 100644 --- a/src/lib/api/services/MarketDataService.proto +++ b/src/lib_spark/spark/api/services/MarketDataService.proto @@ -1,10 +1,10 @@ syntax="proto3"; package bts.api; option csharp_namespace="bts.api"; -import "lib/api/apioptions.proto"; -import "lib/api/apicore.proto"; -import "lib/domain_model/Security.proto"; -import "lib/md/protos/co2.proto"; +import "spark/api/apioptions.proto"; +import "spark/api/apicore.proto"; +import "spark/domain_model/Security.proto"; +import "spark/md/protos/co2.proto"; message ProductList { repeated bts.api.Product products = 1; diff --git a/src/lib/api/services/MoneyFileService.proto b/src/lib_spark/spark/api/services/MoneyFileService.proto similarity index 85% rename from src/lib/api/services/MoneyFileService.proto rename to src/lib_spark/spark/api/services/MoneyFileService.proto index 5418fc1f8..7cd21fafe 100644 --- a/src/lib/api/services/MoneyFileService.proto +++ b/src/lib_spark/spark/api/services/MoneyFileService.proto @@ -1,8 +1,8 @@ syntax="proto3"; package bts.api.position; option csharp_namespace="bts.api.position"; -import "lib/api/apioptions.proto"; -import "lib/api/services/MarginService.proto"; +import "spark/api/apioptions.proto"; +import "spark/api/services/MarginService.proto"; message Money_ParseResult { oneof result { @@ -19,4 +19,4 @@ service MoneyFileService { option (bts.api.service_description) = "Obtains cash balances from an external source and invokes the margin service with them. Also provides on demand parsing of the money file"; rpc parse_money_csv (Money_CSVBlock) returns (Money_ParseResult); -} \ No newline at end of file +} diff --git a/src/lib/api/services/OrderService.cpp b/src/lib_spark/spark/api/services/OrderService.cpp similarity index 99% rename from src/lib/api/services/OrderService.cpp rename to src/lib_spark/spark/api/services/OrderService.cpp index d0cadc3f5..930e36e1e 100644 --- a/src/lib/api/services/OrderService.cpp +++ b/src/lib_spark/spark/api/services/OrderService.cpp @@ -1,5 +1,5 @@ #include "OrderService.h" -#include "lib/api/services/OrderService.pb.h" +#include "spark/api/services/OrderService.pb.h" namespace bts::api::orderman { diff --git a/src/lib/api/services/OrderService.h b/src/lib_spark/spark/api/services/OrderService.h similarity index 82% rename from src/lib/api/services/OrderService.h rename to src/lib_spark/spark/api/services/OrderService.h index 68084e4ad..666655459 100644 --- a/src/lib/api/services/OrderService.h +++ b/src/lib_spark/spark/api/services/OrderService.h @@ -1,14 +1,14 @@ #pragma once -#include "lib/api/services/OrderService.pb.h" -#include "lib/api/services/native_order_type.h" -#include "lib/api/services/order_status.h" -#include "lib/api/services/time_in_force.h" -#include "lib/api/services/trigger_price_type.h" -#include "lib/core/EnumMacros.h" -#include "lib/core/FMT_IMPL.h" -#include "lib/io/JsonReader.h" -#include "lib/logging/logging.h" +#include "spark/api/services/OrderService.pb.h" +#include "spark/api/services/native_order_type.h" +#include "spark/api/services/order_status.h" +#include "spark/api/services/time_in_force.h" +#include "spark/api/services/trigger_price_type.h" +#include "spark/core/EnumMacros.h" +#include "spark/core/FMT_IMPL.h" +#include "spark/io/JsonReader.h" +#include "spark/logging/logging.h" #include diff --git a/src/lib/api/services/OrderService.proto b/src/lib_spark/spark/api/services/OrderService.proto similarity index 99% rename from src/lib/api/services/OrderService.proto rename to src/lib_spark/spark/api/services/OrderService.proto index a704689aa..a3b669cf7 100644 --- a/src/lib/api/services/OrderService.proto +++ b/src/lib_spark/spark/api/services/OrderService.proto @@ -2,11 +2,11 @@ syntax="proto3"; package bts.api.orderman; option csharp_namespace="bts.api.orderman"; -import "lib/api/apioptions.proto"; -import "lib/domain_model/Security.proto"; +import "spark/api/apioptions.proto"; +import "spark/domain_model/Security.proto"; import "google/protobuf/timestamp.proto"; -import "lib/sparkproto/SparkProtos.proto"; -import "lib/api/apicore.proto"; +import "spark/sparkproto/SparkProtos.proto"; +import "spark/api/apicore.proto"; service OrderService { option (bts.api.service_description)="Implements order management"; @@ -790,4 +790,4 @@ message RFQRequest{ RFQRequestSecurity security = 10; RFQRequestSide side = 20; RFQRequestQuantity quantity = 30; -} \ No newline at end of file +} diff --git a/src/lib/api/services/OutOfProcessURLListener.proto b/src/lib_spark/spark/api/services/OutOfProcessURLListener.proto similarity index 86% rename from src/lib/api/services/OutOfProcessURLListener.proto rename to src/lib_spark/spark/api/services/OutOfProcessURLListener.proto index 0069a7a0f..2660023df 100644 --- a/src/lib/api/services/OutOfProcessURLListener.proto +++ b/src/lib_spark/spark/api/services/OutOfProcessURLListener.proto @@ -1,7 +1,7 @@ syntax="proto3"; package bts.api.browser; option csharp_namespace="bts.api.browser"; -import "lib/api/apioptions.proto"; +import "spark/api/apioptions.proto"; message URIRequest { string uri = 1; diff --git a/src/lib/api/services/PersistenceService.proto b/src/lib_spark/spark/api/services/PersistenceService.proto similarity index 98% rename from src/lib/api/services/PersistenceService.proto rename to src/lib_spark/spark/api/services/PersistenceService.proto index a2f27a65e..e82425c7d 100644 --- a/src/lib/api/services/PersistenceService.proto +++ b/src/lib_spark/spark/api/services/PersistenceService.proto @@ -1,7 +1,7 @@ syntax="proto3"; package bts.api.persistence; option csharp_namespace="bts.api.persistence"; -import "lib/api/apioptions.proto"; +import "spark/api/apioptions.proto"; message Record { string key = 1 [(bts.api.key)=true]; diff --git a/src/lib/api/services/PositionService.proto b/src/lib_spark/spark/api/services/PositionService.proto similarity index 97% rename from src/lib/api/services/PositionService.proto rename to src/lib_spark/spark/api/services/PositionService.proto index 2ea56b6ec..ae099696d 100644 --- a/src/lib/api/services/PositionService.proto +++ b/src/lib_spark/spark/api/services/PositionService.proto @@ -1,9 +1,9 @@ syntax="proto3"; package bts.api.position; option csharp_namespace="bts.api.position"; -import "lib/api/apioptions.proto"; -import "lib/api/apicore.proto"; -import "lib/domain_model/Security.proto"; +import "spark/api/apioptions.proto"; +import "spark/api/apicore.proto"; +import "spark/domain_model/Security.proto"; import "google/protobuf/timestamp.proto"; message PositionEntry{ diff --git a/src/lib/api/services/ShellDiagnosticService.proto b/src/lib_spark/spark/api/services/ShellDiagnosticService.proto similarity index 90% rename from src/lib/api/services/ShellDiagnosticService.proto rename to src/lib_spark/spark/api/services/ShellDiagnosticService.proto index d9899e5cf..e39f2bf73 100644 --- a/src/lib/api/services/ShellDiagnosticService.proto +++ b/src/lib_spark/spark/api/services/ShellDiagnosticService.proto @@ -1,7 +1,7 @@ syntax="proto3"; package bts.api.diagnostic; option csharp_namespace="bts.api.diagnostic"; -import "lib/api/apicore.proto"; +import "spark/api/apicore.proto"; message ScriptLines { int32 id = 1; @@ -33,4 +33,4 @@ message ShellScriptHostHandle { service ShellDiagnosticService { rpc create(api.VoidMessage) returns (ShellScriptHostHandle); -} \ No newline at end of file +} diff --git a/src/lib/api/services/ShellLatencyService.proto b/src/lib_spark/spark/api/services/ShellLatencyService.proto similarity index 84% rename from src/lib/api/services/ShellLatencyService.proto rename to src/lib_spark/spark/api/services/ShellLatencyService.proto index 8d1a253ae..f52762eae 100644 --- a/src/lib/api/services/ShellLatencyService.proto +++ b/src/lib_spark/spark/api/services/ShellLatencyService.proto @@ -1,8 +1,8 @@ syntax="proto3"; package bts.metrics; option csharp_namespace="bts.metrics"; -import "lib/api/apioptions.proto"; -import "lib/api/apicore.proto"; +import "spark/api/apioptions.proto"; +import "spark/api/apicore.proto"; message Tick { int32 key = 1 [(bts.api.key)=true]; @@ -24,4 +24,4 @@ service ShellLatencyService { rpc clock(bts.api.VoidMessage) returns (stream Tick); rpc report(Report) returns (bts.api.VoidMessage); rpc ping(BufferMessage) returns (BufferMessage); -} \ No newline at end of file +} diff --git a/src/lib/api/services/SyntheticSecurityService.proto b/src/lib_spark/spark/api/services/SyntheticSecurityService.proto similarity index 88% rename from src/lib/api/services/SyntheticSecurityService.proto rename to src/lib_spark/spark/api/services/SyntheticSecurityService.proto index d347a87cb..4fa68c6c4 100644 --- a/src/lib/api/services/SyntheticSecurityService.proto +++ b/src/lib_spark/spark/api/services/SyntheticSecurityService.proto @@ -3,11 +3,11 @@ package bts.api.synthetic; option csharp_namespace="bts.api.synthetic"; -import "lib/api/apicore.proto"; -import "lib/api/apioptions.proto"; -import "lib/domain_model/Security.proto"; +import "spark/api/apicore.proto"; +import "spark/api/apioptions.proto"; +import "spark/domain_model/Security.proto"; //import "google/protobuf/timestamp.proto"; -import "lib/sparkproto/SparkProtos.proto"; +import "spark/sparkproto/SparkProtos.proto"; message CreateResult { enum Error { diff --git a/src/lib/api/services/native_order_type.h b/src/lib_spark/spark/api/services/native_order_type.h similarity index 86% rename from src/lib/api/services/native_order_type.h rename to src/lib_spark/spark/api/services/native_order_type.h index 6fd5bfb64..1db93d763 100644 --- a/src/lib/api/services/native_order_type.h +++ b/src/lib_spark/spark/api/services/native_order_type.h @@ -1,11 +1,11 @@ #pragma once -#include "lib/api/services/OrderService.pb.h" -#include "lib/core/EnumMacros.h" -#include "lib/core/FMT_IMPL.h" -#include "lib/io/JsonReader.h" -#include "lib/logging/logging.h" -#include "lib/utils/string_utils.h" +#include "spark/api/services/OrderService.pb.h" +#include "spark/core/EnumMacros.h" +#include "spark/core/FMT_IMPL.h" +#include "spark/io/JsonReader.h" +#include "spark/logging/logging.h" +#include "spark/utils/string_utils.h" #include diff --git a/src/lib/api/services/order_status.h b/src/lib_spark/spark/api/services/order_status.h similarity index 85% rename from src/lib/api/services/order_status.h rename to src/lib_spark/spark/api/services/order_status.h index a0377b417..b9f0c6960 100644 --- a/src/lib/api/services/order_status.h +++ b/src/lib_spark/spark/api/services/order_status.h @@ -1,11 +1,11 @@ #pragma once -#include "lib/api/services/OrderService.pb.h" -#include "lib/core/EnumMacros.h" -#include "lib/core/FMT_IMPL.h" -#include "lib/io/JsonReader.h" -#include "lib/logging/logging.h" -#include "lib/utils/string_utils.h" +#include "spark/api/services/OrderService.pb.h" +#include "spark/core/EnumMacros.h" +#include "spark/core/FMT_IMPL.h" +#include "spark/io/JsonReader.h" +#include "spark/logging/logging.h" +#include "spark/utils/string_utils.h" #include diff --git a/src/lib/api/services/time_in_force.h b/src/lib_spark/spark/api/services/time_in_force.h similarity index 85% rename from src/lib/api/services/time_in_force.h rename to src/lib_spark/spark/api/services/time_in_force.h index b651b16bc..484541d16 100644 --- a/src/lib/api/services/time_in_force.h +++ b/src/lib_spark/spark/api/services/time_in_force.h @@ -1,11 +1,11 @@ #pragma once -#include "lib/api/services/OrderService.pb.h" -#include "lib/core/EnumMacros.h" -#include "lib/core/FMT_IMPL.h" -#include "lib/io/JsonReader.h" -#include "lib/logging/logging.h" -#include "lib/utils/string_utils.h" +#include "spark/api/services/OrderService.pb.h" +#include "spark/core/EnumMacros.h" +#include "spark/core/FMT_IMPL.h" +#include "spark/io/JsonReader.h" +#include "spark/logging/logging.h" +#include "spark/utils/string_utils.h" #include diff --git a/src/lib/api/services/trigger_price_type.h b/src/lib_spark/spark/api/services/trigger_price_type.h similarity index 86% rename from src/lib/api/services/trigger_price_type.h rename to src/lib_spark/spark/api/services/trigger_price_type.h index 53d9da320..2f3fe6007 100644 --- a/src/lib/api/services/trigger_price_type.h +++ b/src/lib_spark/spark/api/services/trigger_price_type.h @@ -1,11 +1,11 @@ #pragma once -#include "lib/api/services/OrderService.pb.h" -#include "lib/core/EnumMacros.h" -#include "lib/core/FMT_IMPL.h" -#include "lib/io/JsonReader.h" -#include "lib/logging/logging.h" -#include "lib/utils/string_utils.h" +#include "spark/api/services/OrderService.pb.h" +#include "spark/core/EnumMacros.h" +#include "spark/core/FMT_IMPL.h" +#include "spark/io/JsonReader.h" +#include "spark/logging/logging.h" +#include "spark/utils/string_utils.h" #include diff --git a/src/lib/api/test/ApiTests.cpp b/src/lib_spark/spark/api/test/ApiTests.cpp similarity index 92% rename from src/lib/api/test/ApiTests.cpp rename to src/lib_spark/spark/api/test/ApiTests.cpp index 723edd1ff..ba6a71cc9 100644 --- a/src/lib/api/test/ApiTests.cpp +++ b/src/lib_spark/spark/api/test/ApiTests.cpp @@ -1,9 +1,9 @@ #include "../public/ApiUtils.h" #include "../public/ServiceContext.h" #include "HelloServiceServer.h" -#include "lib/utils/bts_export.h" +#include "spark/utils/bts_export.h" -#include "lib/api/services/ApiUnitTestService.server.pb.h" +#include "spark/api/services/ApiUnitTestService.server.pb.h" #include #include diff --git a/src/lib/api/test/HelloServiceServer.cpp b/src/lib_spark/spark/api/test/HelloServiceServer.cpp similarity index 100% rename from src/lib/api/test/HelloServiceServer.cpp rename to src/lib_spark/spark/api/test/HelloServiceServer.cpp diff --git a/src/lib/api/test/HelloServiceServer.h b/src/lib_spark/spark/api/test/HelloServiceServer.h similarity index 82% rename from src/lib/api/test/HelloServiceServer.h rename to src/lib_spark/spark/api/test/HelloServiceServer.h index d9f4f9c6e..0c2f3ff2d 100644 --- a/src/lib/api/test/HelloServiceServer.h +++ b/src/lib_spark/spark/api/test/HelloServiceServer.h @@ -1,10 +1,10 @@ #pragma once -#include "lib/utils/bts_export.h" -#include "lib/utils/bts_no_copy.h" +#include "spark/utils/bts_export.h" +#include "spark/utils/bts_no_copy.h" -#include "lib/api/services/HelloService.client.pb.h" -#include "lib/api/services/HelloService.server.pb.h" +#include "spark/api/services/HelloService.client.pb.h" +#include "spark/api/services/HelloService.server.pb.h" namespace bts { namespace api { diff --git a/src/lib/collections/AutoIncrementedIndex.h b/src/lib_spark/spark/collections/AutoIncrementedIndex.h similarity index 77% rename from src/lib/collections/AutoIncrementedIndex.h rename to src/lib_spark/spark/collections/AutoIncrementedIndex.h index 9a4f432ef..edb34d84f 100644 --- a/src/lib/collections/AutoIncrementedIndex.h +++ b/src/lib_spark/spark/collections/AutoIncrementedIndex.h @@ -1,7 +1,7 @@ #pragma once -#include "lib/algorithm/PlusX.h" -#include "lib/collections/GeneratedKeyMap.h" +#include "spark/algorithm/PlusX.h" +#include "spark/collections/GeneratedKeyMap.h" #include diff --git a/src/lib/collections/Chunk.h b/src/lib_spark/spark/collections/Chunk.h similarity index 100% rename from src/lib/collections/Chunk.h rename to src/lib_spark/spark/collections/Chunk.h diff --git a/src/lib/collections/Contains.h b/src/lib_spark/spark/collections/Contains.h similarity index 100% rename from src/lib/collections/Contains.h rename to src/lib_spark/spark/collections/Contains.h diff --git a/src/lib/collections/DiscreteValuesFilter.h b/src/lib_spark/spark/collections/DiscreteValuesFilter.h similarity index 100% rename from src/lib/collections/DiscreteValuesFilter.h rename to src/lib_spark/spark/collections/DiscreteValuesFilter.h diff --git a/src/lib/collections/Find.h b/src/lib_spark/spark/collections/Find.h similarity index 100% rename from src/lib/collections/Find.h rename to src/lib_spark/spark/collections/Find.h diff --git a/src/lib/collections/FlatUnorderedMap.h b/src/lib_spark/spark/collections/FlatUnorderedMap.h similarity index 100% rename from src/lib/collections/FlatUnorderedMap.h rename to src/lib_spark/spark/collections/FlatUnorderedMap.h diff --git a/src/lib/collections/GeneratedKeyMap.h b/src/lib_spark/spark/collections/GeneratedKeyMap.h similarity index 97% rename from src/lib/collections/GeneratedKeyMap.h rename to src/lib_spark/spark/collections/GeneratedKeyMap.h index de2e45956..9230a9274 100644 --- a/src/lib/collections/GeneratedKeyMap.h +++ b/src/lib_spark/spark/collections/GeneratedKeyMap.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/utils/bts_assert.h" +#include "spark/utils/bts_assert.h" #include #include diff --git a/src/lib/collections/HASH_IMPL.h b/src/lib_spark/spark/collections/HASH_IMPL.h similarity index 94% rename from src/lib/collections/HASH_IMPL.h rename to src/lib_spark/spark/collections/HASH_IMPL.h index db3de5009..33b0a7a85 100644 --- a/src/lib/collections/HASH_IMPL.h +++ b/src/lib_spark/spark/collections/HASH_IMPL.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/collections/HashCombiner.h" +#include "spark/collections/HashCombiner.h" #define _HASH_ARG(x) , std::hash{}(t.x) diff --git a/src/lib/collections/HashCombiner.h b/src/lib_spark/spark/collections/HashCombiner.h similarity index 100% rename from src/lib/collections/HashCombiner.h rename to src/lib_spark/spark/collections/HashCombiner.h diff --git a/src/lib/collections/Remove.h b/src/lib_spark/spark/collections/Remove.h similarity index 100% rename from src/lib/collections/Remove.h rename to src/lib_spark/spark/collections/Remove.h diff --git a/src/lib/collections/Transform.h b/src/lib_spark/spark/collections/Transform.h similarity index 100% rename from src/lib/collections/Transform.h rename to src/lib_spark/spark/collections/Transform.h diff --git a/src/lib/collections/UnorderedMapLookup.h b/src/lib_spark/spark/collections/UnorderedMapLookup.h similarity index 100% rename from src/lib/collections/UnorderedMapLookup.h rename to src/lib_spark/spark/collections/UnorderedMapLookup.h diff --git a/src/lib/collections/UnorderedSetFactory.h b/src/lib_spark/spark/collections/UnorderedSetFactory.h similarity index 100% rename from src/lib/collections/UnorderedSetFactory.h rename to src/lib_spark/spark/collections/UnorderedSetFactory.h diff --git a/src/lib/collections/UnorderedSetMap.h b/src/lib_spark/spark/collections/UnorderedSetMap.h similarity index 98% rename from src/lib/collections/UnorderedSetMap.h rename to src/lib_spark/spark/collections/UnorderedSetMap.h index f92b9cc55..2c24e6d1c 100644 --- a/src/lib/collections/UnorderedSetMap.h +++ b/src/lib_spark/spark/collections/UnorderedSetMap.h @@ -1,5 +1,5 @@ #pragma once -#include "lib/core/AllSameType.h" +#include "spark/core/AllSameType.h" #include #include diff --git a/src/lib/collections/concurrent_factory.h b/src/lib_spark/spark/collections/concurrent_factory.h similarity index 97% rename from src/lib/collections/concurrent_factory.h rename to src/lib_spark/spark/collections/concurrent_factory.h index 916767fed..f75b1fa02 100644 --- a/src/lib/collections/concurrent_factory.h +++ b/src/lib_spark/spark/collections/concurrent_factory.h @@ -1,8 +1,8 @@ #pragma once -#include "lib/utils/LockBox.h" -#include "lib/utils/bts_assert.h" -#include "lib/utils/type_name.h" +#include "spark/utils/LockBox.h" +#include "spark/utils/bts_assert.h" +#include "spark/utils/type_name.h" #include #include diff --git a/src/lib/collections/concurrent_queue.h b/src/lib_spark/spark/collections/concurrent_queue.h similarity index 100% rename from src/lib/collections/concurrent_queue.h rename to src/lib_spark/spark/collections/concurrent_queue.h diff --git a/src/lib/collections/concurrent_unordered_map.h b/src/lib_spark/spark/collections/concurrent_unordered_map.h similarity index 98% rename from src/lib/collections/concurrent_unordered_map.h rename to src/lib_spark/spark/collections/concurrent_unordered_map.h index 3953cbb9a..85d51d096 100644 --- a/src/lib/collections/concurrent_unordered_map.h +++ b/src/lib_spark/spark/collections/concurrent_unordered_map.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/collections/concurrent_unordered_map_iterator.h" +#include "spark/collections/concurrent_unordered_map_iterator.h" #include #include diff --git a/src/lib/collections/concurrent_unordered_map_iterator.h b/src/lib_spark/spark/collections/concurrent_unordered_map_iterator.h similarity index 100% rename from src/lib/collections/concurrent_unordered_map_iterator.h rename to src/lib_spark/spark/collections/concurrent_unordered_map_iterator.h diff --git a/src/lib/collections/tests/concurrent_unordered_map_tests.cpp b/src/lib_spark/spark/collections/tests/concurrent_unordered_map_tests.cpp similarity index 97% rename from src/lib/collections/tests/concurrent_unordered_map_tests.cpp rename to src/lib_spark/spark/collections/tests/concurrent_unordered_map_tests.cpp index e45a20942..8a7b0e74c 100644 --- a/src/lib/collections/tests/concurrent_unordered_map_tests.cpp +++ b/src/lib_spark/spark/collections/tests/concurrent_unordered_map_tests.cpp @@ -1,5 +1,5 @@ -#include "lib/collections/concurrent_unordered_map.h" -#include "lib/collections/concurrent_unordered_map_iterator.h" +#include "spark/collections/concurrent_unordered_map.h" +#include "spark/collections/concurrent_unordered_map_iterator.h" #include #include diff --git a/src/lib/communincation/websockets/tests/WebsocketSyncClientTests.cpp b/src/lib_spark/spark/communincation/websockets/tests/WebsocketSyncClientTests.cpp similarity index 100% rename from src/lib/communincation/websockets/tests/WebsocketSyncClientTests.cpp rename to src/lib_spark/spark/communincation/websockets/tests/WebsocketSyncClientTests.cpp diff --git a/src/lib/config/ConfigDownloader.cpp b/src/lib_spark/spark/config/ConfigDownloader.cpp similarity index 96% rename from src/lib/config/ConfigDownloader.cpp rename to src/lib_spark/spark/config/ConfigDownloader.cpp index eda20ac9a..7295417b4 100644 --- a/src/lib/config/ConfigDownloader.cpp +++ b/src/lib_spark/spark/config/ConfigDownloader.cpp @@ -1,4 +1,4 @@ -#include "lib/utils/windows_wrapper.h" +#include "spark/utils/windows_wrapper.h" #include "ConfigDownloader.h" @@ -6,7 +6,7 @@ #include #include -#include "lib/utils/bts_assert.h" +#include "spark/utils/bts_assert.h" using namespace std; diff --git a/src/lib/config/ConfigDownloader.h b/src/lib_spark/spark/config/ConfigDownloader.h similarity index 92% rename from src/lib/config/ConfigDownloader.h rename to src/lib_spark/spark/config/ConfigDownloader.h index 3ae8c6d5e..c2cfbfb45 100644 --- a/src/lib/config/ConfigDownloader.h +++ b/src/lib_spark/spark/config/ConfigDownloader.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/utils/bts_no_copy.h" +#include "spark/utils/bts_no_copy.h" #include #include diff --git a/src/lib/config/ConfigErrorCollector.cpp b/src/lib_spark/spark/config/ConfigErrorCollector.cpp similarity index 98% rename from src/lib/config/ConfigErrorCollector.cpp rename to src/lib_spark/spark/config/ConfigErrorCollector.cpp index e6680cead..36e23c384 100644 --- a/src/lib/config/ConfigErrorCollector.cpp +++ b/src/lib_spark/spark/config/ConfigErrorCollector.cpp @@ -1,5 +1,5 @@ #include "ConfigErrorCollector.h" -#include "lib/os/os.h" +#include "spark/os/os.h" #include diff --git a/src/lib/config/ConfigErrorCollector.h b/src/lib_spark/spark/config/ConfigErrorCollector.h similarity index 100% rename from src/lib/config/ConfigErrorCollector.h rename to src/lib_spark/spark/config/ConfigErrorCollector.h diff --git a/src/lib/config/ConfigLog.h b/src/lib_spark/spark/config/ConfigLog.h similarity index 97% rename from src/lib/config/ConfigLog.h rename to src/lib_spark/spark/config/ConfigLog.h index 243228878..8e8a5cfb2 100644 --- a/src/lib/config/ConfigLog.h +++ b/src/lib_spark/spark/config/ConfigLog.h @@ -1,7 +1,7 @@ #pragma once -#include "lib/logging/logging.h" -#include "lib/utils/bts_no_copy.h" +#include "spark/logging/logging.h" +#include "spark/utils/bts_no_copy.h" #include #include diff --git a/src/lib/config/ConfigPropertyEvaluator.cpp b/src/lib_spark/spark/config/ConfigPropertyEvaluator.cpp similarity index 98% rename from src/lib/config/ConfigPropertyEvaluator.cpp rename to src/lib_spark/spark/config/ConfigPropertyEvaluator.cpp index de9c260fd..9e9766187 100644 --- a/src/lib/config/ConfigPropertyEvaluator.cpp +++ b/src/lib_spark/spark/config/ConfigPropertyEvaluator.cpp @@ -1,9 +1,9 @@ #include "ConfigPropertyEvaluator.h" #include "ConfigurationState.h" -#include "lib/expression/ExpressionEvaluator.h" -#include "lib/utils/bts_assert.h" -#include "lib/utils/windows_wrapper.h" +#include "spark/expression/ExpressionEvaluator.h" +#include "spark/utils/bts_assert.h" +#include "spark/utils/windows_wrapper.h" #include #include diff --git a/src/lib/config/ConfigPropertyEvaluator.h b/src/lib_spark/spark/config/ConfigPropertyEvaluator.h similarity index 85% rename from src/lib/config/ConfigPropertyEvaluator.h rename to src/lib_spark/spark/config/ConfigPropertyEvaluator.h index 23b7d2d1c..5bc0f79e0 100644 --- a/src/lib/config/ConfigPropertyEvaluator.h +++ b/src/lib_spark/spark/config/ConfigPropertyEvaluator.h @@ -1,9 +1,9 @@ #ifndef CONFIGPROPERTYEVALUATOR_H_ #define CONFIGPROPERTYEVALUATOR_H_ -#include "lib/expression/IPropertyEvaluator.h" -#include "lib/expression/Value.h" -#include "lib/utils/bts_no_copy.h" +#include "spark/expression/IPropertyEvaluator.h" +#include "spark/expression/Value.h" +#include "spark/utils/bts_no_copy.h" namespace bts { namespace expression { diff --git a/src/lib/config/ConfigQuerier.cpp b/src/lib_spark/spark/config/ConfigQuerier.cpp similarity index 92% rename from src/lib/config/ConfigQuerier.cpp rename to src/lib_spark/spark/config/ConfigQuerier.cpp index 51d67a544..90d846c32 100644 --- a/src/lib/config/ConfigQuerier.cpp +++ b/src/lib_spark/spark/config/ConfigQuerier.cpp @@ -1,11 +1,11 @@ #include "ConfigQuerier.h" #include "config.h" -#include "lib/collections/Contains.h" -#include "lib/config/ConfigQueryErrors.h" -#include "lib/config/text_format/text_format.h" -#include "lib/core/EnumMacros.h" -#include "lib/utils/TimeStamp.h" -#include "lib/utils/bts_export.h" +#include "spark/collections/Contains.h" +#include "spark/config/ConfigQueryErrors.h" +#include "spark/config/text_format/text_format.h" +#include "spark/core/EnumMacros.h" +#include "spark/utils/TimeStamp.h" +#include "spark/utils/bts_export.h" #include #include diff --git a/src/lib/config/ConfigQuerier.h b/src/lib_spark/spark/config/ConfigQuerier.h similarity index 89% rename from src/lib/config/ConfigQuerier.h rename to src/lib_spark/spark/config/ConfigQuerier.h index a2dbaaa07..c910e4256 100644 --- a/src/lib/config/ConfigQuerier.h +++ b/src/lib_spark/spark/config/ConfigQuerier.h @@ -1,5 +1,5 @@ #pragma once -#include "lib/utils/bts_export.h" +#include "spark/utils/bts_export.h" #include #include diff --git a/src/lib/config/ConfigQueryErrors.h b/src/lib_spark/spark/config/ConfigQueryErrors.h similarity index 83% rename from src/lib/config/ConfigQueryErrors.h rename to src/lib_spark/spark/config/ConfigQueryErrors.h index 5d0c980f0..12cba1db9 100644 --- a/src/lib/config/ConfigQueryErrors.h +++ b/src/lib_spark/spark/config/ConfigQueryErrors.h @@ -1,5 +1,5 @@ #pragma once -#include "lib/core/EnumMacros.h" +#include "spark/core/EnumMacros.h" namespace bts::config { diff --git a/src/lib/config/ConfigValueQueue.cpp b/src/lib_spark/spark/config/ConfigValueQueue.cpp similarity index 99% rename from src/lib/config/ConfigValueQueue.cpp rename to src/lib_spark/spark/config/ConfigValueQueue.cpp index 2d40f9f98..b6d01acaa 100644 --- a/src/lib/config/ConfigValueQueue.cpp +++ b/src/lib_spark/spark/config/ConfigValueQueue.cpp @@ -3,7 +3,7 @@ #include "ConfigurationException.h" #include "config.h" -#include "lib/utils/proto_helper.h" +#include "spark/utils/proto_helper.h" #include #include diff --git a/src/lib/config/ConfigValueQueue.h b/src/lib_spark/spark/config/ConfigValueQueue.h similarity index 95% rename from src/lib/config/ConfigValueQueue.h rename to src/lib_spark/spark/config/ConfigValueQueue.h index 48809437f..89447649a 100644 --- a/src/lib/config/ConfigValueQueue.h +++ b/src/lib_spark/spark/config/ConfigValueQueue.h @@ -1,8 +1,8 @@ #pragma once -#include "lib/expression/IPropertyEvaluator.h" -#include "lib/expression/Value.h" -#include "lib/utils/bts_no_copy.h" +#include "spark/expression/IPropertyEvaluator.h" +#include "spark/expression/Value.h" +#include "spark/utils/bts_no_copy.h" #include "text_format/text_format.h" #include diff --git a/src/lib/config/ConfigurationException.cpp b/src/lib_spark/spark/config/ConfigurationException.cpp similarity index 100% rename from src/lib/config/ConfigurationException.cpp rename to src/lib_spark/spark/config/ConfigurationException.cpp diff --git a/src/lib/config/ConfigurationException.h b/src/lib_spark/spark/config/ConfigurationException.h similarity index 98% rename from src/lib/config/ConfigurationException.h rename to src/lib_spark/spark/config/ConfigurationException.h index d5477ffe8..6d951039a 100644 --- a/src/lib/config/ConfigurationException.h +++ b/src/lib_spark/spark/config/ConfigurationException.h @@ -1,7 +1,7 @@ #ifndef BADCONFIGURATIONEXCEPTION_H_ #define BADCONFIGURATIONEXCEPTION_H_ -#include "lib/utils/bts_export.h" +#include "spark/utils/bts_export.h" #include #include #include diff --git a/src/lib/config/ConfigurationState.cpp b/src/lib_spark/spark/config/ConfigurationState.cpp similarity index 98% rename from src/lib/config/ConfigurationState.cpp rename to src/lib_spark/spark/config/ConfigurationState.cpp index 448211641..b96a92f27 100644 --- a/src/lib/config/ConfigurationState.cpp +++ b/src/lib_spark/spark/config/ConfigurationState.cpp @@ -6,16 +6,16 @@ #include "ConfigurationException.h" #include "PreprocessInputStream.h" #include "config.h" -#include "lib/collections/Contains.h" -#include "lib/core/FMT.h" -#include "lib/io/ProtoPrinter.h" -#include "lib/os/os.h" -#include "lib/utils/bts_array_size.h" -#include "lib/utils/bts_assert.h" -#include "lib/utils/defer.h" -#include "lib/utils/is_unittest_environment.h" +#include "spark/collections/Contains.h" +#include "spark/core/FMT.h" +#include "spark/io/ProtoPrinter.h" +#include "spark/os/os.h" +#include "spark/utils/bts_array_size.h" +#include "spark/utils/bts_assert.h" +#include "spark/utils/defer.h" +#include "spark/utils/is_unittest_environment.h" -#include "lib/config/protos/system_config.pb.h" +#include "spark/config/protos/system_config.pb.h" #include #include // iequals @@ -33,8 +33,8 @@ #define URDL_DISALE_SSL 1 #include -#include "lib/config_defaults.h" -#include "lib/config_proto_files.h" +#include "spark/protobufs/config_defaults.h" +#include "spark/protobufs/config_proto_files.h" #ifdef _WIN32 #include @@ -46,7 +46,7 @@ #include #endif -#include "lib/os/os.h" +#include "spark/os/os.h" using namespace std; @@ -59,7 +59,7 @@ namespace internal { logger.enqueue(level, __FILE__, __LINE__, __VA_ARGS__) using bts::io::ProtoPrinter; -using bts::libspark::protobufs::config_proto_files; +using spark::protobufs::config_proto_files; const char *MESSAGE_STRING_RULE = "rule"; const char *MESSAGE_STRING_VALUE = "value"; @@ -513,7 +513,7 @@ void ConfigurationState::add_message_types( // on linux the linker might throw away config protos that // are not used in sparkd. On windows we build a dll so that // should not happen - throw InvalidDescriptorException(proto_files_[x].c_str()); + throw InvalidDescriptorException(config_proto_files[x]); #endif } } diff --git a/src/lib/config/ConfigurationState.h b/src/lib_spark/spark/config/ConfigurationState.h similarity index 98% rename from src/lib/config/ConfigurationState.h rename to src/lib_spark/spark/config/ConfigurationState.h index e701c35cc..b8ad94e48 100644 --- a/src/lib/config/ConfigurationState.h +++ b/src/lib_spark/spark/config/ConfigurationState.h @@ -5,8 +5,8 @@ #include "ConfigDownloader.h" #include "ConfigLog.h" #include "ConfigurationException.h" -#include "lib/expression/ExpressionEvaluator.h" -#include "lib/expression/Value.h" +#include "spark/expression/ExpressionEvaluator.h" +#include "spark/expression/Value.h" #include "text_format/text_format.h" #include diff --git a/src/lib/config/PreprocessInputStream.cpp b/src/lib_spark/spark/config/PreprocessInputStream.cpp similarity index 100% rename from src/lib/config/PreprocessInputStream.cpp rename to src/lib_spark/spark/config/PreprocessInputStream.cpp diff --git a/src/lib/config/PreprocessInputStream.h b/src/lib_spark/spark/config/PreprocessInputStream.h similarity index 95% rename from src/lib/config/PreprocessInputStream.h rename to src/lib_spark/spark/config/PreprocessInputStream.h index 4115f3f3f..4e3f66392 100644 --- a/src/lib/config/PreprocessInputStream.h +++ b/src/lib_spark/spark/config/PreprocessInputStream.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/utils/bts_no_copy.h" +#include "spark/utils/bts_no_copy.h" #include #include diff --git a/src/lib/config/config.cpp b/src/lib_spark/spark/config/config.cpp similarity index 98% rename from src/lib/config/config.cpp rename to src/lib_spark/spark/config/config.cpp index e107b8474..b03e5fde7 100644 --- a/src/lib/config/config.cpp +++ b/src/lib_spark/spark/config/config.cpp @@ -4,7 +4,7 @@ #include "config.h" #include "../os/os.h" #include "ConfigurationState.h" -#include "lib/collections/Contains.h" +#include "spark/collections/Contains.h" #include #include diff --git a/src/lib/config/config.h b/src/lib_spark/spark/config/config.h similarity index 97% rename from src/lib/config/config.h rename to src/lib_spark/spark/config/config.h index 77934b0eb..c55434140 100644 --- a/src/lib/config/config.h +++ b/src/lib_spark/spark/config/config.h @@ -1,8 +1,8 @@ #ifndef BTS_CONFIG_H_ #define BTS_CONFIG_H_ -#include "lib/utils/bts_export.h" -#include "lib/utils/checked_cast.h" +#include "spark/utils/bts_export.h" +#include "spark/utils/checked_cast.h" #include #include diff --git a/src/lib/config/extensions/extensions.proto b/src/lib_spark/spark/config/extensions/extensions.proto similarity index 100% rename from src/lib/config/extensions/extensions.proto rename to src/lib_spark/spark/config/extensions/extensions.proto diff --git a/src/lib/config/invalid/invalid.proto b/src/lib_spark/spark/config/invalid/invalid.proto similarity index 100% rename from src/lib/config/invalid/invalid.proto rename to src/lib_spark/spark/config/invalid/invalid.proto diff --git a/src/lib/config/profiles/README.md b/src/lib_spark/spark/config/profiles/README.md similarity index 100% rename from src/lib/config/profiles/README.md rename to src/lib_spark/spark/config/profiles/README.md diff --git a/src/lib/config/profiles/data_stream/data_stream_config.conf b/src/lib_spark/spark/config/profiles/data_stream/data_stream_config.conf similarity index 100% rename from src/lib/config/profiles/data_stream/data_stream_config.conf rename to src/lib_spark/spark/config/profiles/data_stream/data_stream_config.conf diff --git a/src/lib/config/profiles/default/SecurityMetadataCollection.conf b/src/lib_spark/spark/config/profiles/default/SecurityMetadataCollection.conf similarity index 100% rename from src/lib/config/profiles/default/SecurityMetadataCollection.conf rename to src/lib_spark/spark/config/profiles/default/SecurityMetadataCollection.conf diff --git a/src/lib/config/profiles/default/cme_reference_data.conf b/src/lib_spark/spark/config/profiles/default/cme_reference_data.conf similarity index 100% rename from src/lib/config/profiles/default/cme_reference_data.conf rename to src/lib_spark/spark/config/profiles/default/cme_reference_data.conf diff --git a/src/lib/config/profiles/default/deployment_type.conf b/src/lib_spark/spark/config/profiles/default/deployment_type.conf similarity index 100% rename from src/lib/config/profiles/default/deployment_type.conf rename to src/lib_spark/spark/config/profiles/default/deployment_type.conf diff --git a/src/lib/config/profiles/default/exchange_sim_cfg.conf b/src/lib_spark/spark/config/profiles/default/exchange_sim_cfg.conf similarity index 100% rename from src/lib/config/profiles/default/exchange_sim_cfg.conf rename to src/lib_spark/spark/config/profiles/default/exchange_sim_cfg.conf diff --git a/src/lib/config/profiles/default/jetfix.conf b/src/lib_spark/spark/config/profiles/default/jetfix.conf similarity index 100% rename from src/lib/config/profiles/default/jetfix.conf rename to src/lib_spark/spark/config/profiles/default/jetfix.conf diff --git a/src/lib/config/profiles/default/keycode.conf b/src/lib_spark/spark/config/profiles/default/keycode.conf similarity index 100% rename from src/lib/config/profiles/default/keycode.conf rename to src/lib_spark/spark/config/profiles/default/keycode.conf diff --git a/src/lib/config/profiles/default/logging.conf b/src/lib_spark/spark/config/profiles/default/logging.conf similarity index 100% rename from src/lib/config/profiles/default/logging.conf rename to src/lib_spark/spark/config/profiles/default/logging.conf diff --git a/src/lib/config/profiles/default/marex_fix_cfg.conf b/src/lib_spark/spark/config/profiles/default/marex_fix_cfg.conf similarity index 100% rename from src/lib/config/profiles/default/marex_fix_cfg.conf rename to src/lib_spark/spark/config/profiles/default/marex_fix_cfg.conf diff --git a/src/lib/config/profiles/default/market_data.conf b/src/lib_spark/spark/config/profiles/default/market_data.conf similarity index 100% rename from src/lib/config/profiles/default/market_data.conf rename to src/lib_spark/spark/config/profiles/default/market_data.conf diff --git a/src/lib/config/profiles/default/mercury_cfg.conf b/src/lib_spark/spark/config/profiles/default/mercury_cfg.conf similarity index 100% rename from src/lib/config/profiles/default/mercury_cfg.conf rename to src/lib_spark/spark/config/profiles/default/mercury_cfg.conf diff --git a/src/lib/config/profiles/default/okx_exe_cfg.conf b/src/lib_spark/spark/config/profiles/default/okx_exe_cfg.conf similarity index 100% rename from src/lib/config/profiles/default/okx_exe_cfg.conf rename to src/lib_spark/spark/config/profiles/default/okx_exe_cfg.conf diff --git a/src/lib/config/profiles/default/orderman_cfg.conf b/src/lib_spark/spark/config/profiles/default/orderman_cfg.conf similarity index 100% rename from src/lib/config/profiles/default/orderman_cfg.conf rename to src/lib_spark/spark/config/profiles/default/orderman_cfg.conf diff --git a/src/lib/config/profiles/default/orders_fills_cleanup.conf b/src/lib_spark/spark/config/profiles/default/orders_fills_cleanup.conf similarity index 100% rename from src/lib/config/profiles/default/orders_fills_cleanup.conf rename to src/lib_spark/spark/config/profiles/default/orders_fills_cleanup.conf diff --git a/src/lib/config/profiles/default/ports.conf b/src/lib_spark/spark/config/profiles/default/ports.conf similarity index 100% rename from src/lib/config/profiles/default/ports.conf rename to src/lib_spark/spark/config/profiles/default/ports.conf diff --git a/src/lib/config/profiles/default/position_cfg.conf b/src/lib_spark/spark/config/profiles/default/position_cfg.conf similarity index 100% rename from src/lib/config/profiles/default/position_cfg.conf rename to src/lib_spark/spark/config/profiles/default/position_cfg.conf diff --git a/src/lib/config/profiles/default/quickbus_cfg.conf b/src/lib_spark/spark/config/profiles/default/quickbus_cfg.conf similarity index 100% rename from src/lib/config/profiles/default/quickbus_cfg.conf rename to src/lib_spark/spark/config/profiles/default/quickbus_cfg.conf diff --git a/src/lib/config/profiles/default/span.conf b/src/lib_spark/spark/config/profiles/default/span.conf similarity index 100% rename from src/lib/config/profiles/default/span.conf rename to src/lib_spark/spark/config/profiles/default/span.conf diff --git a/src/lib/config/profiles/default/spreader.conf b/src/lib_spark/spark/config/profiles/default/spreader.conf similarity index 100% rename from src/lib/config/profiles/default/spreader.conf rename to src/lib_spark/spark/config/profiles/default/spreader.conf diff --git a/src/lib/config/profiles/default/symbols.conf b/src/lib_spark/spark/config/profiles/default/symbols.conf similarity index 100% rename from src/lib/config/profiles/default/symbols.conf rename to src/lib_spark/spark/config/profiles/default/symbols.conf diff --git a/src/lib/config/profiles/default/taifex_reference_data.conf b/src/lib_spark/spark/config/profiles/default/taifex_reference_data.conf similarity index 100% rename from src/lib/config/profiles/default/taifex_reference_data.conf rename to src/lib_spark/spark/config/profiles/default/taifex_reference_data.conf diff --git a/src/lib/config/profiles/default/testkeys.conf b/src/lib_spark/spark/config/profiles/default/testkeys.conf similarity index 100% rename from src/lib/config/profiles/default/testkeys.conf rename to src/lib_spark/spark/config/profiles/default/testkeys.conf diff --git a/src/lib/config/profiles/default/threads.conf b/src/lib_spark/spark/config/profiles/default/threads.conf similarity index 100% rename from src/lib/config/profiles/default/threads.conf rename to src/lib_spark/spark/config/profiles/default/threads.conf diff --git a/src/lib/config/profiles/default/toggles.conf b/src/lib_spark/spark/config/profiles/default/toggles.conf similarity index 100% rename from src/lib/config/profiles/default/toggles.conf rename to src/lib_spark/spark/config/profiles/default/toggles.conf diff --git a/src/lib/config/profiles/default/ui.conf b/src/lib_spark/spark/config/profiles/default/ui.conf similarity index 100% rename from src/lib/config/profiles/default/ui.conf rename to src/lib_spark/spark/config/profiles/default/ui.conf diff --git a/src/lib/config/profiles/md_dev/market_data_config.conf b/src/lib_spark/spark/config/profiles/md_dev/market_data_config.conf similarity index 100% rename from src/lib/config/profiles/md_dev/market_data_config.conf rename to src/lib_spark/spark/config/profiles/md_dev/market_data_config.conf diff --git a/src/lib/config/profiles/md_prod/market_data_config.conf b/src/lib_spark/spark/config/profiles/md_prod/market_data_config.conf similarity index 100% rename from src/lib/config/profiles/md_prod/market_data_config.conf rename to src/lib_spark/spark/config/profiles/md_prod/market_data_config.conf diff --git a/src/lib/config/protos/algo_types.proto b/src/lib_spark/spark/config/protos/algo_types.proto similarity index 100% rename from src/lib/config/protos/algo_types.proto rename to src/lib_spark/spark/config/protos/algo_types.proto diff --git a/src/lib/config/protos/cme_reference_data.proto b/src/lib_spark/spark/config/protos/cme_reference_data.proto similarity index 82% rename from src/lib/config/protos/cme_reference_data.proto rename to src/lib_spark/spark/config/protos/cme_reference_data.proto index f33d6ed93..ed0ab930a 100644 --- a/src/lib/config/protos/cme_reference_data.proto +++ b/src/lib_spark/spark/config/protos/cme_reference_data.proto @@ -1,6 +1,6 @@ syntax = "proto3"; -import "lib/domain_model/Security.proto"; +import "spark/domain_model/Security.proto"; package bts.config; diff --git a/src/lib/config/protos/data_stream_config.proto b/src/lib_spark/spark/config/protos/data_stream_config.proto similarity index 100% rename from src/lib/config/protos/data_stream_config.proto rename to src/lib_spark/spark/config/protos/data_stream_config.proto diff --git a/src/lib/config/protos/deployment_type.proto b/src/lib_spark/spark/config/protos/deployment_type.proto similarity index 100% rename from src/lib/config/protos/deployment_type.proto rename to src/lib_spark/spark/config/protos/deployment_type.proto diff --git a/src/lib/config/protos/exchange_sim_cfg.proto b/src/lib_spark/spark/config/protos/exchange_sim_cfg.proto similarity index 100% rename from src/lib/config/protos/exchange_sim_cfg.proto rename to src/lib_spark/spark/config/protos/exchange_sim_cfg.proto diff --git a/src/lib/config/protos/jetfix.proto b/src/lib_spark/spark/config/protos/jetfix.proto similarity index 98% rename from src/lib/config/protos/jetfix.proto rename to src/lib_spark/spark/config/protos/jetfix.proto index 46e8083da..3db2acdae 100644 --- a/src/lib/config/protos/jetfix.proto +++ b/src/lib_spark/spark/config/protos/jetfix.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package bts.config; -import "lib/domain_model/Security.proto"; +import "spark/domain_model/Security.proto"; message JetFIX { message Connection { diff --git a/src/lib/config/protos/keycode.proto b/src/lib_spark/spark/config/protos/keycode.proto similarity index 100% rename from src/lib/config/protos/keycode.proto rename to src/lib_spark/spark/config/protos/keycode.proto diff --git a/src/lib/config/protos/logging.proto b/src/lib_spark/spark/config/protos/logging.proto similarity index 100% rename from src/lib/config/protos/logging.proto rename to src/lib_spark/spark/config/protos/logging.proto diff --git a/src/lib/config/protos/marex_fix_cfg.proto b/src/lib_spark/spark/config/protos/marex_fix_cfg.proto similarity index 100% rename from src/lib/config/protos/marex_fix_cfg.proto rename to src/lib_spark/spark/config/protos/marex_fix_cfg.proto diff --git a/src/lib/config/protos/market_data.proto b/src/lib_spark/spark/config/protos/market_data.proto similarity index 100% rename from src/lib/config/protos/market_data.proto rename to src/lib_spark/spark/config/protos/market_data.proto diff --git a/src/lib/config/protos/mercury_cfg.proto b/src/lib_spark/spark/config/protos/mercury_cfg.proto similarity index 100% rename from src/lib/config/protos/mercury_cfg.proto rename to src/lib_spark/spark/config/protos/mercury_cfg.proto diff --git a/src/lib/config/protos/okx_exe_cfg.proto b/src/lib_spark/spark/config/protos/okx_exe_cfg.proto similarity index 100% rename from src/lib/config/protos/okx_exe_cfg.proto rename to src/lib_spark/spark/config/protos/okx_exe_cfg.proto diff --git a/src/lib/config/protos/orderman_cfg.proto b/src/lib_spark/spark/config/protos/orderman_cfg.proto similarity index 100% rename from src/lib/config/protos/orderman_cfg.proto rename to src/lib_spark/spark/config/protos/orderman_cfg.proto diff --git a/src/lib/config/protos/orders_fills_cleanup.proto b/src/lib_spark/spark/config/protos/orders_fills_cleanup.proto similarity index 100% rename from src/lib/config/protos/orders_fills_cleanup.proto rename to src/lib_spark/spark/config/protos/orders_fills_cleanup.proto diff --git a/src/lib/config/protos/perflog_cfg.proto b/src/lib_spark/spark/config/protos/perflog_cfg.proto similarity index 100% rename from src/lib/config/protos/perflog_cfg.proto rename to src/lib_spark/spark/config/protos/perflog_cfg.proto diff --git a/src/lib/config/protos/ports.proto b/src/lib_spark/spark/config/protos/ports.proto similarity index 100% rename from src/lib/config/protos/ports.proto rename to src/lib_spark/spark/config/protos/ports.proto diff --git a/src/lib/config/protos/position_cfg.proto b/src/lib_spark/spark/config/protos/position_cfg.proto similarity index 95% rename from src/lib/config/protos/position_cfg.proto rename to src/lib_spark/spark/config/protos/position_cfg.proto index 3d2c4513b..149241ebe 100644 --- a/src/lib/config/protos/position_cfg.proto +++ b/src/lib_spark/spark/config/protos/position_cfg.proto @@ -1,6 +1,6 @@ syntax = "proto3"; -import "lib/domain_model/Security.proto"; +import "spark/domain_model/Security.proto"; package bts.config; diff --git a/src/lib/config/protos/quickbus_cfg.proto b/src/lib_spark/spark/config/protos/quickbus_cfg.proto similarity index 100% rename from src/lib/config/protos/quickbus_cfg.proto rename to src/lib_spark/spark/config/protos/quickbus_cfg.proto diff --git a/src/lib/config/protos/span.proto b/src/lib_spark/spark/config/protos/span.proto similarity index 100% rename from src/lib/config/protos/span.proto rename to src/lib_spark/spark/config/protos/span.proto diff --git a/src/lib/config/protos/spartan.proto b/src/lib_spark/spark/config/protos/spartan.proto similarity index 100% rename from src/lib/config/protos/spartan.proto rename to src/lib_spark/spark/config/protos/spartan.proto diff --git a/src/lib/config/protos/spreader.proto b/src/lib_spark/spark/config/protos/spreader.proto similarity index 100% rename from src/lib/config/protos/spreader.proto rename to src/lib_spark/spark/config/protos/spreader.proto diff --git a/src/lib/config/protos/subprocess.proto b/src/lib_spark/spark/config/protos/subprocess.proto similarity index 100% rename from src/lib/config/protos/subprocess.proto rename to src/lib_spark/spark/config/protos/subprocess.proto diff --git a/src/lib/config/protos/symbols.proto b/src/lib_spark/spark/config/protos/symbols.proto similarity index 100% rename from src/lib/config/protos/symbols.proto rename to src/lib_spark/spark/config/protos/symbols.proto diff --git a/src/lib/config/protos/system_config.proto b/src/lib_spark/spark/config/protos/system_config.proto similarity index 100% rename from src/lib/config/protos/system_config.proto rename to src/lib_spark/spark/config/protos/system_config.proto diff --git a/src/lib/config/protos/taifex_reference_data.proto b/src/lib_spark/spark/config/protos/taifex_reference_data.proto similarity index 76% rename from src/lib/config/protos/taifex_reference_data.proto rename to src/lib_spark/spark/config/protos/taifex_reference_data.proto index 669aedb99..0163d163c 100644 --- a/src/lib/config/protos/taifex_reference_data.proto +++ b/src/lib_spark/spark/config/protos/taifex_reference_data.proto @@ -1,6 +1,6 @@ syntax = "proto3"; -import "lib/domain_model/Security.proto"; +import "spark/domain_model/Security.proto"; package bts.config; diff --git a/src/lib/config/protos/testkeys.proto b/src/lib_spark/spark/config/protos/testkeys.proto similarity index 96% rename from src/lib/config/protos/testkeys.proto rename to src/lib_spark/spark/config/protos/testkeys.proto index ca860a98d..5ac129016 100755 --- a/src/lib/config/protos/testkeys.proto +++ b/src/lib_spark/spark/config/protos/testkeys.proto @@ -1,6 +1,6 @@ syntax = "proto3"; -import "lib/config/extensions/extensions.proto"; +import "spark/config/extensions/extensions.proto"; package bts.config.test; diff --git a/src/lib/config/protos/threads.proto b/src/lib_spark/spark/config/protos/threads.proto similarity index 100% rename from src/lib/config/protos/threads.proto rename to src/lib_spark/spark/config/protos/threads.proto diff --git a/src/lib/config/protos/toggles.proto b/src/lib_spark/spark/config/protos/toggles.proto similarity index 93% rename from src/lib/config/protos/toggles.proto rename to src/lib_spark/spark/config/protos/toggles.proto index 6c65fce43..d5994e28a 100644 --- a/src/lib/config/protos/toggles.proto +++ b/src/lib_spark/spark/config/protos/toggles.proto @@ -6,7 +6,7 @@ syntax = "proto3"; -import "lib/domain_model/Security.proto"; +import "spark/domain_model/Security.proto"; package bts.config.toggles; diff --git a/src/lib/config/protos/ui.proto b/src/lib_spark/spark/config/protos/ui.proto similarity index 100% rename from src/lib/config/protos/ui.proto rename to src/lib_spark/spark/config/protos/ui.proto diff --git a/src/lib/config/tests/HTTPServer.cpp b/src/lib_spark/spark/config/tests/HTTPServer.cpp similarity index 98% rename from src/lib/config/tests/HTTPServer.cpp rename to src/lib_spark/spark/config/tests/HTTPServer.cpp index 8bf0cf743..651bddfa5 100644 --- a/src/lib/config/tests/HTTPServer.cpp +++ b/src/lib_spark/spark/config/tests/HTTPServer.cpp @@ -1,6 +1,6 @@ #include "HTTPServer.h" -#include "lib/utils/bts_assert.h" +#include "spark/utils/bts_assert.h" using boost::asio::ip::tcp; diff --git a/src/lib/config/tests/HTTPServer.h b/src/lib_spark/spark/config/tests/HTTPServer.h similarity index 100% rename from src/lib/config/tests/HTTPServer.h rename to src/lib_spark/spark/config/tests/HTTPServer.h diff --git a/src/lib/config/tests/config_ref_tests.cpp b/src/lib_spark/spark/config/tests/config_ref_tests.cpp similarity index 99% rename from src/lib/config/tests/config_ref_tests.cpp rename to src/lib_spark/spark/config/tests/config_ref_tests.cpp index be6e9d6fb..9efc73b77 100644 --- a/src/lib/config/tests/config_ref_tests.cpp +++ b/src/lib_spark/spark/config/tests/config_ref_tests.cpp @@ -1,12 +1,12 @@ -#include "lib/utils/TempDir.h" -#include "lib/utils/TempFile.h" +#include "spark/utils/TempDir.h" +#include "spark/utils/TempFile.h" #include "../ConfigurationException.h" #include "../ConfigurationState.h" #include "../config.h" -#include "lib/config/invalid/invalid.pb.h" -#include "lib/config/protos/testkeys.pb.h" -#include "lib/expression/ParserExceptions.h" +#include "spark/config/invalid/invalid.pb.h" +#include "spark/config/protos/testkeys.pb.h" +#include "spark/expression/ParserExceptions.h" #include "HTTPServer.h" diff --git a/src/lib/config/tests/config_tests.cpp b/src/lib_spark/spark/config/tests/config_tests.cpp similarity index 98% rename from src/lib/config/tests/config_tests.cpp rename to src/lib_spark/spark/config/tests/config_tests.cpp index 59e25ee58..08274e9e5 100644 --- a/src/lib/config/tests/config_tests.cpp +++ b/src/lib_spark/spark/config/tests/config_tests.cpp @@ -1,17 +1,17 @@ -#include "lib/utils/TempFile.h" +#include "spark/utils/TempFile.h" #include "../ConfigurationException.h" #include "../ConfigurationState.h" #include "../config.h" -#include "lib/expression/ParserExceptions.h" -#include "lib/utils/bts_assert.h" -#include "lib/utils/is_unittest_environment.h" +#include "spark/expression/ParserExceptions.h" +#include "spark/utils/bts_assert.h" +#include "spark/utils/is_unittest_environment.h" #include "HTTPServer.h" -#include "lib/config/invalid/invalid.pb.h" -#include "lib/config/protos/system_config.pb.h" -#include "lib/config/protos/testkeys.pb.h" +#include "spark/config/invalid/invalid.pb.h" +#include "spark/config/protos/system_config.pb.h" +#include "spark/config/protos/testkeys.pb.h" #include #include diff --git a/src/lib/config/text_format/strutil.h b/src/lib_spark/spark/config/text_format/strutil.h similarity index 100% rename from src/lib/config/text_format/strutil.h rename to src/lib_spark/spark/config/text_format/strutil.h diff --git a/src/lib/config/text_format/text_format.cpp b/src/lib_spark/spark/config/text_format/text_format.cpp similarity index 100% rename from src/lib/config/text_format/text_format.cpp rename to src/lib_spark/spark/config/text_format/text_format.cpp diff --git a/src/lib/config/text_format/text_format.h b/src/lib_spark/spark/config/text_format/text_format.h similarity index 100% rename from src/lib/config/text_format/text_format.h rename to src/lib_spark/spark/config/text_format/text_format.h diff --git a/src/lib/core/AllSameType.h b/src/lib_spark/spark/core/AllSameType.h similarity index 100% rename from src/lib/core/AllSameType.h rename to src/lib_spark/spark/core/AllSameType.h diff --git a/src/lib/core/BoolName.h b/src/lib_spark/spark/core/BoolName.h similarity index 100% rename from src/lib/core/BoolName.h rename to src/lib_spark/spark/core/BoolName.h diff --git a/src/lib/core/EnumMacros.h b/src/lib_spark/spark/core/EnumMacros.h similarity index 100% rename from src/lib/core/EnumMacros.h rename to src/lib_spark/spark/core/EnumMacros.h diff --git a/src/lib/core/FMT.h b/src/lib_spark/spark/core/FMT.h similarity index 100% rename from src/lib/core/FMT.h rename to src/lib_spark/spark/core/FMT.h diff --git a/src/lib/core/FMT_IMPL.h b/src/lib_spark/spark/core/FMT_IMPL.h similarity index 100% rename from src/lib/core/FMT_IMPL.h rename to src/lib_spark/spark/core/FMT_IMPL.h diff --git a/src/lib/core/HashPhaser.h b/src/lib_spark/spark/core/HashPhaser.h similarity index 100% rename from src/lib/core/HashPhaser.h rename to src/lib_spark/spark/core/HashPhaser.h diff --git a/src/lib/core/LOCK_GUARD.h b/src/lib_spark/spark/core/LOCK_GUARD.h similarity index 100% rename from src/lib/core/LOCK_GUARD.h rename to src/lib_spark/spark/core/LOCK_GUARD.h diff --git a/src/lib/core/NaN.h b/src/lib_spark/spark/core/NaN.h similarity index 100% rename from src/lib/core/NaN.h rename to src/lib_spark/spark/core/NaN.h diff --git a/src/lib/core/StringContains.h b/src/lib_spark/spark/core/StringContains.h similarity index 100% rename from src/lib/core/StringContains.h rename to src/lib_spark/spark/core/StringContains.h diff --git a/src/lib/core/StringFiller.h b/src/lib_spark/spark/core/StringFiller.h similarity index 100% rename from src/lib/core/StringFiller.h rename to src/lib_spark/spark/core/StringFiller.h diff --git a/src/lib/core/StringFinder.h b/src/lib_spark/spark/core/StringFinder.h similarity index 100% rename from src/lib/core/StringFinder.h rename to src/lib_spark/spark/core/StringFinder.h diff --git a/src/lib/core/StringJoiner.h b/src/lib_spark/spark/core/StringJoiner.h similarity index 100% rename from src/lib/core/StringJoiner.h rename to src/lib_spark/spark/core/StringJoiner.h diff --git a/src/lib/core/TableFormatter.h b/src/lib_spark/spark/core/TableFormatter.h similarity index 100% rename from src/lib/core/TableFormatter.h rename to src/lib_spark/spark/core/TableFormatter.h diff --git a/src/lib/core/TimeSpan.cpp b/src/lib_spark/spark/core/TimeSpan.cpp similarity index 100% rename from src/lib/core/TimeSpan.cpp rename to src/lib_spark/spark/core/TimeSpan.cpp diff --git a/src/lib/core/TimeSpan.h b/src/lib_spark/spark/core/TimeSpan.h similarity index 98% rename from src/lib/core/TimeSpan.h rename to src/lib_spark/spark/core/TimeSpan.h index 59a22e4c8..8e86de72e 100644 --- a/src/lib/core/TimeSpan.h +++ b/src/lib_spark/spark/core/TimeSpan.h @@ -1,7 +1,7 @@ #pragma once -#include "lib/core/FMT_IMPL.h" -#include "lib/utils/bts_assert.h" -#include "lib/utils/datetime.h" +#include "spark/core/FMT_IMPL.h" +#include "spark/utils/bts_assert.h" +#include "spark/utils/datetime.h" #include #include #include diff --git a/src/lib/core/TimeStamp.cpp b/src/lib_spark/spark/core/TimeStamp.cpp similarity index 98% rename from src/lib/core/TimeStamp.cpp rename to src/lib_spark/spark/core/TimeStamp.cpp index 4437d8869..616c717bc 100644 --- a/src/lib/core/TimeStamp.cpp +++ b/src/lib_spark/spark/core/TimeStamp.cpp @@ -1,5 +1,5 @@ #include "TimeStamp.h" -#include "lib/utils/datetime.h" +#include "spark/utils/datetime.h" #include #include diff --git a/src/lib/core/TimeStamp.h b/src/lib_spark/spark/core/TimeStamp.h similarity index 98% rename from src/lib/core/TimeStamp.h rename to src/lib_spark/spark/core/TimeStamp.h index b06780259..fcd1ed799 100644 --- a/src/lib/core/TimeStamp.h +++ b/src/lib_spark/spark/core/TimeStamp.h @@ -1,8 +1,8 @@ #pragma once -#include "lib/core/FMT_IMPL.h" -#include "lib/core/TimeSpan.h" -#include "lib/utils/bts_assert.h" -#include "lib/utils/datetime.h" +#include "spark/core/FMT_IMPL.h" +#include "spark/core/TimeSpan.h" +#include "spark/utils/bts_assert.h" +#include "spark/utils/datetime.h" #include #include diff --git a/src/lib/core/ValueWrapper.h b/src/lib_spark/spark/core/ValueWrapper.h similarity index 80% rename from src/lib/core/ValueWrapper.h rename to src/lib_spark/spark/core/ValueWrapper.h index ef776972b..243f17e5e 100644 --- a/src/lib/core/ValueWrapper.h +++ b/src/lib_spark/spark/core/ValueWrapper.h @@ -1,5 +1,5 @@ #pragma once -#include "lib/utils/ValueWrapper.h" +#include "spark/utils/ValueWrapper.h" namespace bts::core { diff --git a/src/lib/core/VectorAdapter.h b/src/lib_spark/spark/core/VectorAdapter.h similarity index 100% rename from src/lib/core/VectorAdapter.h rename to src/lib_spark/spark/core/VectorAdapter.h diff --git a/src/lib/core/start_stop_state_machine.cpp b/src/lib_spark/spark/core/start_stop_state_machine.cpp similarity index 95% rename from src/lib/core/start_stop_state_machine.cpp rename to src/lib_spark/spark/core/start_stop_state_machine.cpp index fee026a59..2ff23711f 100644 --- a/src/lib/core/start_stop_state_machine.cpp +++ b/src/lib_spark/spark/core/start_stop_state_machine.cpp @@ -1,10 +1,10 @@ #include "start_stop_state_machine.h" -#include "lib/io/json_formatter.h" -#include "lib/logging/Common.h" -#include "lib/logging/logging.h" -#include "lib/logging/trace_log_var.h" -#include "lib/utils/bts_assert.h" -#include "lib/utils/bts_lock_guard.h" +#include "spark/io/json_formatter.h" +#include "spark/logging/Common.h" +#include "spark/logging/logging.h" +#include "spark/logging/trace_log_var.h" +#include "spark/utils/bts_assert.h" +#include "spark/utils/bts_lock_guard.h" namespace bts::core { diff --git a/src/lib/core/start_stop_state_machine.h b/src/lib_spark/spark/core/start_stop_state_machine.h similarity index 97% rename from src/lib/core/start_stop_state_machine.h rename to src/lib_spark/spark/core/start_stop_state_machine.h index f1a9a8d1c..4b29a2c92 100644 --- a/src/lib/core/start_stop_state_machine.h +++ b/src/lib_spark/spark/core/start_stop_state_machine.h @@ -1,7 +1,7 @@ #pragma once -#include "lib/logging/Common.h" -#include "lib/utils/Delegate.h" +#include "spark/logging/Common.h" +#include "spark/utils/Delegate.h" #include #include diff --git a/src/lib/datastreams/Tables/StreamData.h b/src/lib_spark/spark/datastreams/Tables/StreamData.h similarity index 99% rename from src/lib/datastreams/Tables/StreamData.h rename to src/lib_spark/spark/datastreams/Tables/StreamData.h index 385a60e69..829d4c574 100644 --- a/src/lib/datastreams/Tables/StreamData.h +++ b/src/lib_spark/spark/datastreams/Tables/StreamData.h @@ -1,4 +1,4 @@ -#include "lib/utils/bts_assert.h" +#include "spark/utils/bts_assert.h" #include #include #include diff --git a/src/lib/datastreams/Tables/tests/stream_tests.cpp b/src/lib_spark/spark/datastreams/Tables/tests/stream_tests.cpp similarity index 93% rename from src/lib/datastreams/Tables/tests/stream_tests.cpp rename to src/lib_spark/spark/datastreams/Tables/tests/stream_tests.cpp index b8f675cb4..54bde560a 100644 --- a/src/lib/datastreams/Tables/tests/stream_tests.cpp +++ b/src/lib_spark/spark/datastreams/Tables/tests/stream_tests.cpp @@ -1,10 +1,9 @@ - -#include "lib/api/service_helpers/AdminServiceUtils.h" -#include "lib/api/services/AdminService.server.pb.h" -#include "lib/config/config.h" -#include "lib/datastreams/Tables/StreamData.h" -#include "lib/utils/bts_chrono.h" -#include "lib/utils/helper_macros.h" +#include "spark/api/service_helpers/AdminServiceUtils.h" +#include "spark/api/services/AdminService.server.pb.h" +#include "spark/config/config.h" +#include "spark/datastreams/Tables/StreamData.h" +#include "spark/utils/bts_chrono.h" +#include "spark/utils/helper_macros.h" #include #include diff --git a/src/lib/domain/AccountID.h b/src/lib_spark/spark/domain/AccountID.h similarity index 80% rename from src/lib/domain/AccountID.h rename to src/lib_spark/spark/domain/AccountID.h index b5d412a77..6fd2920c3 100644 --- a/src/lib/domain/AccountID.h +++ b/src/lib_spark/spark/domain/AccountID.h @@ -1,5 +1,5 @@ #pragma once -#include "lib/utils/ValueWrapper.h" +#include "spark/utils/ValueWrapper.h" #include namespace bts::domain { diff --git a/src/lib/domain/AggressorSide.h b/src/lib_spark/spark/domain/AggressorSide.h similarity index 89% rename from src/lib/domain/AggressorSide.h rename to src/lib_spark/spark/domain/AggressorSide.h index 377144d6c..2705ba142 100644 --- a/src/lib/domain/AggressorSide.h +++ b/src/lib_spark/spark/domain/AggressorSide.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/core/EnumMacros.h" -#include "lib/core/FMT_IMPL.h" +#include "spark/core/EnumMacros.h" +#include "spark/core/FMT_IMPL.h" #include #include #include diff --git a/src/lib/domain/BUY_SELL.h b/src/lib_spark/spark/domain/BUY_SELL.h similarity index 73% rename from src/lib/domain/BUY_SELL.h rename to src/lib_spark/spark/domain/BUY_SELL.h index afd016896..6e7f77469 100644 --- a/src/lib/domain/BUY_SELL.h +++ b/src/lib_spark/spark/domain/BUY_SELL.h @@ -1,5 +1,5 @@ #pragma once -#include "lib/domain/Side.h" +#include "spark/domain/Side.h" #define BUY bts::domain::Side::Buy #define SELL bts::domain::Side::Sell diff --git a/src/lib/domain/Book.h b/src/lib_spark/spark/domain/Book.h similarity index 97% rename from src/lib/domain/Book.h rename to src/lib_spark/spark/domain/Book.h index 537f45882..960e72661 100644 --- a/src/lib/domain/Book.h +++ b/src/lib_spark/spark/domain/Book.h @@ -1,9 +1,9 @@ #pragma once -#include "BookSide.h" -#include "SecurityID.h" -#include "Side.h" -#include "lib/io/JsonReader.h" +#include "spark/domain/BookSide.h" +#include "spark/domain/SecurityID.h" +#include "spark/domain/Side.h" +#include "spark/io/JsonReader.h" #include #include diff --git a/src/lib/domain/BookLevel.h b/src/lib_spark/spark/domain/BookLevel.h similarity index 98% rename from src/lib/domain/BookLevel.h rename to src/lib_spark/spark/domain/BookLevel.h index 8ff934a79..50beb2c99 100644 --- a/src/lib/domain/BookLevel.h +++ b/src/lib_spark/spark/domain/BookLevel.h @@ -1,7 +1,7 @@ #pragma once #include "Price.h" #include "Quantity.h" -#include "lib/io/JsonReader.h" +#include "spark/io/JsonReader.h" #include #include diff --git a/src/lib/domain/BookLevelComp.h b/src/lib_spark/spark/domain/BookLevelComp.h similarity index 100% rename from src/lib/domain/BookLevelComp.h rename to src/lib_spark/spark/domain/BookLevelComp.h diff --git a/src/lib/domain/BookSide.h b/src/lib_spark/spark/domain/BookSide.h similarity index 98% rename from src/lib/domain/BookSide.h rename to src/lib_spark/spark/domain/BookSide.h index 8e582fde9..68be365c7 100644 --- a/src/lib/domain/BookSide.h +++ b/src/lib_spark/spark/domain/BookSide.h @@ -1,11 +1,11 @@ #pragma once -#include "BookLevel.h" -#include "BookLevelComp.h" -#include "BookSide_PopulatedIterator.h" -#include "PriceComp.h" -#include "Side.h" -#include "lib/io/JsonReader.h" +#include "spark/domain/BookLevel.h" +#include "spark/domain/BookLevelComp.h" +#include "spark/domain/BookSide_PopulatedIterator.h" +#include "spark/domain/PriceComp.h" +#include "spark/domain/Side.h" +#include "spark/io/JsonReader.h" #include #include diff --git a/src/lib/domain/BookSide_PopulatedIterator.h b/src/lib_spark/spark/domain/BookSide_PopulatedIterator.h similarity index 100% rename from src/lib/domain/BookSide_PopulatedIterator.h rename to src/lib_spark/spark/domain/BookSide_PopulatedIterator.h diff --git a/src/lib/domain/DomainSecurityUtils.cpp b/src/lib_spark/spark/domain/DomainSecurityUtils.cpp similarity index 96% rename from src/lib/domain/DomainSecurityUtils.cpp rename to src/lib_spark/spark/domain/DomainSecurityUtils.cpp index bc562e23a..390ea5bd2 100644 --- a/src/lib/domain/DomainSecurityUtils.cpp +++ b/src/lib_spark/spark/domain/DomainSecurityUtils.cpp @@ -1,14 +1,14 @@ #include "DomainSecurityUtils.h" -#include "FutureSecurity.h" -#include "OptionSecurity.h" -#include "SpreadSecurity.h" -#include "lib/api/domain/Venue.pb.h" -#include "lib/domain/TradeRecord.h" -#include "lib/domain_model/Security.pb.h" -#include "lib/md/IntPrice.h" -#include "lib/md/PriceSize.h" -#include "lib/md/protos/co2.pb.h" -#include "lib/utils/bts_assert.h" +#include "spark/domain/FutureSecurity.h" +#include "spark/domain/OptionSecurity.h" +#include "spark/domain/SpreadSecurity.h" +#include "spark/api/domain/Venue.pb.h" +#include "spark/domain/TradeRecord.h" +#include "spark/domain_model/Security.pb.h" +#include "spark/md/IntPrice.h" +#include "spark/md/PriceSize.h" +#include "spark/md/protos/co2.pb.h" +#include "spark/utils/bts_assert.h" namespace bts::domain { diff --git a/src/lib/domain/DomainSecurityUtils.h b/src/lib_spark/spark/domain/DomainSecurityUtils.h similarity index 84% rename from src/lib/domain/DomainSecurityUtils.h rename to src/lib_spark/spark/domain/DomainSecurityUtils.h index e4dd16607..7499ab65e 100644 --- a/src/lib/domain/DomainSecurityUtils.h +++ b/src/lib_spark/spark/domain/DomainSecurityUtils.h @@ -1,12 +1,12 @@ #pragma once -#include "FutureSecurity.h" -#include "OptionSecurity.h" -#include "SpreadSecurity.h" -#include "lib/api/domain/SecurityType.pb.h" -#include "lib/api/domain/Venue.pb.h" -#include "lib/domain/BookSide.h" -#include "lib/domain_model/Security.pb.h" +#include "spark/api/domain/SecurityType.pb.h" +#include "spark/api/domain/Venue.pb.h" +#include "spark/domain/BookSide.h" +#include "spark/domain/FutureSecurity.h" +#include "spark/domain/OptionSecurity.h" +#include "spark/domain/SpreadSecurity.h" +#include "spark/domain_model/Security.pb.h" #include diff --git a/src/lib/domain/FTXSecurity.h b/src/lib_spark/spark/domain/FTXSecurity.h similarity index 100% rename from src/lib/domain/FTXSecurity.h rename to src/lib_spark/spark/domain/FTXSecurity.h diff --git a/src/lib/domain/FutureSecurity.h b/src/lib_spark/spark/domain/FutureSecurity.h similarity index 92% rename from src/lib/domain/FutureSecurity.h rename to src/lib_spark/spark/domain/FutureSecurity.h index c89da4c95..e26ad514c 100644 --- a/src/lib/domain/FutureSecurity.h +++ b/src/lib_spark/spark/domain/FutureSecurity.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/core/TimeStamp.h" -#include "lib/io/JsonReader.h" +#include "spark/core/TimeStamp.h" +#include "spark/io/JsonReader.h" #include namespace bts::domain { diff --git a/src/lib/domain/LegDefinition.h b/src/lib_spark/spark/domain/LegDefinition.h similarity index 97% rename from src/lib/domain/LegDefinition.h rename to src/lib_spark/spark/domain/LegDefinition.h index 0037fb3b3..94d4ef40f 100644 --- a/src/lib/domain/LegDefinition.h +++ b/src/lib_spark/spark/domain/LegDefinition.h @@ -2,7 +2,7 @@ #include "Quantity.h" #include "SecurityID.h" #include "Side.h" -#include "lib/io/JsonReader.h" +#include "spark/io/JsonReader.h" #include #include diff --git a/src/lib/domain/NewBookSide.h b/src/lib_spark/spark/domain/NewBookSide.h similarity index 100% rename from src/lib/domain/NewBookSide.h rename to src/lib_spark/spark/domain/NewBookSide.h diff --git a/src/lib/domain/NewOrder.cpp b/src/lib_spark/spark/domain/NewOrder.cpp similarity index 100% rename from src/lib/domain/NewOrder.cpp rename to src/lib_spark/spark/domain/NewOrder.cpp diff --git a/src/lib/domain/NewOrder.h b/src/lib_spark/spark/domain/NewOrder.h similarity index 100% rename from src/lib/domain/NewOrder.h rename to src/lib_spark/spark/domain/NewOrder.h diff --git a/src/lib/domain/OptionSecurity.h b/src/lib_spark/spark/domain/OptionSecurity.h similarity index 88% rename from src/lib/domain/OptionSecurity.h rename to src/lib_spark/spark/domain/OptionSecurity.h index b031f6954..5477e2618 100644 --- a/src/lib/domain/OptionSecurity.h +++ b/src/lib_spark/spark/domain/OptionSecurity.h @@ -1,8 +1,8 @@ #pragma once -#include "lib/api/domain/CallPut.h" -#include "lib/core/TimeStamp.h" -#include "lib/domain/Price.h" -#include "lib/io/JsonReader.h" +#include "spark/api/domain/CallPut.h" +#include "spark/core/TimeStamp.h" +#include "spark/domain/Price.h" +#include "spark/io/JsonReader.h" #include namespace bts::domain { diff --git a/src/lib/domain/OrderDefinition.cpp b/src/lib_spark/spark/domain/OrderDefinition.cpp similarity index 100% rename from src/lib/domain/OrderDefinition.cpp rename to src/lib_spark/spark/domain/OrderDefinition.cpp diff --git a/src/lib/domain/OrderDefinition.h b/src/lib_spark/spark/domain/OrderDefinition.h similarity index 72% rename from src/lib/domain/OrderDefinition.h rename to src/lib_spark/spark/domain/OrderDefinition.h index caf3a7300..541aab2a0 100644 --- a/src/lib/domain/OrderDefinition.h +++ b/src/lib_spark/spark/domain/OrderDefinition.h @@ -1,12 +1,12 @@ #pragma once -#include "AccountID.h" -#include "SecurityID.h" -#include "Side.h" -#include "TimeInForce.h" -#include "UserID.h" -#include "lib/domain/cme/GlbxOrderDefinition.h" -#include "lib/domain/deribit/DeribitOrderDefinition.h" +#include "spark/domain/AccountID.h" +#include "spark/domain/SecurityID.h" +#include "spark/domain/Side.h" +#include "spark/domain/TimeInForce.h" +#include "spark/domain/UserID.h" +#include "spark/domain/cme/GlbxOrderDefinition.h" +#include "spark/domain/deribit/DeribitOrderDefinition.h" #include #include diff --git a/src/lib/domain/OrderKey.h b/src/lib_spark/spark/domain/OrderKey.h similarity index 80% rename from src/lib/domain/OrderKey.h rename to src/lib_spark/spark/domain/OrderKey.h index e3e7c3269..0d4a2f3e5 100644 --- a/src/lib/domain/OrderKey.h +++ b/src/lib_spark/spark/domain/OrderKey.h @@ -1,5 +1,5 @@ #pragma once -#include "lib/utils/ValueWrapper.h" +#include "spark/utils/ValueWrapper.h" #include namespace bts::domain { diff --git a/src/lib/domain/OrderState.h b/src/lib_spark/spark/domain/OrderState.h similarity index 79% rename from src/lib/domain/OrderState.h rename to src/lib_spark/spark/domain/OrderState.h index 3b2307332..866695b49 100644 --- a/src/lib/domain/OrderState.h +++ b/src/lib_spark/spark/domain/OrderState.h @@ -2,8 +2,8 @@ #include "OrderStatus.h" #include "Price.h" #include "Quantity.h" -#include "lib/domain/cme/GlbxOrderState.h" -#include "lib/domain/deribit/DeribitOrderState.h" +#include "spark/domain/cme/GlbxOrderState.h" +#include "spark/domain/deribit/DeribitOrderState.h" #include namespace bts::domain { diff --git a/src/lib/domain/OrderStatus.cpp b/src/lib_spark/spark/domain/OrderStatus.cpp similarity index 100% rename from src/lib/domain/OrderStatus.cpp rename to src/lib_spark/spark/domain/OrderStatus.cpp diff --git a/src/lib/domain/OrderStatus.h b/src/lib_spark/spark/domain/OrderStatus.h similarity index 100% rename from src/lib/domain/OrderStatus.h rename to src/lib_spark/spark/domain/OrderStatus.h diff --git a/src/lib/domain/OrderUpdate.cpp b/src/lib_spark/spark/domain/OrderUpdate.cpp similarity index 100% rename from src/lib/domain/OrderUpdate.cpp rename to src/lib_spark/spark/domain/OrderUpdate.cpp diff --git a/src/lib/domain/OrderUpdate.h b/src/lib_spark/spark/domain/OrderUpdate.h similarity index 100% rename from src/lib/domain/OrderUpdate.h rename to src/lib_spark/spark/domain/OrderUpdate.h diff --git a/src/lib/domain/Price.h b/src/lib_spark/spark/domain/Price.h similarity index 99% rename from src/lib/domain/Price.h rename to src/lib_spark/spark/domain/Price.h index c735aa855..21a48b3c9 100644 --- a/src/lib/domain/Price.h +++ b/src/lib_spark/spark/domain/Price.h @@ -1,10 +1,10 @@ #pragma once -#include "Side.h" -#include "lib/core/FMT_IMPL.h" -#include "lib/io/JsonReader.h" -#include "lib/utils/bts_array_size.h" -#include "lib/utils/bts_assert.h" +#include "spark/core/FMT_IMPL.h" +#include "spark/domain/Side.h" +#include "spark/io/JsonReader.h" +#include "spark/utils/bts_array_size.h" +#include "spark/utils/bts_assert.h" #include #include diff --git a/src/lib/domain/PriceComp.h b/src/lib_spark/spark/domain/PriceComp.h similarity index 100% rename from src/lib/domain/PriceComp.h rename to src/lib_spark/spark/domain/PriceComp.h diff --git a/src/lib/domain/Quantity.h b/src/lib_spark/spark/domain/Quantity.h similarity index 97% rename from src/lib/domain/Quantity.h rename to src/lib_spark/spark/domain/Quantity.h index b48bdcaf1..63dd6e472 100644 --- a/src/lib/domain/Quantity.h +++ b/src/lib_spark/spark/domain/Quantity.h @@ -1,9 +1,9 @@ #pragma once -#include "lib/core/FMT_IMPL.h" -#include "lib/io/JsonReader.h" -#include "lib/logging/logging.h" -#include "lib/utils/ValueWrapper.h" +#include "spark/core/FMT_IMPL.h" +#include "spark/io/JsonReader.h" +#include "spark/logging/logging.h" +#include "spark/utils/ValueWrapper.h" #include diff --git a/src/lib/domain/RFQ.h b/src/lib_spark/spark/domain/RFQ.h similarity index 100% rename from src/lib/domain/RFQ.h rename to src/lib_spark/spark/domain/RFQ.h diff --git a/src/lib/domain/Security.cpp b/src/lib_spark/spark/domain/Security.cpp similarity index 90% rename from src/lib/domain/Security.cpp rename to src/lib_spark/spark/domain/Security.cpp index 219be149b..637cd2b89 100644 --- a/src/lib/domain/Security.cpp +++ b/src/lib_spark/spark/domain/Security.cpp @@ -1,10 +1,10 @@ #include "Security.h" -#include "DomainSecurityUtils.h" -#include "lib/domain/FutureSecurity.h" -#include "lib/domain/OptionSecurity.h" -#include "lib/domain/SpotSecurity.h" -#include "lib/io/JsonDumper.h" -#include "lib/io/JsonReader.h" +#include "spark/domain/DomainSecurityUtils.h" +#include "spark/domain/FutureSecurity.h" +#include "spark/domain/OptionSecurity.h" +#include "spark/domain/SpotSecurity.h" +#include "spark/io/JsonDumper.h" +#include "spark/io/JsonReader.h" namespace bts::domain { diff --git a/src/lib/domain/Security.h b/src/lib_spark/spark/domain/Security.h similarity index 97% rename from src/lib/domain/Security.h rename to src/lib_spark/spark/domain/Security.h index 2fe982b57..4d5df25d7 100644 --- a/src/lib/domain/Security.h +++ b/src/lib_spark/spark/domain/Security.h @@ -4,9 +4,9 @@ #include "SecurityCommon.h" #include "SpotSecurity.h" #include "SpreadSecurity.h" -#include "lib/core/FMT_IMPL.h" -#include "lib/domain/SecurityID.h" -#include "lib/utils/overloaded.h" +#include "spark/core/FMT_IMPL.h" +#include "spark/domain/SecurityID.h" +#include "spark/utils/overloaded.h" #include #include diff --git a/src/lib/domain/SecurityCommon.h b/src/lib_spark/spark/domain/SecurityCommon.h similarity index 91% rename from src/lib/domain/SecurityCommon.h rename to src/lib_spark/spark/domain/SecurityCommon.h index ed52a9ce2..70a037937 100644 --- a/src/lib/domain/SecurityCommon.h +++ b/src/lib_spark/spark/domain/SecurityCommon.h @@ -1,11 +1,11 @@ #pragma once -#include "Price.h" -#include "SecurityID.h" -#include "lib/api/domain/Venue.h" -#include "lib/domain/DomainSecurityUtils.h" -#include "lib/domain_model/Security.pb.h" -#include "lib/io/JsonReader.h" -#include "lib/logging/logging.h" +#include "spark/domain/Price.h" +#include "spark/domain/SecurityID.h" +#include "spark/api/domain/Venue.h" +#include "spark/domain/DomainSecurityUtils.h" +#include "spark/domain_model/Security.pb.h" +#include "spark/io/JsonReader.h" +#include "spark/logging/logging.h" #include #include diff --git a/src/lib/domain/SecurityCriteria.cpp b/src/lib_spark/spark/domain/SecurityCriteria.cpp similarity index 94% rename from src/lib/domain/SecurityCriteria.cpp rename to src/lib_spark/spark/domain/SecurityCriteria.cpp index 74eea0d5d..4416b6c51 100644 --- a/src/lib/domain/SecurityCriteria.cpp +++ b/src/lib_spark/spark/domain/SecurityCriteria.cpp @@ -1,7 +1,7 @@ #include "SecurityCriteria.h" -#include "lib/api/domain/SecurityCriteria.pb.h" -#include "lib/core/FMT.h" -#include "lib/domain/DomainSecurityUtils.h" +#include "spark/api/domain/SecurityCriteria.pb.h" +#include "spark/core/FMT.h" +#include "spark/domain/DomainSecurityUtils.h" #include namespace bts::domain { diff --git a/src/lib/domain/SecurityCriteria.h b/src/lib_spark/spark/domain/SecurityCriteria.h similarity index 94% rename from src/lib/domain/SecurityCriteria.h rename to src/lib_spark/spark/domain/SecurityCriteria.h index ef75497b0..d48a2142e 100644 --- a/src/lib/domain/SecurityCriteria.h +++ b/src/lib_spark/spark/domain/SecurityCriteria.h @@ -1,10 +1,10 @@ #pragma once #include "SecurityID.h" -#include "lib/api/domain/Venue.pb.h" -#include "lib/domain/Security.h" -#include "lib/core/FMT_IMPL.h" -#include "lib/domain/SecurityCriteriaClause.h" -#include "lib/domain_model/Security.pb.h" +#include "spark/api/domain/Venue.pb.h" +#include "spark/domain/Security.h" +#include "spark/core/FMT_IMPL.h" +#include "spark/domain/SecurityCriteriaClause.h" +#include "spark/domain_model/Security.pb.h" #include #include diff --git a/src/lib/domain/SecurityCriteriaClause.cpp b/src/lib_spark/spark/domain/SecurityCriteriaClause.cpp similarity index 95% rename from src/lib/domain/SecurityCriteriaClause.cpp rename to src/lib_spark/spark/domain/SecurityCriteriaClause.cpp index 506eb430c..688bcd017 100644 --- a/src/lib/domain/SecurityCriteriaClause.cpp +++ b/src/lib_spark/spark/domain/SecurityCriteriaClause.cpp @@ -1,12 +1,12 @@ #include "SecurityCriteriaClause.h" -#include "lib/api/domain/SecurityCriteria.pb.h" -#include "lib/api/domain/SecurityCriteriaClause.pb.h" -#include "lib/api/domain/SecurityType.h" -#include "lib/api/domain/Venue.h" -#include "lib/collections/Contains.h" -#include "lib/core/FMT.h" -#include "lib/domain/Security.h" -#include "lib/domain_model/Security.pb.h" +#include "spark/api/domain/SecurityCriteria.pb.h" +#include "spark/api/domain/SecurityCriteriaClause.pb.h" +#include "spark/api/domain/SecurityType.h" +#include "spark/api/domain/Venue.h" +#include "spark/collections/Contains.h" +#include "spark/core/FMT.h" +#include "spark/domain/Security.h" +#include "spark/domain_model/Security.pb.h" #include #include diff --git a/src/lib/domain/SecurityCriteriaClause.h b/src/lib_spark/spark/domain/SecurityCriteriaClause.h similarity index 93% rename from src/lib/domain/SecurityCriteriaClause.h rename to src/lib_spark/spark/domain/SecurityCriteriaClause.h index 48625296c..ecb4060c5 100644 --- a/src/lib/domain/SecurityCriteriaClause.h +++ b/src/lib_spark/spark/domain/SecurityCriteriaClause.h @@ -1,8 +1,8 @@ #pragma once -#include "lib/api/domain/SecurityType.pb.h" -#include "lib/api/domain/Venue.pb.h" -#include "lib/core/FMT_IMPL.h" -#include "lib/domain/SecurityID.h" +#include "spark/api/domain/SecurityType.pb.h" +#include "spark/api/domain/Venue.pb.h" +#include "spark/core/FMT_IMPL.h" +#include "spark/domain/SecurityID.h" #include #include diff --git a/src/lib/domain/SecurityID.h b/src/lib_spark/spark/domain/SecurityID.h similarity index 90% rename from src/lib/domain/SecurityID.h rename to src/lib_spark/spark/domain/SecurityID.h index c1e0e4179..333058f46 100644 --- a/src/lib/domain/SecurityID.h +++ b/src/lib_spark/spark/domain/SecurityID.h @@ -1,7 +1,7 @@ #pragma once -#include "lib/core/FMT_IMPL.h" -#include "lib/utils/ValueWrapper.h" +#include "spark/core/FMT_IMPL.h" +#include "spark/utils/ValueWrapper.h" #include #include diff --git a/src/lib/domain/SecurityMarketDataStatistics.h b/src/lib_spark/spark/domain/SecurityMarketDataStatistics.h similarity index 91% rename from src/lib/domain/SecurityMarketDataStatistics.h rename to src/lib_spark/spark/domain/SecurityMarketDataStatistics.h index 24f8238fe..53b9e1fbb 100644 --- a/src/lib/domain/SecurityMarketDataStatistics.h +++ b/src/lib_spark/spark/domain/SecurityMarketDataStatistics.h @@ -1,12 +1,12 @@ #pragma once -#include "Price.h" -#include "Quantity.h" -#include "lib/core/FMT_IMPL.h" -#include "lib/domain/SecurityID.h" -#include "lib/io/JsonReader.h" -#include "lib/md/IntPrice.h" -#include "lib/md/protos/co2.pb.h" +#include "spark/core/FMT_IMPL.h" +#include "spark/domain/Price.h" +#include "spark/domain/Quantity.h" +#include "spark/domain/SecurityID.h" +#include "spark/io/JsonReader.h" +#include "spark/md/IntPrice.h" +#include "spark/md/protos/co2.pb.h" #include #include diff --git a/src/lib/domain/SecurityState.h b/src/lib_spark/spark/domain/SecurityState.h similarity index 100% rename from src/lib/domain/SecurityState.h rename to src/lib_spark/spark/domain/SecurityState.h diff --git a/src/lib/domain/Side.cpp b/src/lib_spark/spark/domain/Side.cpp similarity index 100% rename from src/lib/domain/Side.cpp rename to src/lib_spark/spark/domain/Side.cpp diff --git a/src/lib/domain/Side.h b/src/lib_spark/spark/domain/Side.h similarity index 99% rename from src/lib/domain/Side.h rename to src/lib_spark/spark/domain/Side.h index c7c124a87..9be12a5ed 100644 --- a/src/lib/domain/Side.h +++ b/src/lib_spark/spark/domain/Side.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/core/FMT_IMPL.h" +#include "spark/core/FMT_IMPL.h" #include diff --git a/src/lib/domain/SideReq.h b/src/lib_spark/spark/domain/SideReq.h similarity index 100% rename from src/lib/domain/SideReq.h rename to src/lib_spark/spark/domain/SideReq.h diff --git a/src/lib/domain/SpotSecurity.h b/src/lib_spark/spark/domain/SpotSecurity.h similarity index 100% rename from src/lib/domain/SpotSecurity.h rename to src/lib_spark/spark/domain/SpotSecurity.h diff --git a/src/lib/domain/SpreadSecurity.h b/src/lib_spark/spark/domain/SpreadSecurity.h similarity index 96% rename from src/lib/domain/SpreadSecurity.h rename to src/lib_spark/spark/domain/SpreadSecurity.h index c511fd2d3..c3493da64 100644 --- a/src/lib/domain/SpreadSecurity.h +++ b/src/lib_spark/spark/domain/SpreadSecurity.h @@ -1,6 +1,6 @@ #pragma once #include "LegDefinition.h" -#include "lib/io/JsonReader.h" +#include "spark/io/JsonReader.h" #include #include diff --git a/src/lib/domain/TimeInForce.cpp b/src/lib_spark/spark/domain/TimeInForce.cpp similarity index 100% rename from src/lib/domain/TimeInForce.cpp rename to src/lib_spark/spark/domain/TimeInForce.cpp diff --git a/src/lib/domain/TimeInForce.h b/src/lib_spark/spark/domain/TimeInForce.h similarity index 100% rename from src/lib/domain/TimeInForce.h rename to src/lib_spark/spark/domain/TimeInForce.h diff --git a/src/lib/domain/TradeRecord.h b/src/lib_spark/spark/domain/TradeRecord.h similarity index 85% rename from src/lib/domain/TradeRecord.h rename to src/lib_spark/spark/domain/TradeRecord.h index 9708a8fa5..9cd328cea 100644 --- a/src/lib/domain/TradeRecord.h +++ b/src/lib_spark/spark/domain/TradeRecord.h @@ -1,11 +1,11 @@ #pragma once -#include "AggressorSide.h" -#include "Price.h" -#include "Quantity.h" -#include "SecurityID.h" -#include "lib/core/TimeStamp.h" -#include "lib/logging/logging.h" +#include "spark/core/TimeStamp.h" +#include "spark/domain/AggressorSide.h" +#include "spark/domain/Price.h" +#include "spark/domain/Quantity.h" +#include "spark/domain/SecurityID.h" +#include "spark/logging/logging.h" #include diff --git a/src/lib/domain/UserID.h b/src/lib_spark/spark/domain/UserID.h similarity index 80% rename from src/lib/domain/UserID.h rename to src/lib_spark/spark/domain/UserID.h index c7cd24ff6..326d53158 100644 --- a/src/lib/domain/UserID.h +++ b/src/lib_spark/spark/domain/UserID.h @@ -1,5 +1,5 @@ #pragma once -#include "lib/utils/ValueWrapper.h" +#include "spark/utils/ValueWrapper.h" #include namespace bts::domain { diff --git a/src/lib/domain/book_side_consumer.h b/src/lib_spark/spark/domain/book_side_consumer.h similarity index 97% rename from src/lib/domain/book_side_consumer.h rename to src/lib_spark/spark/domain/book_side_consumer.h index 4b9d7ab56..e0168b0ce 100644 --- a/src/lib/domain/book_side_consumer.h +++ b/src/lib_spark/spark/domain/book_side_consumer.h @@ -1,7 +1,7 @@ #pragma once -#include "lib/domain/BookSide.h" -#include "lib/domain/Quantity.h" +#include "spark/domain/BookSide.h" +#include "spark/domain/Quantity.h" namespace bts::domain { diff --git a/src/lib/domain/cme/GlbxOrderDefinition.h b/src/lib_spark/spark/domain/cme/GlbxOrderDefinition.h similarity index 100% rename from src/lib/domain/cme/GlbxOrderDefinition.h rename to src/lib_spark/spark/domain/cme/GlbxOrderDefinition.h diff --git a/src/lib/domain/cme/GlbxOrderState.h b/src/lib_spark/spark/domain/cme/GlbxOrderState.h similarity index 100% rename from src/lib/domain/cme/GlbxOrderState.h rename to src/lib_spark/spark/domain/cme/GlbxOrderState.h diff --git a/src/lib/domain/deribit/DeribitOrderDefinition.h b/src/lib_spark/spark/domain/deribit/DeribitOrderDefinition.h similarity index 100% rename from src/lib/domain/deribit/DeribitOrderDefinition.h rename to src/lib_spark/spark/domain/deribit/DeribitOrderDefinition.h diff --git a/src/lib/domain/deribit/DeribitOrderState.h b/src/lib_spark/spark/domain/deribit/DeribitOrderState.h similarity index 100% rename from src/lib/domain/deribit/DeribitOrderState.h rename to src/lib_spark/spark/domain/deribit/DeribitOrderState.h diff --git a/src/lib/domain/synthetic_book_side.cpp b/src/lib_spark/spark/domain/synthetic_book_side.cpp similarity index 98% rename from src/lib/domain/synthetic_book_side.cpp rename to src/lib_spark/spark/domain/synthetic_book_side.cpp index 6466a9211..c48889a44 100644 --- a/src/lib/domain/synthetic_book_side.cpp +++ b/src/lib_spark/spark/domain/synthetic_book_side.cpp @@ -1,5 +1,5 @@ #include "synthetic_book_side.h" -#include "lib/domain/book_side_consumer.h" +#include "spark/domain/book_side_consumer.h" #include diff --git a/src/lib/domain/synthetic_book_side.h b/src/lib_spark/spark/domain/synthetic_book_side.h similarity index 97% rename from src/lib/domain/synthetic_book_side.h rename to src/lib_spark/spark/domain/synthetic_book_side.h index 22da05c18..4d95bea39 100644 --- a/src/lib/domain/synthetic_book_side.h +++ b/src/lib_spark/spark/domain/synthetic_book_side.h @@ -1,7 +1,7 @@ #pragma once -#include "lib/domain/BookLevel.h" -#include "lib/domain/Quantity.h" +#include "spark/domain/BookLevel.h" +#include "spark/domain/Quantity.h" #include #include diff --git a/src/lib/domain_model/PutOrCall.h b/src/lib_spark/spark/domain_model/PutOrCall.h similarity index 84% rename from src/lib/domain_model/PutOrCall.h rename to src/lib_spark/spark/domain_model/PutOrCall.h index b26b94b3c..e95569f7e 100644 --- a/src/lib/domain_model/PutOrCall.h +++ b/src/lib_spark/spark/domain_model/PutOrCall.h @@ -1,11 +1,11 @@ #pragma once -#include "lib/core/EnumMacros.h" -#include "lib/core/FMT_IMPL.h" -#include "lib/domain_model/Security.pb.h" -#include "lib/io/JsonReader.h" -#include "lib/logging/logging.h" -#include "lib/utils/string_utils.h" +#include "spark/core/EnumMacros.h" +#include "spark/core/FMT_IMPL.h" +#include "spark/domain_model/Security.pb.h" +#include "spark/io/JsonReader.h" +#include "spark/logging/logging.h" +#include "spark/utils/string_utils.h" #include diff --git a/src/lib/domain_model/Security.cpp b/src/lib_spark/spark/domain_model/Security.cpp similarity index 98% rename from src/lib/domain_model/Security.cpp rename to src/lib_spark/spark/domain_model/Security.cpp index 8829a4424..19e4290ba 100644 --- a/src/lib/domain_model/Security.cpp +++ b/src/lib_spark/spark/domain_model/Security.cpp @@ -1,10 +1,10 @@ #include "Security.h" -#include "lib/config/config.h" -#include "lib/config/protos/orders_fills_cleanup.pb.h" -#include "lib/domain_model/Security.pb.h" -#include "lib/io/JsonMacros.h" -#include "lib/md/common.h" -#include "lib/utils/pb_json_macros.h" +#include "spark/config/config.h" +#include "spark/config/protos/orders_fills_cleanup.pb.h" +#include "spark/domain_model/Security.pb.h" +#include "spark/io/JsonMacros.h" +#include "spark/md/common.h" +#include "spark/utils/pb_json_macros.h" #include #include diff --git a/src/lib/domain_model/Security.h b/src/lib_spark/spark/domain_model/Security.h similarity index 98% rename from src/lib/domain_model/Security.h rename to src/lib_spark/spark/domain_model/Security.h index 456cda6a5..4491b9052 100644 --- a/src/lib/domain_model/Security.h +++ b/src/lib_spark/spark/domain_model/Security.h @@ -1,12 +1,12 @@ #pragma once -#include "lib/domain_model/PutOrCall.h" -#include "lib/domain_model/Security.pb.h" -#include "lib/domain_model/SecurityType.h" -#include "lib/domain_model/Side.h" -#include "lib/domain_model/Venue.h" -#include "lib/domain_model/common.h" -#include "lib/utils/bts_assert.h" +#include "spark/domain_model/PutOrCall.h" +#include "spark/domain_model/Security.pb.h" +#include "spark/domain_model/SecurityType.h" +#include "spark/domain_model/Side.h" +#include "spark/domain_model/Venue.h" +#include "spark/domain_model/common.h" +#include "spark/utils/bts_assert.h" #include #include diff --git a/src/lib/domain_model/Security.proto b/src/lib_spark/spark/domain_model/Security.proto similarity index 99% rename from src/lib/domain_model/Security.proto rename to src/lib_spark/spark/domain_model/Security.proto index c24d515c6..9321694c2 100644 --- a/src/lib/domain_model/Security.proto +++ b/src/lib_spark/spark/domain_model/Security.proto @@ -1,7 +1,7 @@ syntax="proto3"; package bts.api; option csharp_namespace="bts.api"; -import "lib/api/apioptions.proto"; +import "spark/api/apioptions.proto"; enum Venue { VENUE_UNSET = 0; diff --git a/src/lib/domain_model/SecurityKey.h b/src/lib_spark/spark/domain_model/SecurityKey.h similarity index 70% rename from src/lib/domain_model/SecurityKey.h rename to src/lib_spark/spark/domain_model/SecurityKey.h index c38124556..c09ae55cb 100644 --- a/src/lib/domain_model/SecurityKey.h +++ b/src/lib_spark/spark/domain_model/SecurityKey.h @@ -1,7 +1,7 @@ #pragma once -#include "lib/core/FMT_IMPL.h" -#include "lib/utils/ValueWrapper.h" +#include "spark/core/FMT_IMPL.h" +#include "spark/utils/ValueWrapper.h" #include diff --git a/src/lib/domain_model/SecurityTests.cpp b/src/lib_spark/spark/domain_model/SecurityTests.cpp similarity index 100% rename from src/lib/domain_model/SecurityTests.cpp rename to src/lib_spark/spark/domain_model/SecurityTests.cpp diff --git a/src/lib/domain_model/SecurityType.h b/src/lib_spark/spark/domain_model/SecurityType.h similarity index 85% rename from src/lib/domain_model/SecurityType.h rename to src/lib_spark/spark/domain_model/SecurityType.h index 2f4c54a20..0ca4327f7 100644 --- a/src/lib/domain_model/SecurityType.h +++ b/src/lib_spark/spark/domain_model/SecurityType.h @@ -1,11 +1,11 @@ #pragma once -#include "lib/core/EnumMacros.h" -#include "lib/core/FMT_IMPL.h" -#include "lib/domain_model/Security.pb.h" -#include "lib/io/JsonReader.h" -#include "lib/logging/logging.h" -#include "lib/utils/string_utils.h" +#include "spark/core/EnumMacros.h" +#include "spark/core/FMT_IMPL.h" +#include "spark/domain_model/Security.pb.h" +#include "spark/io/JsonReader.h" +#include "spark/logging/logging.h" +#include "spark/utils/string_utils.h" #include diff --git a/src/lib/domain_model/Side.h b/src/lib_spark/spark/domain_model/Side.h similarity index 52% rename from src/lib/domain_model/Side.h rename to src/lib_spark/spark/domain_model/Side.h index edb967170..7447c8a46 100644 --- a/src/lib/domain_model/Side.h +++ b/src/lib_spark/spark/domain_model/Side.h @@ -1,10 +1,10 @@ #pragma once -#include "lib/core/EnumMacros.h" -#include "lib/core/FMT_IMPL.h" -#include "lib/domain_model/Security.pb.h" -#include "lib/io/JsonReader.h" -#include "lib/logging/logging.h" +#include "spark/core/EnumMacros.h" +#include "spark/core/FMT_IMPL.h" +#include "spark/domain_model/Security.pb.h" +#include "spark/io/JsonReader.h" +#include "spark/logging/logging.h" #include diff --git a/src/lib/domain_model/Venue.h b/src/lib_spark/spark/domain_model/Venue.h similarity index 83% rename from src/lib/domain_model/Venue.h rename to src/lib_spark/spark/domain_model/Venue.h index b00b5c942..e3196dd85 100644 --- a/src/lib/domain_model/Venue.h +++ b/src/lib_spark/spark/domain_model/Venue.h @@ -1,11 +1,11 @@ #pragma once -#include "lib/core/EnumMacros.h" -#include "lib/core/FMT_IMPL.h" -#include "lib/domain_model/Security.pb.h" -#include "lib/io/JsonReader.h" -#include "lib/logging/logging.h" -#include "lib/utils/string_utils.h" +#include "spark/core/EnumMacros.h" +#include "spark/core/FMT_IMPL.h" +#include "spark/domain_model/Security.pb.h" +#include "spark/io/JsonReader.h" +#include "spark/logging/logging.h" +#include "spark/utils/string_utils.h" #include diff --git a/src/lib/domain_model/common.cpp b/src/lib_spark/spark/domain_model/common.cpp similarity index 96% rename from src/lib/domain_model/common.cpp rename to src/lib_spark/spark/domain_model/common.cpp index 2ec0ef238..9dbf792b4 100644 --- a/src/lib/domain_model/common.cpp +++ b/src/lib_spark/spark/domain_model/common.cpp @@ -1,5 +1,5 @@ #include "common.h" -#include "lib/utils/bts_assert.h" +#include "spark/utils/bts_assert.h" namespace bts { diff --git a/src/lib/domain_model/common.h b/src/lib_spark/spark/domain_model/common.h similarity index 94% rename from src/lib/domain_model/common.h rename to src/lib_spark/spark/domain_model/common.h index 5dea42192..2bd44dc52 100644 --- a/src/lib/domain_model/common.h +++ b/src/lib_spark/spark/domain_model/common.h @@ -7,9 +7,9 @@ #include #include -#include "lib/core/FMT_IMPL.h" -#include "lib/domain_model/SecurityKey.h" -#include "lib/utils/ValueWrapper.h" +#include "spark/core/FMT_IMPL.h" +#include "spark/domain_model/SecurityKey.h" +#include "spark/utils/ValueWrapper.h" namespace bts { struct CQuantity { diff --git a/src/lib/domain_model/sod.cpp b/src/lib_spark/spark/domain_model/sod.cpp similarity index 86% rename from src/lib/domain_model/sod.cpp rename to src/lib_spark/spark/domain_model/sod.cpp index 70ab8d41f..82c57b15f 100644 --- a/src/lib/domain_model/sod.cpp +++ b/src/lib_spark/spark/domain_model/sod.cpp @@ -1,6 +1,6 @@ #include "sod.h" -#include "lib/config/config.h" -#include "lib/config/protos/orders_fills_cleanup.pb.h" +#include "spark/config/config.h" +#include "spark/config/protos/orders_fills_cleanup.pb.h" namespace bts { namespace sod { diff --git a/src/lib/domain_model/sod.h b/src/lib_spark/spark/domain_model/sod.h similarity index 87% rename from src/lib/domain_model/sod.h rename to src/lib_spark/spark/domain_model/sod.h index b66229f0f..7703c88e4 100644 --- a/src/lib/domain_model/sod.h +++ b/src/lib_spark/spark/domain_model/sod.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/utils/datetime.h" +#include "spark/utils/datetime.h" #include namespace bts { diff --git a/src/lib/domain_model/tests/domain_tests.cpp b/src/lib_spark/spark/domain_model/tests/domain_tests.cpp similarity index 95% rename from src/lib/domain_model/tests/domain_tests.cpp rename to src/lib_spark/spark/domain_model/tests/domain_tests.cpp index c67b20a8b..1f257bacb 100644 --- a/src/lib/domain_model/tests/domain_tests.cpp +++ b/src/lib_spark/spark/domain_model/tests/domain_tests.cpp @@ -1,10 +1,9 @@ +#include "spark/core/TimeStamp.h" +#include "spark/domain_model/Security.h" +#include "spark/quickbus/rpc/RPCServiceName.h" +#include "spark/utils/PBUtils.h" +#include "spark/utils/datetime.h" -#include "../Security.h" -#include "lib/core/TimeStamp.h" -#include "lib/domain_model/Security.h" -#include "lib/quickbus/rpc/RPCServiceName.h" -#include "lib/utils/PBUtils.h" -#include "lib/utils/datetime.h" #include #include #include diff --git a/src/lib/expression/BooleanGrammar.cpp b/src/lib_spark/spark/expression/BooleanGrammar.cpp similarity index 100% rename from src/lib/expression/BooleanGrammar.cpp rename to src/lib_spark/spark/expression/BooleanGrammar.cpp diff --git a/src/lib/expression/BooleanGrammar.h b/src/lib_spark/spark/expression/BooleanGrammar.h similarity index 99% rename from src/lib/expression/BooleanGrammar.h rename to src/lib_spark/spark/expression/BooleanGrammar.h index 11baa3ff3..54e689442 100644 --- a/src/lib/expression/BooleanGrammar.h +++ b/src/lib_spark/spark/expression/BooleanGrammar.h @@ -1,7 +1,7 @@ #ifndef BOOLEANGRAMMAR_H_ #define BOOLEANGRAMMAR_H_ -#include "lib/utils/bts_no_copy.h" +#include "spark/utils/bts_no_copy.h" #include #include diff --git a/src/lib/expression/ExpressionEvaluator.cpp b/src/lib_spark/spark/expression/ExpressionEvaluator.cpp similarity index 100% rename from src/lib/expression/ExpressionEvaluator.cpp rename to src/lib_spark/spark/expression/ExpressionEvaluator.cpp diff --git a/src/lib/expression/ExpressionEvaluator.h b/src/lib_spark/spark/expression/ExpressionEvaluator.h similarity index 100% rename from src/lib/expression/ExpressionEvaluator.h rename to src/lib_spark/spark/expression/ExpressionEvaluator.h diff --git a/src/lib/expression/IPropertyEvaluator.h b/src/lib_spark/spark/expression/IPropertyEvaluator.h similarity index 100% rename from src/lib/expression/IPropertyEvaluator.h rename to src/lib_spark/spark/expression/IPropertyEvaluator.h diff --git a/src/lib/expression/ParserExceptions.cpp b/src/lib_spark/spark/expression/ParserExceptions.cpp similarity index 100% rename from src/lib/expression/ParserExceptions.cpp rename to src/lib_spark/spark/expression/ParserExceptions.cpp diff --git a/src/lib/expression/ParserExceptions.h b/src/lib_spark/spark/expression/ParserExceptions.h similarity index 100% rename from src/lib/expression/ParserExceptions.h rename to src/lib_spark/spark/expression/ParserExceptions.h diff --git a/src/lib/expression/RecursionGuard.h b/src/lib_spark/spark/expression/RecursionGuard.h similarity index 97% rename from src/lib/expression/RecursionGuard.h rename to src/lib_spark/spark/expression/RecursionGuard.h index f01827880..93a46b5bd 100644 --- a/src/lib/expression/RecursionGuard.h +++ b/src/lib_spark/spark/expression/RecursionGuard.h @@ -1,7 +1,7 @@ #ifndef RECURSIONGUARD_H_ #define RECURSIONGUARD_H_ -#include "lib/utils/bts_no_copy.h" +#include "spark/utils/bts_no_copy.h" #include #include diff --git a/src/lib/expression/Value.cpp b/src/lib_spark/spark/expression/Value.cpp similarity index 100% rename from src/lib/expression/Value.cpp rename to src/lib_spark/spark/expression/Value.cpp diff --git a/src/lib/expression/Value.h b/src/lib_spark/spark/expression/Value.h similarity index 100% rename from src/lib/expression/Value.h rename to src/lib_spark/spark/expression/Value.h diff --git a/src/lib/expression/tests/expression_parser_tests.cpp b/src/lib_spark/spark/expression/tests/expression_parser_tests.cpp similarity index 100% rename from src/lib/expression/tests/expression_parser_tests.cpp rename to src/lib_spark/spark/expression/tests/expression_parser_tests.cpp diff --git a/src/lib/io/JsonDumper.h b/src/lib_spark/spark/io/JsonDumper.h similarity index 100% rename from src/lib/io/JsonDumper.h rename to src/lib_spark/spark/io/JsonDumper.h diff --git a/src/lib/io/JsonMacros.h b/src/lib_spark/spark/io/JsonMacros.h similarity index 100% rename from src/lib/io/JsonMacros.h rename to src/lib_spark/spark/io/JsonMacros.h diff --git a/src/lib/io/JsonOptional.h b/src/lib_spark/spark/io/JsonOptional.h similarity index 100% rename from src/lib/io/JsonOptional.h rename to src/lib_spark/spark/io/JsonOptional.h diff --git a/src/lib/io/JsonReader.cpp b/src/lib_spark/spark/io/JsonReader.cpp similarity index 98% rename from src/lib/io/JsonReader.cpp rename to src/lib_spark/spark/io/JsonReader.cpp index 6799e50f3..263826e12 100644 --- a/src/lib/io/JsonReader.cpp +++ b/src/lib_spark/spark/io/JsonReader.cpp @@ -1,9 +1,9 @@ #include "JsonReader.h" -#include "lib/algorithm/TryCatch.h" -#include "lib/core/TimeStamp.h" -#include "lib/logging/logging.h" -#include "lib/utils/TimeStamp.h" -#include "lib/utils/datetime.h" +#include "spark/algorithm/TryCatch.h" +#include "spark/core/TimeStamp.h" +#include "spark/logging/logging.h" +#include "spark/utils/TimeStamp.h" +#include "spark/utils/datetime.h" #include #include #include diff --git a/src/lib/io/JsonReader.h b/src/lib_spark/spark/io/JsonReader.h similarity index 99% rename from src/lib/io/JsonReader.h rename to src/lib_spark/spark/io/JsonReader.h index 276650b93..746259ca9 100644 --- a/src/lib/io/JsonReader.h +++ b/src/lib_spark/spark/io/JsonReader.h @@ -1,5 +1,5 @@ #pragma once -#include "lib/core/TimeStamp.h" +#include "spark/core/TimeStamp.h" #include #include #include diff --git a/src/lib/io/JsonType.h b/src/lib_spark/spark/io/JsonType.h similarity index 97% rename from src/lib/io/JsonType.h rename to src/lib_spark/spark/io/JsonType.h index 41964334a..022c744ae 100644 --- a/src/lib/io/JsonType.h +++ b/src/lib_spark/spark/io/JsonType.h @@ -1,6 +1,6 @@ #pragma once #ifdef SPARK_ENABLE_CCAPI -#include "lib/core/EnumMacros.h" +#include "spark/core/EnumMacros.h" #include #include #include diff --git a/src/lib/io/ProtoPrinter.h b/src/lib_spark/spark/io/ProtoPrinter.h similarity index 100% rename from src/lib/io/ProtoPrinter.h rename to src/lib_spark/spark/io/ProtoPrinter.h diff --git a/src/lib/io/ProtoReader.h b/src/lib_spark/spark/io/ProtoReader.h similarity index 100% rename from src/lib/io/ProtoReader.h rename to src/lib_spark/spark/io/ProtoReader.h diff --git a/src/lib/io/QueryParams.cpp b/src/lib_spark/spark/io/QueryParams.cpp similarity index 100% rename from src/lib/io/QueryParams.cpp rename to src/lib_spark/spark/io/QueryParams.cpp diff --git a/src/lib/io/QueryParams.h b/src/lib_spark/spark/io/QueryParams.h similarity index 81% rename from src/lib/io/QueryParams.h rename to src/lib_spark/spark/io/QueryParams.h index 78f01310f..1f733d16e 100644 --- a/src/lib/io/QueryParams.h +++ b/src/lib_spark/spark/io/QueryParams.h @@ -1,5 +1,5 @@ #pragma once -#include "lib/collections/FlatUnorderedMap.h" +#include "spark/collections/FlatUnorderedMap.h" #include namespace bts::io { diff --git a/src/lib/io/URL.cpp b/src/lib_spark/spark/io/URL.cpp similarity index 99% rename from src/lib/io/URL.cpp rename to src/lib_spark/spark/io/URL.cpp index 5fb868324..6be8946a3 100644 --- a/src/lib/io/URL.cpp +++ b/src/lib_spark/spark/io/URL.cpp @@ -1,5 +1,5 @@ #include "URL.h" -#include "lib/api/io/URL.pb.h" +#include "spark/api/io/URL.pb.h" #include #include diff --git a/src/lib/io/URL.h b/src/lib_spark/spark/io/URL.h similarity index 98% rename from src/lib/io/URL.h rename to src/lib_spark/spark/io/URL.h index 56f4f199a..4fdbd8f8a 100644 --- a/src/lib/io/URL.h +++ b/src/lib_spark/spark/io/URL.h @@ -1,6 +1,6 @@ #pragma once #include "QueryParams.h" -#include "lib/core/HashPhaser.h" +#include "spark/core/HashPhaser.h" #include #include #include diff --git a/src/lib/io/http/HTTPHeaders.cpp b/src/lib_spark/spark/io/http/HTTPHeaders.cpp similarity index 95% rename from src/lib/io/http/HTTPHeaders.cpp rename to src/lib_spark/spark/io/http/HTTPHeaders.cpp index 8c26cf97f..7c1bf3cdc 100644 --- a/src/lib/io/http/HTTPHeaders.cpp +++ b/src/lib_spark/spark/io/http/HTTPHeaders.cpp @@ -1,5 +1,5 @@ #include "HTTPHeaders.h" -#include "lib/utils/StringSplitter.h" +#include "spark/utils/StringSplitter.h" #include diff --git a/src/lib/io/http/HTTPHeaders.h b/src/lib_spark/spark/io/http/HTTPHeaders.h similarity index 92% rename from src/lib/io/http/HTTPHeaders.h rename to src/lib_spark/spark/io/http/HTTPHeaders.h index 3c5dfe7a4..b47d0dfa9 100644 --- a/src/lib/io/http/HTTPHeaders.h +++ b/src/lib_spark/spark/io/http/HTTPHeaders.h @@ -1,5 +1,5 @@ #pragma once -#include "lib/collections/FlatUnorderedMap.h" +#include "spark/collections/FlatUnorderedMap.h" namespace bts::io::http { diff --git a/src/lib/io/http/HTTPResponse.cpp b/src/lib_spark/spark/io/http/HTTPResponse.cpp similarity index 100% rename from src/lib/io/http/HTTPResponse.cpp rename to src/lib_spark/spark/io/http/HTTPResponse.cpp diff --git a/src/lib/io/http/HTTPResponse.h b/src/lib_spark/spark/io/http/HTTPResponse.h similarity index 95% rename from src/lib/io/http/HTTPResponse.h rename to src/lib_spark/spark/io/http/HTTPResponse.h index c22ce2c8f..4c4ef8c96 100644 --- a/src/lib/io/http/HTTPResponse.h +++ b/src/lib_spark/spark/io/http/HTTPResponse.h @@ -1,6 +1,6 @@ #pragma once #include "HTTPHeaders.h" -#include "lib/io/URL.h" +#include "spark/io/URL.h" #include #include diff --git a/src/lib/io/http/HttpMethod.h b/src/lib_spark/spark/io/http/HttpMethod.h similarity index 92% rename from src/lib/io/http/HttpMethod.h rename to src/lib_spark/spark/io/http/HttpMethod.h index 9fe0c1f81..c9bfb7ea8 100644 --- a/src/lib/io/http/HttpMethod.h +++ b/src/lib_spark/spark/io/http/HttpMethod.h @@ -1,8 +1,8 @@ #pragma once #ifdef SPARK_ENABLE_CCAPI -#include "lib/core/EnumMacros.h" -#include "lib/core/FMT_IMPL.h" +#include "spark/core/EnumMacros.h" +#include "spark/core/FMT_IMPL.h" #include #include diff --git a/src/lib/io/http/HttpProtocol.h b/src/lib_spark/spark/io/http/HttpProtocol.h similarity index 85% rename from src/lib/io/http/HttpProtocol.h rename to src/lib_spark/spark/io/http/HttpProtocol.h index aab5ccb76..a3bde5a46 100644 --- a/src/lib/io/http/HttpProtocol.h +++ b/src/lib_spark/spark/io/http/HttpProtocol.h @@ -1,11 +1,11 @@ #pragma once #ifdef SPARK_ENABLE_CCAPI -#include "lib/algorithm/StringCaseConverter.h" -#include "lib/api/domain/SecurityType.pb.h" -#include "lib/core/EnumMacros.h" -#include "lib/core/FMT_IMPL.h" -#include "lib/domain_model/Security.pb.h" +#include "spark/algorithm/StringCaseConverter.h" +#include "spark/api/domain/SecurityType.pb.h" +#include "spark/core/EnumMacros.h" +#include "spark/core/FMT_IMPL.h" +#include "spark/domain_model/Security.pb.h" #include #include diff --git a/src/lib/io/http/curl_headers.h b/src/lib_spark/spark/io/http/curl_headers.h similarity index 100% rename from src/lib/io/http/curl_headers.h rename to src/lib_spark/spark/io/http/curl_headers.h diff --git a/src/lib/io/http/curl_session.h b/src/lib_spark/spark/io/http/curl_session.h similarity index 94% rename from src/lib/io/http/curl_session.h rename to src/lib_spark/spark/io/http/curl_session.h index 483857b44..9163b6669 100644 --- a/src/lib/io/http/curl_session.h +++ b/src/lib_spark/spark/io/http/curl_session.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/logging/logging.h" +#include "spark/logging/logging.h" #include #include diff --git a/src/lib/io/http/http_client.cpp b/src/lib_spark/spark/io/http/http_client.cpp similarity index 94% rename from src/lib/io/http/http_client.cpp rename to src/lib_spark/spark/io/http/http_client.cpp index 89d889e53..956ac6a55 100644 --- a/src/lib/io/http/http_client.cpp +++ b/src/lib_spark/spark/io/http/http_client.cpp @@ -1,13 +1,13 @@ #include "http_client.h" -#include "lib/io/JsonDumper.h" -#include "lib/io/http/HttpMethod.h" -#include "lib/io/http/curl_headers.h" -#include "lib/io/http/curl_session.h" -#include "lib/io/http/http_request.h" -#include "lib/io/http/http_response.h" -#include "lib/io/http/i_http_response.h" -#include "lib/io/http/query_params.h" -#include "lib/logging/logging.h" +#include "spark/io/JsonDumper.h" +#include "spark/io/http/HttpMethod.h" +#include "spark/io/http/curl_headers.h" +#include "spark/io/http/curl_session.h" +#include "spark/io/http/http_request.h" +#include "spark/io/http/http_response.h" +#include "spark/io/http/i_http_response.h" +#include "spark/io/http/query_params.h" +#include "spark/logging/logging.h" #include #include diff --git a/src/lib/io/http/http_client.h b/src/lib_spark/spark/io/http/http_client.h similarity index 94% rename from src/lib/io/http/http_client.h rename to src/lib_spark/spark/io/http/http_client.h index c1bf569d8..19b817b41 100644 --- a/src/lib/io/http/http_client.h +++ b/src/lib_spark/spark/io/http/http_client.h @@ -1,7 +1,7 @@ #pragma once -#include "lib/io/http/http_request.h" -#include "lib/io/http/i_http_response.h" +#include "spark/io/http/http_request.h" +#include "spark/io/http/i_http_response.h" #include #include diff --git a/src/lib/io/http/http_request.h b/src/lib_spark/spark/io/http/http_request.h similarity index 96% rename from src/lib/io/http/http_request.h rename to src/lib_spark/spark/io/http/http_request.h index 64e73865c..7109aa4ac 100644 --- a/src/lib/io/http/http_request.h +++ b/src/lib_spark/spark/io/http/http_request.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/io/http/HttpMethod.h" +#include "spark/io/http/HttpMethod.h" #include #include diff --git a/src/lib/io/http/http_response.h b/src/lib_spark/spark/io/http/http_response.h similarity index 96% rename from src/lib/io/http/http_response.h rename to src/lib_spark/spark/io/http/http_response.h index d5027a082..25f3db14c 100644 --- a/src/lib/io/http/http_response.h +++ b/src/lib_spark/spark/io/http/http_response.h @@ -1,7 +1,7 @@ #pragma once -#include "lib/core/FMT_IMPL.h" -#include "lib/io/http/i_http_response.h" +#include "spark/core/FMT_IMPL.h" +#include "spark/io/http/i_http_response.h" #include #include diff --git a/src/lib/io/http/i_http_response.h b/src/lib_spark/spark/io/http/i_http_response.h similarity index 100% rename from src/lib/io/http/i_http_response.h rename to src/lib_spark/spark/io/http/i_http_response.h diff --git a/src/lib/io/http/query_params.h b/src/lib_spark/spark/io/http/query_params.h similarity index 97% rename from src/lib/io/http/query_params.h rename to src/lib_spark/spark/io/http/query_params.h index 95863f5b7..d3c339553 100644 --- a/src/lib/io/http/query_params.h +++ b/src/lib_spark/spark/io/http/query_params.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/core/FMT_IMPL.h" +#include "spark/core/FMT_IMPL.h" #include #include diff --git a/src/lib/io/json_formatter.h b/src/lib_spark/spark/io/json_formatter.h similarity index 100% rename from src/lib/io/json_formatter.h rename to src/lib_spark/spark/io/json_formatter.h diff --git a/src/lib/io/websocket/IJsonRpcHandler.cpp b/src/lib_spark/spark/io/websocket/IJsonRpcHandler.cpp similarity index 100% rename from src/lib/io/websocket/IJsonRpcHandler.cpp rename to src/lib_spark/spark/io/websocket/IJsonRpcHandler.cpp diff --git a/src/lib/io/websocket/IJsonRpcHandler.h b/src/lib_spark/spark/io/websocket/IJsonRpcHandler.h similarity index 70% rename from src/lib/io/websocket/IJsonRpcHandler.h rename to src/lib_spark/spark/io/websocket/IJsonRpcHandler.h index 37c4fdc73..ce5071eb2 100644 --- a/src/lib/io/websocket/IJsonRpcHandler.h +++ b/src/lib_spark/spark/io/websocket/IJsonRpcHandler.h @@ -1,8 +1,8 @@ #pragma once -#include "lib/io/websocket/JsonRpcError.h" -#include "lib/io/websocket/JsonRpcRequest.h" -#include "lib/io/websocket/JsonRpcResponse.h" +#include "spark/io/websocket/JsonRpcError.h" +#include "spark/io/websocket/JsonRpcRequest.h" +#include "spark/io/websocket/JsonRpcResponse.h" namespace bts::io::websocket { diff --git a/src/lib/io/websocket/IWebsocketListener.h b/src/lib_spark/spark/io/websocket/IWebsocketListener.h similarity index 100% rename from src/lib/io/websocket/IWebsocketListener.h rename to src/lib_spark/spark/io/websocket/IWebsocketListener.h diff --git a/src/lib/io/websocket/JsonRpcError.h b/src/lib_spark/spark/io/websocket/JsonRpcError.h similarity index 97% rename from src/lib/io/websocket/JsonRpcError.h rename to src/lib_spark/spark/io/websocket/JsonRpcError.h index d2bdf42cd..f8e6211ff 100644 --- a/src/lib/io/websocket/JsonRpcError.h +++ b/src/lib_spark/spark/io/websocket/JsonRpcError.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/core/FMT_IMPL.h" +#include "spark/core/FMT_IMPL.h" #include #include diff --git a/src/lib/io/websocket/JsonRpcHandler.cpp b/src/lib_spark/spark/io/websocket/JsonRpcHandler.cpp similarity index 97% rename from src/lib/io/websocket/JsonRpcHandler.cpp rename to src/lib_spark/spark/io/websocket/JsonRpcHandler.cpp index 7c3233975..09bac1dbd 100644 --- a/src/lib/io/websocket/JsonRpcHandler.cpp +++ b/src/lib_spark/spark/io/websocket/JsonRpcHandler.cpp @@ -1,5 +1,5 @@ #include "JsonRpcHandler.h" -#include "lib/algorithm/TryCatch.h" +#include "spark/algorithm/TryCatch.h" namespace bts::io::websocket { diff --git a/src/lib/io/websocket/JsonRpcHandler.h b/src/lib_spark/spark/io/websocket/JsonRpcHandler.h similarity index 94% rename from src/lib/io/websocket/JsonRpcHandler.h rename to src/lib_spark/spark/io/websocket/JsonRpcHandler.h index 51c870e17..642dc7f0a 100644 --- a/src/lib/io/websocket/JsonRpcHandler.h +++ b/src/lib_spark/spark/io/websocket/JsonRpcHandler.h @@ -1,11 +1,11 @@ #pragma once -#include "lib/algorithm/TryCatch.h" -#include "lib/io/websocket/IJsonRpcHandler.h" -#include "lib/io/websocket/JsonRpcError.h" -#include "lib/io/websocket/JsonRpcRequest.h" -#include "lib/io/websocket/JsonRpcResponse.h" -#include "lib/utils/Delegate.h" +#include "spark/algorithm/TryCatch.h" +#include "spark/io/websocket/IJsonRpcHandler.h" +#include "spark/io/websocket/JsonRpcError.h" +#include "spark/io/websocket/JsonRpcRequest.h" +#include "spark/io/websocket/JsonRpcResponse.h" +#include "spark/utils/Delegate.h" #include #include diff --git a/src/lib/io/websocket/JsonRpcId.h b/src/lib_spark/spark/io/websocket/JsonRpcId.h similarity index 97% rename from src/lib/io/websocket/JsonRpcId.h rename to src/lib_spark/spark/io/websocket/JsonRpcId.h index 456b32497..51651d26d 100644 --- a/src/lib/io/websocket/JsonRpcId.h +++ b/src/lib_spark/spark/io/websocket/JsonRpcId.h @@ -1,8 +1,8 @@ #pragma once -#include "lib/core/FMT.h" -#include "lib/core/FMT_IMPL.h" -#include "lib/core/TimeStamp.h" +#include "spark/core/FMT.h" +#include "spark/core/FMT_IMPL.h" +#include "spark/core/TimeStamp.h" #include #include diff --git a/src/lib/io/websocket/JsonRpcRequest.h b/src/lib_spark/spark/io/websocket/JsonRpcRequest.h similarity index 97% rename from src/lib/io/websocket/JsonRpcRequest.h rename to src/lib_spark/spark/io/websocket/JsonRpcRequest.h index fd79f73fa..9f27a8593 100644 --- a/src/lib/io/websocket/JsonRpcRequest.h +++ b/src/lib_spark/spark/io/websocket/JsonRpcRequest.h @@ -1,8 +1,8 @@ #pragma once -#include "lib/core/FMT_IMPL.h" -#include "lib/io/websocket/JsonRpcId.h" -#include "lib/utils/bts_assert.h" +#include "spark/core/FMT_IMPL.h" +#include "spark/io/websocket/JsonRpcId.h" +#include "spark/utils/bts_assert.h" #include #include diff --git a/src/lib/io/websocket/JsonRpcResponse.h b/src/lib_spark/spark/io/websocket/JsonRpcResponse.h similarity index 96% rename from src/lib/io/websocket/JsonRpcResponse.h rename to src/lib_spark/spark/io/websocket/JsonRpcResponse.h index f53c205e4..7c629f53e 100644 --- a/src/lib/io/websocket/JsonRpcResponse.h +++ b/src/lib_spark/spark/io/websocket/JsonRpcResponse.h @@ -1,9 +1,9 @@ #pragma once -#include "lib/core/FMT_IMPL.h" -#include "lib/io/websocket/JsonRpcError.h" -#include "lib/io/websocket/JsonRpcId.h" -#include "lib/utils/overloaded.h" +#include "spark/core/FMT_IMPL.h" +#include "spark/io/websocket/JsonRpcError.h" +#include "spark/io/websocket/JsonRpcId.h" +#include "spark/utils/overloaded.h" #include #include diff --git a/src/lib/io/websocket/JsonRpcRouter.h b/src/lib_spark/spark/io/websocket/JsonRpcRouter.h similarity index 83% rename from src/lib/io/websocket/JsonRpcRouter.h rename to src/lib_spark/spark/io/websocket/JsonRpcRouter.h index aaddfbef0..f580051d8 100644 --- a/src/lib/io/websocket/JsonRpcRouter.h +++ b/src/lib_spark/spark/io/websocket/JsonRpcRouter.h @@ -1,11 +1,11 @@ #pragma once -#include "lib/algorithm/TryCatch.h" -#include "lib/io/websocket/IJsonRpcHandler.h" -#include "lib/io/websocket/JsonRpcError.h" -#include "lib/io/websocket/JsonRpcRequest.h" -#include "lib/io/websocket/JsonRpcResponse.h" -#include "lib/utils/Delegate.h" +#include "spark/algorithm/TryCatch.h" +#include "spark/io/websocket/IJsonRpcHandler.h" +#include "spark/io/websocket/JsonRpcError.h" +#include "spark/io/websocket/JsonRpcRequest.h" +#include "spark/io/websocket/JsonRpcResponse.h" +#include "spark/utils/Delegate.h" #include #include diff --git a/src/lib/io/websocket/WebsocketClient.cpp b/src/lib_spark/spark/io/websocket/WebsocketClient.cpp similarity index 99% rename from src/lib/io/websocket/WebsocketClient.cpp rename to src/lib_spark/spark/io/websocket/WebsocketClient.cpp index 0718db93c..a7cc6cae6 100644 --- a/src/lib/io/websocket/WebsocketClient.cpp +++ b/src/lib_spark/spark/io/websocket/WebsocketClient.cpp @@ -3,8 +3,8 @@ #include "WebsocketClientConfiguration.h" #include "WebsocketError.h" #include "WebsocketMessage.h" -#include "lib/logging/logging.h" -#include "lib/utils/bts_assert.h" +#include "spark/logging/logging.h" +#include "spark/utils/bts_assert.h" #include #ifndef _WIN32 #include diff --git a/src/lib/io/websocket/WebsocketClient.h b/src/lib_spark/spark/io/websocket/WebsocketClient.h similarity index 100% rename from src/lib/io/websocket/WebsocketClient.h rename to src/lib_spark/spark/io/websocket/WebsocketClient.h diff --git a/src/lib/io/websocket/WebsocketClientConfiguration.cpp b/src/lib_spark/spark/io/websocket/WebsocketClientConfiguration.cpp similarity index 92% rename from src/lib/io/websocket/WebsocketClientConfiguration.cpp rename to src/lib_spark/spark/io/websocket/WebsocketClientConfiguration.cpp index e9cb64047..5a283bcc7 100644 --- a/src/lib/io/websocket/WebsocketClientConfiguration.cpp +++ b/src/lib_spark/spark/io/websocket/WebsocketClientConfiguration.cpp @@ -1,5 +1,5 @@ #include "WebsocketClientConfiguration.h" -#include "lib/io/URL.h" +#include "spark/io/URL.h" namespace bts::io::websocket { diff --git a/src/lib/io/websocket/WebsocketClientConfiguration.h b/src/lib_spark/spark/io/websocket/WebsocketClientConfiguration.h similarity index 100% rename from src/lib/io/websocket/WebsocketClientConfiguration.h rename to src/lib_spark/spark/io/websocket/WebsocketClientConfiguration.h diff --git a/src/lib/io/websocket/WebsocketError.cpp b/src/lib_spark/spark/io/websocket/WebsocketError.cpp similarity index 100% rename from src/lib/io/websocket/WebsocketError.cpp rename to src/lib_spark/spark/io/websocket/WebsocketError.cpp diff --git a/src/lib/io/websocket/WebsocketError.h b/src/lib_spark/spark/io/websocket/WebsocketError.h similarity index 100% rename from src/lib/io/websocket/WebsocketError.h rename to src/lib_spark/spark/io/websocket/WebsocketError.h diff --git a/src/lib/io/websocket/WebsocketMessage.cpp b/src/lib_spark/spark/io/websocket/WebsocketMessage.cpp similarity index 100% rename from src/lib/io/websocket/WebsocketMessage.cpp rename to src/lib_spark/spark/io/websocket/WebsocketMessage.cpp diff --git a/src/lib/io/websocket/WebsocketMessage.h b/src/lib_spark/spark/io/websocket/WebsocketMessage.h similarity index 100% rename from src/lib/io/websocket/WebsocketMessage.h rename to src/lib_spark/spark/io/websocket/WebsocketMessage.h diff --git a/src/lib/io/websocket/WebsocketSSLClientInternal.cpp b/src/lib_spark/spark/io/websocket/WebsocketSSLClientInternal.cpp similarity index 99% rename from src/lib/io/websocket/WebsocketSSLClientInternal.cpp rename to src/lib_spark/spark/io/websocket/WebsocketSSLClientInternal.cpp index 3ab6fd20c..45c0f5c4f 100644 --- a/src/lib/io/websocket/WebsocketSSLClientInternal.cpp +++ b/src/lib_spark/spark/io/websocket/WebsocketSSLClientInternal.cpp @@ -1,8 +1,8 @@ #include "WebsocketSSLClientInternal.h" #include "WebsocketError.h" #include "WebsocketMessage.h" -#include "lib/logging/logging.h" -#include "lib/utils/bts_assert.h" +#include "spark/logging/logging.h" +#include "spark/utils/bts_assert.h" #include #ifndef _WIN32 #include diff --git a/src/lib/io/websocket/WebsocketSSLClientInternal.h b/src/lib_spark/spark/io/websocket/WebsocketSSLClientInternal.h similarity index 98% rename from src/lib/io/websocket/WebsocketSSLClientInternal.h rename to src/lib_spark/spark/io/websocket/WebsocketSSLClientInternal.h index c5c09f4b1..a97b2dba3 100644 --- a/src/lib/io/websocket/WebsocketSSLClientInternal.h +++ b/src/lib_spark/spark/io/websocket/WebsocketSSLClientInternal.h @@ -2,7 +2,7 @@ #include "WebsocketClientConfiguration.h" #include "WebsocketError.h" #include "WebsocketMessage.h" -#include "lib/io/websocket/IWebsocketListener.h" +#include "spark/io/websocket/IWebsocketListener.h" #include #ifndef _WIN32 #include diff --git a/src/lib/io/websocket/tests/WebsocketClientTests.cpp b/src/lib_spark/spark/io/websocket/tests/WebsocketClientTests.cpp similarity index 98% rename from src/lib/io/websocket/tests/WebsocketClientTests.cpp rename to src/lib_spark/spark/io/websocket/tests/WebsocketClientTests.cpp index 868c2c29c..0150c90c2 100644 --- a/src/lib/io/websocket/tests/WebsocketClientTests.cpp +++ b/src/lib_spark/spark/io/websocket/tests/WebsocketClientTests.cpp @@ -1,9 +1,9 @@ #ifndef _WIN32 -#include "lib/io/websocket/IWebsocketListener.h" -#include "lib/io/websocket/WebsocketClient.h" -#include "lib/io/websocket/WebsocketClientConfiguration.h" -#include "lib/io/websocket/WebsocketError.h" -#include "lib/io/websocket/WebsocketMessage.h" +#include "spark/io/websocket/IWebsocketListener.h" +#include "spark/io/websocket/WebsocketClient.h" +#include "spark/io/websocket/WebsocketClientConfiguration.h" +#include "spark/io/websocket/WebsocketError.h" +#include "spark/io/websocket/WebsocketMessage.h" #include #include #include diff --git a/src/lib/io/websocket/websocket_client.cpp b/src/lib_spark/spark/io/websocket/websocket_client.cpp similarity index 96% rename from src/lib/io/websocket/websocket_client.cpp rename to src/lib_spark/spark/io/websocket/websocket_client.cpp index a1465a041..3052cff10 100644 --- a/src/lib/io/websocket/websocket_client.cpp +++ b/src/lib_spark/spark/io/websocket/websocket_client.cpp @@ -1,19 +1,18 @@ #include "websocket_client.h" - -#include "lib/core/TimeSpan.h" -#include "lib/core/TimeStamp.h" -#include "lib/io/websocket/websocket_client_config.h" -#include "lib/io/websocket/websocket_client_logger.h" -#include "lib/io/websocket/websocket_client_state.h" -#include "lib/io/websocket/websocket_close_status.h" -#include "lib/io/websocket/websocket_error_code.h" -#include "lib/io/websocket/websocketpp_exception_formatter.h" -#include "lib/logging/logging.h" -#include "lib/utils/LockBox.h" -#include "lib/utils/bts_assert.h" -#include "lib/utils/bts_lock_guard.h" -#include "lib/utils/formatters/exception_formatter.h" -#include "lib/utils/thread_manager.h" +#include "spark/core/TimeSpan.h" +#include "spark/core/TimeStamp.h" +#include "spark/io/websocket/websocket_client_config.h" +#include "spark/io/websocket/websocket_client_logger.h" +#include "spark/io/websocket/websocket_client_state.h" +#include "spark/io/websocket/websocket_close_status.h" +#include "spark/io/websocket/websocket_error_code.h" +#include "spark/io/websocket/websocketpp_exception_formatter.h" +#include "spark/logging/logging.h" +#include "spark/utils/bts_lock_guard.h" +#include "spark/utils/LockBox.h" +#include "spark/utils/bts_assert.h" +#include "spark/utils/formatters/exception_formatter.h" +#include "spark/utils/thread_manager.h" #include #include diff --git a/src/lib/io/websocket/websocket_client.h b/src/lib_spark/spark/io/websocket/websocket_client.h similarity index 93% rename from src/lib/io/websocket/websocket_client.h rename to src/lib_spark/spark/io/websocket/websocket_client.h index d7d4d7b07..6c0c737cb 100644 --- a/src/lib/io/websocket/websocket_client.h +++ b/src/lib_spark/spark/io/websocket/websocket_client.h @@ -1,7 +1,7 @@ #pragma once -#include "lib/io/websocket/websocket_client_config.h" -#include "lib/utils/Delegate.h" +#include "spark/io/websocket/websocket_client_config.h" +#include "spark/utils/Delegate.h" #include #include diff --git a/src/lib/io/websocket/websocket_client_config.h b/src/lib_spark/spark/io/websocket/websocket_client_config.h similarity index 92% rename from src/lib/io/websocket/websocket_client_config.h rename to src/lib_spark/spark/io/websocket/websocket_client_config.h index 05df484cb..a64bcac4b 100644 --- a/src/lib/io/websocket/websocket_client_config.h +++ b/src/lib_spark/spark/io/websocket/websocket_client_config.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/core/TimeSpan.h" +#include "spark/core/TimeSpan.h" namespace bts::websocket { diff --git a/src/lib/io/websocket/websocket_client_logger.h b/src/lib_spark/spark/io/websocket/websocket_client_logger.h similarity index 96% rename from src/lib/io/websocket/websocket_client_logger.h rename to src/lib_spark/spark/io/websocket/websocket_client_logger.h index dbc1af0a5..b3796d159 100644 --- a/src/lib/io/websocket/websocket_client_logger.h +++ b/src/lib_spark/spark/io/websocket/websocket_client_logger.h @@ -1,7 +1,7 @@ #pragma once -#include "lib/logging/Common.h" -#include "lib/logging/logging.h" +#include "spark/logging/Common.h" +#include "spark/logging/logging.h" #include #include diff --git a/src/lib/io/websocket/websocket_client_state.h b/src/lib_spark/spark/io/websocket/websocket_client_state.h similarity index 89% rename from src/lib/io/websocket/websocket_client_state.h rename to src/lib_spark/spark/io/websocket/websocket_client_state.h index e70b1499d..9b77965e7 100644 --- a/src/lib/io/websocket/websocket_client_state.h +++ b/src/lib_spark/spark/io/websocket/websocket_client_state.h @@ -1,7 +1,7 @@ #pragma once -#include "lib/core/EnumMacros.h" -#include "lib/core/FMT_IMPL.h" +#include "spark/core/EnumMacros.h" +#include "spark/core/FMT_IMPL.h" #include diff --git a/src/lib/io/websocket/websocket_close_status.h b/src/lib_spark/spark/io/websocket/websocket_close_status.h similarity index 87% rename from src/lib/io/websocket/websocket_close_status.h rename to src/lib_spark/spark/io/websocket/websocket_close_status.h index 2d8f60d5a..35eea3c74 100644 --- a/src/lib/io/websocket/websocket_close_status.h +++ b/src/lib_spark/spark/io/websocket/websocket_close_status.h @@ -1,7 +1,7 @@ #pragma once -#include "lib/core/FMT_IMPL.h" -#include "lib/utils/ValueWrapper.h" +#include "spark/core/FMT_IMPL.h" +#include "spark/utils/ValueWrapper.h" #include diff --git a/src/lib/io/websocket/websocket_error_code.h b/src/lib_spark/spark/io/websocket/websocket_error_code.h similarity index 79% rename from src/lib/io/websocket/websocket_error_code.h rename to src/lib_spark/spark/io/websocket/websocket_error_code.h index e583e7a6c..4c2c3b779 100644 --- a/src/lib/io/websocket/websocket_error_code.h +++ b/src/lib_spark/spark/io/websocket/websocket_error_code.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/core/FMT_IMPL.h" +#include "spark/core/FMT_IMPL.h" #include diff --git a/src/lib/io/websocket/websocketpp_exception_formatter.h b/src/lib_spark/spark/io/websocket/websocketpp_exception_formatter.h similarity index 77% rename from src/lib/io/websocket/websocketpp_exception_formatter.h rename to src/lib_spark/spark/io/websocket/websocketpp_exception_formatter.h index 80d828889..664fb737e 100644 --- a/src/lib/io/websocket/websocketpp_exception_formatter.h +++ b/src/lib_spark/spark/io/websocket/websocketpp_exception_formatter.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/core/FMT_IMPL.h" +#include "spark/core/FMT_IMPL.h" #include diff --git a/src/lib/jetfix/codec/FIXArray.cpp b/src/lib_spark/spark/jetfix/codec/FIXArray.cpp similarity index 100% rename from src/lib/jetfix/codec/FIXArray.cpp rename to src/lib_spark/spark/jetfix/codec/FIXArray.cpp diff --git a/src/lib/jetfix/codec/FIXArray.h b/src/lib_spark/spark/jetfix/codec/FIXArray.h similarity index 93% rename from src/lib/jetfix/codec/FIXArray.h rename to src/lib_spark/spark/jetfix/codec/FIXArray.h index 01fcfc33c..40096ec8e 100644 --- a/src/lib/jetfix/codec/FIXArray.h +++ b/src/lib_spark/spark/jetfix/codec/FIXArray.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/jetfix/codec/FIXFragment.h" +#include "spark/jetfix/codec/FIXFragment.h" #include namespace bts { diff --git a/src/lib/jetfix/codec/FIXBuffer.h b/src/lib_spark/spark/jetfix/codec/FIXBuffer.h similarity index 98% rename from src/lib/jetfix/codec/FIXBuffer.h rename to src/lib_spark/spark/jetfix/codec/FIXBuffer.h index 6b235f020..ed98985ce 100644 --- a/src/lib/jetfix/codec/FIXBuffer.h +++ b/src/lib_spark/spark/jetfix/codec/FIXBuffer.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/utils/bts_assert.h" +#include "spark/utils/bts_assert.h" #include #include diff --git a/src/lib/jetfix/codec/FIXEncodingStream.h b/src/lib_spark/spark/jetfix/codec/FIXEncodingStream.h similarity index 96% rename from src/lib/jetfix/codec/FIXEncodingStream.h rename to src/lib_spark/spark/jetfix/codec/FIXEncodingStream.h index 2456e9a96..2e1ecdb8b 100644 --- a/src/lib/jetfix/codec/FIXEncodingStream.h +++ b/src/lib_spark/spark/jetfix/codec/FIXEncodingStream.h @@ -1,13 +1,13 @@ #pragma once -#include "lib/jetfix/codec/FIXBuffer.h" -#include "lib/jetfix/codec/FIXFragment.h" -#include "lib/jetfix/codec/FieldDefinitions.h" -#include "lib/jetfix/codec/Fields.h" -#include "lib/jetfix/codec/MessageTypes.h" +#include "spark/jetfix/codec/FIXBuffer.h" +#include "spark/jetfix/codec/FIXFragment.h" +#include "spark/jetfix/codec/FieldDefinitions.h" +#include "spark/jetfix/codec/Fields.h" +#include "spark/jetfix/codec/MessageTypes.h" #include -#include "lib/config/protos/jetfix.pb.h" +#include "spark/config/protos/jetfix.pb.h" namespace bts { namespace jetfix { diff --git a/src/lib/jetfix/codec/FIXFragment.h b/src/lib_spark/spark/jetfix/codec/FIXFragment.h similarity index 97% rename from src/lib/jetfix/codec/FIXFragment.h rename to src/lib_spark/spark/jetfix/codec/FIXFragment.h index 295f24e59..d9ceb76f8 100644 --- a/src/lib/jetfix/codec/FIXFragment.h +++ b/src/lib_spark/spark/jetfix/codec/FIXFragment.h @@ -3,9 +3,9 @@ #include #include -#include "lib/jetfix/codec/FIXBuffer.h" -#include "lib/jetfix/codec/Fields.h" -#include "lib/utils/bts_assert.h" +#include "spark/jetfix/codec/FIXBuffer.h" +#include "spark/jetfix/codec/Fields.h" +#include "spark/utils/bts_assert.h" namespace bts { namespace jetfix { diff --git a/src/lib/jetfix/codec/FIXMsg.h b/src/lib_spark/spark/jetfix/codec/FIXMsg.h similarity index 87% rename from src/lib/jetfix/codec/FIXMsg.h rename to src/lib_spark/spark/jetfix/codec/FIXMsg.h index 5069c7984..58a036590 100644 --- a/src/lib/jetfix/codec/FIXMsg.h +++ b/src/lib_spark/spark/jetfix/codec/FIXMsg.h @@ -4,14 +4,14 @@ #include #include -#include "lib/jetfix/codec/IFIXMsg.h" -#include "lib/jetfix/codec/IFieldReader.h" -#include "lib/jetfix/codec/MessageTypes.h" -#include "lib/jetfix/codec/ReaderCursor.h" -#include "lib/jetfix/codec/WriterCursor.h" -#include "lib/jetfix/common/InMsgBuffer.h" -#include "lib/tracing/PerfLog.h" -#include "lib/utils/meta_programming.h" +#include "spark/jetfix/codec/IFIXMsg.h" +#include "spark/jetfix/codec/IFieldReader.h" +#include "spark/jetfix/codec/MessageTypes.h" +#include "spark/jetfix/codec/ReaderCursor.h" +#include "spark/jetfix/codec/WriterCursor.h" +#include "spark/jetfix/common/InMsgBuffer.h" +#include "spark/tracing/PerfLog.h" +#include "spark/utils/meta_programming.h" namespace bts { namespace jetfix { diff --git a/src/lib/jetfix/codec/FIXParser.h b/src/lib_spark/spark/jetfix/codec/FIXParser.h similarity index 97% rename from src/lib/jetfix/codec/FIXParser.h rename to src/lib_spark/spark/jetfix/codec/FIXParser.h index 2b324bfc5..7953e8bc4 100644 --- a/src/lib/jetfix/codec/FIXParser.h +++ b/src/lib_spark/spark/jetfix/codec/FIXParser.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/jetfix/codec/IFIXParser.h" +#include "spark/jetfix/codec/IFIXParser.h" #include namespace bts { diff --git a/src/lib/jetfix/codec/FIXWriter.h b/src/lib_spark/spark/jetfix/codec/FIXWriter.h similarity index 100% rename from src/lib/jetfix/codec/FIXWriter.h rename to src/lib_spark/spark/jetfix/codec/FIXWriter.h diff --git a/src/lib/jetfix/codec/FieldDefinitions.h b/src/lib_spark/spark/jetfix/codec/FieldDefinitions.h similarity index 100% rename from src/lib/jetfix/codec/FieldDefinitions.h rename to src/lib_spark/spark/jetfix/codec/FieldDefinitions.h diff --git a/src/lib/jetfix/codec/Fields.h b/src/lib_spark/spark/jetfix/codec/Fields.h similarity index 95% rename from src/lib/jetfix/codec/Fields.h rename to src/lib_spark/spark/jetfix/codec/Fields.h index 79c4e57fe..08e49b45c 100644 --- a/src/lib/jetfix/codec/Fields.h +++ b/src/lib_spark/spark/jetfix/codec/Fields.h @@ -4,13 +4,13 @@ #include #include -#include "lib/jetfix/codec/IFieldReader.h" -#include "lib/jetfix/codec/ReaderCursor.h" -#include "lib/jetfix/codec/f_toa.h" -#include "lib/jetfix/codec/i32_toa.h" -#include "lib/jetfix/codec/sum_bytes.h" -#include "lib/utils/datetime.h" -#include "lib/utils/meta_programming.h" +#include "spark/jetfix/codec/IFieldReader.h" +#include "spark/jetfix/codec/ReaderCursor.h" +#include "spark/jetfix/codec/f_toa.h" +#include "spark/jetfix/codec/i32_toa.h" +#include "spark/jetfix/codec/sum_bytes.h" +#include "spark/utils/datetime.h" +#include "spark/utils/meta_programming.h" namespace bts { namespace jetfix { diff --git a/src/lib/jetfix/codec/Group.h b/src/lib_spark/spark/jetfix/codec/Group.h similarity index 97% rename from src/lib/jetfix/codec/Group.h rename to src/lib_spark/spark/jetfix/codec/Group.h index d71b3e412..3ad70384c 100644 --- a/src/lib/jetfix/codec/Group.h +++ b/src/lib_spark/spark/jetfix/codec/Group.h @@ -8,8 +8,8 @@ #include "ReaderCursor.h" #include "WriterCursor.h" -#include "lib/utils/bts_assert.h" -#include "lib/utils/meta_programming.h" +#include "spark/utils/bts_assert.h" +#include "spark/utils/meta_programming.h" namespace bts { namespace jetfix { diff --git a/src/lib/jetfix/codec/IFIXMsg.h b/src/lib_spark/spark/jetfix/codec/IFIXMsg.h similarity index 85% rename from src/lib/jetfix/codec/IFIXMsg.h rename to src/lib_spark/spark/jetfix/codec/IFIXMsg.h index 177185ea0..c3d03e770 100644 --- a/src/lib/jetfix/codec/IFIXMsg.h +++ b/src/lib_spark/spark/jetfix/codec/IFIXMsg.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/jetfix/codec/MessageTypes.h" +#include "spark/jetfix/codec/MessageTypes.h" #include namespace bts { diff --git a/src/lib/jetfix/codec/IFIXParser.h b/src/lib_spark/spark/jetfix/codec/IFIXParser.h similarity index 86% rename from src/lib/jetfix/codec/IFIXParser.h rename to src/lib_spark/spark/jetfix/codec/IFIXParser.h index 08a70a4f9..1fddbe83f 100644 --- a/src/lib/jetfix/codec/IFIXParser.h +++ b/src/lib_spark/spark/jetfix/codec/IFIXParser.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/jetfix/codec/IFIXMsg.h" +#include "spark/jetfix/codec/IFIXMsg.h" #include namespace bts { diff --git a/src/lib/jetfix/codec/IFieldReader.h b/src/lib_spark/spark/jetfix/codec/IFieldReader.h similarity index 100% rename from src/lib/jetfix/codec/IFieldReader.h rename to src/lib_spark/spark/jetfix/codec/IFieldReader.h diff --git a/src/lib/jetfix/codec/MessageDefinitions.h b/src/lib_spark/spark/jetfix/codec/MessageDefinitions.h similarity index 94% rename from src/lib/jetfix/codec/MessageDefinitions.h rename to src/lib_spark/spark/jetfix/codec/MessageDefinitions.h index 934a292b6..bb3511b79 100644 --- a/src/lib/jetfix/codec/MessageDefinitions.h +++ b/src/lib_spark/spark/jetfix/codec/MessageDefinitions.h @@ -1,8 +1,8 @@ #pragma once -#include "lib/jetfix/codec/FIXMsg.h" -#include "lib/jetfix/codec/FieldDefinitions.h" -#include "lib/jetfix/codec/MessageTypes.h" +#include "spark/jetfix/codec/FIXMsg.h" +#include "spark/jetfix/codec/FieldDefinitions.h" +#include "spark/jetfix/codec/MessageTypes.h" #include namespace bts { diff --git a/src/lib/jetfix/codec/MessageTypes.h b/src/lib_spark/spark/jetfix/codec/MessageTypes.h similarity index 100% rename from src/lib/jetfix/codec/MessageTypes.h rename to src/lib_spark/spark/jetfix/codec/MessageTypes.h diff --git a/src/lib/jetfix/codec/ReaderCursor.h b/src/lib_spark/spark/jetfix/codec/ReaderCursor.h similarity index 97% rename from src/lib/jetfix/codec/ReaderCursor.h rename to src/lib_spark/spark/jetfix/codec/ReaderCursor.h index a9b3abc56..239cc02ba 100644 --- a/src/lib/jetfix/codec/ReaderCursor.h +++ b/src/lib_spark/spark/jetfix/codec/ReaderCursor.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/utils/bts_assert.h" +#include "spark/utils/bts_assert.h" #include namespace bts { diff --git a/src/lib/jetfix/codec/WriterCursor.h b/src/lib_spark/spark/jetfix/codec/WriterCursor.h similarity index 96% rename from src/lib/jetfix/codec/WriterCursor.h rename to src/lib_spark/spark/jetfix/codec/WriterCursor.h index c20ca5a15..96b9f49aa 100644 --- a/src/lib/jetfix/codec/WriterCursor.h +++ b/src/lib_spark/spark/jetfix/codec/WriterCursor.h @@ -1,8 +1,8 @@ #pragma once -#include "lib/jetfix/codec/f_toa.h" -#include "lib/jetfix/codec/i32_toa.h" -#include "lib/utils/bts_assert.h" +#include "spark/jetfix/codec/f_toa.h" +#include "spark/jetfix/codec/i32_toa.h" +#include "spark/utils/bts_assert.h" #include namespace bts { diff --git a/src/lib/jetfix/codec/f_toa.h b/src/lib_spark/spark/jetfix/codec/f_toa.h similarity index 98% rename from src/lib/jetfix/codec/f_toa.h rename to src/lib_spark/spark/jetfix/codec/f_toa.h index b6dcefea1..77e3f0a1e 100644 --- a/src/lib/jetfix/codec/f_toa.h +++ b/src/lib_spark/spark/jetfix/codec/f_toa.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/utils/bts_assert.h" +#include "spark/utils/bts_assert.h" #include #include diff --git a/src/lib/jetfix/codec/i32_toa.h b/src/lib_spark/spark/jetfix/codec/i32_toa.h similarity index 100% rename from src/lib/jetfix/codec/i32_toa.h rename to src/lib_spark/spark/jetfix/codec/i32_toa.h diff --git a/src/lib/jetfix/codec/sum_bytes.h b/src/lib_spark/spark/jetfix/codec/sum_bytes.h similarity index 100% rename from src/lib/jetfix/codec/sum_bytes.h rename to src/lib_spark/spark/jetfix/codec/sum_bytes.h diff --git a/src/lib/jetfix/common/InMsgBuffer.h b/src/lib_spark/spark/jetfix/common/InMsgBuffer.h similarity index 97% rename from src/lib/jetfix/common/InMsgBuffer.h rename to src/lib_spark/spark/jetfix/common/InMsgBuffer.h index ef0bb68ef..ee251126a 100644 --- a/src/lib/jetfix/common/InMsgBuffer.h +++ b/src/lib_spark/spark/jetfix/common/InMsgBuffer.h @@ -1,8 +1,8 @@ #pragma once -#include "lib/jetfix/codec/MessageTypes.h" -#include "lib/tracing/PerfLog.h" -#include "lib/utils/bts_assert.h" +#include "spark/jetfix/codec/MessageTypes.h" +#include "spark/tracing/PerfLog.h" +#include "spark/utils/bts_assert.h" #include #include #include diff --git a/src/lib/jetfix/common/JetFIXError.h b/src/lib_spark/spark/jetfix/common/JetFIXError.h similarity index 100% rename from src/lib/jetfix/common/JetFIXError.h rename to src/lib_spark/spark/jetfix/common/JetFIXError.h diff --git a/src/lib/jetfix/common/OutFIX.cpp b/src/lib_spark/spark/jetfix/common/OutFIX.cpp similarity index 100% rename from src/lib/jetfix/common/OutFIX.cpp rename to src/lib_spark/spark/jetfix/common/OutFIX.cpp diff --git a/src/lib/jetfix/common/OutFIX.h b/src/lib_spark/spark/jetfix/common/OutFIX.h similarity index 89% rename from src/lib/jetfix/common/OutFIX.h rename to src/lib_spark/spark/jetfix/common/OutFIX.h index 11bbd9c4d..4c773749f 100644 --- a/src/lib/jetfix/common/OutFIX.h +++ b/src/lib_spark/spark/jetfix/common/OutFIX.h @@ -1,10 +1,10 @@ #pragma once -#include "lib/jetfix/codec/FIXEncodingStream.h" -#include "lib/utils/TimeStamp.h" +#include "spark/jetfix/codec/FIXEncodingStream.h" +#include "spark/utils/TimeStamp.h" #include -#include "lib/config/protos/jetfix.pb.h" +#include "spark/config/protos/jetfix.pb.h" // fwds namespace bts { diff --git a/src/lib/jetfix/common/OutFIXPtr.h b/src/lib_spark/spark/jetfix/common/OutFIXPtr.h similarity index 100% rename from src/lib/jetfix/common/OutFIXPtr.h rename to src/lib_spark/spark/jetfix/common/OutFIXPtr.h diff --git a/src/lib/jetfix/common/OutMsgVecPtr.h b/src/lib_spark/spark/jetfix/common/OutMsgVecPtr.h similarity index 100% rename from src/lib/jetfix/common/OutMsgVecPtr.h rename to src/lib_spark/spark/jetfix/common/OutMsgVecPtr.h diff --git a/src/lib/jetfix/connection/AsyncReader.cpp b/src/lib_spark/spark/jetfix/connection/AsyncReader.cpp similarity index 96% rename from src/lib/jetfix/connection/AsyncReader.cpp rename to src/lib_spark/spark/jetfix/connection/AsyncReader.cpp index 1de8ef3c3..dea912e66 100644 --- a/src/lib/jetfix/connection/AsyncReader.cpp +++ b/src/lib_spark/spark/jetfix/connection/AsyncReader.cpp @@ -2,11 +2,11 @@ #include "AsyncReader.h" #include "IConnection.h" -#include "lib/jetfix/gateway/ICoreGatewayEventSink.h" -#include "lib/os/os.h" -#include "lib/tracing/bts_trace.h" -#include "lib/utils/bts_assert.h" -#include "lib/utils/thread_manager.h" +#include "spark/jetfix/gateway/ICoreGatewayEventSink.h" +#include "spark/os/os.h" +#include "spark/tracing/bts_trace.h" +#include "spark/utils/bts_assert.h" +#include "spark/utils/thread_manager.h" #include #include diff --git a/src/lib/jetfix/connection/AsyncReader.h b/src/lib_spark/spark/jetfix/connection/AsyncReader.h similarity index 100% rename from src/lib/jetfix/connection/AsyncReader.h rename to src/lib_spark/spark/jetfix/connection/AsyncReader.h diff --git a/src/lib/jetfix/connection/IConnection.cpp b/src/lib_spark/spark/jetfix/connection/IConnection.cpp similarity index 100% rename from src/lib/jetfix/connection/IConnection.cpp rename to src/lib_spark/spark/jetfix/connection/IConnection.cpp diff --git a/src/lib/jetfix/connection/IConnection.h b/src/lib_spark/spark/jetfix/connection/IConnection.h similarity index 100% rename from src/lib/jetfix/connection/IConnection.h rename to src/lib_spark/spark/jetfix/connection/IConnection.h diff --git a/src/lib/jetfix/connection/IConnectionObserver.h b/src/lib_spark/spark/jetfix/connection/IConnectionObserver.h similarity index 100% rename from src/lib/jetfix/connection/IConnectionObserver.h rename to src/lib_spark/spark/jetfix/connection/IConnectionObserver.h diff --git a/src/lib/jetfix/connection/SocketConnection.cpp b/src/lib_spark/spark/jetfix/connection/SocketConnection.cpp similarity index 93% rename from src/lib/jetfix/connection/SocketConnection.cpp rename to src/lib_spark/spark/jetfix/connection/SocketConnection.cpp index 14f18541d..1cdfbe74a 100644 --- a/src/lib/jetfix/connection/SocketConnection.cpp +++ b/src/lib_spark/spark/jetfix/connection/SocketConnection.cpp @@ -1,11 +1,11 @@ #include "SocketConnection.h" -#include "lib/jetfix/store/session_name.h" -#include "lib/logging/logging.h" -#include "lib/tracing/PerfLog.h" -#include "lib/tracing/bts_trace.h" -#include "lib/utils/TimeStamp.h" -#include "lib/utils/bts_assert.h" -#include "lib/utils/helper_macros.h" +#include "spark/jetfix/store/session_name.h" +#include "spark/logging/logging.h" +#include "spark/tracing/PerfLog.h" +#include "spark/tracing/bts_trace.h" +#include "spark/utils/TimeStamp.h" +#include "spark/utils/bts_assert.h" +#include "spark/utils/helper_macros.h" #include #include diff --git a/src/lib/jetfix/connection/SocketConnection.h b/src/lib_spark/spark/jetfix/connection/SocketConnection.h similarity index 90% rename from src/lib/jetfix/connection/SocketConnection.h rename to src/lib_spark/spark/jetfix/connection/SocketConnection.h index 42ac53308..b1552bdca 100644 --- a/src/lib/jetfix/connection/SocketConnection.h +++ b/src/lib_spark/spark/jetfix/connection/SocketConnection.h @@ -1,8 +1,8 @@ #pragma once #include "IConnection.h" -#include "lib/config/protos/jetfix.pb.h" -#include "lib/metrics/metrics.h" +#include "spark/config/protos/jetfix.pb.h" +#include "spark/metrics/metrics.h" #include #include diff --git a/src/lib/jetfix/gateway/CoreGateway.cpp b/src/lib_spark/spark/jetfix/gateway/CoreGateway.cpp similarity index 96% rename from src/lib/jetfix/gateway/CoreGateway.cpp rename to src/lib_spark/spark/jetfix/gateway/CoreGateway.cpp index 41a673fa5..8c54b2e91 100644 --- a/src/lib/jetfix/gateway/CoreGateway.cpp +++ b/src/lib_spark/spark/jetfix/gateway/CoreGateway.cpp @@ -1,18 +1,18 @@ #include "CoreGateway.h" -#include "lib/jetfix/common/OutFIX.h" -#include "lib/jetfix/connection/AsyncReader.h" -#include "lib/jetfix/connection/IConnection.h" -#include "lib/jetfix/gateway/ICoreGatewayObserver.h" -#include "lib/jetfix/gateway/Session.h" -#include "lib/jetfix/store/IFIXStore.h" -#include "lib/logging/logging.h" -#include "lib/orderman/orderman_utils/orderman_common.h" -#include "lib/tracing/bts_trace.h" -#include "lib/utils/TimeStamp.h" -#include "lib/utils/bts_chrono.h" -#include "lib/utils/datetime.h" -#include "lib/utils/thread_manager.h" +#include "spark/jetfix/common/OutFIX.h" +#include "spark/jetfix/connection/AsyncReader.h" +#include "spark/jetfix/connection/IConnection.h" +#include "spark/jetfix/gateway/ICoreGatewayObserver.h" +#include "spark/jetfix/gateway/Session.h" +#include "spark/jetfix/store/IFIXStore.h" +#include "spark/logging/logging.h" +#include "spark/orderman/orderman_utils/orderman_common.h" +#include "spark/tracing/bts_trace.h" +#include "spark/utils/TimeStamp.h" +#include "spark/utils/bts_chrono.h" +#include "spark/utils/datetime.h" +#include "spark/utils/thread_manager.h" #include #include diff --git a/src/lib/jetfix/gateway/CoreGateway.h b/src/lib_spark/spark/jetfix/gateway/CoreGateway.h similarity index 90% rename from src/lib/jetfix/gateway/CoreGateway.h rename to src/lib_spark/spark/jetfix/gateway/CoreGateway.h index d6aa04849..eb0c38485 100644 --- a/src/lib/jetfix/gateway/CoreGateway.h +++ b/src/lib_spark/spark/jetfix/gateway/CoreGateway.h @@ -3,11 +3,11 @@ #include #include -#include "lib/jetfix/common/OutFIXPtr.h" -#include "lib/jetfix/gateway/ICoreGatewayEventSink.h" -#include "lib/orderman/orderman_utils/orderman_common.h" +#include "spark/jetfix/common/OutFIXPtr.h" +#include "spark/jetfix/gateway/ICoreGatewayEventSink.h" +#include "spark/orderman/orderman_utils/orderman_common.h" -#include "lib/config/protos/jetfix.pb.h" +#include "spark/config/protos/jetfix.pb.h" namespace bts { namespace trace { diff --git a/src/lib/jetfix/gateway/ICoreGatewayEventSink.h b/src/lib_spark/spark/jetfix/gateway/ICoreGatewayEventSink.h similarity index 90% rename from src/lib/jetfix/gateway/ICoreGatewayEventSink.h rename to src/lib_spark/spark/jetfix/gateway/ICoreGatewayEventSink.h index 68877cc7f..5ba955347 100644 --- a/src/lib/jetfix/gateway/ICoreGatewayEventSink.h +++ b/src/lib_spark/spark/jetfix/gateway/ICoreGatewayEventSink.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/jetfix/common/InMsgBuffer.h" +#include "spark/jetfix/common/InMsgBuffer.h" #include namespace bts { diff --git a/src/lib/jetfix/gateway/ICoreGatewayObserver.h b/src/lib_spark/spark/jetfix/gateway/ICoreGatewayObserver.h similarity index 89% rename from src/lib/jetfix/gateway/ICoreGatewayObserver.h rename to src/lib_spark/spark/jetfix/gateway/ICoreGatewayObserver.h index 293915236..b194567e4 100644 --- a/src/lib/jetfix/gateway/ICoreGatewayObserver.h +++ b/src/lib_spark/spark/jetfix/gateway/ICoreGatewayObserver.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/jetfix/common/InMsgBuffer.h" +#include "spark/jetfix/common/InMsgBuffer.h" #include namespace bts { diff --git a/src/lib/jetfix/gateway/JetFIXGateway.cpp b/src/lib_spark/spark/jetfix/gateway/JetFIXGateway.cpp similarity index 100% rename from src/lib/jetfix/gateway/JetFIXGateway.cpp rename to src/lib_spark/spark/jetfix/gateway/JetFIXGateway.cpp diff --git a/src/lib/jetfix/gateway/JetFIXGateway.h b/src/lib_spark/spark/jetfix/gateway/JetFIXGateway.h similarity index 90% rename from src/lib/jetfix/gateway/JetFIXGateway.h rename to src/lib_spark/spark/jetfix/gateway/JetFIXGateway.h index bc27b92cd..cfb447970 100644 --- a/src/lib/jetfix/gateway/JetFIXGateway.h +++ b/src/lib_spark/spark/jetfix/gateway/JetFIXGateway.h @@ -1,16 +1,16 @@ #pragma once -#include "lib/jetfix/gateway/CoreGateway.h" +#include "spark/jetfix/gateway/CoreGateway.h" #include -#include "lib/jetfix/connection/SocketConnection.h" -#include "lib/jetfix/gateway/ICoreGatewayObserver.h" -#include "lib/jetfix/store/FIXFileStore.h" -#include "lib/orderman/orderman_utils/orderman_common.h" -#include "lib/tracing/PerfLog.h" -#include "lib/utils/meta_programming.h" +#include "spark/jetfix/connection/SocketConnection.h" +#include "spark/jetfix/gateway/ICoreGatewayObserver.h" +#include "spark/jetfix/store/FIXFileStore.h" +#include "spark/orderman/orderman_utils/orderman_common.h" +#include "spark/tracing/PerfLog.h" +#include "spark/utils/meta_programming.h" -#include "lib/config/protos/jetfix.pb.h" +#include "spark/config/protos/jetfix.pb.h" namespace bts { namespace trace { diff --git a/src/lib/jetfix/gateway/Session.cpp b/src/lib_spark/spark/jetfix/gateway/Session.cpp similarity index 97% rename from src/lib/jetfix/gateway/Session.cpp rename to src/lib_spark/spark/jetfix/gateway/Session.cpp index 6520a6a8b..f0b05b528 100644 --- a/src/lib/jetfix/gateway/Session.cpp +++ b/src/lib_spark/spark/jetfix/gateway/Session.cpp @@ -1,21 +1,21 @@ #include "Session.h" -#include "lib/config/config.h" -#include "lib/domain_model/Security.pb.h" -#include "lib/jetfix/codec/FIXEncodingStream.h" -#include "lib/jetfix/codec/FieldDefinitions.h" -#include "lib/jetfix/codec/MessageTypes.h" -#include "lib/jetfix/common/OutFIX.h" -#include "lib/jetfix/connection/IConnection.h" -#include "lib/jetfix/gateway/ICoreGatewayEventSink.h" -#include "lib/jetfix/store/IFIXStore.h" -#include "lib/logging/logging.h" -#include "lib/tracing/bts_trace.h" -#include "lib/utils/SecureLogon.h" -#include "lib/utils/TimeStamp.h" -#include "lib/utils/datetime.h" +#include "spark/config/config.h" +#include "spark/domain_model/Security.pb.h" +#include "spark/jetfix/codec/FIXEncodingStream.h" +#include "spark/jetfix/codec/FieldDefinitions.h" +#include "spark/jetfix/codec/MessageTypes.h" +#include "spark/jetfix/common/OutFIX.h" +#include "spark/jetfix/connection/IConnection.h" +#include "spark/jetfix/gateway/ICoreGatewayEventSink.h" +#include "spark/jetfix/store/IFIXStore.h" +#include "spark/logging/logging.h" +#include "spark/tracing/bts_trace.h" +#include "spark/utils/SecureLogon.h" +#include "spark/utils/TimeStamp.h" +#include "spark/utils/datetime.h" -#include "lib/config/protos/jetfix.pb.h" +#include "spark/config/protos/jetfix.pb.h" #include #include diff --git a/src/lib/jetfix/gateway/Session.h b/src/lib_spark/spark/jetfix/gateway/Session.h similarity index 87% rename from src/lib/jetfix/gateway/Session.h rename to src/lib_spark/spark/jetfix/gateway/Session.h index 0e2fbdf55..0161c618a 100644 --- a/src/lib/jetfix/gateway/Session.h +++ b/src/lib_spark/spark/jetfix/gateway/Session.h @@ -3,14 +3,14 @@ #include #include -#include "lib/jetfix/common/InMsgBuffer.h" -#include "lib/jetfix/common/JetFIXError.h" -#include "lib/jetfix/common/OutFIXPtr.h" -#include "lib/orderman/orderman_utils/orderman_common.h" -#include "lib/tracing/PerfLog.h" -#include "lib/utils/datetime.h" +#include "spark/jetfix/common/InMsgBuffer.h" +#include "spark/jetfix/common/JetFIXError.h" +#include "spark/jetfix/common/OutFIXPtr.h" +#include "spark/orderman/orderman_utils/orderman_common.h" +#include "spark/tracing/PerfLog.h" +#include "spark/utils/datetime.h" -#include "lib/config/protos/jetfix.pb.h" +#include "spark/config/protos/jetfix.pb.h" namespace bts { namespace utils { diff --git a/src/lib_spark/spark/jetfix/jetfix.h b/src/lib_spark/spark/jetfix/jetfix.h new file mode 100644 index 000000000..64891fced --- /dev/null +++ b/src/lib_spark/spark/jetfix/jetfix.h @@ -0,0 +1,5 @@ +#pragma once +#include "spark/jetfix/codec/FIXFragment.h" +#include "spark/jetfix/codec/FieldDefinitions.h" +#include "spark/jetfix/codec/MessageDefinitions.h" +#include "spark/jetfix/gateway/JetFIXGateway.h" diff --git a/src/lib/jetfix/store/FIXFileStore.cpp b/src/lib_spark/spark/jetfix/store/FIXFileStore.cpp similarity index 95% rename from src/lib/jetfix/store/FIXFileStore.cpp rename to src/lib_spark/spark/jetfix/store/FIXFileStore.cpp index e759da9ee..ed34f5aea 100644 --- a/src/lib/jetfix/store/FIXFileStore.cpp +++ b/src/lib_spark/spark/jetfix/store/FIXFileStore.cpp @@ -1,16 +1,16 @@ #include "FIXFileStore.h" -#include "lib/config/config.h" -#include "lib/config/protos/system_config.pb.h" -#include "lib/jetfix/codec/FIXEncodingStream.h" -#include "lib/jetfix/common/InMsgBuffer.h" -#include "lib/jetfix/common/OutFIX.h" -#include "lib/jetfix/store/session_name.h" -#include "lib/os/os.h" -#include "lib/utils/bts_chrono.h" -#include "lib/utils/datetime.h" -#include "lib/utils/file_utils.h" -#include "lib/utils/thread_manager.h" +#include "spark/config/config.h" +#include "spark/config/protos/system_config.pb.h" +#include "spark/jetfix/codec/FIXEncodingStream.h" +#include "spark/jetfix/common/InMsgBuffer.h" +#include "spark/jetfix/common/OutFIX.h" +#include "spark/jetfix/store/session_name.h" +#include "spark/os/os.h" +#include "spark/utils/bts_chrono.h" +#include "spark/utils/datetime.h" +#include "spark/utils/file_utils.h" +#include "spark/utils/thread_manager.h" #include #include diff --git a/src/lib/jetfix/store/FIXFileStore.h b/src/lib_spark/spark/jetfix/store/FIXFileStore.h similarity index 90% rename from src/lib/jetfix/store/FIXFileStore.h rename to src/lib_spark/spark/jetfix/store/FIXFileStore.h index 20d49ab44..1a3054623 100644 --- a/src/lib/jetfix/store/FIXFileStore.h +++ b/src/lib_spark/spark/jetfix/store/FIXFileStore.h @@ -1,7 +1,7 @@ #pragma once -#include "lib/config/protos/jetfix.pb.h" -#include "lib/jetfix/store/IFIXStore.h" +#include "spark/config/protos/jetfix.pb.h" +#include "spark/jetfix/store/IFIXStore.h" #include namespace bts { diff --git a/src/lib/jetfix/store/IFIXStore.h b/src/lib_spark/spark/jetfix/store/IFIXStore.h similarity index 93% rename from src/lib/jetfix/store/IFIXStore.h rename to src/lib_spark/spark/jetfix/store/IFIXStore.h index 685d21cd8..ecbb96aec 100644 --- a/src/lib/jetfix/store/IFIXStore.h +++ b/src/lib_spark/spark/jetfix/store/IFIXStore.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/jetfix/common/OutFIXPtr.h" +#include "spark/jetfix/common/OutFIXPtr.h" #include #include diff --git a/src/lib/jetfix/store/session_name.cpp b/src/lib_spark/spark/jetfix/store/session_name.cpp similarity index 98% rename from src/lib/jetfix/store/session_name.cpp rename to src/lib_spark/spark/jetfix/store/session_name.cpp index c9fa8043b..813df38f9 100644 --- a/src/lib/jetfix/store/session_name.cpp +++ b/src/lib_spark/spark/jetfix/store/session_name.cpp @@ -1,6 +1,6 @@ #include "session_name.h" -#include "lib/utils/bts_assert.h" -#include "lib/utils/datetime.h" +#include "spark/utils/bts_assert.h" +#include "spark/utils/datetime.h" #include namespace bts { diff --git a/src/lib/jetfix/store/session_name.h b/src/lib_spark/spark/jetfix/store/session_name.h similarity index 95% rename from src/lib/jetfix/store/session_name.h rename to src/lib_spark/spark/jetfix/store/session_name.h index 9052d3450..67383d8a9 100644 --- a/src/lib/jetfix/store/session_name.h +++ b/src/lib_spark/spark/jetfix/store/session_name.h @@ -1,7 +1,7 @@ #pragma once -#include "lib/config/protos/jetfix.pb.h" -#include "lib/utils/datetime.h" +#include "spark/config/protos/jetfix.pb.h" +#include "spark/utils/datetime.h" #include #include diff --git a/src/lib/jetfix/tests/async_reader_tests.cpp b/src/lib_spark/spark/jetfix/tests/async_reader_tests.cpp similarity index 95% rename from src/lib/jetfix/tests/async_reader_tests.cpp rename to src/lib_spark/spark/jetfix/tests/async_reader_tests.cpp index aa539433c..c95129ef8 100644 --- a/src/lib/jetfix/tests/async_reader_tests.cpp +++ b/src/lib_spark/spark/jetfix/tests/async_reader_tests.cpp @@ -1,8 +1,8 @@ -#include "lib/jetfix/common/InMsgBuffer.h" -#include "lib/jetfix/connection/AsyncReader.h" -#include "lib/jetfix/connection/IConnection.h" -#include "lib/jetfix/gateway/ICoreGatewayEventSink.h" -#include "lib/jetfix/tests/sample_fix.h" +#include "spark/jetfix/common/InMsgBuffer.h" +#include "spark/jetfix/connection/AsyncReader.h" +#include "spark/jetfix/connection/IConnection.h" +#include "spark/jetfix/gateway/ICoreGatewayEventSink.h" +#include "spark/jetfix/tests/sample_fix.h" #include #include diff --git a/src/lib/jetfix/tests/conv.py b/src/lib_spark/spark/jetfix/tests/conv.py similarity index 100% rename from src/lib/jetfix/tests/conv.py rename to src/lib_spark/spark/jetfix/tests/conv.py diff --git a/src/lib/jetfix/tests/decoding_tests.cpp b/src/lib_spark/spark/jetfix/tests/decoding_tests.cpp similarity index 93% rename from src/lib/jetfix/tests/decoding_tests.cpp rename to src/lib_spark/spark/jetfix/tests/decoding_tests.cpp index f32be7c78..9cc71373c 100644 --- a/src/lib/jetfix/tests/decoding_tests.cpp +++ b/src/lib_spark/spark/jetfix/tests/decoding_tests.cpp @@ -1,12 +1,12 @@ -#include "lib/jetfix/codec/FIXFragment.h" -#include "lib/jetfix/codec/FIXMsg.h" -#include "lib/jetfix/codec/FIXParser.h" -#include "lib/jetfix/codec/FieldDefinitions.h" -#include "lib/jetfix/codec/Fields.h" -#include "lib/jetfix/codec/Group.h" -#include "lib/jetfix/common/InMsgBuffer.h" -#include "lib/jetfix/connection/IConnectionObserver.h" -#include "lib/utils/TimeStamp.h" +#include "spark/jetfix/codec/FIXFragment.h" +#include "spark/jetfix/codec/FIXMsg.h" +#include "spark/jetfix/codec/FIXParser.h" +#include "spark/jetfix/codec/FieldDefinitions.h" +#include "spark/jetfix/codec/Fields.h" +#include "spark/jetfix/codec/Group.h" +#include "spark/jetfix/common/InMsgBuffer.h" +#include "spark/jetfix/connection/IConnectionObserver.h" +#include "spark/utils/TimeStamp.h" #include diff --git a/src/lib/jetfix/tests/fix_encoding_stream_tests.cpp b/src/lib_spark/spark/jetfix/tests/fix_encoding_stream_tests.cpp similarity index 98% rename from src/lib/jetfix/tests/fix_encoding_stream_tests.cpp rename to src/lib_spark/spark/jetfix/tests/fix_encoding_stream_tests.cpp index 4c222e291..f7377ba1f 100644 --- a/src/lib/jetfix/tests/fix_encoding_stream_tests.cpp +++ b/src/lib_spark/spark/jetfix/tests/fix_encoding_stream_tests.cpp @@ -1,4 +1,4 @@ -#include "lib/jetfix/codec/FIXEncodingStream.h" +#include "spark/jetfix/codec/FIXEncodingStream.h" #include #include diff --git a/src/lib/jetfix/tests/fix_fragment_tests.cpp b/src/lib_spark/spark/jetfix/tests/fix_fragment_tests.cpp similarity index 97% rename from src/lib/jetfix/tests/fix_fragment_tests.cpp rename to src/lib_spark/spark/jetfix/tests/fix_fragment_tests.cpp index 58c06b3d0..381caa76c 100644 --- a/src/lib/jetfix/tests/fix_fragment_tests.cpp +++ b/src/lib_spark/spark/jetfix/tests/fix_fragment_tests.cpp @@ -1,6 +1,6 @@ -#include "lib/jetfix/codec/FIXFragment.h" -#include "lib/jetfix/codec/Fields.h" -#include "lib/utils/datetime.h" +#include "spark/jetfix/codec/FIXFragment.h" +#include "spark/jetfix/codec/Fields.h" +#include "spark/utils/datetime.h" #include diff --git a/src/lib/jetfix/tests/jetfix_performance_tests.cpp b/src/lib_spark/spark/jetfix/tests/jetfix_performance_tests.cpp similarity index 95% rename from src/lib/jetfix/tests/jetfix_performance_tests.cpp rename to src/lib_spark/spark/jetfix/tests/jetfix_performance_tests.cpp index e2652a1c3..67eca04c8 100644 --- a/src/lib/jetfix/tests/jetfix_performance_tests.cpp +++ b/src/lib_spark/spark/jetfix/tests/jetfix_performance_tests.cpp @@ -1,13 +1,13 @@ -#include "lib/jetfix/codec/FIXFragment.h" -#include "lib/jetfix/codec/FIXMsg.h" -#include "lib/jetfix/codec/FIXParser.h" -#include "lib/jetfix/codec/FieldDefinitions.h" -#include "lib/jetfix/codec/Fields.h" -#include "lib/jetfix/codec/Group.h" -#include "lib/jetfix/common/InMsgBuffer.h" -#include "lib/jetfix/connection/IConnectionObserver.h" -#include "lib/logging/logging.h" -#include "lib/utils/TimeStamp.h" +#include "spark/jetfix/codec/FIXFragment.h" +#include "spark/jetfix/codec/FIXMsg.h" +#include "spark/jetfix/codec/FIXParser.h" +#include "spark/jetfix/codec/FieldDefinitions.h" +#include "spark/jetfix/codec/Fields.h" +#include "spark/jetfix/codec/Group.h" +#include "spark/jetfix/common/InMsgBuffer.h" +#include "spark/jetfix/connection/IConnectionObserver.h" +#include "spark/logging/logging.h" +#include "spark/utils/TimeStamp.h" #include diff --git a/src/lib/jetfix/tests/sample_fix.cpp b/src/lib_spark/spark/jetfix/tests/sample_fix.cpp similarity index 100% rename from src/lib/jetfix/tests/sample_fix.cpp rename to src/lib_spark/spark/jetfix/tests/sample_fix.cpp diff --git a/src/lib/jetfix/tests/sample_fix.dat b/src/lib_spark/spark/jetfix/tests/sample_fix.dat similarity index 100% rename from src/lib/jetfix/tests/sample_fix.dat rename to src/lib_spark/spark/jetfix/tests/sample_fix.dat diff --git a/src/lib/jetfix/tests/sample_fix.h b/src/lib_spark/spark/jetfix/tests/sample_fix.h similarity index 100% rename from src/lib/jetfix/tests/sample_fix.h rename to src/lib_spark/spark/jetfix/tests/sample_fix.h diff --git a/src/lib/jetfix/tests/store_tests.cpp b/src/lib_spark/spark/jetfix/tests/store_tests.cpp similarity index 96% rename from src/lib/jetfix/tests/store_tests.cpp rename to src/lib_spark/spark/jetfix/tests/store_tests.cpp index 1378dde99..3543b5afb 100644 --- a/src/lib/jetfix/tests/store_tests.cpp +++ b/src/lib_spark/spark/jetfix/tests/store_tests.cpp @@ -1,13 +1,13 @@ -#include "lib/jetfix/codec/FIXEncodingStream.h" -#include "lib/jetfix/common/InMsgBuffer.h" -#include "lib/jetfix/common/OutFIX.h" -#include "lib/jetfix/common/OutFIXPtr.h" -#include "lib/jetfix/store/FIXFileStore.h" -#include "lib/jetfix/store/session_name.h" -#include "lib/logging/logging.h" -#include "lib/utils/TempDir.h" -#include "lib/utils/TimeStamp.h" -#include "lib/utils/datetime.h" +#include "spark/jetfix/codec/FIXEncodingStream.h" +#include "spark/jetfix/common/InMsgBuffer.h" +#include "spark/jetfix/common/OutFIX.h" +#include "spark/jetfix/common/OutFIXPtr.h" +#include "spark/jetfix/store/FIXFileStore.h" +#include "spark/jetfix/store/session_name.h" +#include "spark/logging/logging.h" +#include "spark/utils/TempDir.h" +#include "spark/utils/TimeStamp.h" +#include "spark/utils/datetime.h" #include #include diff --git a/src/lib/logging/Common.h b/src/lib_spark/spark/logging/Common.h similarity index 96% rename from src/lib/logging/Common.h rename to src/lib_spark/spark/logging/Common.h index 260bb8653..8b69f5d80 100644 --- a/src/lib/logging/Common.h +++ b/src/lib_spark/spark/logging/Common.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/utils/windows_wrapper.h" +#include "spark/utils/windows_wrapper.h" #include #include diff --git a/src/lib/logging/LogRec.h b/src/lib_spark/spark/logging/LogRec.h similarity index 96% rename from src/lib/logging/LogRec.h rename to src/lib_spark/spark/logging/LogRec.h index 96dce6c34..751c90c9c 100644 --- a/src/lib/logging/LogRec.h +++ b/src/lib_spark/spark/logging/LogRec.h @@ -2,7 +2,7 @@ #include "Common.h" #include "MsgPacking.h" -#include "lib/utils/warn_ctrl.h" +#include "spark/utils/warn_ctrl.h" namespace bts { namespace log { diff --git a/src/lib/logging/Logger.h b/src/lib_spark/spark/logging/Logger.h similarity index 99% rename from src/lib/logging/Logger.h rename to src/lib_spark/spark/logging/Logger.h index edbb57b79..1a92a67ca 100644 --- a/src/lib/logging/Logger.h +++ b/src/lib_spark/spark/logging/Logger.h @@ -2,7 +2,7 @@ #include "LogRec.h" #include "MsgPacking.h" -#include "lib/os/os.h" +#include "spark/os/os.h" #include #include diff --git a/src/lib/logging/LoggerHub.cpp b/src/lib_spark/spark/logging/LoggerHub.cpp similarity index 97% rename from src/lib/logging/LoggerHub.cpp rename to src/lib_spark/spark/logging/LoggerHub.cpp index 75babbd1b..817968307 100644 --- a/src/lib/logging/LoggerHub.cpp +++ b/src/lib_spark/spark/logging/LoggerHub.cpp @@ -1,10 +1,10 @@ #include "LoggerHub.h" #include "Logger.h" -#include "lib/os/os.h" -#include "lib/utils/bts_assert.h" -#include "lib/utils/bts_chrono.h" -#include "lib/utils/thread_manager.h" +#include "spark/os/os.h" +#include "spark/utils/bts_assert.h" +#include "spark/utils/bts_chrono.h" +#include "spark/utils/thread_manager.h" #include #include diff --git a/src/lib/logging/LoggerHub.h b/src/lib_spark/spark/logging/LoggerHub.h similarity index 100% rename from src/lib/logging/LoggerHub.h rename to src/lib_spark/spark/logging/LoggerHub.h diff --git a/src/lib/logging/LoggingConfig.h b/src/lib_spark/spark/logging/LoggingConfig.h similarity index 93% rename from src/lib/logging/LoggingConfig.h rename to src/lib_spark/spark/logging/LoggingConfig.h index fa8324f7f..e343427d9 100644 --- a/src/lib/logging/LoggingConfig.h +++ b/src/lib_spark/spark/logging/LoggingConfig.h @@ -2,7 +2,7 @@ #include "Common.h" #include "Sink.h" -#include "lib/config/protos/threads.pb.h" +#include "spark/config/protos/threads.pb.h" #include #include diff --git a/src/lib/logging/MsgPacking.h b/src/lib_spark/spark/logging/MsgPacking.h similarity index 100% rename from src/lib/logging/MsgPacking.h rename to src/lib_spark/spark/logging/MsgPacking.h diff --git a/src/lib/logging/Sink.cpp b/src/lib_spark/spark/logging/Sink.cpp similarity index 95% rename from src/lib/logging/Sink.cpp rename to src/lib_spark/spark/logging/Sink.cpp index ee56efb04..dca909941 100644 --- a/src/lib/logging/Sink.cpp +++ b/src/lib_spark/spark/logging/Sink.cpp @@ -1,10 +1,10 @@ #include "Sink.h" -#include "lib/logging/logging.h" -#include "lib/os/os.h" -#include "lib/utils/bts_assert.h" -#include "lib/utils/datetime.h" -#include "lib/utils/file_utils.h" +#include "spark/logging/logging.h" +#include "spark/os/os.h" +#include "spark/utils/bts_assert.h" +#include "spark/utils/datetime.h" +#include "spark/utils/file_utils.h" #include #include diff --git a/src/lib/logging/Sink.h b/src/lib_spark/spark/logging/Sink.h similarity index 95% rename from src/lib/logging/Sink.h rename to src/lib_spark/spark/logging/Sink.h index 2423c8bac..29abe583f 100644 --- a/src/lib/logging/Sink.h +++ b/src/lib_spark/spark/logging/Sink.h @@ -1,7 +1,7 @@ #pragma once #include "Common.h" -#include "lib/utils/warn_ctrl.h" +#include "spark/utils/warn_ctrl.h" #include #include diff --git a/src/lib/logging/ccapi_logger.h b/src/lib_spark/spark/logging/ccapi_logger.h similarity index 94% rename from src/lib/logging/ccapi_logger.h rename to src/lib_spark/spark/logging/ccapi_logger.h index b1fa65460..28ea167b3 100644 --- a/src/lib/logging/ccapi_logger.h +++ b/src/lib_spark/spark/logging/ccapi_logger.h @@ -1,8 +1,9 @@ -#include "logging.h" +#pragma once -#include "LoggerHub.h" -#include "lib/utils/bts_assert.h" -#include "lib/utils/bts_lock_guard.h" +#include "spark/logging/LoggerHub.h" +#include "spark/logging/logging.h" +#include "spark/utils/bts_assert.h" +#include "spark/utils/bts_lock_guard.h" #include #include diff --git a/src/lib/logging/log_var.h b/src/lib_spark/spark/logging/log_var.h similarity index 91% rename from src/lib/logging/log_var.h rename to src/lib_spark/spark/logging/log_var.h index c3006b6cf..bbb159e9a 100644 --- a/src/lib/logging/log_var.h +++ b/src/lib_spark/spark/logging/log_var.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/logging/logging.h" +#include "spark/logging/logging.h" #define LOG_VAR(subsystem, level, ...) \ bts::log::_thread_logger.logger->is_loggable(subsystem, level) && \ diff --git a/src/lib/logging/logging.cpp b/src/lib_spark/spark/logging/logging.cpp similarity index 94% rename from src/lib/logging/logging.cpp rename to src/lib_spark/spark/logging/logging.cpp index 4b260a590..6643184bb 100644 --- a/src/lib/logging/logging.cpp +++ b/src/lib_spark/spark/logging/logging.cpp @@ -1,15 +1,15 @@ #include "logging.h" #include "LoggerHub.h" -#include "lib/config/config.h" -#include "lib/config/protos/deployment_type.pb.h" -#include "lib/config/protos/logging.pb.h" -#include "lib/config/protos/system_config.pb.h" -#include "lib/os/os.h" -#include "lib/utils/Dispatcher.h" -#include "lib/utils/bts_assert.h" -#include "lib/utils/thread_manager.h" +#include "spark/config/config.h" +#include "spark/config/protos/deployment_type.pb.h" +#include "spark/config/protos/logging.pb.h" +#include "spark/config/protos/system_config.pb.h" +#include "spark/os/os.h" +#include "spark/utils/Dispatcher.h" +#include "spark/utils/bts_assert.h" +#include "spark/utils/thread_manager.h" #ifdef SPARK_ENABLE_CCAPI -#include "lib/logging/ccapi_logger.h" +#include "spark/logging/ccapi_logger.h" #endif #include diff --git a/src/lib/logging/logging.h b/src/lib_spark/spark/logging/logging.h similarity index 98% rename from src/lib/logging/logging.h rename to src/lib_spark/spark/logging/logging.h index acfbb25d0..dfe84be4b 100644 --- a/src/lib/logging/logging.h +++ b/src/lib_spark/spark/logging/logging.h @@ -3,8 +3,8 @@ #include "Common.h" #include "Logger.h" #include "LoggerHub.h" -#include "lib/utils/Dispatcher.h" -#include "lib/utils/bts_chrono.h" +#include "spark/utils/Dispatcher.h" +#include "spark/utils/bts_chrono.h" #include #include diff --git a/src/lib/logging/tests/logging_tests.cpp b/src/lib_spark/spark/logging/tests/logging_tests.cpp similarity index 94% rename from src/lib/logging/tests/logging_tests.cpp rename to src/lib_spark/spark/logging/tests/logging_tests.cpp index 4e785a1cc..dacac614f 100644 --- a/src/lib/logging/tests/logging_tests.cpp +++ b/src/lib_spark/spark/logging/tests/logging_tests.cpp @@ -1,7 +1,7 @@ -#include "lib/config/config.h" -#include "lib/config/protos/logging.pb.h" -#include "lib/logging/logging.h" -#include "lib/utils/bts_chrono.h" +#include "spark/config/config.h" +#include "spark/config/protos/logging.pb.h" +#include "spark/logging/logging.h" +#include "spark/utils/bts_chrono.h" #include #include diff --git a/src/lib/logging/trace_log.h b/src/lib_spark/spark/logging/trace_log.h similarity index 100% rename from src/lib/logging/trace_log.h rename to src/lib_spark/spark/logging/trace_log.h diff --git a/src/lib/logging/trace_log_var.h b/src/lib_spark/spark/logging/trace_log_var.h similarity index 96% rename from src/lib/logging/trace_log_var.h rename to src/lib_spark/spark/logging/trace_log_var.h index 0bb632a05..a32a6eee9 100644 --- a/src/lib/logging/trace_log_var.h +++ b/src/lib_spark/spark/logging/trace_log_var.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/logging/log_var.h" +#include "spark/logging/log_var.h" #define LOG_TRACE_VAR(subsystem, level, scope, name) \ LOG_VAR( \ diff --git a/src/lib/md/CompositeMarketDataListener.h b/src/lib_spark/spark/md/CompositeMarketDataListener.h similarity index 100% rename from src/lib/md/CompositeMarketDataListener.h rename to src/lib_spark/spark/md/CompositeMarketDataListener.h diff --git a/src/lib/md/Diag/MDPeriodicDumper.cpp b/src/lib_spark/spark/md/Diag/MDPeriodicDumper.cpp similarity index 93% rename from src/lib/md/Diag/MDPeriodicDumper.cpp rename to src/lib_spark/spark/md/Diag/MDPeriodicDumper.cpp index 69569d67b..9304c6d81 100644 --- a/src/lib/md/Diag/MDPeriodicDumper.cpp +++ b/src/lib_spark/spark/md/Diag/MDPeriodicDumper.cpp @@ -1,11 +1,11 @@ #include "MDPeriodicDumper.h" -#include "lib/config/protos/system_config.pb.h" -#include "lib/md/MDConsumer.h" -#include "lib/md/SecurityCache.h" -#include "lib/utils/Dispatcher.h" -#include "lib/utils/TimeStamp.h" -#include "lib/utils/datetime.h" -#include "lib/utils/thread_manager.h" +#include "spark/config/protos/system_config.pb.h" +#include "spark/md/MDConsumer.h" +#include "spark/md/SecurityCache.h" +#include "spark/utils/Dispatcher.h" +#include "spark/utils/TimeStamp.h" +#include "spark/utils/datetime.h" +#include "spark/utils/thread_manager.h" #include #include diff --git a/src/lib/md/Diag/MDPeriodicDumper.h b/src/lib_spark/spark/md/Diag/MDPeriodicDumper.h similarity index 85% rename from src/lib/md/Diag/MDPeriodicDumper.h rename to src/lib_spark/spark/md/Diag/MDPeriodicDumper.h index 71eea8646..7a2b698bf 100644 --- a/src/lib/md/Diag/MDPeriodicDumper.h +++ b/src/lib_spark/spark/md/Diag/MDPeriodicDumper.h @@ -1,5 +1,5 @@ #pragma once -#include "lib/md/UserSymbol.h" +#include "spark/md/UserSymbol.h" #include #include diff --git a/src/lib/md/Diag/ShmDumper.cpp b/src/lib_spark/spark/md/Diag/ShmDumper.cpp similarity index 95% rename from src/lib/md/Diag/ShmDumper.cpp rename to src/lib_spark/spark/md/Diag/ShmDumper.cpp index dc04f67f7..127d952a1 100644 --- a/src/lib/md/Diag/ShmDumper.cpp +++ b/src/lib_spark/spark/md/Diag/ShmDumper.cpp @@ -3,10 +3,10 @@ #include "ShmDumper.h" #include "../Shm/MDStructure.h" -#include "lib/domain_model/Security.h" -#include "lib/io/JsonDumper.h" -#include "lib/logging/logging.h" -#include "lib/utils/SharedList.h" +#include "spark/domain_model/Security.h" +#include "spark/io/JsonDumper.h" +#include "spark/logging/logging.h" +#include "spark/utils/SharedList.h" #include #include diff --git a/src/lib/md/Diag/ShmDumper.h b/src/lib_spark/spark/md/Diag/ShmDumper.h similarity index 77% rename from src/lib/md/Diag/ShmDumper.h rename to src/lib_spark/spark/md/Diag/ShmDumper.h index a5e18ef3d..d22dfe266 100644 --- a/src/lib/md/Diag/ShmDumper.h +++ b/src/lib_spark/spark/md/Diag/ShmDumper.h @@ -1,7 +1,7 @@ #pragma once -#include "lib/md/Shm/FixedSecurity.h" -#include "lib/utils/bts_export.h" -#include "lib/utils/bts_no_copy.h" +#include "spark/md/Shm/FixedSecurity.h" +#include "spark/utils/bts_export.h" +#include "spark/utils/bts_no_copy.h" #include namespace bts { diff --git a/src/lib/md/ExchangeOrderKey.h b/src/lib_spark/spark/md/ExchangeOrderKey.h similarity index 83% rename from src/lib/md/ExchangeOrderKey.h rename to src/lib_spark/spark/md/ExchangeOrderKey.h index 9212703ac..1dfcf39e9 100644 --- a/src/lib/md/ExchangeOrderKey.h +++ b/src/lib_spark/spark/md/ExchangeOrderKey.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/utils/ValueWrapper.h" +#include "spark/utils/ValueWrapper.h" #include diff --git a/src/lib/md/ExchangeSecurityKey.h b/src/lib_spark/spark/md/ExchangeSecurityKey.h similarity index 81% rename from src/lib/md/ExchangeSecurityKey.h rename to src/lib_spark/spark/md/ExchangeSecurityKey.h index 2a83568db..41bbed5c0 100644 --- a/src/lib/md/ExchangeSecurityKey.h +++ b/src/lib_spark/spark/md/ExchangeSecurityKey.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/utils/ValueWrapper.h" +#include "spark/utils/ValueWrapper.h" #include diff --git a/src/lib/md/GeneralMarketDataListener.cpp b/src/lib_spark/spark/md/GeneralMarketDataListener.cpp similarity index 95% rename from src/lib/md/GeneralMarketDataListener.cpp rename to src/lib_spark/spark/md/GeneralMarketDataListener.cpp index 91a87b934..a50d9300d 100644 --- a/src/lib/md/GeneralMarketDataListener.cpp +++ b/src/lib_spark/spark/md/GeneralMarketDataListener.cpp @@ -1,41 +1,41 @@ #include "GeneralMarketDataListener.h" -#include "lib/api/domain/SecurityType.pb.h" -#include "lib/api/domain/Venue.pb.h" -#include "lib/core/TimeStamp.h" -#include "lib/domain/AggressorSide.h" -#include "lib/domain/Book.h" -#include "lib/domain/DomainSecurityUtils.h" -#include "lib/domain/FutureSecurity.h" -#include "lib/domain/OptionSecurity.h" -#include "lib/domain/Price.h" -#include "lib/domain/Quantity.h" -#include "lib/domain/Security.h" -#include "lib/domain/SecurityCommon.h" -#include "lib/domain/SecurityID.h" -#include "lib/domain/SecurityMarketDataStatistics.h" -#include "lib/domain/SecurityState.h" -#include "lib/domain/Side.h" -#include "lib/domain/SpotSecurity.h" -#include "lib/domain/SpreadSecurity.h" -#include "lib/domain/TradeRecord.h" -#include "lib/domain_model/Security.pb.h" -#include "lib/domain_model/common.h" -#include "lib/io/JsonDumper.h" -#include "lib/logging/logging.h" -#include "lib/md/GeneralSecurityIndex.h" -#include "lib/md/IMarketDataListener.h" -#include "lib/md/IntPrice.h" -#include "lib/md/MDProducer.h" -#include "lib/md/MDProducerHandle.h" -#include "lib/md/PriceSize.h" -#include "lib/md/Shm/FixedSecurity.h" -#include "lib/md/Shm/MDStructure.h" -#include "lib/md/protos/co2.pb.h" -#include "lib/orderman/gateways/sim/SimExecutionGateway.h" -#include "lib/orderman/gateways/sim/SimExecutionGatewayFactory.h" -#include "lib/persistence/IDGenerator.h" -#include "lib/utils/TimeStamp.h" -#include "lib/utils/bts_assert.h" +#include "spark/api/domain/SecurityType.pb.h" +#include "spark/api/domain/Venue.pb.h" +#include "spark/core/TimeStamp.h" +#include "spark/domain/AggressorSide.h" +#include "spark/domain/Book.h" +#include "spark/domain/DomainSecurityUtils.h" +#include "spark/domain/FutureSecurity.h" +#include "spark/domain/OptionSecurity.h" +#include "spark/domain/Price.h" +#include "spark/domain/Quantity.h" +#include "spark/domain/Security.h" +#include "spark/domain/SecurityCommon.h" +#include "spark/domain/SecurityID.h" +#include "spark/domain/SecurityMarketDataStatistics.h" +#include "spark/domain/SecurityState.h" +#include "spark/domain/Side.h" +#include "spark/domain/SpotSecurity.h" +#include "spark/domain/SpreadSecurity.h" +#include "spark/domain/TradeRecord.h" +#include "spark/domain_model/Security.pb.h" +#include "spark/domain_model/common.h" +#include "spark/io/JsonDumper.h" +#include "spark/logging/logging.h" +#include "spark/md/GeneralSecurityIndex.h" +#include "spark/md/IMarketDataListener.h" +#include "spark/md/IntPrice.h" +#include "spark/md/MDProducer.h" +#include "spark/md/MDProducerHandle.h" +#include "spark/md/PriceSize.h" +#include "spark/md/Shm/FixedSecurity.h" +#include "spark/md/Shm/MDStructure.h" +#include "spark/md/protos/co2.pb.h" +#include "spark/orderman/gateways/sim/SimExecutionGateway.h" +#include "spark/orderman/gateways/sim/SimExecutionGatewayFactory.h" +#include "spark/persistence/IDGenerator.h" +#include "spark/utils/TimeStamp.h" +#include "spark/utils/bts_assert.h" #include #include diff --git a/src/lib/md/GeneralMarketDataListener.h b/src/lib_spark/spark/md/GeneralMarketDataListener.h similarity index 88% rename from src/lib/md/GeneralMarketDataListener.h rename to src/lib_spark/spark/md/GeneralMarketDataListener.h index 290e35ef3..4359e184c 100644 --- a/src/lib/md/GeneralMarketDataListener.h +++ b/src/lib_spark/spark/md/GeneralMarketDataListener.h @@ -1,11 +1,12 @@ #pragma once -#include "lib/domain/Security.h" -#include "lib/domain/SecurityID.h" -#include "lib/domain_model/Security.pb.h" -#include "lib/md/GeneralSecurityIndex.h" -#include "lib/md/IMarketDataListener.h" -#include "lib/md/Shm/FixedSecurity.h" -#include "lib/persistence/IDGenerator.h" + +#include "spark/domain/Security.h" +#include "spark/domain/SecurityID.h" +#include "spark/domain_model/Security.pb.h" +#include "spark/md/GeneralSecurityIndex.h" +#include "spark/md/IMarketDataListener.h" +#include "spark/md/Shm/FixedSecurity.h" +#include "spark/persistence/IDGenerator.h" namespace bts::md { class MDProducer; diff --git a/src/lib/md/GeneralSecurityIndex.h b/src/lib_spark/spark/md/GeneralSecurityIndex.h similarity index 90% rename from src/lib/md/GeneralSecurityIndex.h rename to src/lib_spark/spark/md/GeneralSecurityIndex.h index 54f32bf61..fff2ee802 100644 --- a/src/lib/md/GeneralSecurityIndex.h +++ b/src/lib_spark/spark/md/GeneralSecurityIndex.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/md/SecurityIndex.h" +#include "spark/md/SecurityIndex.h" #include diff --git a/src/lib/md/IMarketDataListener.h b/src/lib_spark/spark/md/IMarketDataListener.h similarity index 94% rename from src/lib/md/IMarketDataListener.h rename to src/lib_spark/spark/md/IMarketDataListener.h index e29f78593..ba457e407 100644 --- a/src/lib/md/IMarketDataListener.h +++ b/src/lib_spark/spark/md/IMarketDataListener.h @@ -1,8 +1,8 @@ #pragma once -#include "lib/domain/Book.h" -#include "lib/domain/SecurityID.h" -#include "lib/utils/TimeStamp.h" +#include "spark/domain/Book.h" +#include "spark/domain/SecurityID.h" +#include "spark/utils/TimeStamp.h" #include diff --git a/src/lib/md/IMarketDataProvider.cpp b/src/lib_spark/spark/md/IMarketDataProvider.cpp similarity index 100% rename from src/lib/md/IMarketDataProvider.cpp rename to src/lib_spark/spark/md/IMarketDataProvider.cpp diff --git a/src/lib/md/IMarketDataProvider.h b/src/lib_spark/spark/md/IMarketDataProvider.h similarity index 89% rename from src/lib/md/IMarketDataProvider.h rename to src/lib_spark/spark/md/IMarketDataProvider.h index a561477ab..1137062c7 100644 --- a/src/lib/md/IMarketDataProvider.h +++ b/src/lib_spark/spark/md/IMarketDataProvider.h @@ -1,7 +1,7 @@ #pragma once -#include "lib/api/domain/Venue.pb.h" -#include "lib/md/IMarketDataSource.h" +#include "spark/api/domain/Venue.pb.h" +#include "spark/md/IMarketDataSource.h" #include diff --git a/src/lib/md/IMarketDataSource.cpp b/src/lib_spark/spark/md/IMarketDataSource.cpp similarity index 100% rename from src/lib/md/IMarketDataSource.cpp rename to src/lib_spark/spark/md/IMarketDataSource.cpp diff --git a/src/lib/md/IMarketDataSource.h b/src/lib_spark/spark/md/IMarketDataSource.h similarity index 100% rename from src/lib/md/IMarketDataSource.h rename to src/lib_spark/spark/md/IMarketDataSource.h diff --git a/src/lib/md/ISyntheticSecurityService.h b/src/lib_spark/spark/md/ISyntheticSecurityService.h similarity index 74% rename from src/lib/md/ISyntheticSecurityService.h rename to src/lib_spark/spark/md/ISyntheticSecurityService.h index d982e7254..b6f415aeb 100644 --- a/src/lib/md/ISyntheticSecurityService.h +++ b/src/lib_spark/spark/md/ISyntheticSecurityService.h @@ -1,8 +1,8 @@ #pragma once -#include "lib/api/services/SyntheticSecurityService.pb.h" -#include "lib/domain_model/SecurityKey.h" -#include "lib/utils/Event.h" +#include "spark/api/services/SyntheticSecurityService.pb.h" +#include "spark/domain_model/SecurityKey.h" +#include "spark/utils/Event.h" #include namespace bts { diff --git a/src/lib/md/IntPrice.h b/src/lib_spark/spark/md/IntPrice.h similarity index 95% rename from src/lib/md/IntPrice.h rename to src/lib_spark/spark/md/IntPrice.h index e9c025878..69a2fe78c 100644 --- a/src/lib/md/IntPrice.h +++ b/src/lib_spark/spark/md/IntPrice.h @@ -1,7 +1,7 @@ #pragma once -#include "lib/domain_model/Security.pb.h" -#include "lib/utils/bts_array_size.h" -#include "lib/utils/bts_assert.h" +#include "spark/domain_model/Security.pb.h" +#include "spark/utils/bts_array_size.h" +#include "spark/utils/bts_assert.h" namespace bts { namespace md { diff --git a/src/lib/md/MBOProcessor.cpp b/src/lib_spark/spark/md/MBOProcessor.cpp similarity index 95% rename from src/lib/md/MBOProcessor.cpp rename to src/lib_spark/spark/md/MBOProcessor.cpp index 25ffce4e5..911d4e435 100644 --- a/src/lib/md/MBOProcessor.cpp +++ b/src/lib_spark/spark/md/MBOProcessor.cpp @@ -1,8 +1,8 @@ #include "MBOProcessor.h" -#include "lib/config/config.h" -#include "lib/config/protos/toggles.pb.h" -#include "lib/utils/ConcurrentPool.h" -#include "lib/utils/thread_manager.h" +#include "spark/config/config.h" +#include "spark/config/protos/toggles.pb.h" +#include "spark/utils/ConcurrentPool.h" +#include "spark/utils/thread_manager.h" #include #include diff --git a/src/lib/md/MBOProcessor.h b/src/lib_spark/spark/md/MBOProcessor.h similarity index 92% rename from src/lib/md/MBOProcessor.h rename to src/lib_spark/spark/md/MBOProcessor.h index 851a93543..113f22011 100644 --- a/src/lib/md/MBOProcessor.h +++ b/src/lib_spark/spark/md/MBOProcessor.h @@ -1,9 +1,10 @@ #pragma once -#include "ExchangeOrderKey.h" -#include "IntPrice.h" -#include "MDProducerHandle.h" -#include "lib/core/FMT_IMPL.h" -#include "lib/utils/TimeStamp.h" + +#include "spark/md/ExchangeOrderKey.h" +#include "spark/md/IntPrice.h" +#include "spark/md/MDProducerHandle.h" +#include "spark/core/FMT_IMPL.h" +#include "spark/utils/TimeStamp.h" #include #include diff --git a/src/lib/md/MBOServiceServer.cpp b/src/lib_spark/spark/md/MBOServiceServer.cpp similarity index 94% rename from src/lib/md/MBOServiceServer.cpp rename to src/lib_spark/spark/md/MBOServiceServer.cpp index c01602549..83796b73a 100644 --- a/src/lib/md/MBOServiceServer.cpp +++ b/src/lib_spark/spark/md/MBOServiceServer.cpp @@ -1,13 +1,13 @@ #ifndef _WIN32 #include "MBOServiceServer.h" -#include "ExchangeOrderKey.h" -#include "MBOProcessor.h" -#include "MDClient.h" -#include "lib/api/services/OrderService.client.pb.h" -#include "lib/domain_model/Security.h" -#include "lib/orderman/orderman_utils/orderman_common.h" -#include "lib/utils/Dispatcher.h" -#include "lib/utils/LockBox.h" +#include "spark/api/services/OrderService.client.pb.h" +#include "spark/domain_model/Security.h" +#include "spark/md/ExchangeOrderKey.h" +#include "spark/md/MBOProcessor.h" +#include "spark/md/MDClient.h" +#include "spark/orderman/orderman_utils/orderman_common.h" +#include "spark/utils/Dispatcher.h" +#include "spark/utils/LockBox.h" #include #include diff --git a/src/lib/md/MBOServiceServer.h b/src/lib_spark/spark/md/MBOServiceServer.h similarity index 82% rename from src/lib/md/MBOServiceServer.h rename to src/lib_spark/spark/md/MBOServiceServer.h index aa6025d9c..14696ee66 100644 --- a/src/lib/md/MBOServiceServer.h +++ b/src/lib_spark/spark/md/MBOServiceServer.h @@ -1,7 +1,7 @@ #pragma once #ifndef _WIN32 -#include "lib/api/public/ServiceContext.h" -#include "lib/api/services/MBOService.server.pb.h" +#include "spark/api/public/ServiceContext.h" +#include "spark/api/services/MBOService.server.pb.h" #include diff --git a/src/lib/md/MDClient.cpp b/src/lib_spark/spark/md/MDClient.cpp similarity index 94% rename from src/lib/md/MDClient.cpp rename to src/lib_spark/spark/md/MDClient.cpp index 6cf893e87..403ac23e4 100644 --- a/src/lib/md/MDClient.cpp +++ b/src/lib_spark/spark/md/MDClient.cpp @@ -2,9 +2,9 @@ #include "MBOProcessor.h" #include "SecurityCache.h" #include "SecurityOracle.h" -#include "lib/logging/logging.h" -#include "lib/md/SymbolLoader.h" -#include "lib/utils/TimeStamp.h" +#include "spark/logging/logging.h" +#include "spark/md/SymbolLoader.h" +#include "spark/utils/TimeStamp.h" #include #include diff --git a/src/lib/md/MDClient.h b/src/lib_spark/spark/md/MDClient.h similarity index 75% rename from src/lib/md/MDClient.h rename to src/lib_spark/spark/md/MDClient.h index aaf7b4652..e366f80ab 100644 --- a/src/lib/md/MDClient.h +++ b/src/lib_spark/spark/md/MDClient.h @@ -1,9 +1,11 @@ #pragma once -#include "ISyntheticSecurityService.h" -#include "MDConsumer.h" -#include "UserSymbol.h" -#include "lib/utils/Dispatcher.h" -#include "lib/utils/Event.h" + +#include "spark/md/ISyntheticSecurityService.h" +#include "spark/md/MDConsumer.h" +#include "spark/md/UserSymbol.h" +#include "spark/utils/Dispatcher.h" +#include "spark/utils/Event.h" + #include #include @@ -37,4 +39,4 @@ class MDClient { }; } // namespace md -} // namespace bts \ No newline at end of file +} // namespace bts diff --git a/src/lib/md/MDConsumer.cpp b/src/lib_spark/spark/md/MDConsumer.cpp similarity index 99% rename from src/lib/md/MDConsumer.cpp rename to src/lib_spark/spark/md/MDConsumer.cpp index 6e3aaf4bf..8b08730f0 100644 --- a/src/lib/md/MDConsumer.cpp +++ b/src/lib_spark/spark/md/MDConsumer.cpp @@ -1,14 +1,14 @@ #ifndef NO_CPP0X #include "MDConsumer.h" -#include "MBOProcessor.h" -#include "MemorySegmentUtils.h" -#include "SecurityCache.h" -#include "lib/domain_model/Security.h" -#include "lib/logging/logging.h" -#include "lib/md/ShmSegmentName.h" -#include "lib/md/SymbolLoader.h" -#include "lib/utils/SharedList.h" -#include "lib/utils/WaitFreeQueue.h" +#include "spark/domain_model/Security.h" +#include "spark/logging/logging.h" +#include "spark/md/MBOProcessor.h" +#include "spark/md/MemorySegmentUtils.h" +#include "spark/md/SecurityCache.h" +#include "spark/md/ShmSegmentName.h" +#include "spark/md/SymbolLoader.h" +#include "spark/utils/SharedList.h" +#include "spark/utils/WaitFreeQueue.h" #include #include diff --git a/src/lib/md/MDConsumer.h b/src/lib_spark/spark/md/MDConsumer.h similarity index 93% rename from src/lib/md/MDConsumer.h rename to src/lib_spark/spark/md/MDConsumer.h index 42398fd49..1d9c9993e 100644 --- a/src/lib/md/MDConsumer.h +++ b/src/lib_spark/spark/md/MDConsumer.h @@ -1,11 +1,11 @@ #pragma once -#include "ISyntheticSecurityService.h" -#include "MDConsumerHandle.h" -#include "SecurityPtr.h" -#include "UserSymbol.h" -#include "common.h" -#include "lib/utils/bts_export.h" +#include "spark/md/ISyntheticSecurityService.h" +#include "spark/md/MDConsumerHandle.h" +#include "spark/md/SecurityPtr.h" +#include "spark/md/UserSymbol.h" +#include "spark/md/common.h" +#include "spark/utils/bts_export.h" #include #include diff --git a/src/lib/md/MDConsumerHandle.cpp b/src/lib_spark/spark/md/MDConsumerHandle.cpp similarity index 97% rename from src/lib/md/MDConsumerHandle.cpp rename to src/lib_spark/spark/md/MDConsumerHandle.cpp index e498ef442..68ec674f2 100644 --- a/src/lib/md/MDConsumerHandle.cpp +++ b/src/lib_spark/spark/md/MDConsumerHandle.cpp @@ -1,12 +1,13 @@ #ifndef NO_CPP0X #include "MDConsumerHandle.h" -#include "MBOProcessor.h" -#include "lib/domain/BookSide.h" -#include "lib/domain/DomainSecurityUtils.h" -#include "lib/domain/synthetic_book_side.h" -#include "lib/domain_model/Security.h" -#include "lib/domain_model/Security.pb.h" -#include "lib/os/os.h" +#include "spark/domain/BookSide.h" +#include "spark/domain/DomainSecurityUtils.h" +#include "spark/domain/synthetic_book_side.h" +#include "spark/domain_model/Security.h" +#include "spark/domain_model/Security.pb.h" +#include "spark/md/MBOProcessor.h" +#include "spark/os/os.h" + #include #define never bts_assert(false) diff --git a/src/lib/md/MDConsumerHandle.h b/src/lib_spark/spark/md/MDConsumerHandle.h similarity index 98% rename from src/lib/md/MDConsumerHandle.h rename to src/lib_spark/spark/md/MDConsumerHandle.h index c3ad32db0..cec8d9046 100644 --- a/src/lib/md/MDConsumerHandle.h +++ b/src/lib_spark/spark/md/MDConsumerHandle.h @@ -1,10 +1,10 @@ #pragma once -#include "UserSymbol.h" -#include "lib/md/Shm/MDStructure.h" -#include "lib/sparkproto/SparkProtos.pb.h" -#include "lib/utils/bts_export.h" -#include "lib/utils/sane_algorithm.h" +#include "spark/md/Shm/MDStructure.h" +#include "spark/md/UserSymbol.h" +#include "spark/sparkproto/SparkProtos.pb.h" +#include "spark/utils/bts_export.h" +#include "spark/utils/sane_algorithm.h" #include #include diff --git a/src/lib/md/MDConsumerInterop.cpp b/src/lib_spark/spark/md/MDConsumerInterop.cpp similarity index 97% rename from src/lib/md/MDConsumerInterop.cpp rename to src/lib_spark/spark/md/MDConsumerInterop.cpp index 15c467be5..3164a8d52 100644 --- a/src/lib/md/MDConsumerInterop.cpp +++ b/src/lib_spark/spark/md/MDConsumerInterop.cpp @@ -3,11 +3,11 @@ #include "SecurityCache.h" #include "UserSymbol.h" #include "common.h" -#include "lib/domain/DomainSecurityUtils.h" -#include "lib/md/SymbolLoader.h" -#include "lib/md/protos/co2.pb.h" -#include "lib/utils/Dispatcher.h" -#include "lib/utils/defer.h" +#include "spark/domain/DomainSecurityUtils.h" +#include "spark/md/SymbolLoader.h" +#include "spark/md/protos/co2.pb.h" +#include "spark/utils/Dispatcher.h" +#include "spark/utils/defer.h" #include "relay/RelayClient.h" #include #include diff --git a/src/lib/md/MDProducer.cpp b/src/lib_spark/spark/md/MDProducer.cpp similarity index 95% rename from src/lib/md/MDProducer.cpp rename to src/lib_spark/spark/md/MDProducer.cpp index 90df08509..a2d268a41 100644 --- a/src/lib/md/MDProducer.cpp +++ b/src/lib_spark/spark/md/MDProducer.cpp @@ -1,15 +1,15 @@ #ifndef NO_CPP0X #include "MDProducer.h" -#include "MemorySegmentUtils.h" -#include "SecurityIDRecorder.h" -#include "Shm/MDStructure.h" -#include "lib/domain_model/Security.pb.h" -#include "lib/logging/logging.h" -#include "lib/md/Diag/ShmDumper.h" -#include "lib/md/ShmSegmentName.h" -#include "lib/os/os.h" -#include "lib/utils/SharedList.h" -#include "lib/utils/WaitFreeQueue.h" +#include "spark/domain_model/Security.pb.h" +#include "spark/logging/logging.h" +#include "spark/md/Diag/ShmDumper.h" +#include "spark/md/MemorySegmentUtils.h" +#include "spark/md/SecurityIDRecorder.h" +#include "spark/md/Shm/MDStructure.h" +#include "spark/md/ShmSegmentName.h" +#include "spark/os/os.h" +#include "spark/utils/SharedList.h" +#include "spark/utils/WaitFreeQueue.h" using namespace std; diff --git a/src/lib/md/MDProducer.h b/src/lib_spark/spark/md/MDProducer.h similarity index 96% rename from src/lib/md/MDProducer.h rename to src/lib_spark/spark/md/MDProducer.h index ab6c0344b..721586587 100644 --- a/src/lib/md/MDProducer.h +++ b/src/lib_spark/spark/md/MDProducer.h @@ -1,7 +1,7 @@ #pragma once -#include "lib/utils/bts_export.h" -#include "lib/utils/bts_no_copy.h" +#include "spark/utils/bts_export.h" +#include "spark/utils/bts_no_copy.h" #include "MDProducerChannel.h" #include "MDProducerHandle.h" diff --git a/src/lib/md/MDProducerChannel.h b/src/lib_spark/spark/md/MDProducerChannel.h similarity index 93% rename from src/lib/md/MDProducerChannel.h rename to src/lib_spark/spark/md/MDProducerChannel.h index 7fe8e1fa5..5f448c766 100644 --- a/src/lib/md/MDProducerChannel.h +++ b/src/lib_spark/spark/md/MDProducerChannel.h @@ -1,7 +1,7 @@ #pragma once #include "common.h" -#include "lib/utils/bts_export.h" +#include "spark/utils/bts_export.h" namespace bts { namespace md { diff --git a/src/lib/md/MDProducerHandle.cpp b/src/lib_spark/spark/md/MDProducerHandle.cpp similarity index 99% rename from src/lib/md/MDProducerHandle.cpp rename to src/lib_spark/spark/md/MDProducerHandle.cpp index 4e0e18af1..f532519f5 100644 --- a/src/lib/md/MDProducerHandle.cpp +++ b/src/lib_spark/spark/md/MDProducerHandle.cpp @@ -1,4 +1,4 @@ -#include "lib/logging/logging.h" +#include "spark/logging/logging.h" #ifndef NO_CPP0X #include "MDProducerHandle.h" #include "common.h" diff --git a/src/lib/md/MDProducerHandle.h b/src/lib_spark/spark/md/MDProducerHandle.h similarity index 97% rename from src/lib/md/MDProducerHandle.h rename to src/lib_spark/spark/md/MDProducerHandle.h index 42043b92e..fcaf28bd3 100644 --- a/src/lib/md/MDProducerHandle.h +++ b/src/lib_spark/spark/md/MDProducerHandle.h @@ -1,9 +1,9 @@ #pragma once -#include "MDProducerChannel.h" -#include "Shm/MDStructure.h" -#include "lib/utils/bts_export.h" -#include "lib/utils/datetime.h" +#include "spark/md/MDProducerChannel.h" +#include "spark/md/Shm/MDStructure.h" +#include "spark/utils/bts_export.h" +#include "spark/utils/datetime.h" #include diff --git a/src/lib/md/MemorySegmentUtils.cpp b/src/lib_spark/spark/md/MemorySegmentUtils.cpp similarity index 100% rename from src/lib/md/MemorySegmentUtils.cpp rename to src/lib_spark/spark/md/MemorySegmentUtils.cpp diff --git a/src/lib/md/MemorySegmentUtils.h b/src/lib_spark/spark/md/MemorySegmentUtils.h similarity index 100% rename from src/lib/md/MemorySegmentUtils.h rename to src/lib_spark/spark/md/MemorySegmentUtils.h diff --git a/src/lib/md/PriceSize.cpp b/src/lib_spark/spark/md/PriceSize.cpp similarity index 95% rename from src/lib/md/PriceSize.cpp rename to src/lib_spark/spark/md/PriceSize.cpp index cbd732da3..cecc9cc09 100644 --- a/src/lib/md/PriceSize.cpp +++ b/src/lib_spark/spark/md/PriceSize.cpp @@ -1,5 +1,5 @@ #include "PriceSize.h" -#include "lib/os/os.h" +#include "spark/os/os.h" namespace bts { namespace md { diff --git a/src/lib/md/PriceSize.h b/src/lib_spark/spark/md/PriceSize.h similarity index 96% rename from src/lib/md/PriceSize.h rename to src/lib_spark/spark/md/PriceSize.h index 51eb1b1ff..e239bf8ea 100644 --- a/src/lib/md/PriceSize.h +++ b/src/lib_spark/spark/md/PriceSize.h @@ -1,10 +1,10 @@ #pragma once -#include "IntPrice.h" -#include "SizeTypes.h" -#include "common.h" -#include "lib/os/os.h" -#include "lib/utils/Optimistic.h" +#include "spark/md/IntPrice.h" +#include "spark/md/SizeTypes.h" +#include "spark/md/common.h" +#include "spark/os/os.h" +#include "spark/utils/Optimistic.h" #include diff --git a/src/lib/md/Product.cpp b/src/lib_spark/spark/md/Product.cpp similarity index 100% rename from src/lib/md/Product.cpp rename to src/lib_spark/spark/md/Product.cpp diff --git a/src/lib/md/Product.h b/src/lib_spark/spark/md/Product.h similarity index 81% rename from src/lib/md/Product.h rename to src/lib_spark/spark/md/Product.h index 1702c1795..7dc503f13 100644 --- a/src/lib/md/Product.h +++ b/src/lib_spark/spark/md/Product.h @@ -1,5 +1,5 @@ #pragma once -#include "lib/domain_model/Security.pb.h" +#include "spark/domain_model/Security.pb.h" #include #include diff --git a/src/lib/md/SecurityCache.cpp b/src/lib_spark/spark/md/SecurityCache.cpp similarity index 94% rename from src/lib/md/SecurityCache.cpp rename to src/lib_spark/spark/md/SecurityCache.cpp index 11845ccb2..d63e0c892 100644 --- a/src/lib/md/SecurityCache.cpp +++ b/src/lib_spark/spark/md/SecurityCache.cpp @@ -1,11 +1,11 @@ #include "SecurityCache.h" -#include "SecurityDB.h" -#include "lib/domain_model/Security.h" -#include "lib/domain_model/Security.pb.h" -#include "lib/logging/logging.h" -#include "lib/md/security_type_index.h" -#include "lib/md/venue_index.h" -#include "lib/utils/LockBox.h" +#include "spark/domain_model/Security.h" +#include "spark/domain_model/Security.pb.h" +#include "spark/logging/logging.h" +#include "spark/md/SecurityDB.h" +#include "spark/md/security_type_index.h" +#include "spark/md/venue_index.h" +#include "spark/utils/LockBox.h" #include #include diff --git a/src/lib/md/SecurityCache.h b/src/lib_spark/spark/md/SecurityCache.h similarity index 88% rename from src/lib/md/SecurityCache.h rename to src/lib_spark/spark/md/SecurityCache.h index fb2afe006..ca980d03d 100644 --- a/src/lib/md/SecurityCache.h +++ b/src/lib_spark/spark/md/SecurityCache.h @@ -1,9 +1,9 @@ #pragma once -#include "MDConsumerHandle.h" -#include "SecurityPtr.h" -#include "lib/domain_model/Security.pb.h" -#include "lib/md/ExchangeSecurityKey.h" +#include "spark/domain_model/Security.pb.h" +#include "spark/md/ExchangeSecurityKey.h" +#include "spark/md/MDConsumerHandle.h" +#include "spark/md/SecurityPtr.h" #include diff --git a/src/lib/md/SecurityDB.cpp b/src/lib_spark/spark/md/SecurityDB.cpp similarity index 93% rename from src/lib/md/SecurityDB.cpp rename to src/lib_spark/spark/md/SecurityDB.cpp index 2593aee99..be6cb3b10 100644 --- a/src/lib/md/SecurityDB.cpp +++ b/src/lib_spark/spark/md/SecurityDB.cpp @@ -1,15 +1,15 @@ #include "SecurityDB.h" -#include "lib/logging/logging.h" +#include "spark/logging/logging.h" #ifndef _WIN32 #include #include -#include "lib/config/config.h" -#include "lib/config/protos/market_data.pb.h" -#include "lib/config/protos/system_config.pb.h" -#include "lib/domain_model/Security.h" -#include "lib/md/Shm/FixedSecurity.h" +#include "spark/config/config.h" +#include "spark/config/protos/market_data.pb.h" +#include "spark/config/protos/system_config.pb.h" +#include "spark/domain_model/Security.h" +#include "spark/md/Shm/FixedSecurity.h" #include #include diff --git a/src/lib/md/SecurityDB.h b/src/lib_spark/spark/md/SecurityDB.h similarity index 78% rename from src/lib/md/SecurityDB.h rename to src/lib_spark/spark/md/SecurityDB.h index f619fcb7f..d12b71f61 100644 --- a/src/lib/md/SecurityDB.h +++ b/src/lib_spark/spark/md/SecurityDB.h @@ -1,10 +1,10 @@ #pragma once -#include "SecurityPtr.h" -#include "UserSymbol.h" -#include "lib/api/services/SyntheticSecurityService.pb.h" -#include "lib/domain_model/Security.pb.h" -#include "lib/utils/ResultEnum.h" +#include "spark/api/services/SyntheticSecurityService.pb.h" +#include "spark/domain_model/Security.pb.h" +#include "spark/md/SecurityPtr.h" +#include "spark/md/UserSymbol.h" +#include "spark/utils/ResultEnum.h" #include #include diff --git a/src/lib/md/SecurityIDRecorder.cpp b/src/lib_spark/spark/md/SecurityIDRecorder.cpp similarity index 98% rename from src/lib/md/SecurityIDRecorder.cpp rename to src/lib_spark/spark/md/SecurityIDRecorder.cpp index 5d9ca7194..4495dd32d 100644 --- a/src/lib/md/SecurityIDRecorder.cpp +++ b/src/lib_spark/spark/md/SecurityIDRecorder.cpp @@ -1,10 +1,10 @@ #ifndef _WIN32 #include "SecurityIDRecorder.h" -#include "lib/domain_model/Security.h" -#include "lib/logging/logging.h" -#include "lib/persistence/IStore.h" -#include "lib/persistence/SqliteStore.h" -#include "lib/utils/checked_arithmetic.h" +#include "spark/domain_model/Security.h" +#include "spark/logging/logging.h" +#include "spark/persistence/IStore.h" +#include "spark/persistence/SqliteStore.h" +#include "spark/utils/checked_arithmetic.h" #include #include diff --git a/src/lib/md/SecurityIDRecorder.h b/src/lib_spark/spark/md/SecurityIDRecorder.h similarity index 93% rename from src/lib/md/SecurityIDRecorder.h rename to src/lib_spark/spark/md/SecurityIDRecorder.h index 5b0e18d45..c04c189dc 100644 --- a/src/lib/md/SecurityIDRecorder.h +++ b/src/lib_spark/spark/md/SecurityIDRecorder.h @@ -1,8 +1,8 @@ #pragma once #ifndef _WIN32 -#include "MDProducerHandle.h" -#include "lib/persistence/IStore.h" -#include "lib/utils/Sqlite_utils.h" +#include "spark/md/MDProducerHandle.h" +#include "spark/persistence/IStore.h" +#include "spark/utils/Sqlite_utils.h" #include #include diff --git a/src/lib/md/SecurityIndex.h b/src/lib_spark/spark/md/SecurityIndex.h similarity index 96% rename from src/lib/md/SecurityIndex.h rename to src/lib_spark/spark/md/SecurityIndex.h index 193ef3569..2d1665eef 100644 --- a/src/lib/md/SecurityIndex.h +++ b/src/lib_spark/spark/md/SecurityIndex.h @@ -1,9 +1,9 @@ #pragma once -#include "MDProducerHandle.h" -#include "common.h" -#include "lib/logging/logging.h" -#include "lib/utils/bts_no_copy.h" +#include "spark/logging/logging.h" +#include "spark/md/MDProducerHandle.h" +#include "spark/md/common.h" +#include "spark/utils/bts_no_copy.h" #include #include diff --git a/src/lib/md/SecurityMapper.cpp b/src/lib_spark/spark/md/SecurityMapper.cpp similarity index 87% rename from src/lib/md/SecurityMapper.cpp rename to src/lib_spark/spark/md/SecurityMapper.cpp index 4993660be..8db0f3852 100644 --- a/src/lib/md/SecurityMapper.cpp +++ b/src/lib_spark/spark/md/SecurityMapper.cpp @@ -1,12 +1,11 @@ - #include "SecurityMapper.h" -#include "PriceSize.h" -#include "UserSymbol.h" -#include "lib/config/config.h" -#include "lib/config/protos/cme_reference_data.pb.h" -#include "lib/config/protos/market_data.pb.h" -#include "lib/domain_model/Security.pb.h" -#include "lib/utils/parse_enum.h" +#include "spark/config/config.h" +#include "spark/config/protos/cme_reference_data.pb.h" +#include "spark/config/protos/market_data.pb.h" +#include "spark/domain_model/Security.pb.h" +#include "spark/md/PriceSize.h" +#include "spark/md/UserSymbol.h" +#include "spark/utils/parse_enum.h" #ifndef _WIN32 #include diff --git a/src/lib/md/SecurityMapper.h b/src/lib_spark/spark/md/SecurityMapper.h similarity index 100% rename from src/lib/md/SecurityMapper.h rename to src/lib_spark/spark/md/SecurityMapper.h diff --git a/src/lib/md/SecurityMarketState.cpp b/src/lib_spark/spark/md/SecurityMarketState.cpp similarity index 100% rename from src/lib/md/SecurityMarketState.cpp rename to src/lib_spark/spark/md/SecurityMarketState.cpp diff --git a/src/lib/md/SecurityMarketState.h b/src/lib_spark/spark/md/SecurityMarketState.h similarity index 100% rename from src/lib/md/SecurityMarketState.h rename to src/lib_spark/spark/md/SecurityMarketState.h diff --git a/src/lib/md/SecurityOracle.cpp b/src/lib_spark/spark/md/SecurityOracle.cpp similarity index 92% rename from src/lib/md/SecurityOracle.cpp rename to src/lib_spark/spark/md/SecurityOracle.cpp index 9b12d955b..a89270f45 100644 --- a/src/lib/md/SecurityOracle.cpp +++ b/src/lib_spark/spark/md/SecurityOracle.cpp @@ -1,7 +1,7 @@ #include "SecurityOracle.h" #include "MDClient.h" -#include "lib/logging/logging.h" -#include "lib/utils/PBUtils.h" +#include "spark/logging/logging.h" +#include "spark/utils/PBUtils.h" namespace bts { namespace md { diff --git a/src/lib/md/SecurityOracle.h b/src/lib_spark/spark/md/SecurityOracle.h similarity index 87% rename from src/lib/md/SecurityOracle.h rename to src/lib_spark/spark/md/SecurityOracle.h index c32539d1a..68983ab26 100644 --- a/src/lib/md/SecurityOracle.h +++ b/src/lib_spark/spark/md/SecurityOracle.h @@ -1,8 +1,8 @@ #pragma once -#include "lib/domain_model/SecurityKey.h" -#include "lib/md/ExchangeSecurityKey.h" -#include "lib/md/SecurityCache.h" +#include "spark/domain_model/SecurityKey.h" +#include "spark/md/ExchangeSecurityKey.h" +#include "spark/md/SecurityCache.h" #include #include diff --git a/src/lib/md/SecurityPtr.h b/src/lib_spark/spark/md/SecurityPtr.h similarity index 100% rename from src/lib/md/SecurityPtr.h rename to src/lib_spark/spark/md/SecurityPtr.h diff --git a/src/lib/md/SecurityStore.cpp b/src/lib_spark/spark/md/SecurityStore.cpp similarity index 97% rename from src/lib/md/SecurityStore.cpp rename to src/lib_spark/spark/md/SecurityStore.cpp index 17d11c5df..dae33fb97 100644 --- a/src/lib/md/SecurityStore.cpp +++ b/src/lib_spark/spark/md/SecurityStore.cpp @@ -1,7 +1,7 @@ #include "SecurityStore.h" -#include "lib/domain/FutureSecurity.h" -#include "lib/domain/Security.h" -#include "lib/utils/LockBox.h" +#include "spark/domain/FutureSecurity.h" +#include "spark/domain/Security.h" +#include "spark/utils/LockBox.h" #include #include diff --git a/src/lib/md/SecurityStore.h b/src/lib_spark/spark/md/SecurityStore.h similarity index 89% rename from src/lib/md/SecurityStore.h rename to src/lib_spark/spark/md/SecurityStore.h index 00178ad0f..6d83ef128 100644 --- a/src/lib/md/SecurityStore.h +++ b/src/lib_spark/spark/md/SecurityStore.h @@ -1,8 +1,8 @@ #pragma once -#include "lib/api/domain/SecurityType.pb.h" -#include "lib/api/domain/Venue.pb.h" -#include "lib/domain/SecurityID.h" +#include "spark/api/domain/SecurityType.pb.h" +#include "spark/api/domain/Venue.pb.h" +#include "spark/domain/SecurityID.h" #include diff --git a/src/lib/md/SettlementRecorder.cpp b/src/lib_spark/spark/md/SettlementRecorder.cpp similarity index 97% rename from src/lib/md/SettlementRecorder.cpp rename to src/lib_spark/spark/md/SettlementRecorder.cpp index 18c92a829..694b7d936 100644 --- a/src/lib/md/SettlementRecorder.cpp +++ b/src/lib_spark/spark/md/SettlementRecorder.cpp @@ -1,8 +1,8 @@ #ifndef _WIN32 #include "SettlementRecorder.h" -#include "lib/config/config.h" -#include "lib/config/protos/system_config.pb.h" -#include "lib/utils/Sqlite_utils.h" +#include "spark/config/config.h" +#include "spark/config/protos/system_config.pb.h" +#include "spark/utils/Sqlite_utils.h" #include #include #include diff --git a/src/lib/md/SettlementRecorder.h b/src/lib_spark/spark/md/SettlementRecorder.h similarity index 88% rename from src/lib/md/SettlementRecorder.h rename to src/lib_spark/spark/md/SettlementRecorder.h index 109541716..e1ab8cd16 100644 --- a/src/lib/md/SettlementRecorder.h +++ b/src/lib_spark/spark/md/SettlementRecorder.h @@ -1,7 +1,7 @@ #pragma once -#include "MDProducerHandle.h" -#include "lib/utils/datetime.h" +#include "spark/md/MDProducerHandle.h" +#include "spark/utils/datetime.h" #include diff --git a/src/lib/md/Shm/FixedSecurity.cpp b/src/lib_spark/spark/md/Shm/FixedSecurity.cpp similarity index 99% rename from src/lib/md/Shm/FixedSecurity.cpp rename to src/lib_spark/spark/md/Shm/FixedSecurity.cpp index 5db74325f..cb0a541c1 100644 --- a/src/lib/md/Shm/FixedSecurity.cpp +++ b/src/lib_spark/spark/md/Shm/FixedSecurity.cpp @@ -1,6 +1,6 @@ -#include "lib/domain_model/Security.h" -#include "lib/utils/bts_array_size.h" -#include "lib/utils/bts_assert.h" +#include "spark/domain_model/Security.h" +#include "spark/utils/bts_array_size.h" +#include "spark/utils/bts_assert.h" #ifndef NO_CPP0X #include "../PriceSize.h" diff --git a/src/lib/md/Shm/FixedSecurity.h b/src/lib_spark/spark/md/Shm/FixedSecurity.h similarity index 96% rename from src/lib/md/Shm/FixedSecurity.h rename to src/lib_spark/spark/md/Shm/FixedSecurity.h index a4c572f71..ad65e0f1e 100644 --- a/src/lib/md/Shm/FixedSecurity.h +++ b/src/lib_spark/spark/md/Shm/FixedSecurity.h @@ -1,17 +1,17 @@ #pragma once #include "../common.h" -#include "lib/core/FMT_IMPL.h" -#include "lib/core/TimeStamp.h" -#include "lib/io/JsonDumper.h" -#include "lib/io/JsonReader.h" -#include "lib/utils/ValueWrapper.h" -#include "lib/utils/bts_array_size.h" -#include "lib/utils/bts_assert.h" -#include "lib/utils/bts_export.h" -#include "lib/utils/bts_no_copy.h" -#include "lib/utils/warn_ctrl.h" -#include "lib/domain_model/SecurityKey.h" +#include "spark/core/FMT_IMPL.h" +#include "spark/core/TimeStamp.h" +#include "spark/io/JsonDumper.h" +#include "spark/io/JsonReader.h" +#include "spark/utils/ValueWrapper.h" +#include "spark/utils/bts_array_size.h" +#include "spark/utils/bts_assert.h" +#include "spark/utils/bts_export.h" +#include "spark/utils/bts_no_copy.h" +#include "spark/utils/warn_ctrl.h" +#include "spark/domain_model/SecurityKey.h" #include #include diff --git a/src/lib/md/Shm/MDStructure.h b/src/lib_spark/spark/md/Shm/MDStructure.h similarity index 98% rename from src/lib/md/Shm/MDStructure.h rename to src/lib_spark/spark/md/Shm/MDStructure.h index 081c1ec2f..314558b29 100644 --- a/src/lib/md/Shm/MDStructure.h +++ b/src/lib_spark/spark/md/Shm/MDStructure.h @@ -2,12 +2,12 @@ #include "../PriceSize.h" #include "../common.h" #include "FixedSecurity.h" -#include "lib/config/config.h" -#include "lib/config/protos/market_data.pb.h" -#include "lib/core/BoolName.h" -#include "lib/core/TimeStamp.h" -#include "lib/md/protos/co2.pb.h" -#include "lib/utils/TimeStamp.h" +#include "spark/config/config.h" +#include "spark/config/protos/market_data.pb.h" +#include "spark/core/BoolName.h" +#include "spark/core/TimeStamp.h" +#include "spark/md/protos/co2.pb.h" +#include "spark/utils/TimeStamp.h" #include #include diff --git a/src/lib/md/Shm/readme.txt b/src/lib_spark/spark/md/Shm/readme.txt similarity index 100% rename from src/lib/md/Shm/readme.txt rename to src/lib_spark/spark/md/Shm/readme.txt diff --git a/src/lib/md/ShmSegmentName.h b/src/lib_spark/spark/md/ShmSegmentName.h similarity index 93% rename from src/lib/md/ShmSegmentName.h rename to src/lib_spark/spark/md/ShmSegmentName.h index b6328fa40..d15e57475 100644 --- a/src/lib/md/ShmSegmentName.h +++ b/src/lib_spark/spark/md/ShmSegmentName.h @@ -1,8 +1,8 @@ #pragma once -#include "lib/config/config.h" -#include "lib/config/protos/market_data.pb.h" -#include "lib/domain_model/Security.pb.h" +#include "spark/config/config.h" +#include "spark/config/protos/market_data.pb.h" +#include "spark/domain_model/Security.pb.h" #include #include diff --git a/src/lib/md/SizeTypes.h b/src/lib_spark/spark/md/SizeTypes.h similarity index 77% rename from src/lib/md/SizeTypes.h rename to src/lib_spark/spark/md/SizeTypes.h index 4ff9f7881..58fb2a424 100644 --- a/src/lib/md/SizeTypes.h +++ b/src/lib_spark/spark/md/SizeTypes.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/utils/ValueWrapper.h" +#include "spark/utils/ValueWrapper.h" #include diff --git a/src/lib/md/SymbolLoader.h b/src/lib_spark/spark/md/SymbolLoader.h similarity index 94% rename from src/lib/md/SymbolLoader.h rename to src/lib_spark/spark/md/SymbolLoader.h index 0195c5abf..64d29417a 100644 --- a/src/lib/md/SymbolLoader.h +++ b/src/lib_spark/spark/md/SymbolLoader.h @@ -1,11 +1,11 @@ #pragma once -#include "UserSymbol.h" -#include "common.h" -#include "lib/config/config.h" -#include "lib/config/protos/symbols.pb.h" -#include "lib/domain/SecurityCriteria.h" -#include "lib/domain_model/Security.pb.h" +#include "spark/config/config.h" +#include "spark/config/protos/symbols.pb.h" +#include "spark/domain/SecurityCriteria.h" +#include "spark/domain_model/Security.pb.h" +#include "spark/md/UserSymbol.h" +#include "spark/md/common.h" #include #include diff --git a/src/lib/md/SyntheticSecurityService.cpp b/src/lib_spark/spark/md/SyntheticSecurityService.cpp similarity index 93% rename from src/lib/md/SyntheticSecurityService.cpp rename to src/lib_spark/spark/md/SyntheticSecurityService.cpp index 10a3b1631..7eaf65179 100644 --- a/src/lib/md/SyntheticSecurityService.cpp +++ b/src/lib_spark/spark/md/SyntheticSecurityService.cpp @@ -1,12 +1,12 @@ #ifndef _WIN32 -#include "SyntheticSecurityService.h" -#include "lib/api/public/ServiceContext.h" -#include "lib/domain/SecurityCriteria.h" -#include "lib/md/SecurityDB.h" -#include "lib/md/SecurityIDRecorder.h" -#include "lib/md/SymbolLoader.h" -#include "lib/utils/Dispatcher.h" -#include "lib/utils/Event.h" +#include "spark/md/SyntheticSecurityService.h" +#include "spark/api/public/ServiceContext.h" +#include "spark/domain/SecurityCriteria.h" +#include "spark/md/SecurityDB.h" +#include "spark/md/SecurityIDRecorder.h" +#include "spark/md/SymbolLoader.h" +#include "spark/utils/Dispatcher.h" +#include "spark/utils/Event.h" namespace bts { namespace api { diff --git a/src/lib/md/SyntheticSecurityService.h b/src/lib_spark/spark/md/SyntheticSecurityService.h similarity index 80% rename from src/lib/md/SyntheticSecurityService.h rename to src/lib_spark/spark/md/SyntheticSecurityService.h index f16a21194..ff7541602 100644 --- a/src/lib/md/SyntheticSecurityService.h +++ b/src/lib_spark/spark/md/SyntheticSecurityService.h @@ -1,9 +1,9 @@ #pragma once -#include "ISyntheticSecurityService.h" -#include "lib/api/services/SyntheticSecurityService.pb.h" -#include "lib/api/services/SyntheticSecurityService.server.pb.h" -#include "lib/domain_model/SecurityKey.h" +#include "spark/api/services/SyntheticSecurityService.pb.h" +#include "spark/api/services/SyntheticSecurityService.server.pb.h" +#include "spark/domain_model/SecurityKey.h" +#include "spark/md/ISyntheticSecurityService.h" #include #include diff --git a/src/lib/md/UserSymbol.h b/src/lib_spark/spark/md/UserSymbol.h similarity index 96% rename from src/lib/md/UserSymbol.h rename to src/lib_spark/spark/md/UserSymbol.h index b343211cd..59cf1d6c1 100644 --- a/src/lib/md/UserSymbol.h +++ b/src/lib_spark/spark/md/UserSymbol.h @@ -1,8 +1,9 @@ #pragma once -#include "common.h" -#include "lib/core/FMT_IMPL.h" +#include "spark/core/FMT_IMPL.h" +#include "spark/md/common.h" +#include #include namespace bts { diff --git a/src/lib/md/cme/CMEChannel.h b/src/lib_spark/spark/md/cme/CMEChannel.h similarity index 86% rename from src/lib/md/cme/CMEChannel.h rename to src/lib_spark/spark/md/cme/CMEChannel.h index 74949ab7f..4434eda0d 100644 --- a/src/lib/md/cme/CMEChannel.h +++ b/src/lib_spark/spark/md/cme/CMEChannel.h @@ -1,8 +1,8 @@ #pragma once -#include "lib/core/FMT.h" -#include "lib/core/FMT_IMPL.h" -#include "lib/md/UserSymbol.h" -#include "lib/md/cme/CMEConnection.h" +#include "spark/core/FMT.h" +#include "spark/core/FMT_IMPL.h" +#include "spark/md/UserSymbol.h" +#include "spark/md/cme/CMEConnection.h" #include #include diff --git a/src/lib/md/cme/CMEConnection.h b/src/lib_spark/spark/md/cme/CMEConnection.h similarity index 95% rename from src/lib/md/cme/CMEConnection.h rename to src/lib_spark/spark/md/cme/CMEConnection.h index 7386e6370..f307d6611 100644 --- a/src/lib/md/cme/CMEConnection.h +++ b/src/lib_spark/spark/md/cme/CMEConnection.h @@ -1,5 +1,5 @@ #pragma once -#include "lib/core/FMT_IMPL.h" +#include "spark/core/FMT_IMPL.h" #include #include diff --git a/src/lib/md/cme/GlbxMarketDataSubscription.h b/src/lib_spark/spark/md/cme/GlbxMarketDataSubscription.h similarity index 100% rename from src/lib/md/cme/GlbxMarketDataSubscription.h rename to src/lib_spark/spark/md/cme/GlbxMarketDataSubscription.h diff --git a/src/lib/md/cme/MDP3Utils.cpp b/src/lib_spark/spark/md/cme/MDP3Utils.cpp similarity index 93% rename from src/lib/md/cme/MDP3Utils.cpp rename to src/lib_spark/spark/md/cme/MDP3Utils.cpp index 95c0863b6..ac2af211c 100644 --- a/src/lib/md/cme/MDP3Utils.cpp +++ b/src/lib_spark/spark/md/cme/MDP3Utils.cpp @@ -1,16 +1,16 @@ #ifndef _WIN32 #include "MDP3Utils.h" -#include "lib/config/config.h" -#include "lib/config/protos/deployment_type.pb.h" -#include "lib/config/protos/market_data.pb.h" -#include "lib/config/protos/system_config.pb.h" -#include "lib/core/FMT.h" -#include "lib/domain/SecurityCriteria.h" -#include "lib/logging/logging.h" -#include "lib/md/SymbolLoader.h" -#include "lib/utils/bts_chrono.h" -#include "lib/utils/datetime.h" -#include "lib/utils/download.h" +#include "spark/config/config.h" +#include "spark/config/protos/deployment_type.pb.h" +#include "spark/config/protos/market_data.pb.h" +#include "spark/config/protos/system_config.pb.h" +#include "spark/core/FMT.h" +#include "spark/domain/SecurityCriteria.h" +#include "spark/logging/logging.h" +#include "spark/md/SymbolLoader.h" +#include "spark/utils/bts_chrono.h" +#include "spark/utils/datetime.h" +#include "spark/utils/download.h" #include #include diff --git a/src/lib/md/cme/MDP3Utils.h b/src/lib_spark/spark/md/cme/MDP3Utils.h similarity index 94% rename from src/lib/md/cme/MDP3Utils.h rename to src/lib_spark/spark/md/cme/MDP3Utils.h index 19f17f10d..c5dee0889 100644 --- a/src/lib/md/cme/MDP3Utils.h +++ b/src/lib_spark/spark/md/cme/MDP3Utils.h @@ -1,9 +1,9 @@ #pragma once -#include "lib/core/FMT_IMPL.h" -#include "lib/md/cme/CMEChannel.h" -#include "lib/md/cme/CMEConnection.h" -#include "lib/md/coconut2.h" +#include "spark/core/FMT_IMPL.h" +#include "spark/md/cme/CMEChannel.h" +#include "spark/md/cme/CMEConnection.h" +#include "spark/md/coconut2.h" #include #include #include diff --git a/src/lib/md/cme/mdp3_data_directory.h b/src/lib_spark/spark/md/cme/mdp3_data_directory.h similarity index 94% rename from src/lib/md/cme/mdp3_data_directory.h rename to src/lib_spark/spark/md/cme/mdp3_data_directory.h index ced0f3457..3e955f727 100644 --- a/src/lib/md/cme/mdp3_data_directory.h +++ b/src/lib_spark/spark/md/cme/mdp3_data_directory.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/os/spark_data_directory.h" +#include "spark/os/spark_data_directory.h" #include #include diff --git a/src/lib/md/coconut2.h b/src/lib_spark/spark/md/coconut2.h similarity index 100% rename from src/lib/md/coconut2.h rename to src/lib_spark/spark/md/coconut2.h diff --git a/src/lib/md/common.cpp b/src/lib_spark/spark/md/common.cpp similarity index 80% rename from src/lib/md/common.cpp rename to src/lib_spark/spark/md/common.cpp index 852f09bc0..8342aa395 100644 --- a/src/lib/md/common.cpp +++ b/src/lib_spark/spark/md/common.cpp @@ -1,10 +1,10 @@ #ifndef NO_CPP0X #include "common.h" #include "UserSymbol.h" -#include "lib/config/config.h" +#include "spark/config/config.h" #include "PriceSize.h" -#include "lib/config/protos/market_data.pb.h" +#include "spark/config/protos/market_data.pb.h" #include #include diff --git a/src/lib/md/common.h b/src/lib_spark/spark/md/common.h similarity index 70% rename from src/lib/md/common.h rename to src/lib_spark/spark/md/common.h index ca34dd6ba..94bd35713 100644 --- a/src/lib/md/common.h +++ b/src/lib_spark/spark/md/common.h @@ -2,12 +2,12 @@ #include #include "IntPrice.h" -#include "lib/domain_model/SecurityKey.h" -#include "lib/utils/bts_export.h" -#include "lib/utils/datetime.h" +#include "spark/domain_model/SecurityKey.h" +#include "spark/utils/bts_export.h" +#include "spark/utils/datetime.h" -#include "lib/domain_model/Security.pb.h" -#include "lib/md/protos/co2.pb.h" +#include "spark/domain_model/Security.pb.h" +#include "spark/md/protos/co2.pb.h" #include diff --git a/src/lib/md/ice/ConnectivityConfiguration.APITest.xml b/src/lib_spark/spark/md/ice/ConnectivityConfiguration.APITest.xml similarity index 100% rename from src/lib/md/ice/ConnectivityConfiguration.APITest.xml rename to src/lib_spark/spark/md/ice/ConnectivityConfiguration.APITest.xml diff --git a/src/lib/md/ice/ConnectivityConfiguration.PerfTest.xml b/src/lib_spark/spark/md/ice/ConnectivityConfiguration.PerfTest.xml similarity index 100% rename from src/lib/md/ice/ConnectivityConfiguration.PerfTest.xml rename to src/lib_spark/spark/md/ice/ConnectivityConfiguration.PerfTest.xml diff --git a/src/lib/md/ice/ConnectivityConfiguration.Production.xml b/src/lib_spark/spark/md/ice/ConnectivityConfiguration.Production.xml similarity index 100% rename from src/lib/md/ice/ConnectivityConfiguration.Production.xml rename to src/lib_spark/spark/md/ice/ConnectivityConfiguration.Production.xml diff --git a/src/lib/md/ice/ICEUtils.cpp b/src/lib_spark/spark/md/ice/ICEUtils.cpp similarity index 90% rename from src/lib/md/ice/ICEUtils.cpp rename to src/lib_spark/spark/md/ice/ICEUtils.cpp index b0b60636b..782f13963 100644 --- a/src/lib/md/ice/ICEUtils.cpp +++ b/src/lib_spark/spark/md/ice/ICEUtils.cpp @@ -1,17 +1,17 @@ #ifndef _WIN32 #include "ICEUtils.h" -#include "lib/config/config.h" -#include "lib/domain/SecurityCriteria.h" -#include "lib/logging/logging.h" -#include "lib/md/SymbolLoader.h" -#include "lib/utils/bts_chrono.h" -#include "lib/utils/datetime.h" -#include "lib/utils/download.h" +#include "spark/config/config.h" +#include "spark/domain/SecurityCriteria.h" +#include "spark/logging/logging.h" +#include "spark/md/SymbolLoader.h" +#include "spark/utils/bts_chrono.h" +#include "spark/utils/datetime.h" +#include "spark/utils/download.h" -#include "lib/config/protos/deployment_type.pb.h" -#include "lib/config/protos/market_data.pb.h" -#include "lib/config/protos/system_config.pb.h" +#include "spark/config/protos/deployment_type.pb.h" +#include "spark/config/protos/market_data.pb.h" +#include "spark/config/protos/system_config.pb.h" #include #include diff --git a/src/lib/md/ice/ICEUtils.h b/src/lib_spark/spark/md/ice/ICEUtils.h similarity index 95% rename from src/lib/md/ice/ICEUtils.h rename to src/lib_spark/spark/md/ice/ICEUtils.h index 3ef8bb04b..8a1b418c5 100644 --- a/src/lib/md/ice/ICEUtils.h +++ b/src/lib_spark/spark/md/ice/ICEUtils.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/md/coconut2.h" +#include "spark/md/coconut2.h" #include #include #include diff --git a/src/lib/md/protos/co2.proto b/src/lib_spark/spark/md/protos/co2.proto similarity index 99% rename from src/lib/md/protos/co2.proto rename to src/lib_spark/spark/md/protos/co2.proto index daecf516b..1ec36e773 100644 --- a/src/lib/md/protos/co2.proto +++ b/src/lib_spark/spark/md/protos/co2.proto @@ -1,7 +1,7 @@ syntax='proto3'; package bts.co2; option csharp_namespace="bts.co2"; -import "lib/domain_model/Security.proto"; +import "spark/domain_model/Security.proto"; enum TradingStatus { TRADINGSTATUS_UNKNOWN = 0; diff --git a/src/lib/md/readme.md b/src/lib_spark/spark/md/readme.md similarity index 100% rename from src/lib/md/readme.md rename to src/lib_spark/spark/md/readme.md diff --git a/src/lib/md/relay/QueryServer.cpp b/src/lib_spark/spark/md/relay/QueryServer.cpp similarity index 96% rename from src/lib/md/relay/QueryServer.cpp rename to src/lib_spark/spark/md/relay/QueryServer.cpp index b70ae122c..8a2e7cad8 100644 --- a/src/lib/md/relay/QueryServer.cpp +++ b/src/lib_spark/spark/md/relay/QueryServer.cpp @@ -1,33 +1,33 @@ -#include "lib/domain/DomainSecurityUtils.h" -#include "lib/utils/bts_assert.h" #ifndef _WIN32 #include "QueryServer.h" -#include "lib/config/config.h" -#include "lib/domain_model/Security.h" -#include "lib/md/SymbolLoader.h" -#include "lib/utils/AuthToken.h" -#include "lib/utils/Dispatcher.h" -#include "lib/utils/TimeStamp.h" -#include "lib/utils/helper_macros.h" +#include "spark/config/config.h" +#include "spark/domain/DomainSecurityUtils.h" +#include "spark/domain_model/Security.h" +#include "spark/md/SymbolLoader.h" +#include "spark/utils/AuthToken.h" +#include "spark/utils/Dispatcher.h" +#include "spark/utils/TimeStamp.h" +#include "spark/utils/bts_assert.h" +#include "spark/utils/helper_macros.h" #include "../MBOProcessor.h" #include "../MDClient.h" #include "../MDConsumer.h" -#include "lib/logging/logging.h" +#include "spark/logging/logging.h" -#include "lib/api/apicore.pb.h" -#include "lib/api/public/ServiceContext.h" -#include "lib/api/service_helpers/AdminServiceUtils.h" -#include "lib/api/services/AdminService.client.pb.h" -#include "lib/api/services/MarketDataRelay.server.pb.h" -#include "lib/config/protos/cme_reference_data.pb.h" -#include "lib/config/protos/system_config.pb.h" -#include "lib/md/SecurityCache.h" -#include "lib/md/protos/co2.pb.h" -#include "lib/utils/ConcurrentAppendCollection.h" +#include "spark/api/apicore.pb.h" +#include "spark/api/public/ServiceContext.h" +#include "spark/api/service_helpers/AdminServiceUtils.h" +#include "spark/api/services/AdminService.client.pb.h" +#include "spark/api/services/MarketDataRelay.server.pb.h" +#include "spark/config/protos/cme_reference_data.pb.h" +#include "spark/config/protos/system_config.pb.h" +#include "spark/md/SecurityCache.h" +#include "spark/md/protos/co2.pb.h" +#include "spark/utils/ConcurrentAppendCollection.h" #ifndef _WIN32 -#include "lib/metrics/metrics.h" +#include "spark/metrics/metrics.h" #endif #include diff --git a/src/lib/md/relay/QueryServer.h b/src/lib_spark/spark/md/relay/QueryServer.h similarity index 81% rename from src/lib/md/relay/QueryServer.h rename to src/lib_spark/spark/md/relay/QueryServer.h index 41b0ff874..5bb9f17e1 100644 --- a/src/lib/md/relay/QueryServer.h +++ b/src/lib_spark/spark/md/relay/QueryServer.h @@ -1,14 +1,14 @@ #pragma once -#include "lib/md/ISyntheticSecurityService.h" -#include "lib/md/UserSymbol.h" -#include "lib/utils/bts_export.h" -#include "lib/utils/bts_no_copy.h" +#include "spark/md/ISyntheticSecurityService.h" +#include "spark/md/UserSymbol.h" +#include "spark/utils/bts_export.h" +#include "spark/utils/bts_no_copy.h" #include #include #include -#include "lib/md/protos/co2.pb.h" +#include "spark/md/protos/co2.pb.h" namespace bts { namespace api { diff --git a/src/lib/md/relay/RelayClient.cpp b/src/lib_spark/spark/md/relay/RelayClient.cpp similarity index 96% rename from src/lib/md/relay/RelayClient.cpp rename to src/lib_spark/spark/md/relay/RelayClient.cpp index 2a66782f6..7a657ccd8 100644 --- a/src/lib/md/relay/RelayClient.cpp +++ b/src/lib_spark/spark/md/relay/RelayClient.cpp @@ -3,20 +3,20 @@ #include "RelayRecorder.h" #include "../MDProducer.h" -#include "lib/collections/Remove.h" -#include "lib/config/config.h" -#include "lib/logging/logging.h" -#include "lib/md/SymbolLoader.h" -#include "lib/utils/AuthToken.h" -#include "lib/utils/TimeStamp.h" -#include "lib/utils/bts_chrono.h" +#include "spark/collections/Remove.h" +#include "spark/config/config.h" +#include "spark/logging/logging.h" +#include "spark/md/SymbolLoader.h" +#include "spark/utils/AuthToken.h" +#include "spark/utils/TimeStamp.h" +#include "spark/utils/bts_chrono.h" -#include "lib/api/public/ServiceContext.h" -#include "lib/api/services/MarketDataRelay.client.pb.h" -#include "lib/config/protos/market_data.pb.h" -#include "lib/config/protos/system_config.pb.h" -#include "lib/md/protos/co2.pb.h" -#include "lib/utils/base64.hpp" +#include "spark/api/public/ServiceContext.h" +#include "spark/api/services/MarketDataRelay.client.pb.h" +#include "spark/config/protos/market_data.pb.h" +#include "spark/config/protos/system_config.pb.h" +#include "spark/md/protos/co2.pb.h" +#include "spark/utils/base64.hpp" #include #include diff --git a/src/lib/md/relay/RelayClient.h b/src/lib_spark/spark/md/relay/RelayClient.h similarity index 86% rename from src/lib/md/relay/RelayClient.h rename to src/lib_spark/spark/md/relay/RelayClient.h index 19aca3692..8cb676de7 100644 --- a/src/lib/md/relay/RelayClient.h +++ b/src/lib_spark/spark/md/relay/RelayClient.h @@ -2,13 +2,13 @@ #include "../MDConsumer.h" #include "../UserSymbol.h" -#include "lib/utils/Dispatcher.h" -#include "lib/utils/bts_export.h" -#include "lib/utils/bts_no_copy.h" +#include "spark/utils/Dispatcher.h" +#include "spark/utils/bts_export.h" +#include "spark/utils/bts_no_copy.h" #include #include -#include "lib/md/protos/co2.pb.h" +#include "spark/md/protos/co2.pb.h" namespace bts { namespace pubsub { diff --git a/src/lib/md/relay/RelayRecorder.cpp b/src/lib_spark/spark/md/relay/RelayRecorder.cpp similarity index 93% rename from src/lib/md/relay/RelayRecorder.cpp rename to src/lib_spark/spark/md/relay/RelayRecorder.cpp index 31e4a24aa..3387d8d30 100644 --- a/src/lib/md/relay/RelayRecorder.cpp +++ b/src/lib_spark/spark/md/relay/RelayRecorder.cpp @@ -1,15 +1,15 @@ #ifndef NO_CPP0X #include "RelayRecorder.h" -#include "lib/config/config.h" -#include "lib/config/protos/market_data.pb.h" -#include "lib/config/protos/system_config.pb.h" -#include "lib/logging/logging.h" -#include "lib/md/SecurityIDRecorder.h" -#include "lib/md/protos/co2.pb.h" -#include "lib/utils/HTTPStream.h" -#include "lib/utils/bts_chrono.h" -#include "lib/utils/datetime.h" +#include "spark/config/config.h" +#include "spark/config/protos/market_data.pb.h" +#include "spark/config/protos/system_config.pb.h" +#include "spark/logging/logging.h" +#include "spark/md/SecurityIDRecorder.h" +#include "spark/md/protos/co2.pb.h" +#include "spark/utils/HTTPStream.h" +#include "spark/utils/bts_chrono.h" +#include "spark/utils/datetime.h" #include #include diff --git a/src/lib/md/relay/RelayRecorder.h b/src/lib_spark/spark/md/relay/RelayRecorder.h similarity index 97% rename from src/lib/md/relay/RelayRecorder.h rename to src/lib_spark/spark/md/relay/RelayRecorder.h index babf77864..3f0e38e87 100644 --- a/src/lib/md/relay/RelayRecorder.h +++ b/src/lib_spark/spark/md/relay/RelayRecorder.h @@ -1,7 +1,7 @@ #pragma once #include "RelayClient.h" -#include "lib/utils/bts_no_copy.h" +#include "spark/utils/bts_no_copy.h" #include #include #include diff --git a/src/lib/md/security_type_index.h b/src/lib_spark/spark/md/security_type_index.h similarity index 95% rename from src/lib/md/security_type_index.h rename to src/lib_spark/spark/md/security_type_index.h index 9347f8928..c1cb034ce 100644 --- a/src/lib/md/security_type_index.h +++ b/src/lib_spark/spark/md/security_type_index.h @@ -1,7 +1,7 @@ #pragma once -#include "lib/domain_model/Security.pb.h" -#include "lib/utils/bts_assert.h" +#include "spark/domain_model/Security.pb.h" +#include "spark/utils/bts_assert.h" #include diff --git a/src/lib/md/service/MarketDataServiceServer.cpp b/src/lib_spark/spark/md/service/MarketDataServiceServer.cpp similarity index 91% rename from src/lib/md/service/MarketDataServiceServer.cpp rename to src/lib_spark/spark/md/service/MarketDataServiceServer.cpp index da955db07..ffaded91b 100644 --- a/src/lib/md/service/MarketDataServiceServer.cpp +++ b/src/lib_spark/spark/md/service/MarketDataServiceServer.cpp @@ -1,10 +1,10 @@ #ifndef _WIN32 #include "MarketDataServiceServer.h" -#include "lib/md/Product.h" -#include "lib/md/SymbolLoader.h" -#include "lib/md/UserSymbol.h" -#include "lib/metrics/metrics.h" -#include "lib/utils/AuthToken.h" +#include "spark/md/Product.h" +#include "spark/md/SymbolLoader.h" +#include "spark/md/UserSymbol.h" +#include "spark/metrics/metrics.h" +#include "spark/utils/AuthToken.h" #include diff --git a/src/lib/md/service/MarketDataServiceServer.h b/src/lib_spark/spark/md/service/MarketDataServiceServer.h similarity index 83% rename from src/lib/md/service/MarketDataServiceServer.h rename to src/lib_spark/spark/md/service/MarketDataServiceServer.h index 1ca6d479a..ceecbe7d4 100644 --- a/src/lib/md/service/MarketDataServiceServer.h +++ b/src/lib_spark/spark/md/service/MarketDataServiceServer.h @@ -1,8 +1,8 @@ #pragma once -#include "lib/api/public/ServiceContext.h" -#include "lib/api/services/MarketDataService.server.pb.h" -#include "lib/md/MDClient.h" -#include "lib/utils/Dispatcher.h" +#include "spark/api/public/ServiceContext.h" +#include "spark/api/services/MarketDataService.server.pb.h" +#include "spark/md/MDClient.h" +#include "spark/utils/Dispatcher.h" #include namespace bts { diff --git a/src/lib/md/test/Co2ManagedTestHelper.cpp b/src/lib_spark/spark/md/test/Co2ManagedTestHelper.cpp similarity index 94% rename from src/lib/md/test/Co2ManagedTestHelper.cpp rename to src/lib_spark/spark/md/test/Co2ManagedTestHelper.cpp index c1296ffe7..38999bf3b 100644 --- a/src/lib/md/test/Co2ManagedTestHelper.cpp +++ b/src/lib_spark/spark/md/test/Co2ManagedTestHelper.cpp @@ -1,9 +1,9 @@ #ifdef _WIN32 #include "../coconut2.h" -#include "lib/config/config.h" -#include "lib/md/protos/co2.pb.h" -#include "lib/utils/TimeStamp.h" -#include "lib/utils/bts_export.h" +#include "spark/config/config.h" +#include "spark/md/protos/co2.pb.h" +#include "spark/utils/TimeStamp.h" +#include "spark/utils/bts_export.h" #include #include diff --git a/src/lib/md/test/Co2TestInstrument.cpp b/src/lib_spark/spark/md/test/Co2TestInstrument.cpp similarity index 96% rename from src/lib/md/test/Co2TestInstrument.cpp rename to src/lib_spark/spark/md/test/Co2TestInstrument.cpp index da9ef23f6..8775ee990 100644 --- a/src/lib/md/test/Co2TestInstrument.cpp +++ b/src/lib_spark/spark/md/test/Co2TestInstrument.cpp @@ -1,7 +1,7 @@ #define _DISABLE_EXTENDED_ALIGNED_STORAGE #include "Co2TestInstrument.h" -#include "lib/md/MemorySegmentUtils.h" -#include "lib/os/os.h" +#include "spark/md/MemorySegmentUtils.h" +#include "spark/os/os.h" namespace bts { namespace md { diff --git a/src/lib/md/test/Co2TestInstrument.h b/src/lib_spark/spark/md/test/Co2TestInstrument.h similarity index 94% rename from src/lib/md/test/Co2TestInstrument.h rename to src/lib_spark/spark/md/test/Co2TestInstrument.h index c319f80d8..48b6a1f4b 100644 --- a/src/lib/md/test/Co2TestInstrument.h +++ b/src/lib_spark/spark/md/test/Co2TestInstrument.h @@ -1,7 +1,7 @@ #pragma once #include "../coconut2.h" -#include "lib/utils/bts_no_copy.h" +#include "spark/utils/bts_no_copy.h" #include namespace bts { diff --git a/src/lib/md/test/mbo_tests.cpp b/src/lib_spark/spark/md/test/mbo_tests.cpp similarity index 95% rename from src/lib/md/test/mbo_tests.cpp rename to src/lib_spark/spark/md/test/mbo_tests.cpp index fcf56f925..5b7e23de9 100644 --- a/src/lib/md/test/mbo_tests.cpp +++ b/src/lib_spark/spark/md/test/mbo_tests.cpp @@ -1,8 +1,8 @@ #ifndef _WIN32 -#include "../IntPrice.h" -#include "../MBOProcessor.h" -#include "Co2TestInstrument.h" -#include "lib/utils/Shuffle.h" +#include "spark/md/IntPrice.h" +#include "spark/md/MBOProcessor.h" +#include "spark/md/test/Co2TestInstrument.h" +#include "spark/utils/Shuffle.h" #include #include diff --git a/src/lib/md/test/md2_tests.cpp b/src/lib_spark/spark/md/test/md2_tests.cpp similarity index 99% rename from src/lib/md/test/md2_tests.cpp rename to src/lib_spark/spark/md/test/md2_tests.cpp index c6d1b145c..620f6d6f5 100644 --- a/src/lib/md/test/md2_tests.cpp +++ b/src/lib_spark/spark/md/test/md2_tests.cpp @@ -5,18 +5,18 @@ #include "../coconut2.h" #include "../relay/QueryServer.h" #include "Co2TestInstrument.h" -#include "lib/config/config.h" -#include "lib/metrics/metrics.h" -#include "lib/os/os.h" -#include "lib/persistence/SqliteStore.h" -#include "lib/utils/Dispatcher.h" -#include "lib/utils/Shuffle.h" -#include "lib/utils/bts_chrono.h" -#include "lib/utils/defer.h" -#include "lib/utils/warn_ctrl.h" +#include "spark/config/config.h" +#include "spark/metrics/metrics.h" +#include "spark/os/os.h" +#include "spark/persistence/SqliteStore.h" +#include "spark/utils/Dispatcher.h" +#include "spark/utils/Shuffle.h" +#include "spark/utils/bts_chrono.h" +#include "spark/utils/defer.h" +#include "spark/utils/warn_ctrl.h" -#include "lib/config/protos/market_data.pb.h" -#include "lib/utils/Sqlite_utils.h" +#include "spark/config/protos/market_data.pb.h" +#include "spark/utils/Sqlite_utils.h" #include "md_test_utils.h" #include diff --git a/src/lib/md/test/md_test_utils.cpp b/src/lib_spark/spark/md/test/md_test_utils.cpp similarity index 100% rename from src/lib/md/test/md_test_utils.cpp rename to src/lib_spark/spark/md/test/md_test_utils.cpp diff --git a/src/lib/md/test/md_test_utils.h b/src/lib_spark/spark/md/test/md_test_utils.h similarity index 89% rename from src/lib/md/test/md_test_utils.h rename to src/lib_spark/spark/md/test/md_test_utils.h index cce2e214b..4aa04b06a 100644 --- a/src/lib/md/test/md_test_utils.h +++ b/src/lib_spark/spark/md/test/md_test_utils.h @@ -1,8 +1,8 @@ #pragma once #include "../MDProducerHandle.h" -#include "lib/md/IntPrice.h" -#include "lib/md/PriceSize.h" +#include "spark/md/IntPrice.h" +#include "spark/md/PriceSize.h" #include namespace bts { diff --git a/src/lib/md/test/synthetic_book_merge_tests.cpp b/src/lib_spark/spark/md/test/synthetic_book_merge_tests.cpp similarity index 96% rename from src/lib/md/test/synthetic_book_merge_tests.cpp rename to src/lib_spark/spark/md/test/synthetic_book_merge_tests.cpp index 6ca6f7547..f7050a9be 100644 --- a/src/lib/md/test/synthetic_book_merge_tests.cpp +++ b/src/lib_spark/spark/md/test/synthetic_book_merge_tests.cpp @@ -1,7 +1,7 @@ #ifndef _WIN32 #include "../MDConsumerHandle.h" #include "Co2TestInstrument.h" -#include "lib/utils/sane_algorithm.h" +#include "spark/utils/sane_algorithm.h" #include "md_test_utils.h" #include #include diff --git a/src/lib/md/vendor/OnixsUtils.cpp b/src/lib_spark/spark/md/vendor/OnixsUtils.cpp similarity index 90% rename from src/lib/md/vendor/OnixsUtils.cpp rename to src/lib_spark/spark/md/vendor/OnixsUtils.cpp index 70768d1d5..b25426d84 100644 --- a/src/lib/md/vendor/OnixsUtils.cpp +++ b/src/lib_spark/spark/md/vendor/OnixsUtils.cpp @@ -1,9 +1,9 @@ #ifndef _WIN32 #include "OnixsUtils.h" -#include "lib/config/config.h" -#include "lib/config/protos/market_data.pb.h" -#include "lib/config/protos/system_config.pb.h" -#include "lib/logging/logging.h" +#include "spark/config/config.h" +#include "spark/config/protos/market_data.pb.h" +#include "spark/config/protos/system_config.pb.h" +#include "spark/logging/logging.h" #include #include diff --git a/src/lib/md/vendor/OnixsUtils.h b/src/lib_spark/spark/md/vendor/OnixsUtils.h similarity index 100% rename from src/lib/md/vendor/OnixsUtils.h rename to src/lib_spark/spark/md/vendor/OnixsUtils.h diff --git a/src/lib/md/venue_index.h b/src/lib_spark/spark/md/venue_index.h similarity index 96% rename from src/lib/md/venue_index.h rename to src/lib_spark/spark/md/venue_index.h index aadb310e4..d9b9c96e4 100644 --- a/src/lib/md/venue_index.h +++ b/src/lib_spark/spark/md/venue_index.h @@ -1,7 +1,7 @@ #pragma once -#include "lib/domain_model/Security.pb.h" -#include "lib/utils/bts_assert.h" +#include "spark/domain_model/Security.pb.h" +#include "spark/utils/bts_assert.h" #include diff --git a/src/lib/mercury/actors/Actor.h b/src/lib_spark/spark/mercury/actors/Actor.h similarity index 96% rename from src/lib/mercury/actors/Actor.h rename to src/lib_spark/spark/mercury/actors/Actor.h index 17e520e63..a59471ed5 100644 --- a/src/lib/mercury/actors/Actor.h +++ b/src/lib_spark/spark/mercury/actors/Actor.h @@ -3,15 +3,15 @@ #include #include -#include "lib/mercury/actors/ActorBroker.h" -#include "lib/mercury/common/mercury_common.h" -#include "lib/mercury/events/Stream.h" -#include "lib/mercury/events/Update.h" -#include "lib/mercury/topics/Topic.h" +#include "spark/mercury/actors/ActorBroker.h" +#include "spark/mercury/common/mercury_common.h" +#include "spark/mercury/events/Stream.h" +#include "spark/mercury/events/Update.h" +#include "spark/mercury/topics/Topic.h" -#include "lib/tracing/bts_trace.h" -#include "lib/utils/bts_assert.h" -#include "lib/utils/warn_ctrl.h" +#include "spark/tracing/bts_trace.h" +#include "spark/utils/bts_assert.h" +#include "spark/utils/warn_ctrl.h" namespace bts { namespace mercury { diff --git a/src/lib/mercury/actors/ActorBroker.h b/src/lib_spark/spark/mercury/actors/ActorBroker.h similarity index 93% rename from src/lib/mercury/actors/ActorBroker.h rename to src/lib_spark/spark/mercury/actors/ActorBroker.h index 427db25b4..5f4025cbf 100644 --- a/src/lib/mercury/actors/ActorBroker.h +++ b/src/lib_spark/spark/mercury/actors/ActorBroker.h @@ -1,8 +1,8 @@ #pragma once -#include "lib/mercury/broker/BrokerProxy.h" -#include "lib/mercury/common/mercury_common.h" -#include "lib/mercury/events/Stream.h" +#include "spark/mercury/broker/BrokerProxy.h" +#include "spark/mercury/common/mercury_common.h" +#include "spark/mercury/events/Stream.h" namespace bts { namespace mercury { diff --git a/src/lib/mercury/actors/ContentSubscription.h b/src/lib_spark/spark/mercury/actors/ContentSubscription.h similarity index 98% rename from src/lib/mercury/actors/ContentSubscription.h rename to src/lib_spark/spark/mercury/actors/ContentSubscription.h index 9aa7a5167..42aa41ed0 100644 --- a/src/lib/mercury/actors/ContentSubscription.h +++ b/src/lib_spark/spark/mercury/actors/ContentSubscription.h @@ -1,8 +1,8 @@ #pragma once -#include "lib/mercury/actors/Actor.h" -#include "lib/tracing/PerfLog.h" -#include "lib/utils/bts_assert.h" +#include "spark/mercury/actors/Actor.h" +#include "spark/tracing/PerfLog.h" +#include "spark/utils/bts_assert.h" #include #include #include diff --git a/src/lib/mercury/actors/IPollableActor.cpp b/src/lib_spark/spark/mercury/actors/IPollableActor.cpp similarity index 100% rename from src/lib/mercury/actors/IPollableActor.cpp rename to src/lib_spark/spark/mercury/actors/IPollableActor.cpp diff --git a/src/lib/mercury/actors/IPollableActor.h b/src/lib_spark/spark/mercury/actors/IPollableActor.h similarity index 100% rename from src/lib/mercury/actors/IPollableActor.h rename to src/lib_spark/spark/mercury/actors/IPollableActor.h diff --git a/src/lib/mercury/actors/PingPong.h b/src/lib_spark/spark/mercury/actors/PingPong.h similarity index 80% rename from src/lib/mercury/actors/PingPong.h rename to src/lib_spark/spark/mercury/actors/PingPong.h index a37e8b847..5f7c495da 100644 --- a/src/lib/mercury/actors/PingPong.h +++ b/src/lib_spark/spark/mercury/actors/PingPong.h @@ -1,13 +1,13 @@ #pragma once -#include "lib/mercury/actors/Actor.h" -#include "lib/mercury/actors/IPollableActor.h" -#include "lib/mercury/events/Event.h" +#include "spark/mercury/actors/Actor.h" +#include "spark/mercury/actors/IPollableActor.h" +#include "spark/mercury/events/Event.h" -#include "lib/tracing/bts_trace.h" -#include "lib/utils/bts_chrono.h" -#include "lib/utils/datetime.h" -#include "lib/utils/helper_macros.h" +#include "spark/tracing/bts_trace.h" +#include "spark/utils/bts_chrono.h" +#include "spark/utils/datetime.h" +#include "spark/utils/helper_macros.h" #include diff --git a/src/lib/mercury/actors/Timer.h b/src/lib_spark/spark/mercury/actors/Timer.h similarity index 86% rename from src/lib/mercury/actors/Timer.h rename to src/lib_spark/spark/mercury/actors/Timer.h index 91130d8b1..802a98c52 100644 --- a/src/lib/mercury/actors/Timer.h +++ b/src/lib_spark/spark/mercury/actors/Timer.h @@ -1,9 +1,9 @@ #pragma once -#include "lib/mercury/actors/Actor.h" -#include "lib/mercury/events/TimerEvent.h" -#include "lib/utils/bts_chrono.h" -#include "lib/utils/datetime.h" +#include "spark/mercury/actors/Actor.h" +#include "spark/mercury/events/TimerEvent.h" +#include "spark/utils/bts_chrono.h" +#include "spark/utils/datetime.h" #include #include diff --git a/src/lib/mercury/broker/Broker.cpp b/src/lib_spark/spark/mercury/broker/Broker.cpp similarity index 98% rename from src/lib/mercury/broker/Broker.cpp rename to src/lib_spark/spark/mercury/broker/Broker.cpp index 5a2001be6..36114572f 100644 --- a/src/lib/mercury/broker/Broker.cpp +++ b/src/lib_spark/spark/mercury/broker/Broker.cpp @@ -1,10 +1,10 @@ -#include "lib/mercury/broker/Broker.h" +#include "spark/mercury/broker/Broker.h" -#include "lib/mercury/synopsis/ISynopsisBuilder.h" -#include "lib/mercury/topics/ITopic.h" -#include "lib/utils/Puid.h" -#include "lib/utils/bts_assert.h" -#include "lib/utils/bts_chrono.h" +#include "spark/mercury/synopsis/ISynopsisBuilder.h" +#include "spark/mercury/topics/ITopic.h" +#include "spark/utils/Puid.h" +#include "spark/utils/bts_assert.h" +#include "spark/utils/bts_chrono.h" #include #include diff --git a/src/lib/mercury/broker/Broker.h b/src/lib_spark/spark/mercury/broker/Broker.h similarity index 95% rename from src/lib/mercury/broker/Broker.h rename to src/lib_spark/spark/mercury/broker/Broker.h index 638a24890..e95f17759 100644 --- a/src/lib/mercury/broker/Broker.h +++ b/src/lib_spark/spark/mercury/broker/Broker.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/mercury/broker/ILocalBroker.h" +#include "spark/mercury/broker/ILocalBroker.h" #include namespace bts { diff --git a/src/lib/mercury/broker/BrokerProxy.cpp b/src/lib_spark/spark/mercury/broker/BrokerProxy.cpp similarity index 97% rename from src/lib/mercury/broker/BrokerProxy.cpp rename to src/lib_spark/spark/mercury/broker/BrokerProxy.cpp index 43a3ed9ef..b20a1c008 100644 --- a/src/lib/mercury/broker/BrokerProxy.cpp +++ b/src/lib_spark/spark/mercury/broker/BrokerProxy.cpp @@ -1,6 +1,6 @@ -#include "lib/mercury/broker/BrokerProxy.h" -#include "lib/config/config.h" -#include "lib/config/protos/mercury_cfg.pb.h" +#include "spark/mercury/broker/BrokerProxy.h" +#include "spark/config/config.h" +#include "spark/config/protos/mercury_cfg.pb.h" namespace bts { namespace mercury { diff --git a/src/lib/mercury/broker/BrokerProxy.h b/src/lib_spark/spark/mercury/broker/BrokerProxy.h similarity index 91% rename from src/lib/mercury/broker/BrokerProxy.h rename to src/lib_spark/spark/mercury/broker/BrokerProxy.h index e2112f427..a60c9c3f2 100644 --- a/src/lib/mercury/broker/BrokerProxy.h +++ b/src/lib_spark/spark/mercury/broker/BrokerProxy.h @@ -1,11 +1,11 @@ #pragma once -#include "lib/mercury/broker/ILocalBroker.h" -#include "lib/mercury/common/mercury_common.h" -#include "lib/mercury/topics/Topic.h" -#include "lib/tracing/PerfLog.h" -#include "lib/utils/GrowableSPSCQueue.h" -#include "lib/utils/object_pool.h" +#include "spark/mercury/broker/ILocalBroker.h" +#include "spark/mercury/common/mercury_common.h" +#include "spark/mercury/topics/Topic.h" +#include "spark/tracing/PerfLog.h" +#include "spark/utils/GrowableSPSCQueue.h" +#include "spark/utils/object_pool.h" #include diff --git a/src/lib/mercury/broker/ILocalBroker.cpp b/src/lib_spark/spark/mercury/broker/ILocalBroker.cpp similarity index 70% rename from src/lib/mercury/broker/ILocalBroker.cpp rename to src/lib_spark/spark/mercury/broker/ILocalBroker.cpp index 0b929b082..eaa9b08fa 100644 --- a/src/lib/mercury/broker/ILocalBroker.cpp +++ b/src/lib_spark/spark/mercury/broker/ILocalBroker.cpp @@ -1,4 +1,4 @@ -#include "lib/mercury/broker/ILocalBroker.h" +#include "spark/mercury/broker/ILocalBroker.h" namespace bts { namespace mercury { diff --git a/src/lib/mercury/broker/ILocalBroker.h b/src/lib_spark/spark/mercury/broker/ILocalBroker.h similarity index 87% rename from src/lib/mercury/broker/ILocalBroker.h rename to src/lib_spark/spark/mercury/broker/ILocalBroker.h index 086847b8b..4e95aaadc 100644 --- a/src/lib/mercury/broker/ILocalBroker.h +++ b/src/lib_spark/spark/mercury/broker/ILocalBroker.h @@ -1,5 +1,5 @@ #pragma once -#include "lib/mercury/broker/IRemoteBroker.h" +#include "spark/mercury/broker/IRemoteBroker.h" namespace bts { namespace mercury { diff --git a/src/lib/mercury/broker/IRemoteBroker.cpp b/src/lib_spark/spark/mercury/broker/IRemoteBroker.cpp similarity index 70% rename from src/lib/mercury/broker/IRemoteBroker.cpp rename to src/lib_spark/spark/mercury/broker/IRemoteBroker.cpp index 8a739b120..405c764a2 100644 --- a/src/lib/mercury/broker/IRemoteBroker.cpp +++ b/src/lib_spark/spark/mercury/broker/IRemoteBroker.cpp @@ -1,4 +1,4 @@ -#include "lib/mercury/broker/IRemoteBroker.h" +#include "spark/mercury/broker/IRemoteBroker.h" namespace bts { namespace mercury { diff --git a/src/lib/mercury/broker/IRemoteBroker.h b/src/lib_spark/spark/mercury/broker/IRemoteBroker.h similarity index 87% rename from src/lib/mercury/broker/IRemoteBroker.h rename to src/lib_spark/spark/mercury/broker/IRemoteBroker.h index b4ec41b17..363f8beac 100644 --- a/src/lib/mercury/broker/IRemoteBroker.h +++ b/src/lib_spark/spark/mercury/broker/IRemoteBroker.h @@ -1,7 +1,7 @@ #pragma once -#include "lib/mercury/common/mercury_common.h" -#include "lib/mercury/topics/Topic.h" +#include "spark/mercury/common/mercury_common.h" +#include "spark/mercury/topics/Topic.h" #include namespace bts { diff --git a/src/lib/mercury/common/FatWrapper.h b/src/lib_spark/spark/mercury/common/FatWrapper.h similarity index 99% rename from src/lib/mercury/common/FatWrapper.h rename to src/lib_spark/spark/mercury/common/FatWrapper.h index 42eda2ecb..8bbab94b6 100644 --- a/src/lib/mercury/common/FatWrapper.h +++ b/src/lib_spark/spark/mercury/common/FatWrapper.h @@ -3,7 +3,7 @@ #include #include -#include "lib/utils/bts_assert.h" +#include "spark/utils/bts_assert.h" namespace bts { namespace mercury { diff --git a/src/lib/mercury/common/mercury_common.cpp b/src/lib_spark/spark/mercury/common/mercury_common.cpp similarity index 100% rename from src/lib/mercury/common/mercury_common.cpp rename to src/lib_spark/spark/mercury/common/mercury_common.cpp diff --git a/src/lib/mercury/common/mercury_common.h b/src/lib_spark/spark/mercury/common/mercury_common.h similarity index 89% rename from src/lib/mercury/common/mercury_common.h rename to src/lib_spark/spark/mercury/common/mercury_common.h index 572928568..2c4a1cff0 100644 --- a/src/lib/mercury/common/mercury_common.h +++ b/src/lib_spark/spark/mercury/common/mercury_common.h @@ -1,8 +1,8 @@ #pragma once -#include "lib/core/FMT_IMPL.h" -#include "lib/mercury/common/FatWrapper.h" -#include "lib/utils/ValueWrapper.h" +#include "spark/core/FMT_IMPL.h" +#include "spark/mercury/common/FatWrapper.h" +#include "spark/utils/ValueWrapper.h" #include #include #include diff --git a/src/lib/mercury/events/Event.h b/src/lib_spark/spark/mercury/events/Event.h similarity index 72% rename from src/lib/mercury/events/Event.h rename to src/lib_spark/spark/mercury/events/Event.h index d0b45c27a..a1f2fe5fb 100644 --- a/src/lib/mercury/events/Event.h +++ b/src/lib_spark/spark/mercury/events/Event.h @@ -1,9 +1,9 @@ #pragma once -#include "lib/mercury/synopsis/CacheAll.h" -#include "lib/mercury/synopsis/CacheLast.h" -#include "lib/mercury/synopsis/NoSynopsis.h" -#include "lib/orderman/orderman_utils/orderman_common.h" +#include "spark/mercury/synopsis/CacheAll.h" +#include "spark/mercury/synopsis/CacheLast.h" +#include "spark/mercury/synopsis/NoSynopsis.h" +#include "spark/orderman/orderman_utils/orderman_common.h" #include #include diff --git a/src/lib/mercury/events/Stream.h b/src/lib_spark/spark/mercury/events/Stream.h similarity index 78% rename from src/lib/mercury/events/Stream.h rename to src/lib_spark/spark/mercury/events/Stream.h index 5c7ab274a..318819dcd 100644 --- a/src/lib/mercury/events/Stream.h +++ b/src/lib_spark/spark/mercury/events/Stream.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/mercury/common/mercury_common.h" +#include "spark/mercury/common/mercury_common.h" #include namespace bts { diff --git a/src/lib/mercury/events/TimerEvent.cpp b/src/lib_spark/spark/mercury/events/TimerEvent.cpp similarity index 100% rename from src/lib/mercury/events/TimerEvent.cpp rename to src/lib_spark/spark/mercury/events/TimerEvent.cpp diff --git a/src/lib/mercury/events/TimerEvent.h b/src/lib_spark/spark/mercury/events/TimerEvent.h similarity index 69% rename from src/lib/mercury/events/TimerEvent.h rename to src/lib_spark/spark/mercury/events/TimerEvent.h index f1b7c9228..576a6a8c1 100644 --- a/src/lib/mercury/events/TimerEvent.h +++ b/src/lib_spark/spark/mercury/events/TimerEvent.h @@ -1,9 +1,9 @@ #pragma once -#include "lib/mercury/common/mercury_common.h" -#include "lib/mercury/events/Event.h" -#include "lib/mercury/synopsis/NoSynopsis.h" -#include "lib/utils/bts_chrono.h" +#include "spark/mercury/common/mercury_common.h" +#include "spark/mercury/events/Event.h" +#include "spark/mercury/synopsis/NoSynopsis.h" +#include "spark/utils/bts_chrono.h" #include namespace bts { diff --git a/src/lib/mercury/events/Update.h b/src/lib_spark/spark/mercury/events/Update.h similarity index 86% rename from src/lib/mercury/events/Update.h rename to src/lib_spark/spark/mercury/events/Update.h index f3b769058..0498d16cb 100644 --- a/src/lib/mercury/events/Update.h +++ b/src/lib_spark/spark/mercury/events/Update.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/mercury/common/mercury_common.h" +#include "spark/mercury/common/mercury_common.h" #include #include diff --git a/src/lib/mercury/executor/Executor.cpp b/src/lib_spark/spark/mercury/executor/Executor.cpp similarity index 80% rename from src/lib/mercury/executor/Executor.cpp rename to src/lib_spark/spark/mercury/executor/Executor.cpp index b5db4d648..1677dfdc5 100644 --- a/src/lib/mercury/executor/Executor.cpp +++ b/src/lib_spark/spark/mercury/executor/Executor.cpp @@ -1,8 +1,8 @@ -#include "lib/mercury/executor/Executor.h" -#include "lib/mercury/actors/Actor.h" -#include "lib/mercury/actors/IPollableActor.h" -#include "lib/mercury/broker/Broker.h" -#include "lib/mercury/broker/BrokerProxy.h" +#include "spark/mercury/executor/Executor.h" +#include "spark/mercury/actors/Actor.h" +#include "spark/mercury/actors/IPollableActor.h" +#include "spark/mercury/broker/Broker.h" +#include "spark/mercury/broker/BrokerProxy.h" namespace bts { namespace mercury { diff --git a/src/lib/mercury/executor/Executor.h b/src/lib_spark/spark/mercury/executor/Executor.h similarity index 83% rename from src/lib/mercury/executor/Executor.h rename to src/lib_spark/spark/mercury/executor/Executor.h index 4e8e5d14a..1cfc3d903 100644 --- a/src/lib/mercury/executor/Executor.h +++ b/src/lib_spark/spark/mercury/executor/Executor.h @@ -1,10 +1,10 @@ #pragma once -#include "lib/mercury/actors/ActorBroker.h" -#include "lib/mercury/actors/IPollableActor.h" -#include "lib/mercury/broker/Broker.h" -#include "lib/mercury/broker/BrokerProxy.h" -#include "lib/tracing/PerfLog.h" +#include "spark/mercury/actors/ActorBroker.h" +#include "spark/mercury/actors/IPollableActor.h" +#include "spark/mercury/broker/Broker.h" +#include "spark/mercury/broker/BrokerProxy.h" +#include "spark/tracing/PerfLog.h" #include #include diff --git a/src/lib/mercury/synopsis/CacheAll.h b/src/lib_spark/spark/mercury/synopsis/CacheAll.h similarity index 94% rename from src/lib/mercury/synopsis/CacheAll.h rename to src/lib_spark/spark/mercury/synopsis/CacheAll.h index 2a9d6c28e..ceda209da 100644 --- a/src/lib/mercury/synopsis/CacheAll.h +++ b/src/lib_spark/spark/mercury/synopsis/CacheAll.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/mercury/synopsis/ISynopsisBuilder.h" +#include "spark/mercury/synopsis/ISynopsisBuilder.h" #include namespace bts { diff --git a/src/lib/mercury/synopsis/CacheLast.h b/src/lib_spark/spark/mercury/synopsis/CacheLast.h similarity index 85% rename from src/lib/mercury/synopsis/CacheLast.h rename to src/lib_spark/spark/mercury/synopsis/CacheLast.h index 0849e92ff..c000d1dc5 100644 --- a/src/lib/mercury/synopsis/CacheLast.h +++ b/src/lib_spark/spark/mercury/synopsis/CacheLast.h @@ -1,7 +1,7 @@ #pragma once -#include "lib/mercury/common/mercury_common.h" -#include "lib/mercury/synopsis/ISynopsisBuilder.h" +#include "spark/mercury/common/mercury_common.h" +#include "spark/mercury/synopsis/ISynopsisBuilder.h" #include namespace bts { diff --git a/src/lib/mercury/synopsis/ISynopsisBuilder.h b/src/lib_spark/spark/mercury/synopsis/ISynopsisBuilder.h similarity index 88% rename from src/lib/mercury/synopsis/ISynopsisBuilder.h rename to src/lib_spark/spark/mercury/synopsis/ISynopsisBuilder.h index 7b7327787..64fb417b6 100644 --- a/src/lib/mercury/synopsis/ISynopsisBuilder.h +++ b/src/lib_spark/spark/mercury/synopsis/ISynopsisBuilder.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/mercury/common/mercury_common.h" +#include "spark/mercury/common/mercury_common.h" #include namespace bts { diff --git a/src/lib/mercury/synopsis/MergeByKey.h b/src/lib_spark/spark/mercury/synopsis/MergeByKey.h similarity index 96% rename from src/lib/mercury/synopsis/MergeByKey.h rename to src/lib_spark/spark/mercury/synopsis/MergeByKey.h index 69b572561..a88d1750e 100644 --- a/src/lib/mercury/synopsis/MergeByKey.h +++ b/src/lib_spark/spark/mercury/synopsis/MergeByKey.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/mercury/synopsis/ISynopsisBuilder.h" +#include "spark/mercury/synopsis/ISynopsisBuilder.h" #include #include #include diff --git a/src/lib/mercury/synopsis/NoSynopsis.h b/src/lib_spark/spark/mercury/synopsis/NoSynopsis.h similarity index 77% rename from src/lib/mercury/synopsis/NoSynopsis.h rename to src/lib_spark/spark/mercury/synopsis/NoSynopsis.h index 399e2c09f..47d224b1e 100644 --- a/src/lib/mercury/synopsis/NoSynopsis.h +++ b/src/lib_spark/spark/mercury/synopsis/NoSynopsis.h @@ -1,7 +1,7 @@ #pragma once -#include "lib/mercury/common/mercury_common.h" -#include "lib/mercury/synopsis/ISynopsisBuilder.h" +#include "spark/mercury/common/mercury_common.h" +#include "spark/mercury/synopsis/ISynopsisBuilder.h" #include namespace bts { diff --git a/src/lib/mercury/topics/ITopic.h b/src/lib_spark/spark/mercury/topics/ITopic.h similarity index 86% rename from src/lib/mercury/topics/ITopic.h rename to src/lib_spark/spark/mercury/topics/ITopic.h index 1e34f0e7f..3a8adaa2b 100644 --- a/src/lib/mercury/topics/ITopic.h +++ b/src/lib_spark/spark/mercury/topics/ITopic.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/mercury/synopsis/ISynopsisBuilder.h" +#include "spark/mercury/synopsis/ISynopsisBuilder.h" #include namespace bts { diff --git a/src/lib/mercury/topics/Topic.cpp b/src/lib_spark/spark/mercury/topics/Topic.cpp similarity index 100% rename from src/lib/mercury/topics/Topic.cpp rename to src/lib_spark/spark/mercury/topics/Topic.cpp diff --git a/src/lib/mercury/topics/Topic.h b/src/lib_spark/spark/mercury/topics/Topic.h similarity index 90% rename from src/lib/mercury/topics/Topic.h rename to src/lib_spark/spark/mercury/topics/Topic.h index f6bb45664..32cca807e 100644 --- a/src/lib/mercury/topics/Topic.h +++ b/src/lib_spark/spark/mercury/topics/Topic.h @@ -1,9 +1,9 @@ #pragma once -#include "lib/core/FMT_IMPL.h" -#include "lib/mercury/events/Event.h" -#include "lib/mercury/topics/ITopic.h" -#include "lib/utils/type_name.h" +#include "spark/core/FMT_IMPL.h" +#include "spark/mercury/events/Event.h" +#include "spark/mercury/topics/ITopic.h" +#include "spark/utils/type_name.h" #include #include diff --git a/src/lib/metrics/metrics.cpp b/src/lib_spark/spark/metrics/metrics.cpp similarity index 93% rename from src/lib/metrics/metrics.cpp rename to src/lib_spark/spark/metrics/metrics.cpp index 98b5350a3..ab6635cd6 100644 --- a/src/lib/metrics/metrics.cpp +++ b/src/lib_spark/spark/metrics/metrics.cpp @@ -1,5 +1,5 @@ #include "metrics.h" -#include "lib/utils/ConcurrentAppendCollection.h" +#include "spark/utils/ConcurrentAppendCollection.h" #include using std::shared_ptr; diff --git a/src/lib/metrics/metrics.h b/src/lib_spark/spark/metrics/metrics.h similarity index 100% rename from src/lib/metrics/metrics.h rename to src/lib_spark/spark/metrics/metrics.h diff --git a/src/lib/metrics/system_metrics.cpp b/src/lib_spark/spark/metrics/system_metrics.cpp similarity index 93% rename from src/lib/metrics/system_metrics.cpp rename to src/lib_spark/spark/metrics/system_metrics.cpp index b89878093..aad6d9962 100644 --- a/src/lib/metrics/system_metrics.cpp +++ b/src/lib_spark/spark/metrics/system_metrics.cpp @@ -1,7 +1,7 @@ #include "system_metrics.h" -#include "lib/config/config.h" -#include "lib/config/protos/system_config.pb.h" +#include "spark/config/config.h" +#include "spark/config/protos/system_config.pb.h" #include #include diff --git a/src/lib/metrics/system_metrics.h b/src/lib_spark/spark/metrics/system_metrics.h similarity index 100% rename from src/lib/metrics/system_metrics.h rename to src/lib_spark/spark/metrics/system_metrics.h diff --git a/src/lib/orderman/CancelOrderMsg.cpp b/src/lib_spark/spark/orderman/CancelOrderMsg.cpp similarity index 93% rename from src/lib/orderman/CancelOrderMsg.cpp rename to src/lib_spark/spark/orderman/CancelOrderMsg.cpp index 2c3ecf87f..8a285dfdb 100644 --- a/src/lib/orderman/CancelOrderMsg.cpp +++ b/src/lib_spark/spark/orderman/CancelOrderMsg.cpp @@ -1,5 +1,5 @@ #include "CancelOrderMsg.h" -#include "lib/domain_model/Security.h" +#include "spark/domain_model/Security.h" namespace bts::orderman { diff --git a/src/lib/orderman/CancelOrderMsg.h b/src/lib_spark/spark/orderman/CancelOrderMsg.h similarity index 80% rename from src/lib/orderman/CancelOrderMsg.h rename to src/lib_spark/spark/orderman/CancelOrderMsg.h index 4f80a4990..c6a4be226 100644 --- a/src/lib/orderman/CancelOrderMsg.h +++ b/src/lib_spark/spark/orderman/CancelOrderMsg.h @@ -1,8 +1,8 @@ #pragma once -#include "lib/api/services/OrderService.pb.h" -#include "lib/core/FMT_IMPL.h" -#include "lib/orderman/orderman_utils/orderman_common.h" +#include "spark/api/services/OrderService.pb.h" +#include "spark/core/FMT_IMPL.h" +#include "spark/orderman/orderman_utils/orderman_common.h" #include diff --git a/src/lib/orderman/CancelReplaceOrderMsg.h b/src/lib_spark/spark/orderman/CancelReplaceOrderMsg.h similarity index 77% rename from src/lib/orderman/CancelReplaceOrderMsg.h rename to src/lib_spark/spark/orderman/CancelReplaceOrderMsg.h index 6bc6ffad6..7e30be412 100644 --- a/src/lib/orderman/CancelReplaceOrderMsg.h +++ b/src/lib_spark/spark/orderman/CancelReplaceOrderMsg.h @@ -1,8 +1,8 @@ #pragma once -#include "lib/core/FMT_IMPL.h" -#include "lib/orderman/CreateOrderMsg.h" -#include "lib/orderman/orderman_utils/orderman_common.h" +#include "spark/core/FMT_IMPL.h" +#include "spark/orderman/CreateOrderMsg.h" +#include "spark/orderman/orderman_utils/orderman_common.h" #include diff --git a/src/lib/orderman/ChildOrder.cpp b/src/lib_spark/spark/orderman/ChildOrder.cpp similarity index 100% rename from src/lib/orderman/ChildOrder.cpp rename to src/lib_spark/spark/orderman/ChildOrder.cpp diff --git a/src/lib/orderman/ChildOrder.h b/src/lib_spark/spark/orderman/ChildOrder.h similarity index 96% rename from src/lib/orderman/ChildOrder.h rename to src/lib_spark/spark/orderman/ChildOrder.h index e734c36b0..fdd6d62b7 100644 --- a/src/lib/orderman/ChildOrder.h +++ b/src/lib_spark/spark/orderman/ChildOrder.h @@ -1,8 +1,8 @@ #pragma once -#include "lib/orderman/OrderServices.h" -#include "lib/orderman/orderman_utils/orderman_common.h" -#include "lib/utils/bts_assert.h" +#include "spark/orderman/OrderServices.h" +#include "spark/orderman/orderman_utils/orderman_common.h" +#include "spark/utils/bts_assert.h" #include diff --git a/src/lib/orderman/CreateOrderMsg.cpp b/src/lib_spark/spark/orderman/CreateOrderMsg.cpp similarity index 95% rename from src/lib/orderman/CreateOrderMsg.cpp rename to src/lib_spark/spark/orderman/CreateOrderMsg.cpp index 436dffa8a..b4ce4739e 100644 --- a/src/lib/orderman/CreateOrderMsg.cpp +++ b/src/lib_spark/spark/orderman/CreateOrderMsg.cpp @@ -1,6 +1,6 @@ #include "CreateOrderMsg.h" -#include "lib/domain_model/Security.h" -#include "lib/utils/PBUtils.h" +#include "spark/domain_model/Security.h" +#include "spark/utils/PBUtils.h" namespace bts::orderman { diff --git a/src/lib/orderman/CreateOrderMsg.h b/src/lib_spark/spark/orderman/CreateOrderMsg.h similarity index 77% rename from src/lib/orderman/CreateOrderMsg.h rename to src/lib_spark/spark/orderman/CreateOrderMsg.h index 4bd601f7c..8826922fc 100644 --- a/src/lib/orderman/CreateOrderMsg.h +++ b/src/lib_spark/spark/orderman/CreateOrderMsg.h @@ -1,10 +1,10 @@ #pragma once -#include "lib/core/FMT_IMPL.h" -#include "lib/domain_model/Security.h" -#include "lib/domain_model/Security.pb.h" -#include "lib/domain_model/common.h" -#include "lib/orderman/orderman_utils/orderman_common.h" +#include "spark/core/FMT_IMPL.h" +#include "spark/domain_model/Security.h" +#include "spark/domain_model/Security.pb.h" +#include "spark/domain_model/common.h" +#include "spark/orderman/orderman_utils/orderman_common.h" #include diff --git a/src/lib/orderman/Governor.cpp b/src/lib_spark/spark/orderman/Governor.cpp similarity index 100% rename from src/lib/orderman/Governor.cpp rename to src/lib_spark/spark/orderman/Governor.cpp diff --git a/src/lib/orderman/Governor.h b/src/lib_spark/spark/orderman/Governor.h similarity index 93% rename from src/lib/orderman/Governor.h rename to src/lib_spark/spark/orderman/Governor.h index ece8f2805..77173c0d9 100644 --- a/src/lib/orderman/Governor.h +++ b/src/lib_spark/spark/orderman/Governor.h @@ -1,5 +1,5 @@ #pragma once -#include "lib/utils/bts_chrono.h" +#include "spark/utils/bts_chrono.h" #include namespace bts::orderman { diff --git a/src/lib/orderman/IOrderListener.h b/src/lib_spark/spark/orderman/IOrderListener.h similarity index 78% rename from src/lib/orderman/IOrderListener.h rename to src/lib_spark/spark/orderman/IOrderListener.h index 654ba789b..58faf9bfa 100644 --- a/src/lib/orderman/IOrderListener.h +++ b/src/lib_spark/spark/orderman/IOrderListener.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/domain/OrderKey.h" -#include "lib/domain/OrderState.h" +#include "spark/domain/OrderKey.h" +#include "spark/domain/OrderState.h" namespace bts::orderman { diff --git a/src/lib/orderman/IOrderMux.h b/src/lib_spark/spark/orderman/IOrderMux.h similarity index 100% rename from src/lib/orderman/IOrderMux.h rename to src/lib_spark/spark/orderman/IOrderMux.h diff --git a/src/lib/orderman/OrderBuilder.cpp b/src/lib_spark/spark/orderman/OrderBuilder.cpp similarity index 100% rename from src/lib/orderman/OrderBuilder.cpp rename to src/lib_spark/spark/orderman/OrderBuilder.cpp diff --git a/src/lib/orderman/OrderBuilder.h b/src/lib_spark/spark/orderman/OrderBuilder.h similarity index 81% rename from src/lib/orderman/OrderBuilder.h rename to src/lib_spark/spark/orderman/OrderBuilder.h index f5b3edd05..1e983c30c 100644 --- a/src/lib/orderman/OrderBuilder.h +++ b/src/lib_spark/spark/orderman/OrderBuilder.h @@ -1,9 +1,9 @@ #pragma once -#include "lib/api/services/OrderService.pb.h" -#include "lib/orderman/ChildOrder.h" -#include "lib/orderman/OrderServices.h" -#include "lib/orderman/orderman_utils/orderman_common.h" +#include "spark/api/services/OrderService.pb.h" +#include "spark/orderman/ChildOrder.h" +#include "spark/orderman/OrderServices.h" +#include "spark/orderman/orderman_utils/orderman_common.h" #include diff --git a/src/lib/orderman/OrderGateway.h b/src/lib_spark/spark/orderman/OrderGateway.h similarity index 96% rename from src/lib/orderman/OrderGateway.h rename to src/lib_spark/spark/orderman/OrderGateway.h index bc6e7b787..a3eca89f0 100644 --- a/src/lib/orderman/OrderGateway.h +++ b/src/lib_spark/spark/orderman/OrderGateway.h @@ -1,5 +1,5 @@ #pragma once -#include "lib/domain/OrderKey.h" +#include "spark/domain/OrderKey.h" namespace bts::domain { struct NewOrder; diff --git a/src/lib/orderman/OrderMsg.h b/src/lib_spark/spark/orderman/OrderMsg.h similarity index 87% rename from src/lib/orderman/OrderMsg.h rename to src/lib_spark/spark/orderman/OrderMsg.h index 8a52cffbf..1c4e81d24 100644 --- a/src/lib/orderman/OrderMsg.h +++ b/src/lib_spark/spark/orderman/OrderMsg.h @@ -1,11 +1,11 @@ #pragma once -#include "lib/domain_model/Security.pb.h" -#include "lib/orderman/CancelOrderMsg.h" -#include "lib/orderman/CancelReplaceOrderMsg.h" -#include "lib/orderman/CreateOrderMsg.h" -#include "lib/orderman/RFQMsg.h" -#include "lib/utils/overloaded.h" +#include "spark/domain_model/Security.pb.h" +#include "spark/orderman/CancelOrderMsg.h" +#include "spark/orderman/CancelReplaceOrderMsg.h" +#include "spark/orderman/CreateOrderMsg.h" +#include "spark/orderman/RFQMsg.h" +#include "spark/utils/overloaded.h" #include diff --git a/src/lib/orderman/OrderRouter.cpp b/src/lib_spark/spark/orderman/OrderRouter.cpp similarity index 88% rename from src/lib/orderman/OrderRouter.cpp rename to src/lib_spark/spark/orderman/OrderRouter.cpp index d37b22136..f93c4c734 100644 --- a/src/lib/orderman/OrderRouter.cpp +++ b/src/lib_spark/spark/orderman/OrderRouter.cpp @@ -1,11 +1,11 @@ #include "OrderRouter.h" -#include "lib/api/service_helpers/AdminServiceUtils.h" -#include "lib/api/services/AdminService.server.pb.h" -#include "lib/config/config.h" -#include "lib/config/protos/jetfix.pb.h" -#include "lib/domain_model/Security.pb.h" -#include "lib/logging/logging.h" -#include "lib/utils/bts_assert.h" +#include "spark/api/service_helpers/AdminServiceUtils.h" +#include "spark/api/services/AdminService.server.pb.h" +#include "spark/config/config.h" +#include "spark/config/protos/jetfix.pb.h" +#include "spark/domain_model/Security.pb.h" +#include "spark/logging/logging.h" +#include "spark/utils/bts_assert.h" namespace bts { namespace orderman { diff --git a/src/lib/orderman/OrderRouter.h b/src/lib_spark/spark/orderman/OrderRouter.h similarity index 92% rename from src/lib/orderman/OrderRouter.h rename to src/lib_spark/spark/orderman/OrderRouter.h index ff055d595..acc2fc386 100644 --- a/src/lib/orderman/OrderRouter.h +++ b/src/lib_spark/spark/orderman/OrderRouter.h @@ -1,7 +1,7 @@ #pragma once -#include "lib/api/services/OrderService.pb.h" -#include "lib/orderman/orderman_utils/orderman_common.h" +#include "spark/api/services/OrderService.pb.h" +#include "spark/orderman/orderman_utils/orderman_common.h" #include namespace bts { diff --git a/src/lib/orderman/OrderServiceServer.cpp b/src/lib_spark/spark/orderman/OrderServiceServer.cpp similarity index 92% rename from src/lib/orderman/OrderServiceServer.cpp rename to src/lib_spark/spark/orderman/OrderServiceServer.cpp index a8349308b..cb6addbbc 100644 --- a/src/lib/orderman/OrderServiceServer.cpp +++ b/src/lib_spark/spark/orderman/OrderServiceServer.cpp @@ -1,48 +1,48 @@ #include "OrderServiceServer.h" -#include "lib/api/public/ServiceContext.h" -#include "lib/api/public/StatefulPublisher.h" -#include "lib/api/services/AdminService.client.pb.h" -#include "lib/api/services/MarginService.client.pb.h" -#include "lib/api/services/OrderService.pb.h" -#include "lib/api/services/PositionService.client.pb.h" -#include "lib/config/config.h" -#include "lib/config/protos/jetfix.pb.h" -#include "lib/config/protos/orderman_cfg.pb.h" -#include "lib/core/FMT.h" -#include "lib/domain_model/Security.pb.h" -#include "lib/domain_model/common.h" -#include "lib/logging/logging.h" -#include "lib/md/MDClient.h" -#include "lib/md/MDConsumer.h" -#include "lib/md/UserSymbol.h" -#include "lib/mercury/actors/Timer.h" -#include "lib/mercury/executor/Executor.h" -#include "lib/metrics/metrics.h" -#include "lib/orderman/actors/AsyncFactory.h" -#include "lib/orderman/actors/FillStore.h" -#include "lib/orderman/actors/MDSource.h" -#include "lib/orderman/actors/MDSupplementarySource.h" -#include "lib/orderman/actors/OrderStore.h" -#include "lib/orderman/actors/SecuritySrc.h" -#include "lib/orderman/actors/ServiceBridge.h" -#include "lib/orderman/actors/order_manager/OrderManager.h" -#include "lib/orderman/actors/order_manager/OrderServicesData.h" -#include "lib/orderman/actors/order_manager/order_gateway_definition.h" -#include "lib/orderman/events/ExchangePositionEvent.h" -#include "lib/orderman/events/OrderOpResultEvent.h" -#include "lib/orderman/gateways/i_execution_gateway_provider.h" -#include "lib/orderman/order_desc.h" -#include "lib/orderman/order_factory/DynamicOrderRegistry.h" -#include "lib/orderman/orderman_utils/ExchangeOpenOrders.h" -#include "lib/orderman/orders/Order.h" -#include "lib/os/os.h" -#include "lib/os/spark_data_directory.h" -#include "lib/plugin/SparkServices.h" -#include "lib/plugin/plugin.h" -#include "lib/utils/PBUtils.h" -#include "lib/utils/bts_chrono.h" -#include "lib/utils/thread_manager.h" -#include "lib/utils/type_name.h" +#include "spark/api/public/ServiceContext.h" +#include "spark/api/public/StatefulPublisher.h" +#include "spark/api/services/AdminService.client.pb.h" +#include "spark/api/services/MarginService.client.pb.h" +#include "spark/api/services/OrderService.pb.h" +#include "spark/api/services/PositionService.client.pb.h" +#include "spark/config/config.h" +#include "spark/config/protos/jetfix.pb.h" +#include "spark/config/protos/orderman_cfg.pb.h" +#include "spark/core/FMT.h" +#include "spark/domain_model/Security.pb.h" +#include "spark/domain_model/common.h" +#include "spark/logging/logging.h" +#include "spark/md/MDClient.h" +#include "spark/md/MDConsumer.h" +#include "spark/md/UserSymbol.h" +#include "spark/mercury/actors/Timer.h" +#include "spark/mercury/executor/Executor.h" +#include "spark/metrics/metrics.h" +#include "spark/orderman/actors/AsyncFactory.h" +#include "spark/orderman/actors/FillStore.h" +#include "spark/orderman/actors/MDSource.h" +#include "spark/orderman/actors/MDSupplementarySource.h" +#include "spark/orderman/actors/OrderStore.h" +#include "spark/orderman/actors/SecuritySrc.h" +#include "spark/orderman/actors/ServiceBridge.h" +#include "spark/orderman/actors/order_manager/OrderManager.h" +#include "spark/orderman/actors/order_manager/OrderServicesData.h" +#include "spark/orderman/actors/order_manager/order_gateway_definition.h" +#include "spark/orderman/events/ExchangePositionEvent.h" +#include "spark/orderman/events/OrderOpResultEvent.h" +#include "spark/orderman/gateways/i_execution_gateway_provider.h" +#include "spark/orderman/order_desc.h" +#include "spark/orderman/order_factory/DynamicOrderRegistry.h" +#include "spark/orderman/orderman_utils/ExchangeOpenOrders.h" +#include "spark/orderman/orders/Order.h" +#include "spark/os/os.h" +#include "spark/os/spark_data_directory.h" +#include "spark/plugin/SparkServices.h" +#include "spark/plugin/plugin.h" +#include "spark/utils/PBUtils.h" +#include "spark/utils/bts_chrono.h" +#include "spark/utils/thread_manager.h" +#include "spark/utils/type_name.h" #include #include diff --git a/src/lib/orderman/OrderServiceServer.h b/src/lib_spark/spark/orderman/OrderServiceServer.h similarity index 88% rename from src/lib/orderman/OrderServiceServer.h rename to src/lib_spark/spark/orderman/OrderServiceServer.h index 1cf98dd1d..d1346ce9e 100644 --- a/src/lib/orderman/OrderServiceServer.h +++ b/src/lib_spark/spark/orderman/OrderServiceServer.h @@ -1,11 +1,12 @@ #pragma once -#include "lib/api/services/OrderService.pb.h" -#include "lib/api/services/OrderService.server.pb.h" -#include "lib/md/MDClient.h" -#include "lib/mercury/actors/IPollableActor.h" -#include "lib/orderman/events/ExchangeOpenOrdersEvent.h" -#include "lib/orderman/gateways/i_execution_gateway_provider.h" +#include "spark/api/services/OrderService.pb.h" +#include "spark/api/services/OrderService.server.pb.h" +#include "spark/md/MDClient.h" +#include "spark/mercury/actors/IPollableActor.h" +#include "spark/orderman/events/ExchangeOpenOrdersEvent.h" +#include "spark/orderman/gateways/i_execution_gateway_provider.h" + #include namespace bts { diff --git a/src/lib/orderman/OrderServices.cpp b/src/lib_spark/spark/orderman/OrderServices.cpp similarity index 99% rename from src/lib/orderman/OrderServices.cpp rename to src/lib_spark/spark/orderman/OrderServices.cpp index 1b6f6815f..da2324264 100644 --- a/src/lib/orderman/OrderServices.cpp +++ b/src/lib_spark/spark/orderman/OrderServices.cpp @@ -1,6 +1,6 @@ #include "OrderServices.h" -#include "lib/logging/logging.h" -#include "lib/orderman/ChildOrder.h" +#include "spark/logging/logging.h" +#include "spark/orderman/ChildOrder.h" namespace bts::orderman { diff --git a/src/lib/orderman/OrderServices.h b/src/lib_spark/spark/orderman/OrderServices.h similarity index 94% rename from src/lib/orderman/OrderServices.h rename to src/lib_spark/spark/orderman/OrderServices.h index 0ad8a001c..1c30d36f2 100644 --- a/src/lib/orderman/OrderServices.h +++ b/src/lib_spark/spark/orderman/OrderServices.h @@ -1,21 +1,21 @@ #pragma once -#include "lib/api/services/OrderService.pb.h" -#include "lib/jetfix/common/OutFIX.h" -#include "lib/logging/logging.h" -#include "lib/mercury/actors/ContentSubscription.h" -#include "lib/orderman/Governor.h" -#include "lib/orderman/actors/order_manager/OrderManager.h" -#include "lib/orderman/actors/order_manager/OrderServicesData.h" -#include "lib/orderman/actors/order_manager/SessionServices.h" -#include "lib/orderman/events/FilledPositionEvent.h" -#include "lib/orderman/events/StatusUpdateEvent.h" -#include "lib/orderman/events/TheoEvent.h" -#include "lib/orderman/events/TickerUpdateEvent.h" -#include "lib/orderman/orderman_utils/EventStream.h" -#include "lib/orderman/orders/Order.h" +#include "spark/api/services/OrderService.pb.h" +#include "spark/jetfix/common/OutFIX.h" +#include "spark/logging/logging.h" +#include "spark/mercury/actors/ContentSubscription.h" +#include "spark/orderman/Governor.h" +#include "spark/orderman/actors/order_manager/OrderManager.h" +#include "spark/orderman/actors/order_manager/OrderServicesData.h" +#include "spark/orderman/actors/order_manager/SessionServices.h" +#include "spark/orderman/events/FilledPositionEvent.h" +#include "spark/orderman/events/StatusUpdateEvent.h" +#include "spark/orderman/events/TheoEvent.h" +#include "spark/orderman/events/TickerUpdateEvent.h" +#include "spark/orderman/orderman_utils/EventStream.h" +#include "spark/orderman/orders/Order.h" -#include "lib/tracing/PerfLog.h" +#include "spark/tracing/PerfLog.h" #include #include diff --git a/src/lib/orderman/RFQMsg.h b/src/lib_spark/spark/orderman/RFQMsg.h similarity index 54% rename from src/lib/orderman/RFQMsg.h rename to src/lib_spark/spark/orderman/RFQMsg.h index 83fdcd185..6f7362ad0 100644 --- a/src/lib/orderman/RFQMsg.h +++ b/src/lib_spark/spark/orderman/RFQMsg.h @@ -1,10 +1,10 @@ #pragma once -#include "lib/api/services/OrderService.pb.h" -#include "lib/core/FMT_IMPL.h" -#include "lib/domain_model/Security.pb.h" -#include "lib/orderman/events/RFQEvent.h" -#include "lib/orderman/orderman_utils/orderman_common.h" +#include "spark/api/services/OrderService.pb.h" +#include "spark/core/FMT_IMPL.h" +#include "spark/domain_model/Security.pb.h" +#include "spark/orderman/events/RFQEvent.h" +#include "spark/orderman/orderman_utils/orderman_common.h" #include diff --git a/src/lib/orderman/Trade.h b/src/lib_spark/spark/orderman/Trade.h similarity index 65% rename from src/lib/orderman/Trade.h rename to src/lib_spark/spark/orderman/Trade.h index 16e7cee37..588fe71c9 100644 --- a/src/lib/orderman/Trade.h +++ b/src/lib_spark/spark/orderman/Trade.h @@ -1,8 +1,8 @@ #pragma once -#include "lib/domain_model/common.h" -#include "lib/md/protos/co2.pb.h" -#include "lib/utils/bts_chrono.h" +#include "spark/domain_model/common.h" +#include "spark/md/protos/co2.pb.h" +#include "spark/utils/bts_chrono.h" namespace bts::orderman { diff --git a/src/lib/orderman/TradeVector.h b/src/lib_spark/spark/orderman/TradeVector.h similarity index 84% rename from src/lib/orderman/TradeVector.h rename to src/lib_spark/spark/orderman/TradeVector.h index 182f05766..1cbeaf7d6 100644 --- a/src/lib/orderman/TradeVector.h +++ b/src/lib_spark/spark/orderman/TradeVector.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/orderman/Trade.h" +#include "spark/orderman/Trade.h" #include diff --git a/src/lib/orderman/account_id.h b/src/lib_spark/spark/orderman/account_id.h similarity index 81% rename from src/lib/orderman/account_id.h rename to src/lib_spark/spark/orderman/account_id.h index f29e3c8ff..3775f3657 100644 --- a/src/lib/orderman/account_id.h +++ b/src/lib_spark/spark/orderman/account_id.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/utils/ValueWrapper.h" +#include "spark/utils/ValueWrapper.h" #include diff --git a/src/lib/orderman/account_name.h b/src/lib_spark/spark/orderman/account_name.h similarity index 82% rename from src/lib/orderman/account_name.h rename to src/lib_spark/spark/orderman/account_name.h index ffc76ea3b..9a0848e14 100644 --- a/src/lib/orderman/account_name.h +++ b/src/lib_spark/spark/orderman/account_name.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/utils/ValueWrapper.h" +#include "spark/utils/ValueWrapper.h" #include diff --git a/src/lib/orderman/actors/AsyncFactory.cpp b/src/lib_spark/spark/orderman/actors/AsyncFactory.cpp similarity index 78% rename from src/lib/orderman/actors/AsyncFactory.cpp rename to src/lib_spark/spark/orderman/actors/AsyncFactory.cpp index 5f66dae41..fbee865d0 100644 --- a/src/lib/orderman/actors/AsyncFactory.cpp +++ b/src/lib_spark/spark/orderman/actors/AsyncFactory.cpp @@ -1,14 +1,14 @@ #include "AsyncFactory.h" -#include "lib/config/protos/jetfix.pb.h" -#include "lib/jetfix/common/OutFIX.h" -#include "lib/orderman/OrderRouter.h" -#include "lib/orderman/events/CreateFIXBufferReplyEvent.h" -#include "lib/orderman/events/CreateFIXBufferRequestEvent.h" -#include "lib/orderman/events/CreateOrderReplyEvent.h" -#include "lib/orderman/events/CreateOrderRequestEvent.h" -#include "lib/orderman/events/NewAdminDataEvent.h" -#include "lib/orderman/order_factory/OrderFactory.h" -#include "lib/orderman/securities/MapSecurityDB.h" +#include "spark/config/protos/jetfix.pb.h" +#include "spark/jetfix/common/OutFIX.h" +#include "spark/orderman/OrderRouter.h" +#include "spark/orderman/events/CreateFIXBufferReplyEvent.h" +#include "spark/orderman/events/CreateFIXBufferRequestEvent.h" +#include "spark/orderman/events/CreateOrderReplyEvent.h" +#include "spark/orderman/events/CreateOrderRequestEvent.h" +#include "spark/orderman/events/NewAdminDataEvent.h" +#include "spark/orderman/order_factory/OrderFactory.h" +#include "spark/orderman/securities/MapSecurityDB.h" namespace bts { namespace orderman { diff --git a/src/lib/orderman/actors/AsyncFactory.h b/src/lib_spark/spark/orderman/actors/AsyncFactory.h similarity index 70% rename from src/lib/orderman/actors/AsyncFactory.h rename to src/lib_spark/spark/orderman/actors/AsyncFactory.h index a95be14b7..2a8d248f0 100644 --- a/src/lib/orderman/actors/AsyncFactory.h +++ b/src/lib_spark/spark/orderman/actors/AsyncFactory.h @@ -1,9 +1,9 @@ #pragma once -#include "lib/config/protos/jetfix.pb.h" -#include "lib/md/SecurityOracle.h" -#include "lib/mercury/actors/Actor.h" -#include "lib/orderman/orderman_utils/orderman_common.h" +#include "spark/config/protos/jetfix.pb.h" +#include "spark/md/SecurityOracle.h" +#include "spark/mercury/actors/Actor.h" +#include "spark/orderman/orderman_utils/orderman_common.h" #include namespace bts { diff --git a/src/lib/orderman/actors/FillStore.cpp b/src/lib_spark/spark/orderman/actors/FillStore.cpp similarity index 94% rename from src/lib/orderman/actors/FillStore.cpp rename to src/lib_spark/spark/orderman/actors/FillStore.cpp index f0d18ab6a..5fc91281b 100644 --- a/src/lib/orderman/actors/FillStore.cpp +++ b/src/lib_spark/spark/orderman/actors/FillStore.cpp @@ -1,26 +1,26 @@ #include "FillStore.h" -#include "lib/api/services/OrderService.pb.h" -#include "lib/config/config.h" -#include "lib/config/protos/toggles.pb.h" -#include "lib/core/TimeStamp.h" -#include "lib/domain_model/Security.h" -#include "lib/domain_model/Security.pb.h" -#include "lib/domain_model/SecurityKey.h" -#include "lib/logging/logging.h" -#include "lib/mercury/events/Update.h" -#include "lib/orderman/actors/SODPosition.h" -#include "lib/orderman/events/ManuallyBustFillsEvent.h" -#include "lib/orderman/events/NewExecutionReportEvent.h" -#include "lib/orderman/events/OrderDefinitionUpdateEvent.h" -#include "lib/orderman/events/OrderStateUpdateEvent.h" -#include "lib/orderman/events/StoredFillEvent.h" -#include "lib/os/os.h" -#include "lib/persistence/SqliteStore.h" -#include "lib/utils/PBUtils.h" -#include "lib/utils/TimeStamp.h" -#include "lib/utils/bts_assert.h" -#include "lib/utils/bts_chrono.h" -#include "lib/utils/overloaded.h" +#include "spark/api/services/OrderService.pb.h" +#include "spark/config/config.h" +#include "spark/config/protos/toggles.pb.h" +#include "spark/core/TimeStamp.h" +#include "spark/domain_model/Security.h" +#include "spark/domain_model/Security.pb.h" +#include "spark/domain_model/SecurityKey.h" +#include "spark/logging/logging.h" +#include "spark/mercury/events/Update.h" +#include "spark/orderman/actors/SODPosition.h" +#include "spark/orderman/events/ManuallyBustFillsEvent.h" +#include "spark/orderman/events/NewExecutionReportEvent.h" +#include "spark/orderman/events/OrderDefinitionUpdateEvent.h" +#include "spark/orderman/events/OrderStateUpdateEvent.h" +#include "spark/orderman/events/StoredFillEvent.h" +#include "spark/os/os.h" +#include "spark/persistence/SqliteStore.h" +#include "spark/utils/PBUtils.h" +#include "spark/utils/TimeStamp.h" +#include "spark/utils/bts_assert.h" +#include "spark/utils/bts_chrono.h" +#include "spark/utils/overloaded.h" #include #include diff --git a/src/lib/orderman/actors/FillStore.h b/src/lib_spark/spark/orderman/actors/FillStore.h similarity index 88% rename from src/lib/orderman/actors/FillStore.h rename to src/lib_spark/spark/orderman/actors/FillStore.h index b45c08689..554c8b9e6 100644 --- a/src/lib/orderman/actors/FillStore.h +++ b/src/lib_spark/spark/orderman/actors/FillStore.h @@ -1,8 +1,8 @@ #pragma once -#include "lib/md/SecurityOracle.h" -#include "lib/mercury/actors/Actor.h" -#include "lib/mercury/events/Update.h" +#include "spark/md/SecurityOracle.h" +#include "spark/mercury/actors/Actor.h" +#include "spark/mercury/events/Update.h" #include namespace bts { diff --git a/src/lib/orderman/actors/MDSource.cpp b/src/lib_spark/spark/orderman/actors/MDSource.cpp similarity index 99% rename from src/lib/orderman/actors/MDSource.cpp rename to src/lib_spark/spark/orderman/actors/MDSource.cpp index dcac314cf..2b8b899a7 100644 --- a/src/lib/orderman/actors/MDSource.cpp +++ b/src/lib_spark/spark/orderman/actors/MDSource.cpp @@ -1,6 +1,6 @@ #include "MDSource.h" -#include "lib/domain_model/Security.h" -#include "lib/md/cme/MDP3Utils.h" +#include "spark/domain_model/Security.h" +#include "spark/md/cme/MDP3Utils.h" namespace bts::orderman { diff --git a/src/lib/orderman/actors/MDSource.h b/src/lib_spark/spark/orderman/actors/MDSource.h similarity index 78% rename from src/lib/orderman/actors/MDSource.h rename to src/lib_spark/spark/orderman/actors/MDSource.h index b8f6f37cf..9659ab200 100644 --- a/src/lib/orderman/actors/MDSource.h +++ b/src/lib_spark/spark/orderman/actors/MDSource.h @@ -1,19 +1,19 @@ #pragma once -#include "lib/md/MDConsumer.h" -#include "lib/md/MDConsumerHandle.h" -#include "lib/mercury/actors/Actor.h" -#include "lib/mercury/actors/IPollableActor.h" -#include "lib/metrics/metrics.h" -#include "lib/orderman/events/BookUpdateEvent.h" -#include "lib/orderman/events/MDRequestEvent.h" -#include "lib/orderman/events/StatusUpdateEvent.h" -#include "lib/orderman/events/TickerUpdateEvent.h" -#include "lib/orderman/events/TradeSignalEvent.h" -#include "lib/orderman/events/TradeSummarySignalDispatcher.h" -#include "lib/tracing/PerfLog.h" -#include "lib/tracing/bts_trace.h" -#include "lib/utils/TimeStamp.h" +#include "spark/md/MDConsumer.h" +#include "spark/md/MDConsumerHandle.h" +#include "spark/mercury/actors/Actor.h" +#include "spark/mercury/actors/IPollableActor.h" +#include "spark/metrics/metrics.h" +#include "spark/orderman/events/BookUpdateEvent.h" +#include "spark/orderman/events/MDRequestEvent.h" +#include "spark/orderman/events/StatusUpdateEvent.h" +#include "spark/orderman/events/TickerUpdateEvent.h" +#include "spark/orderman/events/TradeSignalEvent.h" +#include "spark/orderman/events/TradeSummarySignalDispatcher.h" +#include "spark/tracing/PerfLog.h" +#include "spark/tracing/bts_trace.h" +#include "spark/utils/TimeStamp.h" namespace bts { namespace orderman { diff --git a/src/lib/orderman/actors/MDSupplementarySource.cpp b/src/lib_spark/spark/orderman/actors/MDSupplementarySource.cpp similarity index 90% rename from src/lib/orderman/actors/MDSupplementarySource.cpp rename to src/lib_spark/spark/orderman/actors/MDSupplementarySource.cpp index 687a14677..5c6ad9ace 100644 --- a/src/lib/orderman/actors/MDSupplementarySource.cpp +++ b/src/lib_spark/spark/orderman/actors/MDSupplementarySource.cpp @@ -1,10 +1,10 @@ #include "MDSupplementarySource.h" -#include "lib/logging/logging.h" -#include "lib/md/MDConsumer.h" -#include "lib/md/MDConsumerHandle.h" -#include "lib/orderman/events/SettlementRequestEvent.h" -#include "lib/orderman/events/SettlementUpdateEvent.h" -#include "lib/os/os.h" +#include "spark/logging/logging.h" +#include "spark/md/MDConsumer.h" +#include "spark/md/MDConsumerHandle.h" +#include "spark/orderman/events/SettlementRequestEvent.h" +#include "spark/orderman/events/SettlementUpdateEvent.h" +#include "spark/os/os.h" namespace bts { namespace orderman { diff --git a/src/lib/orderman/actors/MDSupplementarySource.h b/src/lib_spark/spark/orderman/actors/MDSupplementarySource.h similarity index 89% rename from src/lib/orderman/actors/MDSupplementarySource.h rename to src/lib_spark/spark/orderman/actors/MDSupplementarySource.h index 7ce1ab1b5..effadc479 100644 --- a/src/lib/orderman/actors/MDSupplementarySource.h +++ b/src/lib_spark/spark/orderman/actors/MDSupplementarySource.h @@ -1,7 +1,7 @@ #pragma once -#include "lib/mercury/actors/Actor.h" -#include "lib/mercury/actors/IPollableActor.h" +#include "spark/mercury/actors/Actor.h" +#include "spark/mercury/actors/IPollableActor.h" #include namespace bts { diff --git a/src/lib/orderman/actors/OrderStore.cpp b/src/lib_spark/spark/orderman/actors/OrderStore.cpp similarity index 92% rename from src/lib/orderman/actors/OrderStore.cpp rename to src/lib_spark/spark/orderman/actors/OrderStore.cpp index a353a0256..200d6b678 100644 --- a/src/lib/orderman/actors/OrderStore.cpp +++ b/src/lib_spark/spark/orderman/actors/OrderStore.cpp @@ -1,17 +1,16 @@ #include "OrderStore.h" - -#include "lib/api/services/OrderService.pb.h" -#include "lib/config/config.h" -#include "lib/config/protos/orders_fills_cleanup.pb.h" -#include "lib/config/protos/toggles.pb.h" -#include "lib/logging/logging.h" -#include "lib/md/ExchangeSecurityKey.h" -#include "lib/orderman/actors/SODPosition.h" -#include "lib/orderman/events/OrderDefinitionUpdateEvent.h" -#include "lib/orderman/events/OrderStateUpdateEvent.h" -#include "lib/orderman/events/StoredOrderEvent.h" -#include "lib/persistence/SqliteStore.h" -#include "lib/utils/PBUtils.h" +#include "spark/api/services/OrderService.pb.h" +#include "spark/config/config.h" +#include "spark/config/protos/orders_fills_cleanup.pb.h" +#include "spark/config/protos/toggles.pb.h" +#include "spark/logging/logging.h" +#include "spark/md/ExchangeSecurityKey.h" +#include "spark/orderman/actors/SODPosition.h" +#include "spark/orderman/events/OrderDefinitionUpdateEvent.h" +#include "spark/orderman/events/OrderStateUpdateEvent.h" +#include "spark/orderman/events/StoredOrderEvent.h" +#include "spark/persistence/SqliteStore.h" +#include "spark/utils/PBUtils.h" #include #include diff --git a/src/lib/orderman/actors/OrderStore.h b/src/lib_spark/spark/orderman/actors/OrderStore.h similarity index 87% rename from src/lib/orderman/actors/OrderStore.h rename to src/lib_spark/spark/orderman/actors/OrderStore.h index 5f2b85343..2b1d46f2d 100644 --- a/src/lib/orderman/actors/OrderStore.h +++ b/src/lib_spark/spark/orderman/actors/OrderStore.h @@ -1,8 +1,8 @@ #pragma once -#include "lib/md/SecurityOracle.h" -#include "lib/mercury/actors/Actor.h" -#include "lib/orderman/orderman_utils/orderman_common.h" +#include "spark/md/SecurityOracle.h" +#include "spark/mercury/actors/Actor.h" +#include "spark/orderman/orderman_utils/orderman_common.h" #include namespace bts { diff --git a/src/lib/orderman/actors/SODPosition.cpp b/src/lib_spark/spark/orderman/actors/SODPosition.cpp similarity index 94% rename from src/lib/orderman/actors/SODPosition.cpp rename to src/lib_spark/spark/orderman/actors/SODPosition.cpp index d238e6fa3..728c696d0 100644 --- a/src/lib/orderman/actors/SODPosition.cpp +++ b/src/lib_spark/spark/orderman/actors/SODPosition.cpp @@ -1,11 +1,11 @@ -#include "lib/orderman/actors/SODPosition.h" -#include "lib/api/service_helpers/AdminServiceUtils.h" -#include "lib/config/config.h" -#include "lib/config/protos/orders_fills_cleanup.pb.h" -#include "lib/config/protos/toggles.pb.h" -#include "lib/logging/logging.h" -#include "lib/utils/PBUtils.h" -#include "lib/utils/bts_assert.h" +#include "spark/orderman/actors/SODPosition.h" +#include "spark/api/service_helpers/AdminServiceUtils.h" +#include "spark/config/config.h" +#include "spark/config/protos/orders_fills_cleanup.pb.h" +#include "spark/config/protos/toggles.pb.h" +#include "spark/logging/logging.h" +#include "spark/utils/PBUtils.h" +#include "spark/utils/bts_assert.h" #include #include #include diff --git a/src/lib/orderman/actors/SODPosition.h b/src/lib_spark/spark/orderman/actors/SODPosition.h similarity index 88% rename from src/lib/orderman/actors/SODPosition.h rename to src/lib_spark/spark/orderman/actors/SODPosition.h index 8fb880af9..65070acc5 100644 --- a/src/lib/orderman/actors/SODPosition.h +++ b/src/lib_spark/spark/orderman/actors/SODPosition.h @@ -1,10 +1,10 @@ #pragma once -#include "lib/api/services/OrderService.pb.h" -#include "lib/md/SecurityOracle.h" -#include "lib/mercury/actors/Actor.h" -#include "lib/orderman/events/StoredFillEvent.h" +#include "spark/api/services/OrderService.pb.h" +#include "spark/md/SecurityOracle.h" +#include "spark/mercury/actors/Actor.h" +#include "spark/orderman/events/StoredFillEvent.h" using namespace bts::api::orderman; diff --git a/src/lib/orderman/actors/SecuritySrc.cpp b/src/lib_spark/spark/orderman/actors/SecuritySrc.cpp similarity index 86% rename from src/lib/orderman/actors/SecuritySrc.cpp rename to src/lib_spark/spark/orderman/actors/SecuritySrc.cpp index f5beba7f8..03ae25713 100644 --- a/src/lib/orderman/actors/SecuritySrc.cpp +++ b/src/lib_spark/spark/orderman/actors/SecuritySrc.cpp @@ -1,8 +1,8 @@ #include "SecuritySrc.h" -#include "lib/md/MDConsumer.h" -#include "lib/mercury/events/TimerEvent.h" -#include "lib/orderman/events/NewSecuritiesEvent.h" -#include "lib/utils/bts_chrono.h" +#include "spark/md/MDConsumer.h" +#include "spark/mercury/events/TimerEvent.h" +#include "spark/orderman/events/NewSecuritiesEvent.h" +#include "spark/utils/bts_chrono.h" #include diff --git a/src/lib/orderman/actors/SecuritySrc.h b/src/lib_spark/spark/orderman/actors/SecuritySrc.h similarity index 93% rename from src/lib/orderman/actors/SecuritySrc.h rename to src/lib_spark/spark/orderman/actors/SecuritySrc.h index c5d2103e3..4d7a22123 100644 --- a/src/lib/orderman/actors/SecuritySrc.h +++ b/src/lib_spark/spark/orderman/actors/SecuritySrc.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/mercury/actors/Actor.h" +#include "spark/mercury/actors/Actor.h" #include namespace bts { diff --git a/src/lib/orderman/actors/ServiceBridge.cpp b/src/lib_spark/spark/orderman/actors/ServiceBridge.cpp similarity index 90% rename from src/lib/orderman/actors/ServiceBridge.cpp rename to src/lib_spark/spark/orderman/actors/ServiceBridge.cpp index a151e838f..80fbf7db6 100644 --- a/src/lib/orderman/actors/ServiceBridge.cpp +++ b/src/lib_spark/spark/orderman/actors/ServiceBridge.cpp @@ -1,37 +1,37 @@ #include "ServiceBridge.h" -#include "lib/api/public/ServiceContext.h" -#include "lib/api/service_helpers/PositionUtilities.h" -#include "lib/api/services/OrderService.pb.h" -#include "lib/api/services/PositionService.pb.h" -#include "lib/logging/logging.h" -#include "lib/mercury/broker/BrokerProxy.h" -#include "lib/mercury/events/Stream.h" -#include "lib/orderman/OrderRouter.h" -#include "lib/orderman/calculations/ITheoCalculator.h" -#include "lib/orderman/calculations/TheoCalculator.h" -#include "lib/orderman/events/AccountPnLUpdateEvent.h" -#include "lib/orderman/events/ActivateOrderEvent.h" -#include "lib/orderman/events/CancelOrderEvent.h" -#include "lib/orderman/events/DetachOrderEvent.h" -#include "lib/orderman/events/ExcessLiquidityUpdateEvent.h" -#include "lib/orderman/events/ExchangeOpenOrdersEvent.h" -#include "lib/orderman/events/ExchangePositionEvent.h" -#include "lib/orderman/events/FilledPositionEvent.h" -#include "lib/orderman/events/ManuallyBustFillsEvent.h" -#include "lib/orderman/events/NewAdminDataEvent.h" -#include "lib/orderman/events/OrderManagerReadyEvent.h" -#include "lib/orderman/events/OrderOpResultEvent.h" -#include "lib/orderman/events/RFQEvent.h" -#include "lib/orderman/events/StoredFillEvent.h" -#include "lib/orderman/events/StoredOrderEvent.h" -#include "lib/orderman/events/TheoEvent.h" -#include "lib/orderman/events/UpdateOrderEvent.h" -#include "lib/orderman/order_factory/OrderFactory.h" -#include "lib/orderman/orderman_utils/orderman_common.h" -#include "lib/orderman/orders/Order.h" -#include "lib/orderman/securities/MapSecurityDB.h" -#include "lib/tracing/PerfLog.h" -#include "lib/utils/PBUtils.h" +#include "spark/api/public/ServiceContext.h" +#include "spark/api/service_helpers/PositionUtilities.h" +#include "spark/api/services/OrderService.pb.h" +#include "spark/api/services/PositionService.pb.h" +#include "spark/logging/logging.h" +#include "spark/mercury/broker/BrokerProxy.h" +#include "spark/mercury/events/Stream.h" +#include "spark/orderman/OrderRouter.h" +#include "spark/orderman/calculations/ITheoCalculator.h" +#include "spark/orderman/calculations/TheoCalculator.h" +#include "spark/orderman/events/AccountPnLUpdateEvent.h" +#include "spark/orderman/events/ActivateOrderEvent.h" +#include "spark/orderman/events/CancelOrderEvent.h" +#include "spark/orderman/events/DetachOrderEvent.h" +#include "spark/orderman/events/ExcessLiquidityUpdateEvent.h" +#include "spark/orderman/events/ExchangeOpenOrdersEvent.h" +#include "spark/orderman/events/ExchangePositionEvent.h" +#include "spark/orderman/events/FilledPositionEvent.h" +#include "spark/orderman/events/ManuallyBustFillsEvent.h" +#include "spark/orderman/events/NewAdminDataEvent.h" +#include "spark/orderman/events/OrderManagerReadyEvent.h" +#include "spark/orderman/events/OrderOpResultEvent.h" +#include "spark/orderman/events/RFQEvent.h" +#include "spark/orderman/events/StoredFillEvent.h" +#include "spark/orderman/events/StoredOrderEvent.h" +#include "spark/orderman/events/TheoEvent.h" +#include "spark/orderman/events/UpdateOrderEvent.h" +#include "spark/orderman/order_factory/OrderFactory.h" +#include "spark/orderman/orderman_utils/orderman_common.h" +#include "spark/orderman/orders/Order.h" +#include "spark/orderman/securities/MapSecurityDB.h" +#include "spark/tracing/PerfLog.h" +#include "spark/utils/PBUtils.h" #include namespace bts { diff --git a/src/lib/orderman/actors/ServiceBridge.h b/src/lib_spark/spark/orderman/actors/ServiceBridge.h similarity index 85% rename from src/lib/orderman/actors/ServiceBridge.h rename to src/lib_spark/spark/orderman/actors/ServiceBridge.h index d88692fac..01a92269a 100644 --- a/src/lib/orderman/actors/ServiceBridge.h +++ b/src/lib_spark/spark/orderman/actors/ServiceBridge.h @@ -1,16 +1,16 @@ #pragma once -#include "lib/api/services/MarginService.client.pb.h" -#include "lib/api/services/OrderService.pb.h" -#include "lib/api/services/PositionService.client.pb.h" -#include "lib/config/protos/jetfix.pb.h" -#include "lib/md/SecurityOracle.h" -#include "lib/mercury/actors/Actor.h" -#include "lib/mercury/events/Update.h" -#include "lib/orderman/events/ExchangeOpenOrdersEvent.h" -#include "lib/orderman/events/ExchangePositionEvent.h" -#include "lib/orderman/orderman_utils/ExchangeOpenOrders.h" -#include "lib/orderman/orderman_utils/ExchangePosition.h" +#include "spark/api/services/MarginService.client.pb.h" +#include "spark/api/services/OrderService.pb.h" +#include "spark/api/services/PositionService.client.pb.h" +#include "spark/config/protos/jetfix.pb.h" +#include "spark/md/SecurityOracle.h" +#include "spark/mercury/actors/Actor.h" +#include "spark/mercury/events/Update.h" +#include "spark/orderman/events/ExchangeOpenOrdersEvent.h" +#include "spark/orderman/events/ExchangePositionEvent.h" +#include "spark/orderman/orderman_utils/ExchangeOpenOrders.h" +#include "spark/orderman/orderman_utils/ExchangePosition.h" #include #include diff --git a/src/lib/orderman/actors/order_manager/OrderManager.cpp b/src/lib_spark/spark/orderman/actors/order_manager/OrderManager.cpp similarity index 94% rename from src/lib/orderman/actors/order_manager/OrderManager.cpp rename to src/lib_spark/spark/orderman/actors/order_manager/OrderManager.cpp index 6bc5eea58..2f39474c7 100644 --- a/src/lib/orderman/actors/order_manager/OrderManager.cpp +++ b/src/lib_spark/spark/orderman/actors/order_manager/OrderManager.cpp @@ -1,37 +1,36 @@ #include "OrderManager.h" - -#include "lib/config/protos/jetfix.pb.h" -#include "lib/core/FMT.h" -#include "lib/jetfix/common/OutFIX.h" -#include "lib/logging/logging.h" -#include "lib/md/SecurityOracle.h" -#include "lib/mercury/events/TimerEvent.h" -#include "lib/orderman/OrderServices.h" -#include "lib/orderman/actors/order_manager/OrderServicesData.h" -#include "lib/orderman/actors/order_manager/order_gateway_definition.h" -#include "lib/orderman/actors/order_manager/session_services_data.h" -#include "lib/orderman/events/AccountPnLUpdateEvent.h" -#include "lib/orderman/events/ExcessLiquidityUpdateEvent.h" -#include "lib/orderman/events/ExchangeOpenOrdersEvent.h" -#include "lib/orderman/events/ExchangePositionEvent.h" -#include "lib/orderman/events/FilledPositionEvent.h" -#include "lib/orderman/events/NewAdminDataEvent.h" -#include "lib/orderman/events/NewSecuritiesEvent.h" -#include "lib/orderman/events/OrderManagerReadyEvent.h" -#include "lib/orderman/events/RFQEvent.h" -#include "lib/orderman/events/StoredOrderEvent.h" -#include "lib/orderman/events/TheoEvent.h" -#include "lib/orderman/gateways/IExecutionGateway.h" -#include "lib/orderman/gateways/i_execution_gateway_provider.h" -#include "lib/orderman/order_factory/OrderFactory.h" -#include "lib/orderman/orderman_utils/ExchangePosition.h" -#include "lib/orderman/orders/Order.h" -#include "lib/orderman/securities/ISecurityDB.h" -#include "lib/os/spark_data_directory.h" -#include "lib/tracing/PerfLog.h" -#include "lib/utils/bts_assert.h" -#include "lib/utils/inplace_function.h" -#include "lib/utils/thread_manager.h" +#include "spark/config/protos/jetfix.pb.h" +#include "spark/core/FMT.h" +#include "spark/jetfix/common/OutFIX.h" +#include "spark/logging/logging.h" +#include "spark/md/SecurityOracle.h" +#include "spark/mercury/events/TimerEvent.h" +#include "spark/orderman/OrderServices.h" +#include "spark/orderman/actors/order_manager/OrderServicesData.h" +#include "spark/orderman/actors/order_manager/order_gateway_definition.h" +#include "spark/orderman/actors/order_manager/session_services_data.h" +#include "spark/orderman/events/AccountPnLUpdateEvent.h" +#include "spark/orderman/events/ExcessLiquidityUpdateEvent.h" +#include "spark/orderman/events/ExchangeOpenOrdersEvent.h" +#include "spark/orderman/events/ExchangePositionEvent.h" +#include "spark/orderman/events/FilledPositionEvent.h" +#include "spark/orderman/events/NewAdminDataEvent.h" +#include "spark/orderman/events/NewSecuritiesEvent.h" +#include "spark/orderman/events/OrderManagerReadyEvent.h" +#include "spark/orderman/events/RFQEvent.h" +#include "spark/orderman/events/StoredOrderEvent.h" +#include "spark/orderman/events/TheoEvent.h" +#include "spark/orderman/gateways/IExecutionGateway.h" +#include "spark/orderman/gateways/i_execution_gateway_provider.h" +#include "spark/orderman/order_factory/OrderFactory.h" +#include "spark/orderman/orderman_utils/ExchangePosition.h" +#include "spark/orderman/orders/Order.h" +#include "spark/orderman/securities/ISecurityDB.h" +#include "spark/os/spark_data_directory.h" +#include "spark/tracing/PerfLog.h" +#include "spark/utils/bts_assert.h" +#include "spark/utils/inplace_function.h" +#include "spark/utils/thread_manager.h" #include #include diff --git a/src/lib/orderman/actors/order_manager/OrderManager.h b/src/lib_spark/spark/orderman/actors/order_manager/OrderManager.h similarity index 83% rename from src/lib/orderman/actors/order_manager/OrderManager.h rename to src/lib_spark/spark/orderman/actors/order_manager/OrderManager.h index 3a88646b8..4bfd6e021 100644 --- a/src/lib/orderman/actors/order_manager/OrderManager.h +++ b/src/lib_spark/spark/orderman/actors/order_manager/OrderManager.h @@ -1,18 +1,18 @@ #pragma once -#include "lib/config/protos/jetfix.pb.h" -#include "lib/jetfix/common/OutFIXPtr.h" -#include "lib/md/SecurityOracle.h" -#include "lib/mercury/actors/Actor.h" -#include "lib/mercury/actors/IPollableActor.h" -#include "lib/orderman/actors/order_manager/order_gateway_definition.h" -#include "lib/orderman/events/ActivateOrderEvent.h" -#include "lib/orderman/events/CancelOrderEvent.h" -#include "lib/orderman/events/DetachOrderEvent.h" -#include "lib/orderman/events/RFQEvent.h" -#include "lib/orderman/events/UpdateOrderEvent.h" -#include "lib/orderman/gateways/i_execution_gateway_provider.h" -#include "lib/utils/inplace_function.h" +#include "spark/config/protos/jetfix.pb.h" +#include "spark/jetfix/common/OutFIXPtr.h" +#include "spark/md/SecurityOracle.h" +#include "spark/mercury/actors/Actor.h" +#include "spark/mercury/actors/IPollableActor.h" +#include "spark/orderman/actors/order_manager/order_gateway_definition.h" +#include "spark/orderman/events/ActivateOrderEvent.h" +#include "spark/orderman/events/CancelOrderEvent.h" +#include "spark/orderman/events/DetachOrderEvent.h" +#include "spark/orderman/events/RFQEvent.h" +#include "spark/orderman/events/UpdateOrderEvent.h" +#include "spark/orderman/gateways/i_execution_gateway_provider.h" +#include "spark/utils/inplace_function.h" #include diff --git a/src/lib/orderman/actors/order_manager/OrderServicesData.cpp b/src/lib_spark/spark/orderman/actors/order_manager/OrderServicesData.cpp similarity index 82% rename from src/lib/orderman/actors/order_manager/OrderServicesData.cpp rename to src/lib_spark/spark/orderman/actors/order_manager/OrderServicesData.cpp index be70821aa..ad9a1fdef 100644 --- a/src/lib/orderman/actors/order_manager/OrderServicesData.cpp +++ b/src/lib_spark/spark/orderman/actors/order_manager/OrderServicesData.cpp @@ -1,7 +1,7 @@ #include "OrderServicesData.h" -#include "lib/md/SecurityOracle.h" -#include "lib/orderman/actors/order_manager/order_gateway_definition.h" -#include "lib/tracing/PerfLog.h" +#include "spark/md/SecurityOracle.h" +#include "spark/orderman/actors/order_manager/order_gateway_definition.h" +#include "spark/tracing/PerfLog.h" namespace bts { namespace orderman { diff --git a/src/lib/orderman/actors/order_manager/OrderServicesData.h b/src/lib_spark/spark/orderman/actors/order_manager/OrderServicesData.h similarity index 52% rename from src/lib/orderman/actors/order_manager/OrderServicesData.h rename to src/lib_spark/spark/orderman/actors/order_manager/OrderServicesData.h index dca139f84..581c78017 100644 --- a/src/lib/orderman/actors/order_manager/OrderServicesData.h +++ b/src/lib_spark/spark/orderman/actors/order_manager/OrderServicesData.h @@ -1,46 +1,46 @@ #pragma once -#include "lib/logging/logging.h" -#include "lib/md/SecurityOracle.h" -#include "lib/mercury/actors/ContentSubscription.h" -#include "lib/mercury/events/Stream.h" -#include "lib/mercury/events/TimerEvent.h" -#include "lib/orderman/Governor.h" -#include "lib/orderman/OrderRouter.h" -#include "lib/orderman/actors/order_manager/PositionIndex.h" -#include "lib/orderman/actors/order_manager/order_gateway_definition.h" -#include "lib/orderman/actors/order_manager/session_services_data.h" -#include "lib/orderman/events/ActivateOrderEvent.h" -#include "lib/orderman/events/BookUpdateEvent.h" -#include "lib/orderman/events/CancelOrderEvent.h" -#include "lib/orderman/events/CancelRejectEvent.h" -#include "lib/orderman/events/CreateFIXBufferReplyEvent.h" -#include "lib/orderman/events/CreateFIXBufferRequestEvent.h" -#include "lib/orderman/events/CreateOrderReplyEvent.h" -#include "lib/orderman/events/CreateOrderRequestEvent.h" -#include "lib/orderman/events/DetachOrderEvent.h" -#include "lib/orderman/events/ExchangeOpenOrdersEvent.h" -#include "lib/orderman/events/ExchangePositionEvent.h" -#include "lib/orderman/events/GatewayStatusChangeEvent.h" -#include "lib/orderman/events/MDRequestEvent.h" -#include "lib/orderman/events/NewExecutionReportEvent.h" -#include "lib/orderman/events/OrderDefinitionUpdateEvent.h" -#include "lib/orderman/events/OrderOpResultEvent.h" -#include "lib/orderman/events/OrderStateUpdateEvent.h" -#include "lib/orderman/events/SettlementRequestEvent.h" -#include "lib/orderman/events/SettlementUpdateEvent.h" -#include "lib/orderman/events/StatusUpdateEvent.h" -#include "lib/orderman/events/TheoEvent.h" -#include "lib/orderman/events/TickerUpdateEvent.h" -#include "lib/orderman/events/TradeSignalEvent.h" -#include "lib/orderman/events/UpdateOrderEvent.h" -#include "lib/orderman/gateways/IExecutionGateway.h" -#include "lib/orderman/limiter/Limiter.h" -#include "lib/orderman/order_factory/OrderFactory.h" -#include "lib/orderman/securities/MapSecurityDB.h" -#include "lib/utils/PBUtils.h" -#include "lib/utils/Puid.h" -#include "lib/utils/datetime.h" +#include "spark/logging/logging.h" +#include "spark/md/SecurityOracle.h" +#include "spark/mercury/actors/ContentSubscription.h" +#include "spark/mercury/events/Stream.h" +#include "spark/mercury/events/TimerEvent.h" +#include "spark/orderman/Governor.h" +#include "spark/orderman/OrderRouter.h" +#include "spark/orderman/actors/order_manager/PositionIndex.h" +#include "spark/orderman/actors/order_manager/order_gateway_definition.h" +#include "spark/orderman/actors/order_manager/session_services_data.h" +#include "spark/orderman/events/ActivateOrderEvent.h" +#include "spark/orderman/events/BookUpdateEvent.h" +#include "spark/orderman/events/CancelOrderEvent.h" +#include "spark/orderman/events/CancelRejectEvent.h" +#include "spark/orderman/events/CreateFIXBufferReplyEvent.h" +#include "spark/orderman/events/CreateFIXBufferRequestEvent.h" +#include "spark/orderman/events/CreateOrderReplyEvent.h" +#include "spark/orderman/events/CreateOrderRequestEvent.h" +#include "spark/orderman/events/DetachOrderEvent.h" +#include "spark/orderman/events/ExchangeOpenOrdersEvent.h" +#include "spark/orderman/events/ExchangePositionEvent.h" +#include "spark/orderman/events/GatewayStatusChangeEvent.h" +#include "spark/orderman/events/MDRequestEvent.h" +#include "spark/orderman/events/NewExecutionReportEvent.h" +#include "spark/orderman/events/OrderDefinitionUpdateEvent.h" +#include "spark/orderman/events/OrderOpResultEvent.h" +#include "spark/orderman/events/OrderStateUpdateEvent.h" +#include "spark/orderman/events/SettlementRequestEvent.h" +#include "spark/orderman/events/SettlementUpdateEvent.h" +#include "spark/orderman/events/StatusUpdateEvent.h" +#include "spark/orderman/events/TheoEvent.h" +#include "spark/orderman/events/TickerUpdateEvent.h" +#include "spark/orderman/events/TradeSignalEvent.h" +#include "spark/orderman/events/UpdateOrderEvent.h" +#include "spark/orderman/gateways/IExecutionGateway.h" +#include "spark/orderman/limiter/Limiter.h" +#include "spark/orderman/order_factory/OrderFactory.h" +#include "spark/orderman/securities/MapSecurityDB.h" +#include "spark/utils/PBUtils.h" +#include "spark/utils/Puid.h" +#include "spark/utils/datetime.h" #include #include diff --git a/src/lib/orderman/actors/order_manager/PositionIndex.cpp b/src/lib_spark/spark/orderman/actors/order_manager/PositionIndex.cpp similarity index 88% rename from src/lib/orderman/actors/order_manager/PositionIndex.cpp rename to src/lib_spark/spark/orderman/actors/order_manager/PositionIndex.cpp index 3ec886184..9532260fc 100644 --- a/src/lib/orderman/actors/order_manager/PositionIndex.cpp +++ b/src/lib_spark/spark/orderman/actors/order_manager/PositionIndex.cpp @@ -1,7 +1,7 @@ #include "PositionIndex.h" -#include "lib/orderman/events/FilledPositionEvent.h" -#include "lib/orderman/orders/algo/PositionUpdate.h" +#include "spark/orderman/events/FilledPositionEvent.h" +#include "spark/orderman/orders/algo/PositionUpdate.h" namespace bts { namespace orderman { diff --git a/src/lib/orderman/actors/order_manager/PositionIndex.h b/src/lib_spark/spark/orderman/actors/order_manager/PositionIndex.h similarity index 100% rename from src/lib/orderman/actors/order_manager/PositionIndex.h rename to src/lib_spark/spark/orderman/actors/order_manager/PositionIndex.h diff --git a/src/lib/orderman/actors/order_manager/SessionServices.h b/src/lib_spark/spark/orderman/actors/order_manager/SessionServices.h similarity index 88% rename from src/lib/orderman/actors/order_manager/SessionServices.h rename to src/lib_spark/spark/orderman/actors/order_manager/SessionServices.h index 14ad8a667..5eadfe708 100644 --- a/src/lib/orderman/actors/order_manager/SessionServices.h +++ b/src/lib_spark/spark/orderman/actors/order_manager/SessionServices.h @@ -1,16 +1,16 @@ #pragma once -#include "lib/api/services/OrderService.pb.h" -#include "lib/jetfix/common/OutFIX.h" -#include "lib/logging/logging.h" -#include "lib/orderman/Governor.h" -#include "lib/orderman/actors/order_manager/OrderManager.h" -#include "lib/orderman/actors/order_manager/OrderServicesData.h" -#include "lib/orderman/events/TickerUpdateEvent.h" -#include "lib/orderman/orderman_utils/EventStream.h" -#include "lib/orderman/orders/Order.h" +#include "spark/api/services/OrderService.pb.h" +#include "spark/jetfix/common/OutFIX.h" +#include "spark/logging/logging.h" +#include "spark/orderman/Governor.h" +#include "spark/orderman/actors/order_manager/OrderManager.h" +#include "spark/orderman/actors/order_manager/OrderServicesData.h" +#include "spark/orderman/events/TickerUpdateEvent.h" +#include "spark/orderman/orderman_utils/EventStream.h" +#include "spark/orderman/orders/Order.h" -#include "lib/tracing/PerfLog.h" +#include "spark/tracing/PerfLog.h" #include #include diff --git a/src/lib/orderman/actors/order_manager/order_gateway_definition.h b/src/lib_spark/spark/orderman/actors/order_manager/order_gateway_definition.h similarity index 68% rename from src/lib/orderman/actors/order_manager/order_gateway_definition.h rename to src/lib_spark/spark/orderman/actors/order_manager/order_gateway_definition.h index ca1529c74..5107c6ea8 100644 --- a/src/lib/orderman/actors/order_manager/order_gateway_definition.h +++ b/src/lib_spark/spark/orderman/actors/order_manager/order_gateway_definition.h @@ -1,7 +1,7 @@ #pragma once -#include "lib/config/protos/jetfix.pb.h" -#include "lib/orderman/gateways/IExecutionGateway.h" +#include "spark/config/protos/jetfix.pb.h" +#include "spark/orderman/gateways/IExecutionGateway.h" #include diff --git a/src/lib/orderman/actors/order_manager/session_services_data.h b/src/lib_spark/spark/orderman/actors/order_manager/session_services_data.h similarity index 73% rename from src/lib/orderman/actors/order_manager/session_services_data.h rename to src/lib_spark/spark/orderman/actors/order_manager/session_services_data.h index d7ed78cb4..276dbf064 100644 --- a/src/lib/orderman/actors/order_manager/session_services_data.h +++ b/src/lib_spark/spark/orderman/actors/order_manager/session_services_data.h @@ -1,17 +1,17 @@ #pragma once -#include "lib/logging/logging.h" -#include "lib/mercury/actors/ContentSubscription.h" -#include "lib/mercury/events/Stream.h" -#include "lib/orderman/Governor.h" -#include "lib/orderman/actors/order_manager/order_gateway_definition.h" -#include "lib/orderman/events/CancelRejectEvent.h" -#include "lib/orderman/events/ExchangeOpenOrdersEvent.h" -#include "lib/orderman/events/ExchangePositionEvent.h" -#include "lib/orderman/events/GatewayStatusChangeEvent.h" -#include "lib/orderman/events/NewExecutionReportEvent.h" -#include "lib/orderman/gateways/IExecutionGateway.h" -#include "lib/utils/PBUtils.h" +#include "spark/logging/logging.h" +#include "spark/mercury/actors/ContentSubscription.h" +#include "spark/mercury/events/Stream.h" +#include "spark/orderman/Governor.h" +#include "spark/orderman/actors/order_manager/order_gateway_definition.h" +#include "spark/orderman/events/CancelRejectEvent.h" +#include "spark/orderman/events/ExchangeOpenOrdersEvent.h" +#include "spark/orderman/events/ExchangePositionEvent.h" +#include "spark/orderman/events/GatewayStatusChangeEvent.h" +#include "spark/orderman/events/NewExecutionReportEvent.h" +#include "spark/orderman/gateways/IExecutionGateway.h" +#include "spark/utils/PBUtils.h" #include #include diff --git a/src/lib/orderman/audit/audit_cme.py b/src/lib_spark/spark/orderman/audit/audit_cme.py similarity index 100% rename from src/lib/orderman/audit/audit_cme.py rename to src/lib_spark/spark/orderman/audit/audit_cme.py diff --git a/src/lib/orderman/calculations/ITheoCalculator.h b/src/lib_spark/spark/orderman/calculations/ITheoCalculator.h similarity index 100% rename from src/lib/orderman/calculations/ITheoCalculator.h rename to src/lib_spark/spark/orderman/calculations/ITheoCalculator.h diff --git a/src/lib/orderman/calculations/TheoCalculator.cpp b/src/lib_spark/spark/orderman/calculations/TheoCalculator.cpp similarity index 98% rename from src/lib/orderman/calculations/TheoCalculator.cpp rename to src/lib_spark/spark/orderman/calculations/TheoCalculator.cpp index 4370c96b0..beb4f0c64 100644 --- a/src/lib/orderman/calculations/TheoCalculator.cpp +++ b/src/lib_spark/spark/orderman/calculations/TheoCalculator.cpp @@ -1,8 +1,8 @@ #include "TheoCalculator.h" -#include "lib/api/services/OrderService.pb.h" -#include "lib/logging/logging.h" -#include "lib/os/os.h" -#include "lib/utils/bts_assert.h" +#include "spark/api/services/OrderService.pb.h" +#include "spark/logging/logging.h" +#include "spark/os/os.h" +#include "spark/utils/bts_assert.h" #include #include #include diff --git a/src/lib/orderman/calculations/TheoCalculator.h b/src/lib_spark/spark/orderman/calculations/TheoCalculator.h similarity index 100% rename from src/lib/orderman/calculations/TheoCalculator.h rename to src/lib_spark/spark/orderman/calculations/TheoCalculator.h diff --git a/src/lib/orderman/ccapi/CCAPIConnectionConfig.h b/src/lib_spark/spark/orderman/ccapi/CCAPIConnectionConfig.h similarity index 88% rename from src/lib/orderman/ccapi/CCAPIConnectionConfig.h rename to src/lib_spark/spark/orderman/ccapi/CCAPIConnectionConfig.h index e7f0484cd..4e2212624 100644 --- a/src/lib/orderman/ccapi/CCAPIConnectionConfig.h +++ b/src/lib_spark/spark/orderman/ccapi/CCAPIConnectionConfig.h @@ -1,7 +1,7 @@ #pragma once -#include "lib/domain_model/Security.pb.h" -#include "lib/orderman/orderman_utils/orderman_common.h" +#include "spark/domain_model/Security.pb.h" +#include "spark/orderman/orderman_utils/orderman_common.h" #include #include #include diff --git a/src/lib/orderman/ccapi/CCAPIDeribitHelpers.cpp b/src/lib_spark/spark/orderman/ccapi/CCAPIDeribitHelpers.cpp similarity index 96% rename from src/lib/orderman/ccapi/CCAPIDeribitHelpers.cpp rename to src/lib_spark/spark/orderman/ccapi/CCAPIDeribitHelpers.cpp index ea5ded4a4..afca04c6d 100644 --- a/src/lib/orderman/ccapi/CCAPIDeribitHelpers.cpp +++ b/src/lib_spark/spark/orderman/ccapi/CCAPIDeribitHelpers.cpp @@ -1,8 +1,8 @@ #include "CCAPIDeribitHelpers.h" -#include "lib/api/services/OrderService.pb.h" -#include "lib/domain_model/Security.pb.h" -#include "lib/io/JsonReader.h" -#include "lib/orderman/ccapi/ICCAPIOrderMux.h" +#include "spark/api/services/OrderService.pb.h" +#include "spark/domain_model/Security.pb.h" +#include "spark/io/JsonReader.h" +#include "spark/orderman/ccapi/ICCAPIOrderMux.h" #include #include diff --git a/src/lib/orderman/ccapi/CCAPIDeribitHelpers.h b/src/lib_spark/spark/orderman/ccapi/CCAPIDeribitHelpers.h similarity index 82% rename from src/lib/orderman/ccapi/CCAPIDeribitHelpers.h rename to src/lib_spark/spark/orderman/ccapi/CCAPIDeribitHelpers.h index b74940607..b4c7f8d56 100644 --- a/src/lib/orderman/ccapi/CCAPIDeribitHelpers.h +++ b/src/lib_spark/spark/orderman/ccapi/CCAPIDeribitHelpers.h @@ -1,9 +1,9 @@ #pragma once -#include "lib/domain_model/Security.pb.h" -#include "lib/orderman/ccapi/CCAPIOrderState.h" -#include "lib/orderman/ccapi/ICCAPIOrderMux.h" -#include "lib/orderman/orderman_utils/orderman_common.h" +#include "spark/domain_model/Security.pb.h" +#include "spark/orderman/ccapi/CCAPIOrderState.h" +#include "spark/orderman/ccapi/ICCAPIOrderMux.h" +#include "spark/orderman/orderman_utils/orderman_common.h" #include #include #include diff --git a/src/lib/orderman/ccapi/CCAPIDeribitOrderMux.cpp b/src/lib_spark/spark/orderman/ccapi/CCAPIDeribitOrderMux.cpp similarity index 98% rename from src/lib/orderman/ccapi/CCAPIDeribitOrderMux.cpp rename to src/lib_spark/spark/orderman/ccapi/CCAPIDeribitOrderMux.cpp index c1bcba036..f106173c1 100644 --- a/src/lib/orderman/ccapi/CCAPIDeribitOrderMux.cpp +++ b/src/lib_spark/spark/orderman/ccapi/CCAPIDeribitOrderMux.cpp @@ -2,22 +2,22 @@ #include "CCAPIOrderState.h" #include "CCAPISingleOrderManager.h" #include "ccapi_cpp/ccapi_session.h" -#include "lib/api/services/OrderService.pb.h" -#include "lib/domain_model/Security.pb.h" -#include "lib/domain_model/SecurityKey.h" -#include "lib/logging/logging.h" -#include "lib/md/SecurityOracle.h" -#include "lib/orderman/CancelOrderMsg.h" -#include "lib/orderman/CancelReplaceOrderMsg.h" -#include "lib/orderman/CreateOrderMsg.h" -#include "lib/orderman/RFQMsg.h" -#include "lib/orderman/ccapi/CCAPIConnectionConfig.h" -#include "lib/orderman/ccapi/CCAPIDeribitHelpers.h" -#include "lib/orderman/ccapi/CCAPIOrderCallbackMsgs.h" -#include "lib/orderman/ccapi/ICCAPIOrderMux.h" -#include "lib/orderman/orderman_utils/orderman_common.h" -#include "lib/utils/PBUtils.h" -#include "lib/utils/bts_assert.h" +#include "spark/api/services/OrderService.pb.h" +#include "spark/domain_model/Security.pb.h" +#include "spark/domain_model/SecurityKey.h" +#include "spark/logging/logging.h" +#include "spark/md/SecurityOracle.h" +#include "spark/orderman/CancelOrderMsg.h" +#include "spark/orderman/CancelReplaceOrderMsg.h" +#include "spark/orderman/CreateOrderMsg.h" +#include "spark/orderman/RFQMsg.h" +#include "spark/orderman/ccapi/CCAPIConnectionConfig.h" +#include "spark/orderman/ccapi/CCAPIDeribitHelpers.h" +#include "spark/orderman/ccapi/CCAPIOrderCallbackMsgs.h" +#include "spark/orderman/ccapi/ICCAPIOrderMux.h" +#include "spark/orderman/orderman_utils/orderman_common.h" +#include "spark/utils/PBUtils.h" +#include "spark/utils/bts_assert.h" #include #include #include diff --git a/src/lib/orderman/ccapi/CCAPIDeribitOrderMux.h b/src/lib_spark/spark/orderman/ccapi/CCAPIDeribitOrderMux.h similarity index 92% rename from src/lib/orderman/ccapi/CCAPIDeribitOrderMux.h rename to src/lib_spark/spark/orderman/ccapi/CCAPIDeribitOrderMux.h index 09b8afbab..5d835323b 100644 --- a/src/lib/orderman/ccapi/CCAPIDeribitOrderMux.h +++ b/src/lib_spark/spark/orderman/ccapi/CCAPIDeribitOrderMux.h @@ -1,9 +1,9 @@ #pragma once #include "ICCAPIOrderMux.h" -#include "lib/md/SecurityOracle.h" -#include "lib/orderman/CreateOrderMsg.h" -#include "lib/orderman/ccapi/CCAPIConnectionConfig.h" -#include "lib/orderman/ccapi/CCAPIOrderCallbackMsgs.h" +#include "spark/md/SecurityOracle.h" +#include "spark/orderman/CreateOrderMsg.h" +#include "spark/orderman/ccapi/CCAPIConnectionConfig.h" +#include "spark/orderman/ccapi/CCAPIOrderCallbackMsgs.h" #include #include #include diff --git a/src/lib/orderman/ccapi/CCAPIOrderCallbackMsgs.cpp b/src/lib_spark/spark/orderman/ccapi/CCAPIOrderCallbackMsgs.cpp similarity index 96% rename from src/lib/orderman/ccapi/CCAPIOrderCallbackMsgs.cpp rename to src/lib_spark/spark/orderman/ccapi/CCAPIOrderCallbackMsgs.cpp index 01fa7c8fa..c8cb29a9c 100644 --- a/src/lib/orderman/ccapi/CCAPIOrderCallbackMsgs.cpp +++ b/src/lib_spark/spark/orderman/ccapi/CCAPIOrderCallbackMsgs.cpp @@ -1,6 +1,6 @@ #include "CCAPIOrderCallbackMsgs.h" -#include "lib/io/JsonReader.h" -#include "lib/utils/bts_assert.h" +#include "spark/io/JsonReader.h" +#include "spark/utils/bts_assert.h" namespace bts::orderman { diff --git a/src/lib/orderman/ccapi/CCAPIOrderCallbackMsgs.h b/src/lib_spark/spark/orderman/ccapi/CCAPIOrderCallbackMsgs.h similarity index 98% rename from src/lib/orderman/ccapi/CCAPIOrderCallbackMsgs.h rename to src/lib_spark/spark/orderman/ccapi/CCAPIOrderCallbackMsgs.h index 8939d256f..70d08bd9a 100644 --- a/src/lib/orderman/ccapi/CCAPIOrderCallbackMsgs.h +++ b/src/lib_spark/spark/orderman/ccapi/CCAPIOrderCallbackMsgs.h @@ -1,7 +1,7 @@ #pragma once -#include "lib/api/services/OrderService.pb.h" -#include "lib/domain_model/Security.pb.h" +#include "spark/api/services/OrderService.pb.h" +#include "spark/domain_model/Security.pb.h" #include #include diff --git a/src/lib/orderman/ccapi/CCAPIOrderState.cpp b/src/lib_spark/spark/orderman/ccapi/CCAPIOrderState.cpp similarity index 100% rename from src/lib/orderman/ccapi/CCAPIOrderState.cpp rename to src/lib_spark/spark/orderman/ccapi/CCAPIOrderState.cpp diff --git a/src/lib/orderman/ccapi/CCAPIOrderState.h b/src/lib_spark/spark/orderman/ccapi/CCAPIOrderState.h similarity index 89% rename from src/lib/orderman/ccapi/CCAPIOrderState.h rename to src/lib_spark/spark/orderman/ccapi/CCAPIOrderState.h index a693e798f..900da275f 100644 --- a/src/lib/orderman/ccapi/CCAPIOrderState.h +++ b/src/lib_spark/spark/orderman/ccapi/CCAPIOrderState.h @@ -1,13 +1,13 @@ #pragma once #include "CCAPIOrderCallbackMsgs.h" -#include "lib/api/services/OrderService.pb.h" -#include "lib/core/FMT_IMPL.h" -#include "lib/domain/OrderStatus.h" -#include "lib/domain_model/Security.h" -#include "lib/domain_model/Security.pb.h" -#include "lib/domain_model/SecurityKey.h" -#include "lib/orderman/orderman_utils/orderman_common.h" -#include "lib/os/os.h" +#include "spark/api/services/OrderService.pb.h" +#include "spark/core/FMT_IMPL.h" +#include "spark/domain/OrderStatus.h" +#include "spark/domain_model/Security.h" +#include "spark/domain_model/Security.pb.h" +#include "spark/domain_model/SecurityKey.h" +#include "spark/orderman/orderman_utils/orderman_common.h" +#include "spark/os/os.h" #include #include diff --git a/src/lib/orderman/ccapi/CCAPISingleOrderManager.cpp b/src/lib_spark/spark/orderman/ccapi/CCAPISingleOrderManager.cpp similarity index 97% rename from src/lib/orderman/ccapi/CCAPISingleOrderManager.cpp rename to src/lib_spark/spark/orderman/ccapi/CCAPISingleOrderManager.cpp index 63c33a552..d4b01e5f6 100644 --- a/src/lib/orderman/ccapi/CCAPISingleOrderManager.cpp +++ b/src/lib_spark/spark/orderman/ccapi/CCAPISingleOrderManager.cpp @@ -1,13 +1,13 @@ #include "CCAPISingleOrderManager.h" #include "CCAPIOrderCallbackMsgs.h" #include "CCAPIOrderState.h" -#include "lib/api/services/OrderService.pb.h" -#include "lib/domain_model/Security.h" -#include "lib/domain_model/Security.pb.h" -#include "lib/logging/logging.h" -#include "lib/orderman/orderman_utils/orderman_common.h" -#include "lib/os/os.h" -#include "lib/utils/bts_assert.h" +#include "spark/api/services/OrderService.pb.h" +#include "spark/domain_model/Security.h" +#include "spark/domain_model/Security.pb.h" +#include "spark/logging/logging.h" +#include "spark/orderman/orderman_utils/orderman_common.h" +#include "spark/os/os.h" +#include "spark/utils/bts_assert.h" #include #include #include diff --git a/src/lib/orderman/ccapi/CCAPISingleOrderManager.h b/src/lib_spark/spark/orderman/ccapi/CCAPISingleOrderManager.h similarity index 95% rename from src/lib/orderman/ccapi/CCAPISingleOrderManager.h rename to src/lib_spark/spark/orderman/ccapi/CCAPISingleOrderManager.h index 68059e9af..1ee5dfe36 100644 --- a/src/lib/orderman/ccapi/CCAPISingleOrderManager.h +++ b/src/lib_spark/spark/orderman/ccapi/CCAPISingleOrderManager.h @@ -1,7 +1,7 @@ #pragma once -#include "lib/domain_model/Security.pb.h" -#include "lib/orderman/orderman_utils/orderman_common.h" +#include "spark/domain_model/Security.pb.h" +#include "spark/orderman/orderman_utils/orderman_common.h" #include namespace bts::orderman { diff --git a/src/lib/orderman/ccapi/ICCAPIOrderMux.h b/src/lib_spark/spark/orderman/ccapi/ICCAPIOrderMux.h similarity index 84% rename from src/lib/orderman/ccapi/ICCAPIOrderMux.h rename to src/lib_spark/spark/orderman/ccapi/ICCAPIOrderMux.h index 03aa7b89e..dac050225 100644 --- a/src/lib/orderman/ccapi/ICCAPIOrderMux.h +++ b/src/lib_spark/spark/orderman/ccapi/ICCAPIOrderMux.h @@ -1,22 +1,22 @@ #pragma once //#include "CCAPIOrderCallbackMsgs.h" //#include "CCAPIOrderState.h" -//#include "lib/api/services/OrderService.pb.h" -//#include "lib/domain_model/Security.pb.h" -//#include "lib/logging/logging.h" -//#include "lib/md/common.h" -// #include "lib/orderman/CancelOrderMsg.h" -// #include "lib/orderman/CancelReplaceOrderMsg.h" -// #include "lib/orderman/CreateOrderMsg.h" -//#include "lib/orderman/RFQMsg.h" -//#include "lib/os/os.h" +//#include "spark/api/services/OrderService.pb.h" +//#include "spark/domain_model/Security.pb.h" +//#include "spark/logging/logging.h" +//#include "spark/md/common.h" +// #include "spark/orderman/CancelOrderMsg.h" +// #include "spark/orderman/CancelReplaceOrderMsg.h" +// #include "spark/orderman/CreateOrderMsg.h" +//#include "spark/orderman/RFQMsg.h" +//#include "spark/os/os.h" //#include //#include #include "CCAPIOrderCallbackMsgs.h" -#include "lib/domain_model/Security.pb.h" -#include "lib/md/SecurityOracle.h" -#include "lib/mercury/events/Update.h" -#include "lib/orderman/events/NewSecuritiesEvent.h" +#include "spark/domain_model/Security.pb.h" +#include "spark/md/SecurityOracle.h" +#include "spark/mercury/events/Update.h" +#include "spark/orderman/events/NewSecuritiesEvent.h" #include namespace bts::orderman { diff --git a/src/lib/orderman/doc/attach_detach.org b/src/lib_spark/spark/orderman/doc/attach_detach.org similarity index 100% rename from src/lib/orderman/doc/attach_detach.org rename to src/lib_spark/spark/orderman/doc/attach_detach.org diff --git a/src/lib/orderman/doc/event_flow.pdf b/src/lib_spark/spark/orderman/doc/event_flow.pdf similarity index 100% rename from src/lib/orderman/doc/event_flow.pdf rename to src/lib_spark/spark/orderman/doc/event_flow.pdf diff --git a/src/lib/orderman/doc/ilink3.org b/src/lib_spark/spark/orderman/doc/ilink3.org similarity index 100% rename from src/lib/orderman/doc/ilink3.org rename to src/lib_spark/spark/orderman/doc/ilink3.org diff --git a/src/lib/orderman/doc/order_man_notes.org b/src/lib_spark/spark/orderman/doc/order_man_notes.org similarity index 100% rename from src/lib/orderman/doc/order_man_notes.org rename to src/lib_spark/spark/orderman/doc/order_man_notes.org diff --git a/src/lib/orderman/events/AccountPnLUpdateEvent.h b/src/lib_spark/spark/orderman/events/AccountPnLUpdateEvent.h similarity index 71% rename from src/lib/orderman/events/AccountPnLUpdateEvent.h rename to src/lib_spark/spark/orderman/events/AccountPnLUpdateEvent.h index e6882df8e..d8bd3b361 100644 --- a/src/lib/orderman/events/AccountPnLUpdateEvent.h +++ b/src/lib_spark/spark/orderman/events/AccountPnLUpdateEvent.h @@ -1,10 +1,10 @@ #pragma once -#include "lib/api/services/AdminService.pb.h" +#include "spark/api/services/AdminService.pb.h" -#include "lib/mercury/common/mercury_common.h" -#include "lib/mercury/events/Event.h" -#include "lib/mercury/synopsis/MergeByKey.h" +#include "spark/mercury/common/mercury_common.h" +#include "spark/mercury/events/Event.h" +#include "spark/mercury/synopsis/MergeByKey.h" #include diff --git a/src/lib/orderman/events/ActivateOrderEvent.h b/src/lib_spark/spark/orderman/events/ActivateOrderEvent.h similarity index 77% rename from src/lib/orderman/events/ActivateOrderEvent.h rename to src/lib_spark/spark/orderman/events/ActivateOrderEvent.h index 4b1ee6ed9..54bf2ffac 100644 --- a/src/lib/orderman/events/ActivateOrderEvent.h +++ b/src/lib_spark/spark/orderman/events/ActivateOrderEvent.h @@ -2,9 +2,9 @@ #include -#include "lib/mercury/events/Event.h" -#include "lib/orderman/orderman_utils/orderman_common.h" -#include "lib/tracing/PerfLog.h" +#include "spark/mercury/events/Event.h" +#include "spark/orderman/orderman_utils/orderman_common.h" +#include "spark/tracing/PerfLog.h" namespace bts { namespace orderman { diff --git a/src/lib/orderman/events/BookUpdateEvent.h b/src/lib_spark/spark/orderman/events/BookUpdateEvent.h similarity index 72% rename from src/lib/orderman/events/BookUpdateEvent.h rename to src/lib_spark/spark/orderman/events/BookUpdateEvent.h index 4c3f4b6e1..69673b4c7 100644 --- a/src/lib/orderman/events/BookUpdateEvent.h +++ b/src/lib_spark/spark/orderman/events/BookUpdateEvent.h @@ -2,10 +2,10 @@ #include -#include "lib/mercury/events/Event.h" -#include "lib/orderman/orderman_utils/Book.h" -#include "lib/orderman/orderman_utils/orderman_common.h" -#include "lib/tracing/PerfLog.h" +#include "spark/mercury/events/Event.h" +#include "spark/orderman/orderman_utils/Book.h" +#include "spark/orderman/orderman_utils/orderman_common.h" +#include "spark/tracing/PerfLog.h" namespace bts { namespace orderman { diff --git a/src/lib/orderman/events/CancelOrderEvent.h b/src/lib_spark/spark/orderman/events/CancelOrderEvent.h similarity index 81% rename from src/lib/orderman/events/CancelOrderEvent.h rename to src/lib_spark/spark/orderman/events/CancelOrderEvent.h index ae85d1e44..a1b36cddb 100644 --- a/src/lib/orderman/events/CancelOrderEvent.h +++ b/src/lib_spark/spark/orderman/events/CancelOrderEvent.h @@ -2,9 +2,9 @@ #include -#include "lib/mercury/events/Event.h" -#include "lib/orderman/orderman_utils/orderman_common.h" -#include "lib/tracing/PerfLog.h" +#include "spark/mercury/events/Event.h" +#include "spark/orderman/orderman_utils/orderman_common.h" +#include "spark/tracing/PerfLog.h" namespace bts { namespace orderman { diff --git a/src/lib/orderman/events/CancelRejectEvent.cpp b/src/lib_spark/spark/orderman/events/CancelRejectEvent.cpp similarity index 100% rename from src/lib/orderman/events/CancelRejectEvent.cpp rename to src/lib_spark/spark/orderman/events/CancelRejectEvent.cpp diff --git a/src/lib/orderman/events/CancelRejectEvent.h b/src/lib_spark/spark/orderman/events/CancelRejectEvent.h similarity index 65% rename from src/lib/orderman/events/CancelRejectEvent.h rename to src/lib_spark/spark/orderman/events/CancelRejectEvent.h index aa0e44667..0788dd67e 100644 --- a/src/lib/orderman/events/CancelRejectEvent.h +++ b/src/lib_spark/spark/orderman/events/CancelRejectEvent.h @@ -2,12 +2,12 @@ #include -#include "lib/api/services/OrderService.pb.h" -#include "lib/domain_model/common.h" -#include "lib/mercury/events/Event.h" -#include "lib/mercury/synopsis/NoSynopsis.h" -#include "lib/orderman/orderman_utils/CancelReject.h" -#include "lib/orderman/orderman_utils/orderman_common.h" +#include "spark/api/services/OrderService.pb.h" +#include "spark/domain_model/common.h" +#include "spark/mercury/events/Event.h" +#include "spark/mercury/synopsis/NoSynopsis.h" +#include "spark/orderman/orderman_utils/CancelReject.h" +#include "spark/orderman/orderman_utils/orderman_common.h" namespace bts { namespace orderman { diff --git a/src/lib/orderman/events/CrackOrderEvent.h b/src/lib_spark/spark/orderman/events/CrackOrderEvent.h similarity index 76% rename from src/lib/orderman/events/CrackOrderEvent.h rename to src/lib_spark/spark/orderman/events/CrackOrderEvent.h index 0b86076e0..8a59490d2 100644 --- a/src/lib/orderman/events/CrackOrderEvent.h +++ b/src/lib_spark/spark/orderman/events/CrackOrderEvent.h @@ -2,9 +2,9 @@ #include -#include "lib/mercury/events/Event.h" -#include "lib/orderman/orderman_utils/orderman_common.h" -#include "lib/tracing/PerfLog.h" +#include "spark/mercury/events/Event.h" +#include "spark/orderman/orderman_utils/orderman_common.h" +#include "spark/tracing/PerfLog.h" namespace bts { namespace orderman { diff --git a/src/lib/orderman/events/CreateFIXBufferReplyEvent.h b/src/lib_spark/spark/orderman/events/CreateFIXBufferReplyEvent.h similarity index 72% rename from src/lib/orderman/events/CreateFIXBufferReplyEvent.h rename to src/lib_spark/spark/orderman/events/CreateFIXBufferReplyEvent.h index bb6cede7f..c9cf0c9bb 100644 --- a/src/lib/orderman/events/CreateFIXBufferReplyEvent.h +++ b/src/lib_spark/spark/orderman/events/CreateFIXBufferReplyEvent.h @@ -1,8 +1,8 @@ #pragma once -#include "lib/config/protos/jetfix.pb.h" -#include "lib/jetfix/common/OutFIXPtr.h" -#include "lib/mercury/events/Event.h" -#include "lib/orderman/orderman_utils/orderman_common.h" +#include "spark/config/protos/jetfix.pb.h" +#include "spark/jetfix/common/OutFIXPtr.h" +#include "spark/mercury/events/Event.h" +#include "spark/orderman/orderman_utils/orderman_common.h" #include namespace bts::orderman { diff --git a/src/lib/orderman/events/CreateFIXBufferRequestEvent.h b/src/lib_spark/spark/orderman/events/CreateFIXBufferRequestEvent.h similarity index 76% rename from src/lib/orderman/events/CreateFIXBufferRequestEvent.h rename to src/lib_spark/spark/orderman/events/CreateFIXBufferRequestEvent.h index 4d36c99a5..8e7abc191 100644 --- a/src/lib/orderman/events/CreateFIXBufferRequestEvent.h +++ b/src/lib_spark/spark/orderman/events/CreateFIXBufferRequestEvent.h @@ -2,9 +2,9 @@ #include -#include "lib/config/protos/jetfix.pb.h" -#include "lib/mercury/events/Event.h" -#include "lib/orderman/orderman_utils/orderman_common.h" +#include "spark/config/protos/jetfix.pb.h" +#include "spark/mercury/events/Event.h" +#include "spark/orderman/orderman_utils/orderman_common.h" namespace bts { namespace orderman { diff --git a/src/lib/orderman/events/CreateOrderReplyEvent.h b/src/lib_spark/spark/orderman/events/CreateOrderReplyEvent.h similarity index 78% rename from src/lib/orderman/events/CreateOrderReplyEvent.h rename to src/lib_spark/spark/orderman/events/CreateOrderReplyEvent.h index 8a653176e..1eb1ca742 100644 --- a/src/lib/orderman/events/CreateOrderReplyEvent.h +++ b/src/lib_spark/spark/orderman/events/CreateOrderReplyEvent.h @@ -2,9 +2,9 @@ #include -#include "lib/mercury/events/Event.h" -#include "lib/orderman/orderman_utils/orderman_common.h" -#include "lib/orderman/orders/Order.h" +#include "spark/mercury/events/Event.h" +#include "spark/orderman/orderman_utils/orderman_common.h" +#include "spark/orderman/orders/Order.h" namespace bts { namespace orderman { diff --git a/src/lib/orderman/events/CreateOrderRequestEvent.h b/src/lib_spark/spark/orderman/events/CreateOrderRequestEvent.h similarity index 81% rename from src/lib/orderman/events/CreateOrderRequestEvent.h rename to src/lib_spark/spark/orderman/events/CreateOrderRequestEvent.h index 9d7673969..60b39e1c2 100644 --- a/src/lib/orderman/events/CreateOrderRequestEvent.h +++ b/src/lib_spark/spark/orderman/events/CreateOrderRequestEvent.h @@ -2,9 +2,9 @@ #include -#include "lib/api/services/OrderService.pb.h" -#include "lib/mercury/events/Event.h" -#include "lib/orderman/orderman_utils/orderman_common.h" +#include "spark/api/services/OrderService.pb.h" +#include "spark/mercury/events/Event.h" +#include "spark/orderman/orderman_utils/orderman_common.h" namespace bts { namespace orderman { diff --git a/src/lib/orderman/events/DetachOrderEvent.h b/src/lib_spark/spark/orderman/events/DetachOrderEvent.h similarity index 76% rename from src/lib/orderman/events/DetachOrderEvent.h rename to src/lib_spark/spark/orderman/events/DetachOrderEvent.h index 0b86076e0..8a59490d2 100644 --- a/src/lib/orderman/events/DetachOrderEvent.h +++ b/src/lib_spark/spark/orderman/events/DetachOrderEvent.h @@ -2,9 +2,9 @@ #include -#include "lib/mercury/events/Event.h" -#include "lib/orderman/orderman_utils/orderman_common.h" -#include "lib/tracing/PerfLog.h" +#include "spark/mercury/events/Event.h" +#include "spark/orderman/orderman_utils/orderman_common.h" +#include "spark/tracing/PerfLog.h" namespace bts { namespace orderman { diff --git a/src/lib/orderman/events/ExcessLiquidityUpdateEvent.h b/src/lib_spark/spark/orderman/events/ExcessLiquidityUpdateEvent.h similarity index 79% rename from src/lib/orderman/events/ExcessLiquidityUpdateEvent.h rename to src/lib_spark/spark/orderman/events/ExcessLiquidityUpdateEvent.h index 97a10e9eb..250cb6869 100644 --- a/src/lib/orderman/events/ExcessLiquidityUpdateEvent.h +++ b/src/lib_spark/spark/orderman/events/ExcessLiquidityUpdateEvent.h @@ -1,8 +1,8 @@ #pragma once -#include "lib/mercury/common/mercury_common.h" -#include "lib/mercury/events/Event.h" -#include "lib/mercury/synopsis/MergeByKey.h" +#include "spark/mercury/common/mercury_common.h" +#include "spark/mercury/events/Event.h" +#include "spark/mercury/synopsis/MergeByKey.h" #include diff --git a/src/lib/orderman/events/ExchangeOpenOrdersEvent.h b/src/lib_spark/spark/orderman/events/ExchangeOpenOrdersEvent.h similarity index 60% rename from src/lib/orderman/events/ExchangeOpenOrdersEvent.h rename to src/lib_spark/spark/orderman/events/ExchangeOpenOrdersEvent.h index ad7612e6c..390594b00 100644 --- a/src/lib/orderman/events/ExchangeOpenOrdersEvent.h +++ b/src/lib_spark/spark/orderman/events/ExchangeOpenOrdersEvent.h @@ -1,11 +1,11 @@ #pragma once -#include "lib/api/services/AdminService.pb.h" +#include "spark/api/services/AdminService.pb.h" -#include "lib/mercury/common/mercury_common.h" -#include "lib/mercury/events/Event.h" -#include "lib/mercury/synopsis/CacheLast.h" -#include "lib/orderman/orderman_utils/ExchangeOpenOrders.h" +#include "spark/mercury/common/mercury_common.h" +#include "spark/mercury/events/Event.h" +#include "spark/mercury/synopsis/CacheLast.h" +#include "spark/orderman/orderman_utils/ExchangeOpenOrders.h" #include diff --git a/src/lib/orderman/events/ExchangePositionEvent.h b/src/lib_spark/spark/orderman/events/ExchangePositionEvent.h similarity index 59% rename from src/lib/orderman/events/ExchangePositionEvent.h rename to src/lib_spark/spark/orderman/events/ExchangePositionEvent.h index 5d19078bb..5fc74a503 100644 --- a/src/lib/orderman/events/ExchangePositionEvent.h +++ b/src/lib_spark/spark/orderman/events/ExchangePositionEvent.h @@ -1,11 +1,11 @@ #pragma once -#include "lib/api/services/AdminService.pb.h" +#include "spark/api/services/AdminService.pb.h" -#include "lib/mercury/common/mercury_common.h" -#include "lib/mercury/events/Event.h" -#include "lib/mercury/synopsis/CacheLast.h" -#include "lib/orderman/orderman_utils/ExchangePosition.h" +#include "spark/mercury/common/mercury_common.h" +#include "spark/mercury/events/Event.h" +#include "spark/mercury/synopsis/CacheLast.h" +#include "spark/orderman/orderman_utils/ExchangePosition.h" #include diff --git a/src/lib/orderman/events/FilledPositionEvent.cpp b/src/lib_spark/spark/orderman/events/FilledPositionEvent.cpp similarity index 100% rename from src/lib/orderman/events/FilledPositionEvent.cpp rename to src/lib_spark/spark/orderman/events/FilledPositionEvent.cpp diff --git a/src/lib/orderman/events/FilledPositionEvent.h b/src/lib_spark/spark/orderman/events/FilledPositionEvent.h similarity index 81% rename from src/lib/orderman/events/FilledPositionEvent.h rename to src/lib_spark/spark/orderman/events/FilledPositionEvent.h index e2ea0e269..9d5452028 100644 --- a/src/lib/orderman/events/FilledPositionEvent.h +++ b/src/lib_spark/spark/orderman/events/FilledPositionEvent.h @@ -1,9 +1,9 @@ #pragma once -#include "lib/api/services/OrderService.pb.h" -#include "lib/domain_model/Security.h" -#include "lib/mercury/events/Event.h" -#include "lib/mercury/synopsis/MergeByKey.h" +#include "spark/api/services/OrderService.pb.h" +#include "spark/domain_model/Security.h" +#include "spark/mercury/events/Event.h" +#include "spark/mercury/synopsis/MergeByKey.h" #include namespace bts { diff --git a/src/lib/orderman/events/GatewayStatusChangeEvent.h b/src/lib_spark/spark/orderman/events/GatewayStatusChangeEvent.h similarity index 80% rename from src/lib/orderman/events/GatewayStatusChangeEvent.h rename to src/lib_spark/spark/orderman/events/GatewayStatusChangeEvent.h index 615f85514..e9e21b675 100644 --- a/src/lib/orderman/events/GatewayStatusChangeEvent.h +++ b/src/lib_spark/spark/orderman/events/GatewayStatusChangeEvent.h @@ -1,8 +1,8 @@ #pragma once -#include "lib/logging/logging.h" -#include "lib/mercury/synopsis/CacheLast.h" -#include "lib/orderman/orderman_utils/orderman_common.h" +#include "spark/logging/logging.h" +#include "spark/mercury/synopsis/CacheLast.h" +#include "spark/orderman/orderman_utils/orderman_common.h" #include namespace bts { diff --git a/src/lib/orderman/events/MDRequestEvent.h b/src/lib_spark/spark/orderman/events/MDRequestEvent.h similarity index 87% rename from src/lib/orderman/events/MDRequestEvent.h rename to src/lib_spark/spark/orderman/events/MDRequestEvent.h index e88c453f2..34ef5d328 100644 --- a/src/lib/orderman/events/MDRequestEvent.h +++ b/src/lib_spark/spark/orderman/events/MDRequestEvent.h @@ -2,8 +2,8 @@ #include -#include "lib/mercury/events/Event.h" -#include "lib/orderman/orderman_utils/orderman_common.h" +#include "spark/mercury/events/Event.h" +#include "spark/orderman/orderman_utils/orderman_common.h" namespace bts { namespace orderman { diff --git a/src/lib/orderman/events/ManuallyBustFillsEvent.h b/src/lib_spark/spark/orderman/events/ManuallyBustFillsEvent.h similarity index 79% rename from src/lib/orderman/events/ManuallyBustFillsEvent.h rename to src/lib_spark/spark/orderman/events/ManuallyBustFillsEvent.h index ff543e6ef..268bd8c1a 100644 --- a/src/lib/orderman/events/ManuallyBustFillsEvent.h +++ b/src/lib_spark/spark/orderman/events/ManuallyBustFillsEvent.h @@ -1,7 +1,7 @@ #pragma once -#include "lib/mercury/events/Event.h" -#include "lib/mercury/synopsis/NoSynopsis.h" +#include "spark/mercury/events/Event.h" +#include "spark/mercury/synopsis/NoSynopsis.h" namespace bts::orderman { diff --git a/src/lib/orderman/events/NewAdminDataEvent.h b/src/lib_spark/spark/orderman/events/NewAdminDataEvent.h similarity index 66% rename from src/lib/orderman/events/NewAdminDataEvent.h rename to src/lib_spark/spark/orderman/events/NewAdminDataEvent.h index 213ef3192..ad3597cec 100644 --- a/src/lib/orderman/events/NewAdminDataEvent.h +++ b/src/lib_spark/spark/orderman/events/NewAdminDataEvent.h @@ -1,10 +1,10 @@ #pragma once -#include "lib/api/services/AdminService.pb.h" +#include "spark/api/services/AdminService.pb.h" -#include "lib/mercury/common/mercury_common.h" -#include "lib/mercury/events/Event.h" -#include "lib/mercury/synopsis/CacheLast.h" +#include "spark/mercury/common/mercury_common.h" +#include "spark/mercury/events/Event.h" +#include "spark/mercury/synopsis/CacheLast.h" #include diff --git a/src/lib/orderman/events/NewExecutionReportEvent.cpp b/src/lib_spark/spark/orderman/events/NewExecutionReportEvent.cpp similarity index 100% rename from src/lib/orderman/events/NewExecutionReportEvent.cpp rename to src/lib_spark/spark/orderman/events/NewExecutionReportEvent.cpp diff --git a/src/lib/orderman/events/NewExecutionReportEvent.h b/src/lib_spark/spark/orderman/events/NewExecutionReportEvent.h similarity index 63% rename from src/lib/orderman/events/NewExecutionReportEvent.h rename to src/lib_spark/spark/orderman/events/NewExecutionReportEvent.h index 16c22850e..f72986448 100644 --- a/src/lib/orderman/events/NewExecutionReportEvent.h +++ b/src/lib_spark/spark/orderman/events/NewExecutionReportEvent.h @@ -1,13 +1,13 @@ #pragma once -#include "lib/api/services/OrderService.pb.h" -#include "lib/domain_model/common.h" -#include "lib/mercury/common/mercury_common.h" -#include "lib/mercury/events/Event.h" -#include "lib/mercury/synopsis/CacheAll.h" -#include "lib/orderman/orderman_utils/ExecutionReport.h" -#include "lib/orderman/orderman_utils/orderman_common.h" -#include "lib/tracing/PerfLog.h" +#include "spark/api/services/OrderService.pb.h" +#include "spark/domain_model/common.h" +#include "spark/mercury/common/mercury_common.h" +#include "spark/mercury/events/Event.h" +#include "spark/mercury/synopsis/CacheAll.h" +#include "spark/orderman/orderman_utils/ExecutionReport.h" +#include "spark/orderman/orderman_utils/orderman_common.h" +#include "spark/tracing/PerfLog.h" #include diff --git a/src/lib/orderman/events/NewSecuritiesEvent.h b/src/lib_spark/spark/orderman/events/NewSecuritiesEvent.h similarity index 79% rename from src/lib/orderman/events/NewSecuritiesEvent.h rename to src/lib_spark/spark/orderman/events/NewSecuritiesEvent.h index a1e727b22..0c94333c1 100644 --- a/src/lib/orderman/events/NewSecuritiesEvent.h +++ b/src/lib_spark/spark/orderman/events/NewSecuritiesEvent.h @@ -1,8 +1,8 @@ #pragma once -#include "lib/domain_model/Security.h" -#include "lib/mercury/events/Event.h" -#include "lib/mercury/synopsis/CacheAll.h" +#include "spark/domain_model/Security.h" +#include "spark/mercury/events/Event.h" +#include "spark/mercury/synopsis/CacheAll.h" #include namespace bts { diff --git a/src/lib/orderman/events/OrderDefinitionUpdateEvent.h b/src/lib_spark/spark/orderman/events/OrderDefinitionUpdateEvent.h similarity index 81% rename from src/lib/orderman/events/OrderDefinitionUpdateEvent.h rename to src/lib_spark/spark/orderman/events/OrderDefinitionUpdateEvent.h index 373b950eb..b6d1abc48 100644 --- a/src/lib/orderman/events/OrderDefinitionUpdateEvent.h +++ b/src/lib_spark/spark/orderman/events/OrderDefinitionUpdateEvent.h @@ -1,8 +1,8 @@ #pragma once -#include "lib/api/services/OrderService.pb.h" -#include "lib/mercury/events/Event.h" -#include "lib/tracing/PerfLog.h" +#include "spark/api/services/OrderService.pb.h" +#include "spark/mercury/events/Event.h" +#include "spark/tracing/PerfLog.h" #include diff --git a/src/lib/orderman/events/OrderManagerReadyEvent.h b/src/lib_spark/spark/orderman/events/OrderManagerReadyEvent.h similarity index 85% rename from src/lib/orderman/events/OrderManagerReadyEvent.h rename to src/lib_spark/spark/orderman/events/OrderManagerReadyEvent.h index 7b3e0b38e..26dd6f9b7 100644 --- a/src/lib/orderman/events/OrderManagerReadyEvent.h +++ b/src/lib_spark/spark/orderman/events/OrderManagerReadyEvent.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/mercury/events/Event.h" +#include "spark/mercury/events/Event.h" namespace bts { namespace orderman { diff --git a/src/lib/orderman/events/OrderOpResultEvent.h b/src/lib_spark/spark/orderman/events/OrderOpResultEvent.h similarity index 75% rename from src/lib/orderman/events/OrderOpResultEvent.h rename to src/lib_spark/spark/orderman/events/OrderOpResultEvent.h index 90626ce47..673cc806c 100644 --- a/src/lib/orderman/events/OrderOpResultEvent.h +++ b/src/lib_spark/spark/orderman/events/OrderOpResultEvent.h @@ -2,9 +2,9 @@ #include -#include "lib/mercury/events/Event.h" -#include "lib/orderman/orderman_utils/orderman_common.h" -#include "lib/orderman/orders/Order.h" +#include "spark/mercury/events/Event.h" +#include "spark/orderman/orderman_utils/orderman_common.h" +#include "spark/orderman/orders/Order.h" namespace bts { namespace orderman { diff --git a/src/lib/orderman/events/OrderStateUpdateEvent.h b/src/lib_spark/spark/orderman/events/OrderStateUpdateEvent.h similarity index 96% rename from src/lib/orderman/events/OrderStateUpdateEvent.h rename to src/lib_spark/spark/orderman/events/OrderStateUpdateEvent.h index 1389f39d3..7aa6d535c 100644 --- a/src/lib/orderman/events/OrderStateUpdateEvent.h +++ b/src/lib_spark/spark/orderman/events/OrderStateUpdateEvent.h @@ -1,12 +1,12 @@ #pragma once -#include "lib/api/services/OrderService.pb.h" -#include "lib/logging/logging.h" -#include "lib/mercury/events/Event.h" -#include "lib/orderman/order_factory/OrderFactory.h" -#include "lib/orderman/orderman_utils/orderman_common.h" -#include "lib/tracing/PerfLog.h" -#include "lib/utils/PBUtils.h" +#include "spark/api/services/OrderService.pb.h" +#include "spark/logging/logging.h" +#include "spark/mercury/events/Event.h" +#include "spark/orderman/order_factory/OrderFactory.h" +#include "spark/orderman/orderman_utils/orderman_common.h" +#include "spark/tracing/PerfLog.h" +#include "spark/utils/PBUtils.h" #include #include diff --git a/src/lib/orderman/events/RFQEvent.h b/src/lib_spark/spark/orderman/events/RFQEvent.h similarity index 68% rename from src/lib/orderman/events/RFQEvent.h rename to src/lib_spark/spark/orderman/events/RFQEvent.h index 29f2e4dca..fc506577b 100644 --- a/src/lib/orderman/events/RFQEvent.h +++ b/src/lib_spark/spark/orderman/events/RFQEvent.h @@ -1,10 +1,10 @@ #pragma once -#include "lib/api/services/OrderService.pb.h" -#include "lib/core/FMT_IMPL.h" -#include "lib/domain_model/Security.pb.h" -#include "lib/mercury/events/Event.h" -#include "lib/tracing/PerfLog.h" +#include "spark/api/services/OrderService.pb.h" +#include "spark/core/FMT_IMPL.h" +#include "spark/domain_model/Security.pb.h" +#include "spark/mercury/events/Event.h" +#include "spark/tracing/PerfLog.h" #include #include diff --git a/src/lib/orderman/events/SettlementRequestEvent.h b/src/lib_spark/spark/orderman/events/SettlementRequestEvent.h similarity index 85% rename from src/lib/orderman/events/SettlementRequestEvent.h rename to src/lib_spark/spark/orderman/events/SettlementRequestEvent.h index 92c137235..36bc74243 100644 --- a/src/lib/orderman/events/SettlementRequestEvent.h +++ b/src/lib_spark/spark/orderman/events/SettlementRequestEvent.h @@ -2,8 +2,8 @@ #include -#include "lib/mercury/events/Event.h" -#include "lib/orderman/orderman_utils/orderman_common.h" +#include "spark/mercury/events/Event.h" +#include "spark/orderman/orderman_utils/orderman_common.h" namespace bts { namespace orderman { diff --git a/src/lib/orderman/events/SettlementUpdateEvent.h b/src/lib_spark/spark/orderman/events/SettlementUpdateEvent.h similarity index 71% rename from src/lib/orderman/events/SettlementUpdateEvent.h rename to src/lib_spark/spark/orderman/events/SettlementUpdateEvent.h index 301f493df..3892f6ffa 100644 --- a/src/lib/orderman/events/SettlementUpdateEvent.h +++ b/src/lib_spark/spark/orderman/events/SettlementUpdateEvent.h @@ -2,10 +2,10 @@ #include -#include "lib/mercury/events/Event.h" -#include "lib/mercury/synopsis/MergeByKey.h" -#include "lib/orderman/orderman_utils/Book.h" -#include "lib/orderman/orderman_utils/orderman_common.h" +#include "spark/mercury/events/Event.h" +#include "spark/mercury/synopsis/MergeByKey.h" +#include "spark/orderman/orderman_utils/Book.h" +#include "spark/orderman/orderman_utils/orderman_common.h" namespace bts { namespace orderman { diff --git a/src/lib/orderman/events/StatusUpdateEvent.h b/src/lib_spark/spark/orderman/events/StatusUpdateEvent.h similarity index 69% rename from src/lib/orderman/events/StatusUpdateEvent.h rename to src/lib_spark/spark/orderman/events/StatusUpdateEvent.h index dcb8116d8..ca6d45f97 100644 --- a/src/lib/orderman/events/StatusUpdateEvent.h +++ b/src/lib_spark/spark/orderman/events/StatusUpdateEvent.h @@ -1,9 +1,9 @@ #pragma once -#include "lib/mercury/events/Event.h" -#include "lib/orderman/orderman_utils/Book.h" -#include "lib/orderman/orderman_utils/orderman_common.h" -#include "lib/tracing/PerfLog.h" +#include "spark/mercury/events/Event.h" +#include "spark/orderman/orderman_utils/Book.h" +#include "spark/orderman/orderman_utils/orderman_common.h" +#include "spark/tracing/PerfLog.h" #include namespace bts { diff --git a/src/lib/orderman/events/StoredFillEvent.h b/src/lib_spark/spark/orderman/events/StoredFillEvent.h similarity index 85% rename from src/lib/orderman/events/StoredFillEvent.h rename to src/lib_spark/spark/orderman/events/StoredFillEvent.h index 7b31978dc..b018f4301 100644 --- a/src/lib/orderman/events/StoredFillEvent.h +++ b/src/lib_spark/spark/orderman/events/StoredFillEvent.h @@ -1,7 +1,7 @@ #pragma once -#include "lib/api/services/OrderService.pb.h" -#include "lib/mercury/synopsis/MergeByKey.h" +#include "spark/api/services/OrderService.pb.h" +#include "spark/mercury/synopsis/MergeByKey.h" #include #include diff --git a/src/lib/orderman/events/StoredOrderEvent.h b/src/lib_spark/spark/orderman/events/StoredOrderEvent.h similarity index 78% rename from src/lib/orderman/events/StoredOrderEvent.h rename to src/lib_spark/spark/orderman/events/StoredOrderEvent.h index e360c25e4..91a58acdf 100644 --- a/src/lib/orderman/events/StoredOrderEvent.h +++ b/src/lib_spark/spark/orderman/events/StoredOrderEvent.h @@ -1,8 +1,8 @@ #pragma once -#include "lib/api/services/OrderService.pb.h" -#include "lib/mercury/events/Event.h" -#include "lib/mercury/synopsis/MergeByKey.h" +#include "spark/api/services/OrderService.pb.h" +#include "spark/mercury/events/Event.h" +#include "spark/mercury/synopsis/MergeByKey.h" #include #include diff --git a/src/lib/orderman/events/TheoEvent.h b/src/lib_spark/spark/orderman/events/TheoEvent.h similarity index 78% rename from src/lib/orderman/events/TheoEvent.h rename to src/lib_spark/spark/orderman/events/TheoEvent.h index ab5fcd0b9..66d968f83 100644 --- a/src/lib/orderman/events/TheoEvent.h +++ b/src/lib_spark/spark/orderman/events/TheoEvent.h @@ -1,9 +1,9 @@ #pragma once -#include "lib/api/services/OrderService.pb.h" -#include "lib/logging/logging.h" -#include "lib/mercury/events/Event.h" -#include "lib/orderman/calculations/ITheoCalculator.h" +#include "spark/api/services/OrderService.pb.h" +#include "spark/logging/logging.h" +#include "spark/mercury/events/Event.h" +#include "spark/orderman/calculations/ITheoCalculator.h" namespace bts::orderman { diff --git a/src/lib/orderman/events/TickerUpdateEvent.h b/src/lib_spark/spark/orderman/events/TickerUpdateEvent.h similarity index 88% rename from src/lib/orderman/events/TickerUpdateEvent.h rename to src/lib_spark/spark/orderman/events/TickerUpdateEvent.h index 87fe021d4..7a1f29b91 100644 --- a/src/lib/orderman/events/TickerUpdateEvent.h +++ b/src/lib_spark/spark/orderman/events/TickerUpdateEvent.h @@ -1,7 +1,7 @@ #pragma once -#include "lib/mercury/events/Event.h" -#include "lib/orderman/TradeVector.h" +#include "spark/mercury/events/Event.h" +#include "spark/orderman/TradeVector.h" namespace bts::orderman { diff --git a/src/lib/orderman/events/TradeSignalEvent.h b/src/lib_spark/spark/orderman/events/TradeSignalEvent.h similarity index 73% rename from src/lib/orderman/events/TradeSignalEvent.h rename to src/lib_spark/spark/orderman/events/TradeSignalEvent.h index a81f9ce64..e6b3f21ae 100644 --- a/src/lib/orderman/events/TradeSignalEvent.h +++ b/src/lib_spark/spark/orderman/events/TradeSignalEvent.h @@ -1,11 +1,11 @@ #pragma once -#include +#include "spark/mercury/events/Event.h" +#include "spark/orderman/events/TradeSummarySignalDispatcher.h" +#include "spark/orderman/orderman_utils/orderman_common.h" +#include "spark/tracing/PerfLog.h" -#include "lib/mercury/events/Event.h" -#include "lib/orderman/events/TradeSummarySignalDispatcher.h" -#include "lib/orderman/orderman_utils/orderman_common.h" -#include "lib/tracing/PerfLog.h" +#include namespace bts { namespace orderman { diff --git a/src/lib/orderman/events/TradeSummarySignalDispatcher.h b/src/lib_spark/spark/orderman/events/TradeSummarySignalDispatcher.h similarity index 91% rename from src/lib/orderman/events/TradeSummarySignalDispatcher.h rename to src/lib_spark/spark/orderman/events/TradeSummarySignalDispatcher.h index 620c3daee..3aed6646e 100644 --- a/src/lib/orderman/events/TradeSummarySignalDispatcher.h +++ b/src/lib_spark/spark/orderman/events/TradeSummarySignalDispatcher.h @@ -1,9 +1,8 @@ #pragma once -#include "lib/md/common.h" -#include "lib/utils/TimeStamp.h" +#include "spark/md/common.h" +#include "spark/utils/TimeStamp.h" #include -#include namespace bts { namespace md { diff --git a/src/lib/orderman/events/UpdateOrderEvent.h b/src/lib_spark/spark/orderman/events/UpdateOrderEvent.h similarity index 86% rename from src/lib/orderman/events/UpdateOrderEvent.h rename to src/lib_spark/spark/orderman/events/UpdateOrderEvent.h index 9403a0065..6a05cdd4e 100644 --- a/src/lib/orderman/events/UpdateOrderEvent.h +++ b/src/lib_spark/spark/orderman/events/UpdateOrderEvent.h @@ -2,9 +2,9 @@ #include -#include "lib/mercury/events/Event.h" -#include "lib/orderman/orderman_utils/orderman_common.h" -#include "lib/tracing/PerfLog.h" +#include "spark/mercury/events/Event.h" +#include "spark/orderman/orderman_utils/orderman_common.h" +#include "spark/tracing/PerfLog.h" namespace bts { namespace orderman { diff --git a/src/lib/orderman/gateways/CCAPIExecutionGateway.cpp b/src/lib_spark/spark/orderman/gateways/CCAPIExecutionGateway.cpp similarity index 91% rename from src/lib/orderman/gateways/CCAPIExecutionGateway.cpp rename to src/lib_spark/spark/orderman/gateways/CCAPIExecutionGateway.cpp index 7c36dc477..a323eaf3e 100644 --- a/src/lib/orderman/gateways/CCAPIExecutionGateway.cpp +++ b/src/lib_spark/spark/orderman/gateways/CCAPIExecutionGateway.cpp @@ -1,46 +1,42 @@ #include "CCAPIExecutionGateway.h" -#include "lib/api/service_helpers/AdminServiceUtils.h" -#include "lib/api/services/AdminService.pb.h" -#include "lib/api/services/OrderService.pb.h" -#include "lib/core/TimeStamp.h" -#include "lib/domain_model/Security.pb.h" -#include "lib/domain_model/SecurityKey.h" -#include "lib/domain_model/common.h" -#include "lib/logging/logging.h" -#include "lib/md/SecurityOracle.h" -#include "lib/orderman/CancelOrderMsg.h" -#include "lib/orderman/CancelReplaceOrderMsg.h" -#include "lib/orderman/CreateOrderMsg.h" -#include "lib/orderman/OrderMsg.h" -#include "lib/orderman/RFQMsg.h" -#include "lib/orderman/ccapi/CCAPIDeribitOrderMux.h" -#include "lib/orderman/ccapi/ICCAPIOrderMux.h" -#include "lib/orderman/events/NewAdminDataEvent.h" -#include "lib/orderman/events/NewExecutionReportEvent.h" -#include "lib/orderman/events/NewSecuritiesEvent.h" -#include "lib/orderman/orderman_utils/CancelReject.h" -#include "lib/orderman/orderman_utils/ExchangeOpenOrders.h" -#include "lib/orderman/orderman_utils/ExchangePosition.h" -#include "lib/orderman/orderman_utils/ExecutionReport.h" -#include "lib/orderman/orderman_utils/orderman_common.h" -#include "lib/os/os.h" -#include "lib/utils/bts_assert.h" -#include "lib/utils/bts_chrono.h" -#include "lib/utils/datetime.h" +#include "spark/api/service_helpers/AdminServiceUtils.h" +#include "spark/api/services/AdminService.pb.h" +#include "spark/api/services/OrderService.pb.h" +#include "spark/config/config.h" +#include "spark/config/protos/toggles.pb.h" +#include "spark/core/TimeStamp.h" +#include "spark/domain_model/Security.h" +#include "spark/domain_model/Security.pb.h" +#include "spark/domain_model/SecurityKey.h" +#include "spark/domain_model/common.h" +#include "spark/logging/logging.h" +#include "spark/md/SecurityOracle.h" +#include "spark/orderman/CancelOrderMsg.h" +#include "spark/orderman/CancelReplaceOrderMsg.h" +#include "spark/orderman/CreateOrderMsg.h" +#include "spark/orderman/OrderMsg.h" +#include "spark/orderman/RFQMsg.h" +#include "spark/orderman/ccapi/CCAPIConnectionConfig.h" +#include "spark/orderman/ccapi/CCAPIDeribitOrderMux.h" +#include "spark/orderman/ccapi/CCAPIOrderState.h" +#include "spark/orderman/ccapi/ICCAPIOrderMux.h" +#include "spark/orderman/events/NewAdminDataEvent.h" +#include "spark/orderman/events/NewExecutionReportEvent.h" +#include "spark/orderman/events/NewSecuritiesEvent.h" +#include "spark/orderman/orderman_utils/CancelReject.h" +#include "spark/orderman/orderman_utils/ExchangeOpenOrders.h" +#include "spark/orderman/orderman_utils/ExchangePosition.h" +#include "spark/orderman/orderman_utils/ExecutionReport.h" +#include "spark/orderman/orderman_utils/orderman_common.h" +#include "spark/os/os.h" +#include "spark/utils/PBUtils.h" +#include "spark/utils/Uuid.h" +#include "spark/utils/bts_assert.h" +#include "spark/utils/bts_chrono.h" +#include "spark/utils/datetime.h" -#include "lib/api/service_helpers/AdminServiceUtils.h" -#include "lib/config/config.h" -#include "lib/config/protos/toggles.pb.h" -#include "lib/domain_model/Security.h" -#include "lib/orderman/ccapi/CCAPIOrderState.h" -#include "lib/orderman/ccapi/ICCAPIOrderMux.h" -#include "lib/utils/PBUtils.h" -#include "lib/utils/Uuid.h" #include #include -//#include -#include "lib/orderman/ccapi/CCAPIConnectionConfig.h" - #include #include #include diff --git a/src/lib/orderman/gateways/CCAPIExecutionGateway.h b/src/lib_spark/spark/orderman/gateways/CCAPIExecutionGateway.h similarity index 81% rename from src/lib/orderman/gateways/CCAPIExecutionGateway.h rename to src/lib_spark/spark/orderman/gateways/CCAPIExecutionGateway.h index 87c149e2c..a7e19cd3d 100644 --- a/src/lib/orderman/gateways/CCAPIExecutionGateway.h +++ b/src/lib_spark/spark/orderman/gateways/CCAPIExecutionGateway.h @@ -1,15 +1,15 @@ #pragma once -#include "lib/orderman/gateways/IExecutionGateway.h" -#include "lib/api/services/AdminService.pb.h" -#include "lib/api/services/OrderService.pb.h" -#include "lib/domain_model/Security.pb.h" -#include "lib/orderman/CancelOrderMsg.h" -#include "lib/orderman/CancelReplaceOrderMsg.h" -#include "lib/orderman/CreateOrderMsg.h" -#include "lib/orderman/RFQMsg.h" -#include "lib/orderman/ccapi/CCAPIOrderState.h" -#include "lib/orderman/orderman_utils/orderman_common.h" +#include "spark/orderman/gateways/IExecutionGateway.h" +#include "spark/api/services/AdminService.pb.h" +#include "spark/api/services/OrderService.pb.h" +#include "spark/domain_model/Security.pb.h" +#include "spark/orderman/CancelOrderMsg.h" +#include "spark/orderman/CancelReplaceOrderMsg.h" +#include "spark/orderman/CreateOrderMsg.h" +#include "spark/orderman/RFQMsg.h" +#include "spark/orderman/ccapi/CCAPIOrderState.h" +#include "spark/orderman/orderman_utils/orderman_common.h" #include #include diff --git a/src/lib/orderman/gateways/FakeExecutionGateway.cpp b/src/lib_spark/spark/orderman/gateways/FakeExecutionGateway.cpp similarity index 85% rename from src/lib/orderman/gateways/FakeExecutionGateway.cpp rename to src/lib_spark/spark/orderman/gateways/FakeExecutionGateway.cpp index 6e7b47c53..39e8fc448 100644 --- a/src/lib/orderman/gateways/FakeExecutionGateway.cpp +++ b/src/lib_spark/spark/orderman/gateways/FakeExecutionGateway.cpp @@ -1,32 +1,25 @@ #include "FakeExecutionGateway.h" -#include "lib/api/services/AdminService.pb.h" -#include "lib/api/services/OrderService.pb.h" -#include "lib/domain_model/Security.pb.h" -#include "lib/domain_model/common.h" -#include "lib/logging/logging.h" -#include "lib/orderman/CancelOrderMsg.h" -#include "lib/orderman/CancelReplaceOrderMsg.h" -#include "lib/orderman/CreateOrderMsg.h" -#include "lib/orderman/OrderMsg.h" -#include "lib/orderman/events/CancelRejectEvent.h" -#include "lib/orderman/events/GatewayStatusChangeEvent.h" -#include "lib/orderman/events/NewAdminDataEvent.h" -#include "lib/orderman/events/NewExecutionReportEvent.h" -#include "lib/orderman/events/NewSecuritiesEvent.h" -#include "lib/orderman/gateways/IExecutionGateway.h" -#include "lib/orderman/orderman_utils/ExecutionReport.h" -#include "lib/orderman/orderman_utils/orderman_common.h" -#include "lib/tracing/bts_trace.h" -#include "lib/utils/Dispatcher.h" -#include "lib/utils/TimeStamp.h" -#include "lib/utils/bts_assert.h" -#include "lib/utils/bts_chrono.h" -#include "lib/utils/helper_macros.h" -#include "server/sparkd/md/platforms/emumba/IEMOrderMuxer.h" +#include "spark/api/services/AdminService.pb.h" +#include "spark/api/services/OrderService.pb.h" +#include "spark/domain_model/Security.pb.h" +#include "spark/domain_model/common.h" +#include "spark/logging/logging.h" +#include "spark/orderman/CancelOrderMsg.h" +#include "spark/orderman/CancelReplaceOrderMsg.h" +#include "spark/orderman/CreateOrderMsg.h" +#include "spark/orderman/OrderMsg.h" +#include "spark/orderman/events/NewAdminDataEvent.h" +#include "spark/orderman/events/NewSecuritiesEvent.h" +#include "spark/orderman/gateways/IEMOrderMuxer.h" +#include "spark/orderman/gateways/IExecutionGateway.h" +#include "spark/orderman/orderman_utils/ExecutionReport.h" +#include "spark/orderman/orderman_utils/orderman_common.h" +#include "spark/tracing/bts_trace.h" +#include "spark/utils/bts_assert.h" +#include "spark/utils/bts_chrono.h" #include #include -#include #include #include #include diff --git a/src/lib/orderman/gateways/FakeExecutionGateway.h b/src/lib_spark/spark/orderman/gateways/FakeExecutionGateway.h similarity index 100% rename from src/lib/orderman/gateways/FakeExecutionGateway.h rename to src/lib_spark/spark/orderman/gateways/FakeExecutionGateway.h diff --git a/src/lib/orderman/gateways/GLBXExecutionGateway.cpp b/src/lib_spark/spark/orderman/gateways/GLBXExecutionGateway.cpp similarity index 95% rename from src/lib/orderman/gateways/GLBXExecutionGateway.cpp rename to src/lib_spark/spark/orderman/gateways/GLBXExecutionGateway.cpp index 606d1a4c7..fed9810cc 100644 --- a/src/lib/orderman/gateways/GLBXExecutionGateway.cpp +++ b/src/lib_spark/spark/orderman/gateways/GLBXExecutionGateway.cpp @@ -1,17 +1,17 @@ #include "GLBXExecutionGateway.h" -#include "lib/jetfix/codec/MessageDefinitions.h" -#include "lib/jetfix/common/OutFIX.h" -#include "lib/jetfix/gateway/JetFIXGateway.h" -#include "lib/logging/logging.h" -#include "lib/md/SecurityOracle.h" -#include "lib/orderman/events/CancelRejectEvent.h" -#include "lib/orderman/events/GatewayStatusChangeEvent.h" -#include "lib/orderman/events/NewExecutionReportEvent.h" -#include "lib/orderman/events/NewSecuritiesEvent.h" -#include "lib/orderman/orderman_utils/fix_order_codec.h" -#include "lib/tracing/bts_trace.h" -#include "lib/utils/TimeStamp.h" -#include "lib/utils/bts_chrono.h" +#include "spark/jetfix/codec/MessageDefinitions.h" +#include "spark/jetfix/common/OutFIX.h" +#include "spark/jetfix/gateway/JetFIXGateway.h" +#include "spark/logging/logging.h" +#include "spark/md/SecurityOracle.h" +#include "spark/orderman/events/CancelRejectEvent.h" +#include "spark/orderman/events/GatewayStatusChangeEvent.h" +#include "spark/orderman/events/NewExecutionReportEvent.h" +#include "spark/orderman/events/NewSecuritiesEvent.h" +#include "spark/orderman/orderman_utils/fix_order_codec.h" +#include "spark/tracing/bts_trace.h" +#include "spark/utils/TimeStamp.h" +#include "spark/utils/bts_chrono.h" namespace bts { namespace orderman { diff --git a/src/lib/orderman/gateways/GLBXExecutionGateway.h b/src/lib_spark/spark/orderman/gateways/GLBXExecutionGateway.h similarity index 100% rename from src/lib/orderman/gateways/GLBXExecutionGateway.h rename to src/lib_spark/spark/orderman/gateways/GLBXExecutionGateway.h diff --git a/src/lib/orderman/gateways/GLBXiLink3ExecutionGateway.cpp b/src/lib_spark/spark/orderman/gateways/GLBXiLink3ExecutionGateway.cpp similarity index 92% rename from src/lib/orderman/gateways/GLBXiLink3ExecutionGateway.cpp rename to src/lib_spark/spark/orderman/gateways/GLBXiLink3ExecutionGateway.cpp index 4fe68a49c..14c144b27 100644 --- a/src/lib/orderman/gateways/GLBXiLink3ExecutionGateway.cpp +++ b/src/lib_spark/spark/orderman/gateways/GLBXiLink3ExecutionGateway.cpp @@ -1,20 +1,21 @@ #include "GLBXiLink3ExecutionGateway.h" -#include "lib/config/config.h" -#include "lib/config/protos/orderman_cfg.pb.h" -#include "lib/domain_model/Security.h" -#include "lib/jetfix/common/OutFIX.h" -#include "lib/jetfix/store/session_name.h" -#include "lib/logging/logging.h" -#include "lib/orderman/events/NewSecuritiesEvent.h" -#include "lib/orderman/gateways/GLBXExecutionGateway.h" -#include "lib/orderman/ilink3/IL3GW.h" -#include "lib/orderman/ilink3/IL3MessageFramer.h" -#include "lib/orderman/ilink3/IL3Reactor.h" -#include "lib/orderman/ilink3/IL3SecDB.h" -#include "lib/orderman/ilink3/SessionStore.h" -#include "lib/orderman/orderman_utils/ExecutionReport.h" -#include "lib/orderman/orderman_utils/fix_order_codec.h" -#include "lib/utils/PBUtils.h" +#include "spark/config/config.h" +#include "spark/config/protos/orderman_cfg.pb.h" +#include "spark/domain_model/Security.h" +#include "spark/jetfix/common/OutFIX.h" +#include "spark/jetfix/store/session_name.h" +#include "spark/logging/logging.h" +#include "spark/orderman/events/NewSecuritiesEvent.h" +#include "spark/orderman/gateways/GLBXExecutionGateway.h" +#include "spark/orderman/ilink3/IL3GW.h" +#include "spark/orderman/ilink3/IL3MessageFramer.h" +#include "spark/orderman/ilink3/IL3Reactor.h" +#include "spark/orderman/ilink3/IL3SecDB.h" +#include "spark/orderman/ilink3/SessionStore.h" +#include "spark/orderman/orderman_utils/ExecutionReport.h" +#include "spark/orderman/orderman_utils/fix_order_codec.h" +#include "spark/utils/PBUtils.h" + #include namespace bts { diff --git a/src/lib/orderman/gateways/GLBXiLink3ExecutionGateway.h b/src/lib_spark/spark/orderman/gateways/GLBXiLink3ExecutionGateway.h similarity index 95% rename from src/lib/orderman/gateways/GLBXiLink3ExecutionGateway.h rename to src/lib_spark/spark/orderman/gateways/GLBXiLink3ExecutionGateway.h index 32da66a94..5b42f74c3 100644 --- a/src/lib/orderman/gateways/GLBXiLink3ExecutionGateway.h +++ b/src/lib_spark/spark/orderman/gateways/GLBXiLink3ExecutionGateway.h @@ -1,7 +1,7 @@ #pragma once #include "IExecutionGateway.h" -#include "lib/orderman/gateways/GLBXiLink3ExecutionGatewayState.h" +#include "spark/orderman/gateways/GLBXiLink3ExecutionGatewayState.h" namespace bts { namespace jetfix { diff --git a/src/lib/orderman/gateways/GLBXiLink3ExecutionGatewayState.h b/src/lib_spark/spark/orderman/gateways/GLBXiLink3ExecutionGatewayState.h similarity index 92% rename from src/lib/orderman/gateways/GLBXiLink3ExecutionGatewayState.h rename to src/lib_spark/spark/orderman/gateways/GLBXiLink3ExecutionGatewayState.h index 06a79db83..7d237a49c 100644 --- a/src/lib/orderman/gateways/GLBXiLink3ExecutionGatewayState.h +++ b/src/lib_spark/spark/orderman/gateways/GLBXiLink3ExecutionGatewayState.h @@ -1,8 +1,8 @@ #pragma once #ifdef SPARK_ENABLE_CCAPI -#include "lib/core/EnumMacros.h" -#include "lib/core/FMT_IMPL.h" +#include "spark/core/EnumMacros.h" +#include "spark/core/FMT_IMPL.h" #include #include diff --git a/src/lib/orderman/gateways/GeneralExecutionGateway.cpp b/src/lib_spark/spark/orderman/gateways/GeneralExecutionGateway.cpp similarity index 93% rename from src/lib/orderman/gateways/GeneralExecutionGateway.cpp rename to src/lib_spark/spark/orderman/gateways/GeneralExecutionGateway.cpp index f7c298cb6..1dda9a54f 100644 --- a/src/lib/orderman/gateways/GeneralExecutionGateway.cpp +++ b/src/lib_spark/spark/orderman/gateways/GeneralExecutionGateway.cpp @@ -1,9 +1,10 @@ #include "GeneralExecutionGateway.h" -#include "lib/domain_model/Security.pb.h" -#include "lib/logging/logging.h" -#include "lib/orderman/CreateOrderMsg.h" -#include "lib/orderman/OrderMsg.h" -#include "lib/orderman/gateways/IExecutionGateway.h" +#include "spark/domain_model/Security.pb.h" +#include "spark/logging/logging.h" +#include "spark/orderman/CreateOrderMsg.h" +#include "spark/orderman/OrderMsg.h" +#include "spark/orderman/gateways/IExecutionGateway.h" + #include #include @@ -85,4 +86,4 @@ OnExchangeOpenOrdersState &GeneralExecutionGateway::on_exchange_open_orders() { static OnExchangeOpenOrdersState default_exchange_open_orders; return default_exchange_open_orders; } -} //namespace bts::orderman \ No newline at end of file +} //namespace bts::orderman diff --git a/src/lib/orderman/gateways/GeneralExecutionGateway.h b/src/lib_spark/spark/orderman/gateways/GeneralExecutionGateway.h similarity index 88% rename from src/lib/orderman/gateways/GeneralExecutionGateway.h rename to src/lib_spark/spark/orderman/gateways/GeneralExecutionGateway.h index a07f22a06..968f685c8 100644 --- a/src/lib/orderman/gateways/GeneralExecutionGateway.h +++ b/src/lib_spark/spark/orderman/gateways/GeneralExecutionGateway.h @@ -1,6 +1,8 @@ #pragma once -#include "lib/orderman/gateways/IExecutionGateway.h" -#include "lib/orderman/gateways/IExecutionGenericAdapter.h" + +#include "spark/orderman/gateways/IExecutionGateway.h" +#include "spark/orderman/gateways/IExecutionGenericAdapter.h" + namespace bts { namespace orderman { class GeneralExecutionGateway : public IExecutionGateway { @@ -26,4 +28,4 @@ private: }; } //namespace bts -} //namespace orderman \ No newline at end of file +} //namespace orderman diff --git a/src/lib/orderman/gateways/ICEExecutionGateway.cpp b/src/lib_spark/spark/orderman/gateways/ICEExecutionGateway.cpp similarity index 95% rename from src/lib/orderman/gateways/ICEExecutionGateway.cpp rename to src/lib_spark/spark/orderman/gateways/ICEExecutionGateway.cpp index 3f964b0ac..673f51567 100644 --- a/src/lib/orderman/gateways/ICEExecutionGateway.cpp +++ b/src/lib_spark/spark/orderman/gateways/ICEExecutionGateway.cpp @@ -1,21 +1,21 @@ #include "ICEExecutionGateway.h" -#include "lib/api/services/AdminService.pb.h" -#include "lib/jetfix/codec/MessageDefinitions.h" -#include "lib/jetfix/codec/i32_toa.h" -#include "lib/jetfix/common/OutFIX.h" -#include "lib/jetfix/gateway/JetFIXGateway.h" -#include "lib/logging/logging.h" -#include "lib/orderman/events/CancelRejectEvent.h" -#include "lib/orderman/events/GatewayStatusChangeEvent.h" -#include "lib/orderman/events/NewAdminDataEvent.h" -#include "lib/orderman/events/NewExecutionReportEvent.h" -#include "lib/orderman/events/NewSecuritiesEvent.h" -#include "lib/orderman/orderman_utils/fix_order_codec.h" -#include "lib/tracing/bts_trace.h" -#include "lib/utils/Dispatcher.h" -#include "lib/utils/TimeStamp.h" -#include "lib/utils/bts_chrono.h" -#include "lib/utils/helper_macros.h" +#include "spark/api/services/AdminService.pb.h" +#include "spark/jetfix/codec/MessageDefinitions.h" +#include "spark/jetfix/codec/i32_toa.h" +#include "spark/jetfix/common/OutFIX.h" +#include "spark/jetfix/gateway/JetFIXGateway.h" +#include "spark/logging/logging.h" +#include "spark/orderman/events/CancelRejectEvent.h" +#include "spark/orderman/events/GatewayStatusChangeEvent.h" +#include "spark/orderman/events/NewAdminDataEvent.h" +#include "spark/orderman/events/NewExecutionReportEvent.h" +#include "spark/orderman/events/NewSecuritiesEvent.h" +#include "spark/orderman/orderman_utils/fix_order_codec.h" +#include "spark/tracing/bts_trace.h" +#include "spark/utils/Dispatcher.h" +#include "spark/utils/TimeStamp.h" +#include "spark/utils/bts_chrono.h" +#include "spark/utils/helper_macros.h" #include #include diff --git a/src/lib/orderman/gateways/ICEExecutionGateway.h b/src/lib_spark/spark/orderman/gateways/ICEExecutionGateway.h similarity index 100% rename from src/lib/orderman/gateways/ICEExecutionGateway.h rename to src/lib_spark/spark/orderman/gateways/ICEExecutionGateway.h diff --git a/src/server/sparkd/md/platforms/emumba/IEMOrderMuxer.h b/src/lib_spark/spark/orderman/gateways/IEMOrderMuxer.h similarity index 98% rename from src/server/sparkd/md/platforms/emumba/IEMOrderMuxer.h rename to src/lib_spark/spark/orderman/gateways/IEMOrderMuxer.h index fb5b2e9ec..4c0e9f272 100644 --- a/src/server/sparkd/md/platforms/emumba/IEMOrderMuxer.h +++ b/src/lib_spark/spark/orderman/gateways/IEMOrderMuxer.h @@ -1,10 +1,9 @@ #pragma once -#include "lib/domain_model/Security.pb.h" -#include "lib/logging/logging.h" -#include "lib/md/GeneralSecurityIndex.h" -#include "lib/md/common.h" -#include "lib/orderman/RFQMsg.h" -#include "lib/os/os.h" +#include "spark/domain_model/Security.pb.h" +#include "spark/logging/logging.h" +#include "spark/md/common.h" +#include "spark/orderman/RFQMsg.h" +#include "spark/os/os.h" #include #include #include diff --git a/src/lib/orderman/gateways/IExecutionGateway.cpp b/src/lib_spark/spark/orderman/gateways/IExecutionGateway.cpp similarity index 100% rename from src/lib/orderman/gateways/IExecutionGateway.cpp rename to src/lib_spark/spark/orderman/gateways/IExecutionGateway.cpp diff --git a/src/lib/orderman/gateways/IExecutionGateway.h b/src/lib_spark/spark/orderman/gateways/IExecutionGateway.h similarity index 78% rename from src/lib/orderman/gateways/IExecutionGateway.h rename to src/lib_spark/spark/orderman/gateways/IExecutionGateway.h index 1cbcdd4ad..e2a4637e3 100644 --- a/src/lib/orderman/gateways/IExecutionGateway.h +++ b/src/lib_spark/spark/orderman/gateways/IExecutionGateway.h @@ -1,15 +1,15 @@ #pragma once -#include "lib/config/protos/jetfix.pb.h" -#include "lib/jetfix/codec/MessageDefinitions.h" -#include "lib/jetfix/common/OutFIXPtr.h" -#include "lib/md/SecurityOracle.h" -#include "lib/mercury/events/Update.h" -#include "lib/orderman/OrderMsg.h" -#include "lib/orderman/orderman_utils/ExchangeOpenOrders.h" -#include "lib/orderman/orderman_utils/ExchangePosition.h" -#include "lib/orderman/orderman_utils/orderman_common.h" -#include "lib/utils/bts_no_copy.h" +#include "spark/config/protos/jetfix.pb.h" +#include "spark/jetfix/codec/MessageDefinitions.h" +#include "spark/jetfix/common/OutFIXPtr.h" +#include "spark/md/SecurityOracle.h" +#include "spark/mercury/events/Update.h" +#include "spark/orderman/OrderMsg.h" +#include "spark/orderman/orderman_utils/ExchangeOpenOrders.h" +#include "spark/orderman/orderman_utils/ExchangePosition.h" +#include "spark/orderman/orderman_utils/orderman_common.h" +#include "spark/utils/bts_no_copy.h" #include #include diff --git a/src/lib/orderman/gateways/IExecutionGenericAdapter.cpp b/src/lib_spark/spark/orderman/gateways/IExecutionGenericAdapter.cpp similarity index 100% rename from src/lib/orderman/gateways/IExecutionGenericAdapter.cpp rename to src/lib_spark/spark/orderman/gateways/IExecutionGenericAdapter.cpp diff --git a/src/lib/orderman/gateways/IExecutionGenericAdapter.h b/src/lib_spark/spark/orderman/gateways/IExecutionGenericAdapter.h similarity index 86% rename from src/lib/orderman/gateways/IExecutionGenericAdapter.h rename to src/lib_spark/spark/orderman/gateways/IExecutionGenericAdapter.h index 681e1dc5e..fa4e48231 100644 --- a/src/lib/orderman/gateways/IExecutionGenericAdapter.h +++ b/src/lib_spark/spark/orderman/gateways/IExecutionGenericAdapter.h @@ -1,9 +1,9 @@ #pragma once -#include "lib/orderman/CancelOrderMsg.h" -#include "lib/orderman/CancelReplaceOrderMsg.h" -#include "lib/orderman/CreateOrderMsg.h" -#include "lib/tracing/PerfLog.h" +#include "spark/orderman/CancelOrderMsg.h" +#include "spark/orderman/CancelReplaceOrderMsg.h" +#include "spark/orderman/CreateOrderMsg.h" +#include "spark/tracing/PerfLog.h" #include @@ -11,8 +11,6 @@ namespace bts::orderman { -struct OrderModification {}; - struct OrderCancellation {}; class NewSecuritiesEvent; diff --git a/src/lib/orderman/gateways/OkxExecutionGateway.cpp b/src/lib_spark/spark/orderman/gateways/OkxExecutionGateway.cpp similarity index 97% rename from src/lib/orderman/gateways/OkxExecutionGateway.cpp rename to src/lib_spark/spark/orderman/gateways/OkxExecutionGateway.cpp index c9cb1f081..c0954a139 100644 --- a/src/lib/orderman/gateways/OkxExecutionGateway.cpp +++ b/src/lib_spark/spark/orderman/gateways/OkxExecutionGateway.cpp @@ -1,28 +1,28 @@ #include "OkxExecutionGateway.h" -#include "lib/api/service_helpers/AdminServiceUtils.h" -#include "lib/api/services/OrderService.pb.h" -#include "lib/config/protos/okx_exe_cfg.pb.h" -#include "lib/domain_model/Security.pb.h" -#include "lib/domain_model/common.h" -#include "lib/io/http/http_client.h" -#include "lib/io/http/http_response.h" -#include "lib/io/websocket/websocket_client.h" -#include "lib/io/websocket/websocket_client_config.h" -#include "lib/logging/logging.h" -#include "lib/md/SecurityOracle.h" -#include "lib/orderman/CancelOrderMsg.h" -#include "lib/orderman/CancelReplaceOrderMsg.h" -#include "lib/orderman/CreateOrderMsg.h" -#include "lib/orderman/events/NewAdminDataEvent.h" -#include "lib/orderman/gateways/IExecutionGateway.h" -#include "lib/orderman/orderman_utils/ExchangePosition.h" -#include "lib/orderman/orderman_utils/ExecutionReport.h" -#include "lib/orderman/orderman_utils/OkxUtils.h" -#include "lib/orderman/orderman_utils/orderman_common.h" -#include "lib/utils/Uuid.h" -#include "lib/utils/bts_assert.h" -#include "lib/utils/string_utils.h" -#include "lib/utils/thread_manager.h" +#include "spark/api/service_helpers/AdminServiceUtils.h" +#include "spark/api/services/OrderService.pb.h" +#include "spark/config/protos/okx_exe_cfg.pb.h" +#include "spark/domain_model/Security.pb.h" +#include "spark/domain_model/common.h" +#include "spark/io/http/http_client.h" +#include "spark/io/http/http_response.h" +#include "spark/io/websocket/websocket_client.h" +#include "spark/io/websocket/websocket_client_config.h" +#include "spark/logging/logging.h" +#include "spark/md/SecurityOracle.h" +#include "spark/orderman/CancelOrderMsg.h" +#include "spark/orderman/CancelReplaceOrderMsg.h" +#include "spark/orderman/CreateOrderMsg.h" +#include "spark/orderman/events/NewAdminDataEvent.h" +#include "spark/orderman/gateways/IExecutionGateway.h" +#include "spark/orderman/orderman_utils/ExchangePosition.h" +#include "spark/orderman/orderman_utils/ExecutionReport.h" +#include "spark/orderman/orderman_utils/OkxUtils.h" +#include "spark/orderman/orderman_utils/orderman_common.h" +#include "spark/utils/Uuid.h" +#include "spark/utils/bts_assert.h" +#include "spark/utils/string_utils.h" +#include "spark/utils/thread_manager.h" #include #include diff --git a/src/lib/orderman/gateways/OkxExecutionGateway.h b/src/lib_spark/spark/orderman/gateways/OkxExecutionGateway.h similarity index 88% rename from src/lib/orderman/gateways/OkxExecutionGateway.h rename to src/lib_spark/spark/orderman/gateways/OkxExecutionGateway.h index 26e1bb97d..05501b732 100644 --- a/src/lib/orderman/gateways/OkxExecutionGateway.h +++ b/src/lib_spark/spark/orderman/gateways/OkxExecutionGateway.h @@ -1,8 +1,9 @@ #pragma once -#include "lib/logging/logging.h" -#include "lib/md/SecurityOracle.h" -#include "lib/orderman/gateways/IExecutionGateway.h" +#include "spark/logging/logging.h" +#include "spark/md/SecurityOracle.h" +#include "spark/orderman/gateways/IExecutionGateway.h" + namespace bts::orderman { class OkxExecutionGateway : public IExecutionGateway { @@ -34,4 +35,4 @@ class OkxExecutionGateway : public IExecutionGateway { void modify_order(const CancelReplaceOrderMsg &); }; -} // namespace bts::orderman \ No newline at end of file +} // namespace bts::orderman diff --git a/src/lib/orderman/gateways/OnixFIXAdapter.cpp b/src/lib_spark/spark/orderman/gateways/OnixFIXAdapter.cpp similarity index 96% rename from src/lib/orderman/gateways/OnixFIXAdapter.cpp rename to src/lib_spark/spark/orderman/gateways/OnixFIXAdapter.cpp index e197ff987..39915b9c1 100644 --- a/src/lib/orderman/gateways/OnixFIXAdapter.cpp +++ b/src/lib_spark/spark/orderman/gateways/OnixFIXAdapter.cpp @@ -1,16 +1,17 @@ #include "OnixFIXAdapter.h" -#include "OnixS/FIXEngine/FIX/Engine.h" -#include "lib/config/protos/marex_fix_cfg.pb.h" -#include "lib/domain_model/Security.pb.h" -#include "lib/logging/logging.h" -#include "lib/orderman/CancelOrderMsg.h" -#include "lib/orderman/CancelReplaceOrderMsg.h" -#include "lib/orderman/CreateOrderMsg.h" -#include "lib/orderman/gateways/OnixFIXListener.h" -#include "lib/orderman/gateways/TrafixOrderStateHandler.h" -#include "lib/orderman/orderman_utils/orderman_common.h" -#include "lib/utils/bts_assert.h" -#include "lib/utils/helper_macros.h" +#include "spark/config/protos/marex_fix_cfg.pb.h" +#include "spark/domain_model/Security.pb.h" +#include "spark/logging/logging.h" +#include "spark/orderman/CancelOrderMsg.h" +#include "spark/orderman/CancelReplaceOrderMsg.h" +#include "spark/orderman/CreateOrderMsg.h" +#include "spark/orderman/gateways/OnixFIXListener.h" +#include "spark/orderman/gateways/TrafixOrderStateHandler.h" +#include "spark/orderman/orderman_utils/orderman_common.h" +#include "spark/utils/bts_assert.h" +#include "spark/utils/helper_macros.h" + +#include #include #include #include @@ -387,4 +388,4 @@ void OnixFIXAdapter::cancel_order(const CancelOrderMsg &msg) { handleException("Cacnel order", err); } } -} // namespace bts::orderman \ No newline at end of file +} // namespace bts::orderman diff --git a/src/lib/orderman/gateways/OnixFIXAdapter.h b/src/lib_spark/spark/orderman/gateways/OnixFIXAdapter.h similarity index 77% rename from src/lib/orderman/gateways/OnixFIXAdapter.h rename to src/lib_spark/spark/orderman/gateways/OnixFIXAdapter.h index b8e42c4c9..00fe58ee2 100644 --- a/src/lib/orderman/gateways/OnixFIXAdapter.h +++ b/src/lib_spark/spark/orderman/gateways/OnixFIXAdapter.h @@ -1,8 +1,9 @@ #pragma once -#include "IExecutionGenericAdapter.h" -#include "lib/orderman/gateways/OnixFIXListener.h" -#include "lib/orderman/gateways/TrafixOrderStateHandler.h" +#include "spark/orderman/gateways/IExecutionGenericAdapter.h" +#include "spark/orderman/gateways/OnixFIXListener.h" +#include "spark/orderman/gateways/TrafixOrderStateHandler.h" + #include namespace bts::orderman { @@ -25,4 +26,4 @@ class OnixFIXAdapter : public IExecutionGenericAdapter { std::unique_ptr session; }; -} // namespace bts::orderman \ No newline at end of file +} // namespace bts::orderman diff --git a/src/lib/orderman/gateways/OnixFIXListener.cpp b/src/lib_spark/spark/orderman/gateways/OnixFIXListener.cpp similarity index 95% rename from src/lib/orderman/gateways/OnixFIXListener.cpp rename to src/lib_spark/spark/orderman/gateways/OnixFIXListener.cpp index 0bda07c98..6641eb6bd 100644 --- a/src/lib/orderman/gateways/OnixFIXListener.cpp +++ b/src/lib_spark/spark/orderman/gateways/OnixFIXListener.cpp @@ -1,15 +1,15 @@ #include "OnixFIXListener.h" +#include "spark/api/services/OrderService.pb.h" +#include "spark/domain_model/Security.pb.h" +#include "spark/domain_model/common.h" +#include "spark/logging/logging.h" +#include "spark/orderman/gateways/IExecutionGateway.h" +#include "spark/orderman/gateways/IExecutionGenericAdapter.h" +#include "spark/orderman/orderman_utils/ExecutionReport.h" +#include "spark/orderman/orderman_utils/orderman_common.h" +#include "spark/utils/Uuid.h" +#include "spark/utils/bts_assert.h" -#include "lib/api/services/OrderService.pb.h" -#include "lib/domain_model/Security.pb.h" -#include "lib/domain_model/common.h" -#include "lib/logging/logging.h" -#include "lib/orderman/gateways/IExecutionGateway.h" -#include "lib/orderman/gateways/IExecutionGenericAdapter.h" -#include "lib/orderman/orderman_utils/ExecutionReport.h" -#include "lib/orderman/orderman_utils/orderman_common.h" -#include "lib/utils/Uuid.h" -#include "lib/utils/bts_assert.h" #include #include #include diff --git a/src/lib/orderman/gateways/OnixFIXListener.h b/src/lib_spark/spark/orderman/gateways/OnixFIXListener.h similarity index 90% rename from src/lib/orderman/gateways/OnixFIXListener.h rename to src/lib_spark/spark/orderman/gateways/OnixFIXListener.h index 7520b9f7d..c49711b1a 100644 --- a/src/lib/orderman/gateways/OnixFIXListener.h +++ b/src/lib_spark/spark/orderman/gateways/OnixFIXListener.h @@ -1,9 +1,10 @@ #pragma once -#include "lib/orderman/CreateOrderMsg.h" -#include "lib/orderman/gateways/IExecutionGateway.h" -#include "lib/orderman/gateways/TrafixOrderStateHandler.h" -#include "lib/orderman/orderman_utils/ExecutionReport.h" +#include "spark/orderman/CreateOrderMsg.h" +#include "spark/orderman/gateways/IExecutionGateway.h" +#include "spark/orderman/gateways/TrafixOrderStateHandler.h" +#include "spark/orderman/orderman_utils/ExecutionReport.h" + #include #include #include diff --git a/src/lib/orderman/gateways/TrafixOrderStateHandler.cpp b/src/lib_spark/spark/orderman/gateways/TrafixOrderStateHandler.cpp similarity index 94% rename from src/lib/orderman/gateways/TrafixOrderStateHandler.cpp rename to src/lib_spark/spark/orderman/gateways/TrafixOrderStateHandler.cpp index 0bb702e38..235a20d73 100644 --- a/src/lib/orderman/gateways/TrafixOrderStateHandler.cpp +++ b/src/lib_spark/spark/orderman/gateways/TrafixOrderStateHandler.cpp @@ -1,8 +1,9 @@ #include "TrafixOrderStateHandler.h" -#include "lib/logging/logging.h" -#include "lib/orderman/CreateOrderMsg.h" -#include "lib/orderman/order_factory/IOrderFactory.h" -#include "lib/orderman/orderman_utils/orderman_common.h" +#include "spark/logging/logging.h" +#include "spark/orderman/CreateOrderMsg.h" +#include "spark/orderman/order_factory/IOrderFactory.h" +#include "spark/orderman/orderman_utils/orderman_common.h" + #include #include #include diff --git a/src/lib/orderman/gateways/TrafixOrderStateHandler.h b/src/lib_spark/spark/orderman/gateways/TrafixOrderStateHandler.h similarity index 84% rename from src/lib/orderman/gateways/TrafixOrderStateHandler.h rename to src/lib_spark/spark/orderman/gateways/TrafixOrderStateHandler.h index 76958d54d..2ae3cfc33 100644 --- a/src/lib/orderman/gateways/TrafixOrderStateHandler.h +++ b/src/lib_spark/spark/orderman/gateways/TrafixOrderStateHandler.h @@ -1,11 +1,12 @@ #pragma once -#include "IExecutionGenericAdapter.h" -#include "lib/orderman/CancelOrderMsg.h" -#include "lib/orderman/CreateOrderMsg.h" -#include "lib/orderman/gateways/OnixFIXListener.h" -#include "lib/orderman/order_factory/IOrderFactory.h" -#include "lib/orderman/orderman_utils/orderman_common.h" -#include "lib/utils/bts_assert.h" +#include "spark/orderman/CancelOrderMsg.h" +#include "spark/orderman/CreateOrderMsg.h" +#include "spark/orderman/gateways/IExecutionGenericAdapter.h" +#include "spark/orderman/gateways/OnixFIXListener.h" +#include "spark/orderman/order_factory/IOrderFactory.h" +#include "spark/orderman/orderman_utils/orderman_common.h" +#include "spark/utils/bts_assert.h" + #include #include #include @@ -58,4 +59,4 @@ private: std::unique_ptr pimpl_; }; -} \ No newline at end of file +} diff --git a/src/lib/orderman/gateways/i_execution_gateway_provider.cpp b/src/lib_spark/spark/orderman/gateways/i_execution_gateway_provider.cpp similarity index 100% rename from src/lib/orderman/gateways/i_execution_gateway_provider.cpp rename to src/lib_spark/spark/orderman/gateways/i_execution_gateway_provider.cpp diff --git a/src/lib/orderman/gateways/i_execution_gateway_provider.h b/src/lib_spark/spark/orderman/gateways/i_execution_gateway_provider.h similarity index 79% rename from src/lib/orderman/gateways/i_execution_gateway_provider.h rename to src/lib_spark/spark/orderman/gateways/i_execution_gateway_provider.h index afc94d09e..1b0d18fc2 100644 --- a/src/lib/orderman/gateways/i_execution_gateway_provider.h +++ b/src/lib_spark/spark/orderman/gateways/i_execution_gateway_provider.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/orderman/actors/order_manager/order_gateway_definition.h" +#include "spark/orderman/actors/order_manager/order_gateway_definition.h" #include diff --git a/src/lib/orderman/gateways/sim/SimExecutionGateway.cpp b/src/lib_spark/spark/orderman/gateways/sim/SimExecutionGateway.cpp similarity index 95% rename from src/lib/orderman/gateways/sim/SimExecutionGateway.cpp rename to src/lib_spark/spark/orderman/gateways/sim/SimExecutionGateway.cpp index 32dd7bbc5..4f58a086a 100644 --- a/src/lib/orderman/gateways/sim/SimExecutionGateway.cpp +++ b/src/lib_spark/spark/orderman/gateways/sim/SimExecutionGateway.cpp @@ -1,38 +1,38 @@ #include "SimExecutionGateway.h" -#include "lib/api/services/AdminService.pb.h" -#include "lib/api/services/ApiUnitTestService.pb.h" -#include "lib/api/services/OrderService.pb.h" -#include "lib/core/TimeStamp.h" -#include "lib/domain_model/Security.h" -#include "lib/domain_model/Security.pb.h" -#include "lib/domain_model/SecurityKey.h" -#include "lib/domain_model/common.h" -#include "lib/logging/logging.h" -#include "lib/md/GeneralSecurityIndex.h" -#include "lib/md/IntPrice.h" -#include "lib/md/MDClient.h" -#include "lib/md/MDProducer.h" -#include "lib/md/PriceSize.h" -#include "lib/md/Shm/MDStructure.h" -#include "lib/orderman/CancelOrderMsg.h" -#include "lib/orderman/CreateOrderMsg.h" -#include "lib/orderman/OrderMsg.h" -#include "lib/orderman/events/NewAdminDataEvent.h" -#include "lib/orderman/events/NewSecuritiesEvent.h" -#include "lib/orderman/gateways/IExecutionGateway.h" -#include "lib/orderman/orderman_utils/Book.h" -#include "lib/orderman/orderman_utils/ExecutionReport.h" -#include "lib/orderman/orderman_utils/orderman_common.h" -#include "lib/orderman/orders/spreader_orders/spreader/SpreaderUtils.h" -#include "lib/os/os.h" -#include "lib/tracing/bts_trace.h" -#include "lib/utils/Puid.h" -#include "lib/utils/TimeStamp.h" -#include "lib/utils/Uuid.h" -#include "lib/utils/bts_assert.h" -#include "lib/utils/bts_chrono.h" -#include "lib/utils/helper_macros.h" -#include "lib/utils/thread_manager.h" +#include "spark/api/services/AdminService.pb.h" +#include "spark/api/services/ApiUnitTestService.pb.h" +#include "spark/api/services/OrderService.pb.h" +#include "spark/core/TimeStamp.h" +#include "spark/domain_model/Security.h" +#include "spark/domain_model/Security.pb.h" +#include "spark/domain_model/SecurityKey.h" +#include "spark/domain_model/common.h" +#include "spark/logging/logging.h" +#include "spark/md/GeneralSecurityIndex.h" +#include "spark/md/IntPrice.h" +#include "spark/md/MDClient.h" +#include "spark/md/MDProducer.h" +#include "spark/md/PriceSize.h" +#include "spark/md/Shm/MDStructure.h" +#include "spark/orderman/CancelOrderMsg.h" +#include "spark/orderman/CreateOrderMsg.h" +#include "spark/orderman/OrderMsg.h" +#include "spark/orderman/events/NewAdminDataEvent.h" +#include "spark/orderman/events/NewSecuritiesEvent.h" +#include "spark/orderman/gateways/IExecutionGateway.h" +#include "spark/orderman/orderman_utils/Book.h" +#include "spark/orderman/orderman_utils/ExecutionReport.h" +#include "spark/orderman/orderman_utils/orderman_common.h" +#include "spark/orderman/orders/spreader_orders/spreader/SpreaderUtils.h" +#include "spark/os/os.h" +#include "spark/tracing/bts_trace.h" +#include "spark/utils/Puid.h" +#include "spark/utils/TimeStamp.h" +#include "spark/utils/Uuid.h" +#include "spark/utils/bts_assert.h" +#include "spark/utils/bts_chrono.h" +#include "spark/utils/helper_macros.h" +#include "spark/utils/thread_manager.h" #include #include diff --git a/src/lib/orderman/gateways/sim/SimExecutionGateway.h b/src/lib_spark/spark/orderman/gateways/sim/SimExecutionGateway.h similarity index 80% rename from src/lib/orderman/gateways/sim/SimExecutionGateway.h rename to src/lib_spark/spark/orderman/gateways/sim/SimExecutionGateway.h index 9c372c6d4..4b3ca44ea 100644 --- a/src/lib/orderman/gateways/sim/SimExecutionGateway.h +++ b/src/lib_spark/spark/orderman/gateways/sim/SimExecutionGateway.h @@ -1,19 +1,19 @@ #pragma once -#include "lib/domain_model/Security.pb.h" -#include "lib/domain_model/SecurityKey.h" -#include "lib/domain_model/common.h" -#include "lib/md/GeneralSecurityIndex.h" -#include "lib/md/MDClient.h" -#include "lib/md/MDProducer.h" -#include "lib/md/Shm/FixedSecurity.h" -#include "lib/md/protos/co2.pb.h" -#include "lib/orderman/CancelOrderMsg.h" -#include "lib/orderman/CancelReplaceOrderMsg.h" -#include "lib/orderman/CreateOrderMsg.h" -#include "lib/orderman/OrderMsg.h" -#include "lib/orderman/gateways/IExecutionGateway.h" -#include "lib/orderman/orderman_utils/orderman_common.h" +#include "spark/domain_model/Security.pb.h" +#include "spark/domain_model/SecurityKey.h" +#include "spark/domain_model/common.h" +#include "spark/md/GeneralSecurityIndex.h" +#include "spark/md/MDClient.h" +#include "spark/md/MDProducer.h" +#include "spark/md/Shm/FixedSecurity.h" +#include "spark/md/protos/co2.pb.h" +#include "spark/orderman/CancelOrderMsg.h" +#include "spark/orderman/CancelReplaceOrderMsg.h" +#include "spark/orderman/CreateOrderMsg.h" +#include "spark/orderman/OrderMsg.h" +#include "spark/orderman/gateways/IExecutionGateway.h" +#include "spark/orderman/orderman_utils/orderman_common.h" #include namespace bts::md { diff --git a/src/lib/orderman/gateways/sim/SimExecutionGatewayFactory.cpp b/src/lib_spark/spark/orderman/gateways/sim/SimExecutionGatewayFactory.cpp similarity index 91% rename from src/lib/orderman/gateways/sim/SimExecutionGatewayFactory.cpp rename to src/lib_spark/spark/orderman/gateways/sim/SimExecutionGatewayFactory.cpp index 1439393f4..ebe633569 100644 --- a/src/lib/orderman/gateways/sim/SimExecutionGatewayFactory.cpp +++ b/src/lib_spark/spark/orderman/gateways/sim/SimExecutionGatewayFactory.cpp @@ -1,9 +1,9 @@ #include "SimExecutionGatewayFactory.h" -#include "SimExecutionGateway.h" -#include "lib/domain_model/Security.pb.h" -#include "lib/logging/logging.h" -#include "lib/utils/LockBox.h" -#include "lib/utils/bts_assert.h" +#include "spark/domain_model/Security.pb.h" +#include "spark/logging/logging.h" +#include "spark/orderman/gateways/sim/SimExecutionGateway.h" +#include "spark/utils/LockBox.h" +#include "spark/utils/bts_assert.h" #include #include diff --git a/src/lib/orderman/gateways/sim/SimExecutionGatewayFactory.h b/src/lib_spark/spark/orderman/gateways/sim/SimExecutionGatewayFactory.h similarity index 86% rename from src/lib/orderman/gateways/sim/SimExecutionGatewayFactory.h rename to src/lib_spark/spark/orderman/gateways/sim/SimExecutionGatewayFactory.h index 8fd6e00ec..dd3cb62aa 100644 --- a/src/lib/orderman/gateways/sim/SimExecutionGatewayFactory.h +++ b/src/lib_spark/spark/orderman/gateways/sim/SimExecutionGatewayFactory.h @@ -1,8 +1,8 @@ #pragma once -#include "lib/domain_model/Security.pb.h" -#include "lib/orderman/gateways/IExecutionGateway.h" -#include "lib/utils/LockBox.h" +#include "spark/domain_model/Security.pb.h" +#include "spark/orderman/gateways/IExecutionGateway.h" +#include "spark/utils/LockBox.h" #include #include diff --git a/src/lib/orderman/gateways/sim/SimExecutionGatewayUniqueWrapper.cpp b/src/lib_spark/spark/orderman/gateways/sim/SimExecutionGatewayUniqueWrapper.cpp similarity index 97% rename from src/lib/orderman/gateways/sim/SimExecutionGatewayUniqueWrapper.cpp rename to src/lib_spark/spark/orderman/gateways/sim/SimExecutionGatewayUniqueWrapper.cpp index 2b4b2d396..4ec310e5e 100644 --- a/src/lib/orderman/gateways/sim/SimExecutionGatewayUniqueWrapper.cpp +++ b/src/lib_spark/spark/orderman/gateways/sim/SimExecutionGatewayUniqueWrapper.cpp @@ -1,8 +1,8 @@ #include "SimExecutionGatewayUniqueWrapper.h" #include "SimExecutionGateway.h" #include "SimExecutionGatewayFactory.h" -#include "lib/domain_model/Security.pb.h" -#include "lib/logging/logging.h" +#include "spark/domain_model/Security.pb.h" +#include "spark/logging/logging.h" #include #include #include diff --git a/src/lib/orderman/gateways/sim/SimExecutionGatewayUniqueWrapper.h b/src/lib_spark/spark/orderman/gateways/sim/SimExecutionGatewayUniqueWrapper.h similarity index 92% rename from src/lib/orderman/gateways/sim/SimExecutionGatewayUniqueWrapper.h rename to src/lib_spark/spark/orderman/gateways/sim/SimExecutionGatewayUniqueWrapper.h index 6418265eb..8c049c8c3 100644 --- a/src/lib/orderman/gateways/sim/SimExecutionGatewayUniqueWrapper.h +++ b/src/lib_spark/spark/orderman/gateways/sim/SimExecutionGatewayUniqueWrapper.h @@ -1,7 +1,7 @@ #pragma once -#include "lib/domain_model/Security.pb.h" -#include "lib/orderman/gateways/IExecutionGateway.h" +#include "spark/domain_model/Security.pb.h" +#include "spark/orderman/gateways/IExecutionGateway.h" namespace bts::orderman { diff --git a/src/lib/orderman/ilink3/IL3Connection.h b/src/lib_spark/spark/orderman/ilink3/IL3Connection.h similarity index 94% rename from src/lib/orderman/ilink3/IL3Connection.h rename to src/lib_spark/spark/orderman/ilink3/IL3Connection.h index 28ddefad6..df96fadd3 100644 --- a/src/lib/orderman/ilink3/IL3Connection.h +++ b/src/lib_spark/spark/orderman/ilink3/IL3Connection.h @@ -1,6 +1,6 @@ #pragma once #include "IL3ConnectionHandler.h" -#include "lib/tracing/PerfLog.h" +#include "spark/tracing/PerfLog.h" #include #include diff --git a/src/lib/orderman/ilink3/IL3ConnectionHandler.cpp b/src/lib_spark/spark/orderman/ilink3/IL3ConnectionHandler.cpp similarity index 100% rename from src/lib/orderman/ilink3/IL3ConnectionHandler.cpp rename to src/lib_spark/spark/orderman/ilink3/IL3ConnectionHandler.cpp diff --git a/src/lib/orderman/ilink3/IL3ConnectionHandler.h b/src/lib_spark/spark/orderman/ilink3/IL3ConnectionHandler.h similarity index 100% rename from src/lib/orderman/ilink3/IL3ConnectionHandler.h rename to src/lib_spark/spark/orderman/ilink3/IL3ConnectionHandler.h diff --git a/src/lib/orderman/ilink3/IL3Dispatcher.h b/src/lib_spark/spark/orderman/ilink3/IL3Dispatcher.h similarity index 100% rename from src/lib/orderman/ilink3/IL3Dispatcher.h rename to src/lib_spark/spark/orderman/ilink3/IL3Dispatcher.h diff --git a/src/lib/orderman/ilink3/IL3GW.cpp b/src/lib_spark/spark/orderman/ilink3/IL3GW.cpp similarity index 98% rename from src/lib/orderman/ilink3/IL3GW.cpp rename to src/lib_spark/spark/orderman/ilink3/IL3GW.cpp index 4e35c8bcf..997ca53c8 100644 --- a/src/lib/orderman/ilink3/IL3GW.cpp +++ b/src/lib_spark/spark/orderman/ilink3/IL3GW.cpp @@ -3,12 +3,12 @@ #include "IL3GeneratedFull.h" #include "IL3MessageFramer.h" #include "ILink3Utils.h" -#include "lib/logging/logging.h" -#include "lib/orderman/ilink3/generated/PartyDetailsDefinitionRequest518.h" -#include "lib/orderman/orderman_utils/fix_order_codec.h" -#include "lib/utils/SecureLogon.h" -#include "lib/utils/bts_assert.h" -#include "lib/utils/datetime.h" +#include "spark/logging/logging.h" +#include "spark/orderman/ilink3/generated/PartyDetailsDefinitionRequest518.h" +#include "spark/orderman/orderman_utils/fix_order_codec.h" +#include "spark/utils/SecureLogon.h" +#include "spark/utils/bts_assert.h" +#include "spark/utils/datetime.h" /* # Some notes about session binding and initialization: # diff --git a/src/lib/orderman/ilink3/IL3GW.h b/src/lib_spark/spark/orderman/ilink3/IL3GW.h similarity index 93% rename from src/lib/orderman/ilink3/IL3GW.h rename to src/lib_spark/spark/orderman/ilink3/IL3GW.h index 3534b46ae..3c3013975 100644 --- a/src/lib/orderman/ilink3/IL3GW.h +++ b/src/lib_spark/spark/orderman/ilink3/IL3GW.h @@ -1,17 +1,18 @@ #pragma once -#include "IL3Connection.h" -#include "IL3ConnectionHandler.h" -#include "IL3GeneratedFwd.h" -#include "IL3Parser.h" -#include "TimeKeeper.h" -#include "generated/MessageHeader.h" -#include "lib/config/protos/jetfix.pb.h" -#include "lib/orderman/ilink3/IL3State.h" -#include "lib/orderman/ilink3/RawMsg.h" -#include "lib/orderman/gateways/IExecutionGateway.h" -#include "lib/orderman/orderman_utils/CancelReject.h" -#include "lib/utils/auto_init_shared_ptr.h" -#include "lib/utils/object_pool.h" + +#include "spark/config/protos/jetfix.pb.h" +#include "spark/orderman/gateways/IExecutionGateway.h" +#include "spark/orderman/ilink3/IL3Connection.h" +#include "spark/orderman/ilink3/IL3ConnectionHandler.h" +#include "spark/orderman/ilink3/IL3GeneratedFwd.h" +#include "spark/orderman/ilink3/IL3Parser.h" +#include "spark/orderman/ilink3/IL3State.h" +#include "spark/orderman/ilink3/RawMsg.h" +#include "spark/orderman/ilink3/TimeKeeper.h" +#include "spark/orderman/ilink3/generated/MessageHeader.h" +#include "spark/orderman/orderman_utils/CancelReject.h" +#include "spark/utils/auto_init_shared_ptr.h" +#include "spark/utils/object_pool.h" #include #include diff --git a/src/lib/orderman/ilink3/IL3GeneratedFull.h b/src/lib_spark/spark/orderman/ilink3/IL3GeneratedFull.h similarity index 100% rename from src/lib/orderman/ilink3/IL3GeneratedFull.h rename to src/lib_spark/spark/orderman/ilink3/IL3GeneratedFull.h diff --git a/src/lib/orderman/ilink3/IL3GeneratedFwd.h b/src/lib_spark/spark/orderman/ilink3/IL3GeneratedFwd.h similarity index 100% rename from src/lib/orderman/ilink3/IL3GeneratedFwd.h rename to src/lib_spark/spark/orderman/ilink3/IL3GeneratedFwd.h diff --git a/src/lib/orderman/ilink3/IL3MessageFramer.h b/src/lib_spark/spark/orderman/ilink3/IL3MessageFramer.h similarity index 100% rename from src/lib/orderman/ilink3/IL3MessageFramer.h rename to src/lib_spark/spark/orderman/ilink3/IL3MessageFramer.h diff --git a/src/lib/orderman/ilink3/IL3Parser.cpp b/src/lib_spark/spark/orderman/ilink3/IL3Parser.cpp similarity index 97% rename from src/lib/orderman/ilink3/IL3Parser.cpp rename to src/lib_spark/spark/orderman/ilink3/IL3Parser.cpp index d435f0f05..c43863d8d 100644 --- a/src/lib/orderman/ilink3/IL3Parser.cpp +++ b/src/lib_spark/spark/orderman/ilink3/IL3Parser.cpp @@ -4,13 +4,13 @@ #include "IL3Dispatcher.h" #include "IL3GeneratedFull.h" #include "ILink3Utils.h" -#include "lib/domain_model/Security.h" -#include "lib/md/IntPrice.h" -#include "lib/orderman/ilink3/IL3SecDB.h" -#include "lib/orderman/orderman_utils/CancelReject.h" -#include "lib/orderman/orderman_utils/fix_order_codec.h" -#include "lib/orderman/orderman_utils/orderman_common.h" -#include "lib/os/os.h" +#include "spark/domain_model/Security.h" +#include "spark/md/IntPrice.h" +#include "spark/orderman/ilink3/IL3SecDB.h" +#include "spark/orderman/orderman_utils/CancelReject.h" +#include "spark/orderman/orderman_utils/fix_order_codec.h" +#include "spark/orderman/orderman_utils/orderman_common.h" +#include "spark/os/os.h" namespace bts { namespace orderman { diff --git a/src/lib/orderman/ilink3/IL3Parser.h b/src/lib_spark/spark/orderman/ilink3/IL3Parser.h similarity index 93% rename from src/lib/orderman/ilink3/IL3Parser.h rename to src/lib_spark/spark/orderman/ilink3/IL3Parser.h index 88b19abba..53bfef59a 100644 --- a/src/lib/orderman/ilink3/IL3Parser.h +++ b/src/lib_spark/spark/orderman/ilink3/IL3Parser.h @@ -1,9 +1,9 @@ #pragma once #include "IL3GeneratedFwd.h" -#include "lib/md/ExchangeSecurityKey.h" -#include "lib/md/SecurityOracle.h" -#include "lib/orderman/orderman_utils/ExecutionReport.h" +#include "spark/md/ExchangeSecurityKey.h" +#include "spark/md/SecurityOracle.h" +#include "spark/orderman/orderman_utils/ExecutionReport.h" #include #include #include diff --git a/src/lib/orderman/ilink3/IL3Reactor.cpp b/src/lib_spark/spark/orderman/ilink3/IL3Reactor.cpp similarity index 99% rename from src/lib/orderman/ilink3/IL3Reactor.cpp rename to src/lib_spark/spark/orderman/ilink3/IL3Reactor.cpp index 1f459df2d..dd36768a8 100644 --- a/src/lib/orderman/ilink3/IL3Reactor.cpp +++ b/src/lib_spark/spark/orderman/ilink3/IL3Reactor.cpp @@ -1,8 +1,8 @@ #include "IL3Reactor.h" #include "IL3ReceiveBuffer.h" -#include "lib/tracing/PerfLog.h" -#include "lib/utils/bts_assert.h" +#include "spark/tracing/PerfLog.h" +#include "spark/utils/bts_assert.h" #include #include diff --git a/src/lib/orderman/ilink3/IL3Reactor.h b/src/lib_spark/spark/orderman/ilink3/IL3Reactor.h similarity index 100% rename from src/lib/orderman/ilink3/IL3Reactor.h rename to src/lib_spark/spark/orderman/ilink3/IL3Reactor.h diff --git a/src/lib/orderman/ilink3/IL3ReceiveBuffer.h b/src/lib_spark/spark/orderman/ilink3/IL3ReceiveBuffer.h similarity index 98% rename from src/lib/orderman/ilink3/IL3ReceiveBuffer.h rename to src/lib_spark/spark/orderman/ilink3/IL3ReceiveBuffer.h index c496e1dcf..ff28369e7 100644 --- a/src/lib/orderman/ilink3/IL3ReceiveBuffer.h +++ b/src/lib_spark/spark/orderman/ilink3/IL3ReceiveBuffer.h @@ -1,5 +1,5 @@ #pragma once -#include "lib/utils/bts_assert.h" +#include "spark/utils/bts_assert.h" #include #include #include diff --git a/src/lib/orderman/ilink3/IL3SecDB.h b/src/lib_spark/spark/orderman/ilink3/IL3SecDB.h similarity index 86% rename from src/lib/orderman/ilink3/IL3SecDB.h rename to src/lib_spark/spark/orderman/ilink3/IL3SecDB.h index f58ac8b48..1f08bd146 100644 --- a/src/lib/orderman/ilink3/IL3SecDB.h +++ b/src/lib_spark/spark/orderman/ilink3/IL3SecDB.h @@ -1,9 +1,9 @@ #pragma once -#include "lib/domain_model/Security.pb.h" -#include "lib/domain_model/SecurityKey.h" -#include "lib/md/ExchangeSecurityKey.h" -#include "lib/md/SecurityOracle.h" +#include "spark/domain_model/Security.pb.h" +#include "spark/domain_model/SecurityKey.h" +#include "spark/md/ExchangeSecurityKey.h" +#include "spark/md/SecurityOracle.h" namespace bts { namespace orderman { diff --git a/src/lib/orderman/ilink3/IL3State.h b/src/lib_spark/spark/orderman/ilink3/IL3State.h similarity index 92% rename from src/lib/orderman/ilink3/IL3State.h rename to src/lib_spark/spark/orderman/ilink3/IL3State.h index fdb5c7524..680eb4172 100644 --- a/src/lib/orderman/ilink3/IL3State.h +++ b/src/lib_spark/spark/orderman/ilink3/IL3State.h @@ -1,8 +1,8 @@ #pragma once #ifdef SPARK_ENABLE_CCAPI -#include "lib/core/EnumMacros.h" -#include "lib/core/FMT_IMPL.h" +#include "spark/core/EnumMacros.h" +#include "spark/core/FMT_IMPL.h" #include #include diff --git a/src/lib/orderman/ilink3/ILink3Utils.cpp b/src/lib_spark/spark/orderman/ilink3/ILink3Utils.cpp similarity index 99% rename from src/lib/orderman/ilink3/ILink3Utils.cpp rename to src/lib_spark/spark/orderman/ilink3/ILink3Utils.cpp index cc7846fd3..51188aa1f 100644 --- a/src/lib/orderman/ilink3/ILink3Utils.cpp +++ b/src/lib_spark/spark/orderman/ilink3/ILink3Utils.cpp @@ -1,6 +1,6 @@ #include "ILink3Utils.h" -#include "lib/orderman/orderman_utils/fix_order_codec.h" -#include "lib/utils/base62.h" +#include "spark/orderman/orderman_utils/fix_order_codec.h" +#include "spark/utils/base62.h" namespace bts { namespace orderman { diff --git a/src/lib/orderman/ilink3/ILink3Utils.h b/src/lib_spark/spark/orderman/ilink3/ILink3Utils.h similarity index 87% rename from src/lib/orderman/ilink3/ILink3Utils.h rename to src/lib_spark/spark/orderman/ilink3/ILink3Utils.h index 6b5fd5cd2..dc1377958 100644 --- a/src/lib/orderman/ilink3/ILink3Utils.h +++ b/src/lib_spark/spark/orderman/ilink3/ILink3Utils.h @@ -1,9 +1,9 @@ #pragma once -#include "lib/api/services/OrderService.pb.h" -#include "lib/domain_model/Security.pb.h" -#include "lib/domain_model/common.h" -#include "lib/orderman/orderman_utils/orderman_common.h" +#include "spark/api/services/OrderService.pb.h" +#include "spark/domain_model/Security.pb.h" +#include "spark/domain_model/common.h" +#include "spark/orderman/orderman_utils/orderman_common.h" #include "generated/ClearingAcctType.h" #include "generated/CustOrderCapacity.h" diff --git a/src/lib/orderman/ilink3/RawMsg.h b/src/lib_spark/spark/orderman/ilink3/RawMsg.h similarity index 100% rename from src/lib/orderman/ilink3/RawMsg.h rename to src/lib_spark/spark/orderman/ilink3/RawMsg.h diff --git a/src/lib/orderman/ilink3/SessionStore.cpp b/src/lib_spark/spark/orderman/ilink3/SessionStore.cpp similarity index 93% rename from src/lib/orderman/ilink3/SessionStore.cpp rename to src/lib_spark/spark/orderman/ilink3/SessionStore.cpp index 455421837..0ff269b37 100644 --- a/src/lib/orderman/ilink3/SessionStore.cpp +++ b/src/lib_spark/spark/orderman/ilink3/SessionStore.cpp @@ -1,14 +1,14 @@ #include "SessionStore.h" -#include "lib/config/protos/system_config.pb.h" -#include "lib/jetfix/store/session_name.h" -#include "lib/logging/logging.h" -#include "lib/orderman/ilink3/IL3GW.h" -#include "lib/orderman/ilink3/IL3SecDB.h" -#include "lib/orderman/orderman_utils/ExecutionReport.h" -#include "lib/utils/base64.hpp" -#include "lib/utils/bts_chrono.h" -#include "lib/utils/file_utils.h" -#include "lib/utils/thread_manager.h" +#include "spark/config/protos/system_config.pb.h" +#include "spark/jetfix/store/session_name.h" +#include "spark/logging/logging.h" +#include "spark/orderman/ilink3/IL3GW.h" +#include "spark/orderman/ilink3/IL3SecDB.h" +#include "spark/orderman/orderman_utils/ExecutionReport.h" +#include "spark/utils/base64.hpp" +#include "spark/utils/bts_chrono.h" +#include "spark/utils/file_utils.h" +#include "spark/utils/thread_manager.h" #include #include diff --git a/src/lib/orderman/ilink3/SessionStore.h b/src/lib_spark/spark/orderman/ilink3/SessionStore.h similarity index 95% rename from src/lib/orderman/ilink3/SessionStore.h rename to src/lib_spark/spark/orderman/ilink3/SessionStore.h index 8fbae749f..1935feb24 100644 --- a/src/lib/orderman/ilink3/SessionStore.h +++ b/src/lib_spark/spark/orderman/ilink3/SessionStore.h @@ -1,7 +1,7 @@ #pragma once #include "RawMsg.h" -#include "lib/config/protos/jetfix.pb.h" +#include "spark/config/protos/jetfix.pb.h" #include #include #include diff --git a/src/lib/orderman/ilink3/TimeKeeper.h b/src/lib_spark/spark/orderman/ilink3/TimeKeeper.h similarity index 86% rename from src/lib/orderman/ilink3/TimeKeeper.h rename to src/lib_spark/spark/orderman/ilink3/TimeKeeper.h index a305df663..70e9ddb30 100644 --- a/src/lib/orderman/ilink3/TimeKeeper.h +++ b/src/lib_spark/spark/orderman/ilink3/TimeKeeper.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/utils/TimeStamp.h" -#include "lib/utils/datetime.h" +#include "spark/utils/TimeStamp.h" +#include "spark/utils/datetime.h" namespace bts { namespace orderman { diff --git a/src/lib/orderman/ilink3/generated/AvgPxInd.h b/src/lib_spark/spark/orderman/ilink3/generated/AvgPxInd.h similarity index 100% rename from src/lib/orderman/ilink3/generated/AvgPxInd.h rename to src/lib_spark/spark/orderman/ilink3/generated/AvgPxInd.h diff --git a/src/lib/orderman/ilink3/generated/BooleanFlag.h b/src/lib_spark/spark/orderman/ilink3/generated/BooleanFlag.h similarity index 100% rename from src/lib/orderman/ilink3/generated/BooleanFlag.h rename to src/lib_spark/spark/orderman/ilink3/generated/BooleanFlag.h diff --git a/src/lib/orderman/ilink3/generated/BooleanNULL.h b/src/lib_spark/spark/orderman/ilink3/generated/BooleanNULL.h similarity index 100% rename from src/lib/orderman/ilink3/generated/BooleanNULL.h rename to src/lib_spark/spark/orderman/ilink3/generated/BooleanNULL.h diff --git a/src/lib/orderman/ilink3/generated/BusinessReject521.h b/src/lib_spark/spark/orderman/ilink3/generated/BusinessReject521.h similarity index 100% rename from src/lib/orderman/ilink3/generated/BusinessReject521.h rename to src/lib_spark/spark/orderman/ilink3/generated/BusinessReject521.h diff --git a/src/lib/orderman/ilink3/generated/ClearingAcctType.h b/src/lib_spark/spark/orderman/ilink3/generated/ClearingAcctType.h similarity index 100% rename from src/lib/orderman/ilink3/generated/ClearingAcctType.h rename to src/lib_spark/spark/orderman/ilink3/generated/ClearingAcctType.h diff --git a/src/lib/orderman/ilink3/generated/CmtaGiveUpCD.h b/src/lib_spark/spark/orderman/ilink3/generated/CmtaGiveUpCD.h similarity index 100% rename from src/lib/orderman/ilink3/generated/CmtaGiveUpCD.h rename to src/lib_spark/spark/orderman/ilink3/generated/CmtaGiveUpCD.h diff --git a/src/lib/orderman/ilink3/generated/CustOrdHandlInst.h b/src/lib_spark/spark/orderman/ilink3/generated/CustOrdHandlInst.h similarity index 100% rename from src/lib/orderman/ilink3/generated/CustOrdHandlInst.h rename to src/lib_spark/spark/orderman/ilink3/generated/CustOrdHandlInst.h diff --git a/src/lib/orderman/ilink3/generated/CustOrderCapacity.h b/src/lib_spark/spark/orderman/ilink3/generated/CustOrderCapacity.h similarity index 100% rename from src/lib/orderman/ilink3/generated/CustOrderCapacity.h rename to src/lib_spark/spark/orderman/ilink3/generated/CustOrderCapacity.h diff --git a/src/lib/orderman/ilink3/generated/DATA.h b/src/lib_spark/spark/orderman/ilink3/generated/DATA.h similarity index 100% rename from src/lib/orderman/ilink3/generated/DATA.h rename to src/lib_spark/spark/orderman/ilink3/generated/DATA.h diff --git a/src/lib/orderman/ilink3/generated/DKReason.h b/src/lib_spark/spark/orderman/ilink3/generated/DKReason.h similarity index 100% rename from src/lib/orderman/ilink3/generated/DKReason.h rename to src/lib_spark/spark/orderman/ilink3/generated/DKReason.h diff --git a/src/lib/orderman/ilink3/generated/Decimal32NULL.h b/src/lib_spark/spark/orderman/ilink3/generated/Decimal32NULL.h similarity index 100% rename from src/lib/orderman/ilink3/generated/Decimal32NULL.h rename to src/lib_spark/spark/orderman/ilink3/generated/Decimal32NULL.h diff --git a/src/lib/orderman/ilink3/generated/Decimal64NULL.h b/src/lib_spark/spark/orderman/ilink3/generated/Decimal64NULL.h similarity index 100% rename from src/lib/orderman/ilink3/generated/Decimal64NULL.h rename to src/lib_spark/spark/orderman/ilink3/generated/Decimal64NULL.h diff --git a/src/lib/orderman/ilink3/generated/Establish503.h b/src/lib_spark/spark/orderman/ilink3/generated/Establish503.h similarity index 100% rename from src/lib/orderman/ilink3/generated/Establish503.h rename to src/lib_spark/spark/orderman/ilink3/generated/Establish503.h diff --git a/src/lib/orderman/ilink3/generated/EstablishmentAck504.h b/src/lib_spark/spark/orderman/ilink3/generated/EstablishmentAck504.h similarity index 100% rename from src/lib/orderman/ilink3/generated/EstablishmentAck504.h rename to src/lib_spark/spark/orderman/ilink3/generated/EstablishmentAck504.h diff --git a/src/lib/orderman/ilink3/generated/EstablishmentReject505.h b/src/lib_spark/spark/orderman/ilink3/generated/EstablishmentReject505.h similarity index 100% rename from src/lib/orderman/ilink3/generated/EstablishmentReject505.h rename to src/lib_spark/spark/orderman/ilink3/generated/EstablishmentReject505.h diff --git a/src/lib/orderman/ilink3/generated/ExecAckStatus.h b/src/lib_spark/spark/orderman/ilink3/generated/ExecAckStatus.h similarity index 100% rename from src/lib/orderman/ilink3/generated/ExecAckStatus.h rename to src/lib_spark/spark/orderman/ilink3/generated/ExecAckStatus.h diff --git a/src/lib/orderman/ilink3/generated/ExecInst.h b/src/lib_spark/spark/orderman/ilink3/generated/ExecInst.h similarity index 100% rename from src/lib/orderman/ilink3/generated/ExecInst.h rename to src/lib_spark/spark/orderman/ilink3/generated/ExecInst.h diff --git a/src/lib/orderman/ilink3/generated/ExecMode.h b/src/lib_spark/spark/orderman/ilink3/generated/ExecMode.h similarity index 100% rename from src/lib/orderman/ilink3/generated/ExecMode.h rename to src/lib_spark/spark/orderman/ilink3/generated/ExecMode.h diff --git a/src/lib/orderman/ilink3/generated/ExecReason.h b/src/lib_spark/spark/orderman/ilink3/generated/ExecReason.h similarity index 100% rename from src/lib/orderman/ilink3/generated/ExecReason.h rename to src/lib_spark/spark/orderman/ilink3/generated/ExecReason.h diff --git a/src/lib/orderman/ilink3/generated/ExecTypTrdCxl.h b/src/lib_spark/spark/orderman/ilink3/generated/ExecTypTrdCxl.h similarity index 100% rename from src/lib/orderman/ilink3/generated/ExecTypTrdCxl.h rename to src/lib_spark/spark/orderman/ilink3/generated/ExecTypTrdCxl.h diff --git a/src/lib/orderman/ilink3/generated/ExecutionAck539.h b/src/lib_spark/spark/orderman/ilink3/generated/ExecutionAck539.h similarity index 100% rename from src/lib/orderman/ilink3/generated/ExecutionAck539.h rename to src/lib_spark/spark/orderman/ilink3/generated/ExecutionAck539.h diff --git a/src/lib/orderman/ilink3/generated/ExecutionReportCancel534.h b/src/lib_spark/spark/orderman/ilink3/generated/ExecutionReportCancel534.h similarity index 100% rename from src/lib/orderman/ilink3/generated/ExecutionReportCancel534.h rename to src/lib_spark/spark/orderman/ilink3/generated/ExecutionReportCancel534.h diff --git a/src/lib/orderman/ilink3/generated/ExecutionReportElimination524.h b/src/lib_spark/spark/orderman/ilink3/generated/ExecutionReportElimination524.h similarity index 100% rename from src/lib/orderman/ilink3/generated/ExecutionReportElimination524.h rename to src/lib_spark/spark/orderman/ilink3/generated/ExecutionReportElimination524.h diff --git a/src/lib/orderman/ilink3/generated/ExecutionReportModify531.h b/src/lib_spark/spark/orderman/ilink3/generated/ExecutionReportModify531.h similarity index 100% rename from src/lib/orderman/ilink3/generated/ExecutionReportModify531.h rename to src/lib_spark/spark/orderman/ilink3/generated/ExecutionReportModify531.h diff --git a/src/lib/orderman/ilink3/generated/ExecutionReportNew522.h b/src/lib_spark/spark/orderman/ilink3/generated/ExecutionReportNew522.h similarity index 100% rename from src/lib/orderman/ilink3/generated/ExecutionReportNew522.h rename to src/lib_spark/spark/orderman/ilink3/generated/ExecutionReportNew522.h diff --git a/src/lib/orderman/ilink3/generated/ExecutionReportPendingCancel564.h b/src/lib_spark/spark/orderman/ilink3/generated/ExecutionReportPendingCancel564.h similarity index 100% rename from src/lib/orderman/ilink3/generated/ExecutionReportPendingCancel564.h rename to src/lib_spark/spark/orderman/ilink3/generated/ExecutionReportPendingCancel564.h diff --git a/src/lib/orderman/ilink3/generated/ExecutionReportPendingReplace565.h b/src/lib_spark/spark/orderman/ilink3/generated/ExecutionReportPendingReplace565.h similarity index 100% rename from src/lib/orderman/ilink3/generated/ExecutionReportPendingReplace565.h rename to src/lib_spark/spark/orderman/ilink3/generated/ExecutionReportPendingReplace565.h diff --git a/src/lib/orderman/ilink3/generated/ExecutionReportReject523.h b/src/lib_spark/spark/orderman/ilink3/generated/ExecutionReportReject523.h similarity index 100% rename from src/lib/orderman/ilink3/generated/ExecutionReportReject523.h rename to src/lib_spark/spark/orderman/ilink3/generated/ExecutionReportReject523.h diff --git a/src/lib/orderman/ilink3/generated/ExecutionReportStatus532.h b/src/lib_spark/spark/orderman/ilink3/generated/ExecutionReportStatus532.h similarity index 100% rename from src/lib/orderman/ilink3/generated/ExecutionReportStatus532.h rename to src/lib_spark/spark/orderman/ilink3/generated/ExecutionReportStatus532.h diff --git a/src/lib/orderman/ilink3/generated/ExecutionReportTradeAddendumOutright548.h b/src/lib_spark/spark/orderman/ilink3/generated/ExecutionReportTradeAddendumOutright548.h similarity index 100% rename from src/lib/orderman/ilink3/generated/ExecutionReportTradeAddendumOutright548.h rename to src/lib_spark/spark/orderman/ilink3/generated/ExecutionReportTradeAddendumOutright548.h diff --git a/src/lib/orderman/ilink3/generated/ExecutionReportTradeAddendumSpread549.h b/src/lib_spark/spark/orderman/ilink3/generated/ExecutionReportTradeAddendumSpread549.h similarity index 100% rename from src/lib/orderman/ilink3/generated/ExecutionReportTradeAddendumSpread549.h rename to src/lib_spark/spark/orderman/ilink3/generated/ExecutionReportTradeAddendumSpread549.h diff --git a/src/lib/orderman/ilink3/generated/ExecutionReportTradeAddendumSpreadLeg550.h b/src/lib_spark/spark/orderman/ilink3/generated/ExecutionReportTradeAddendumSpreadLeg550.h similarity index 100% rename from src/lib/orderman/ilink3/generated/ExecutionReportTradeAddendumSpreadLeg550.h rename to src/lib_spark/spark/orderman/ilink3/generated/ExecutionReportTradeAddendumSpreadLeg550.h diff --git a/src/lib/orderman/ilink3/generated/ExecutionReportTradeOutright525.h b/src/lib_spark/spark/orderman/ilink3/generated/ExecutionReportTradeOutright525.h similarity index 100% rename from src/lib/orderman/ilink3/generated/ExecutionReportTradeOutright525.h rename to src/lib_spark/spark/orderman/ilink3/generated/ExecutionReportTradeOutright525.h diff --git a/src/lib/orderman/ilink3/generated/ExecutionReportTradeSpread526.h b/src/lib_spark/spark/orderman/ilink3/generated/ExecutionReportTradeSpread526.h similarity index 100% rename from src/lib/orderman/ilink3/generated/ExecutionReportTradeSpread526.h rename to src/lib_spark/spark/orderman/ilink3/generated/ExecutionReportTradeSpread526.h diff --git a/src/lib/orderman/ilink3/generated/ExecutionReportTradeSpreadLeg527.h b/src/lib_spark/spark/orderman/ilink3/generated/ExecutionReportTradeSpreadLeg527.h similarity index 100% rename from src/lib/orderman/ilink3/generated/ExecutionReportTradeSpreadLeg527.h rename to src/lib_spark/spark/orderman/ilink3/generated/ExecutionReportTradeSpreadLeg527.h diff --git a/src/lib/orderman/ilink3/generated/ExpCycle.h b/src/lib_spark/spark/orderman/ilink3/generated/ExpCycle.h similarity index 100% rename from src/lib/orderman/ilink3/generated/ExpCycle.h rename to src/lib_spark/spark/orderman/ilink3/generated/ExpCycle.h diff --git a/src/lib/orderman/ilink3/generated/FTI.h b/src/lib_spark/spark/orderman/ilink3/generated/FTI.h similarity index 100% rename from src/lib/orderman/ilink3/generated/FTI.h rename to src/lib_spark/spark/orderman/ilink3/generated/FTI.h diff --git a/src/lib/orderman/ilink3/generated/GroupSize.h b/src/lib_spark/spark/orderman/ilink3/generated/GroupSize.h similarity index 100% rename from src/lib/orderman/ilink3/generated/GroupSize.h rename to src/lib_spark/spark/orderman/ilink3/generated/GroupSize.h diff --git a/src/lib/orderman/ilink3/generated/KeepAliveLapsed.h b/src/lib_spark/spark/orderman/ilink3/generated/KeepAliveLapsed.h similarity index 100% rename from src/lib/orderman/ilink3/generated/KeepAliveLapsed.h rename to src/lib_spark/spark/orderman/ilink3/generated/KeepAliveLapsed.h diff --git a/src/lib/orderman/ilink3/generated/ListUpdAct.h b/src/lib_spark/spark/orderman/ilink3/generated/ListUpdAct.h similarity index 100% rename from src/lib/orderman/ilink3/generated/ListUpdAct.h rename to src/lib_spark/spark/orderman/ilink3/generated/ListUpdAct.h diff --git a/src/lib/orderman/ilink3/generated/ManualOrdInd.h b/src/lib_spark/spark/orderman/ilink3/generated/ManualOrdInd.h similarity index 100% rename from src/lib/orderman/ilink3/generated/ManualOrdInd.h rename to src/lib_spark/spark/orderman/ilink3/generated/ManualOrdInd.h diff --git a/src/lib/orderman/ilink3/generated/ManualOrdIndReq.h b/src/lib_spark/spark/orderman/ilink3/generated/ManualOrdIndReq.h similarity index 100% rename from src/lib/orderman/ilink3/generated/ManualOrdIndReq.h rename to src/lib_spark/spark/orderman/ilink3/generated/ManualOrdIndReq.h diff --git a/src/lib/orderman/ilink3/generated/MassActionOrdTyp.h b/src/lib_spark/spark/orderman/ilink3/generated/MassActionOrdTyp.h similarity index 100% rename from src/lib/orderman/ilink3/generated/MassActionOrdTyp.h rename to src/lib_spark/spark/orderman/ilink3/generated/MassActionOrdTyp.h diff --git a/src/lib/orderman/ilink3/generated/MassActionResponse.h b/src/lib_spark/spark/orderman/ilink3/generated/MassActionResponse.h similarity index 100% rename from src/lib/orderman/ilink3/generated/MassActionResponse.h rename to src/lib_spark/spark/orderman/ilink3/generated/MassActionResponse.h diff --git a/src/lib/orderman/ilink3/generated/MassActionScope.h b/src/lib_spark/spark/orderman/ilink3/generated/MassActionScope.h similarity index 100% rename from src/lib/orderman/ilink3/generated/MassActionScope.h rename to src/lib_spark/spark/orderman/ilink3/generated/MassActionScope.h diff --git a/src/lib/orderman/ilink3/generated/MassCancelTIF.h b/src/lib_spark/spark/orderman/ilink3/generated/MassCancelTIF.h similarity index 100% rename from src/lib/orderman/ilink3/generated/MassCancelTIF.h rename to src/lib_spark/spark/orderman/ilink3/generated/MassCancelTIF.h diff --git a/src/lib/orderman/ilink3/generated/MassCxlReqTyp.h b/src/lib_spark/spark/orderman/ilink3/generated/MassCxlReqTyp.h similarity index 100% rename from src/lib/orderman/ilink3/generated/MassCxlReqTyp.h rename to src/lib_spark/spark/orderman/ilink3/generated/MassCxlReqTyp.h diff --git a/src/lib/orderman/ilink3/generated/MassQuote517.h b/src/lib_spark/spark/orderman/ilink3/generated/MassQuote517.h similarity index 100% rename from src/lib/orderman/ilink3/generated/MassQuote517.h rename to src/lib_spark/spark/orderman/ilink3/generated/MassQuote517.h diff --git a/src/lib/orderman/ilink3/generated/MassQuoteAck545.h b/src/lib_spark/spark/orderman/ilink3/generated/MassQuoteAck545.h similarity index 100% rename from src/lib/orderman/ilink3/generated/MassQuoteAck545.h rename to src/lib_spark/spark/orderman/ilink3/generated/MassQuoteAck545.h diff --git a/src/lib/orderman/ilink3/generated/MassStatusOrdTyp.h b/src/lib_spark/spark/orderman/ilink3/generated/MassStatusOrdTyp.h similarity index 100% rename from src/lib/orderman/ilink3/generated/MassStatusOrdTyp.h rename to src/lib_spark/spark/orderman/ilink3/generated/MassStatusOrdTyp.h diff --git a/src/lib/orderman/ilink3/generated/MassStatusReqTyp.h b/src/lib_spark/spark/orderman/ilink3/generated/MassStatusReqTyp.h similarity index 100% rename from src/lib/orderman/ilink3/generated/MassStatusReqTyp.h rename to src/lib_spark/spark/orderman/ilink3/generated/MassStatusReqTyp.h diff --git a/src/lib/orderman/ilink3/generated/MassStatusTIF.h b/src/lib_spark/spark/orderman/ilink3/generated/MassStatusTIF.h similarity index 100% rename from src/lib/orderman/ilink3/generated/MassStatusTIF.h rename to src/lib_spark/spark/orderman/ilink3/generated/MassStatusTIF.h diff --git a/src/lib/orderman/ilink3/generated/MaturityMonthYear.h b/src/lib_spark/spark/orderman/ilink3/generated/MaturityMonthYear.h similarity index 100% rename from src/lib/orderman/ilink3/generated/MaturityMonthYear.h rename to src/lib_spark/spark/orderman/ilink3/generated/MaturityMonthYear.h diff --git a/src/lib/orderman/ilink3/generated/MessageHeader.h b/src/lib_spark/spark/orderman/ilink3/generated/MessageHeader.h similarity index 100% rename from src/lib/orderman/ilink3/generated/MessageHeader.h rename to src/lib_spark/spark/orderman/ilink3/generated/MessageHeader.h diff --git a/src/lib/orderman/ilink3/generated/Negotiate500.h b/src/lib_spark/spark/orderman/ilink3/generated/Negotiate500.h similarity index 100% rename from src/lib/orderman/ilink3/generated/Negotiate500.h rename to src/lib_spark/spark/orderman/ilink3/generated/Negotiate500.h diff --git a/src/lib/orderman/ilink3/generated/NegotiationReject502.h b/src/lib_spark/spark/orderman/ilink3/generated/NegotiationReject502.h similarity index 100% rename from src/lib/orderman/ilink3/generated/NegotiationReject502.h rename to src/lib_spark/spark/orderman/ilink3/generated/NegotiationReject502.h diff --git a/src/lib/orderman/ilink3/generated/NegotiationResponse501.h b/src/lib_spark/spark/orderman/ilink3/generated/NegotiationResponse501.h similarity index 100% rename from src/lib/orderman/ilink3/generated/NegotiationResponse501.h rename to src/lib_spark/spark/orderman/ilink3/generated/NegotiationResponse501.h diff --git a/src/lib/orderman/ilink3/generated/NewOrderCross544.h b/src/lib_spark/spark/orderman/ilink3/generated/NewOrderCross544.h similarity index 100% rename from src/lib/orderman/ilink3/generated/NewOrderCross544.h rename to src/lib_spark/spark/orderman/ilink3/generated/NewOrderCross544.h diff --git a/src/lib/orderman/ilink3/generated/NewOrderSingle514.h b/src/lib_spark/spark/orderman/ilink3/generated/NewOrderSingle514.h similarity index 100% rename from src/lib/orderman/ilink3/generated/NewOrderSingle514.h rename to src/lib_spark/spark/orderman/ilink3/generated/NewOrderSingle514.h diff --git a/src/lib/orderman/ilink3/generated/NotApplied513.h b/src/lib_spark/spark/orderman/ilink3/generated/NotApplied513.h similarity index 100% rename from src/lib/orderman/ilink3/generated/NotApplied513.h rename to src/lib_spark/spark/orderman/ilink3/generated/NotApplied513.h diff --git a/src/lib/orderman/ilink3/generated/OFMOverrideReq.h b/src/lib_spark/spark/orderman/ilink3/generated/OFMOverrideReq.h similarity index 100% rename from src/lib/orderman/ilink3/generated/OFMOverrideReq.h rename to src/lib_spark/spark/orderman/ilink3/generated/OFMOverrideReq.h diff --git a/src/lib/orderman/ilink3/generated/OrdStatusTrd.h b/src/lib_spark/spark/orderman/ilink3/generated/OrdStatusTrd.h similarity index 100% rename from src/lib/orderman/ilink3/generated/OrdStatusTrd.h rename to src/lib_spark/spark/orderman/ilink3/generated/OrdStatusTrd.h diff --git a/src/lib/orderman/ilink3/generated/OrdStatusTrdCxl.h b/src/lib_spark/spark/orderman/ilink3/generated/OrdStatusTrdCxl.h similarity index 100% rename from src/lib/orderman/ilink3/generated/OrdStatusTrdCxl.h rename to src/lib_spark/spark/orderman/ilink3/generated/OrdStatusTrdCxl.h diff --git a/src/lib/orderman/ilink3/generated/OrderCancelReject535.h b/src/lib_spark/spark/orderman/ilink3/generated/OrderCancelReject535.h similarity index 100% rename from src/lib/orderman/ilink3/generated/OrderCancelReject535.h rename to src/lib_spark/spark/orderman/ilink3/generated/OrderCancelReject535.h diff --git a/src/lib/orderman/ilink3/generated/OrderCancelReplaceReject536.h b/src/lib_spark/spark/orderman/ilink3/generated/OrderCancelReplaceReject536.h similarity index 100% rename from src/lib/orderman/ilink3/generated/OrderCancelReplaceReject536.h rename to src/lib_spark/spark/orderman/ilink3/generated/OrderCancelReplaceReject536.h diff --git a/src/lib/orderman/ilink3/generated/OrderCancelReplaceRequest515.h b/src/lib_spark/spark/orderman/ilink3/generated/OrderCancelReplaceRequest515.h similarity index 100% rename from src/lib/orderman/ilink3/generated/OrderCancelReplaceRequest515.h rename to src/lib_spark/spark/orderman/ilink3/generated/OrderCancelReplaceRequest515.h diff --git a/src/lib/orderman/ilink3/generated/OrderCancelRequest516.h b/src/lib_spark/spark/orderman/ilink3/generated/OrderCancelRequest516.h similarity index 100% rename from src/lib/orderman/ilink3/generated/OrderCancelRequest516.h rename to src/lib_spark/spark/orderman/ilink3/generated/OrderCancelRequest516.h diff --git a/src/lib/orderman/ilink3/generated/OrderEventType.h b/src/lib_spark/spark/orderman/ilink3/generated/OrderEventType.h similarity index 100% rename from src/lib/orderman/ilink3/generated/OrderEventType.h rename to src/lib_spark/spark/orderman/ilink3/generated/OrderEventType.h diff --git a/src/lib/orderman/ilink3/generated/OrderMassActionReport562.h b/src/lib_spark/spark/orderman/ilink3/generated/OrderMassActionReport562.h similarity index 100% rename from src/lib/orderman/ilink3/generated/OrderMassActionReport562.h rename to src/lib_spark/spark/orderman/ilink3/generated/OrderMassActionReport562.h diff --git a/src/lib/orderman/ilink3/generated/OrderMassActionRequest529.h b/src/lib_spark/spark/orderman/ilink3/generated/OrderMassActionRequest529.h similarity index 100% rename from src/lib/orderman/ilink3/generated/OrderMassActionRequest529.h rename to src/lib_spark/spark/orderman/ilink3/generated/OrderMassActionRequest529.h diff --git a/src/lib/orderman/ilink3/generated/OrderMassStatusRequest530.h b/src/lib_spark/spark/orderman/ilink3/generated/OrderMassStatusRequest530.h similarity index 100% rename from src/lib/orderman/ilink3/generated/OrderMassStatusRequest530.h rename to src/lib_spark/spark/orderman/ilink3/generated/OrderMassStatusRequest530.h diff --git a/src/lib/orderman/ilink3/generated/OrderStatus.h b/src/lib_spark/spark/orderman/ilink3/generated/OrderStatus.h similarity index 100% rename from src/lib/orderman/ilink3/generated/OrderStatus.h rename to src/lib_spark/spark/orderman/ilink3/generated/OrderStatus.h diff --git a/src/lib/orderman/ilink3/generated/OrderStatusRequest533.h b/src/lib_spark/spark/orderman/ilink3/generated/OrderStatusRequest533.h similarity index 100% rename from src/lib/orderman/ilink3/generated/OrderStatusRequest533.h rename to src/lib_spark/spark/orderman/ilink3/generated/OrderStatusRequest533.h diff --git a/src/lib/orderman/ilink3/generated/OrderType.h b/src/lib_spark/spark/orderman/ilink3/generated/OrderType.h similarity index 100% rename from src/lib/orderman/ilink3/generated/OrderType.h rename to src/lib_spark/spark/orderman/ilink3/generated/OrderType.h diff --git a/src/lib/orderman/ilink3/generated/OrderTypeReq.h b/src/lib_spark/spark/orderman/ilink3/generated/OrderTypeReq.h similarity index 100% rename from src/lib/orderman/ilink3/generated/OrderTypeReq.h rename to src/lib_spark/spark/orderman/ilink3/generated/OrderTypeReq.h diff --git a/src/lib/orderman/ilink3/generated/PRICE9.h b/src/lib_spark/spark/orderman/ilink3/generated/PRICE9.h similarity index 100% rename from src/lib/orderman/ilink3/generated/PRICE9.h rename to src/lib_spark/spark/orderman/ilink3/generated/PRICE9.h diff --git a/src/lib/orderman/ilink3/generated/PRICENULL9.h b/src/lib_spark/spark/orderman/ilink3/generated/PRICENULL9.h similarity index 100% rename from src/lib/orderman/ilink3/generated/PRICENULL9.h rename to src/lib_spark/spark/orderman/ilink3/generated/PRICENULL9.h diff --git a/src/lib/orderman/ilink3/generated/PartyDetailRole.h b/src/lib_spark/spark/orderman/ilink3/generated/PartyDetailRole.h similarity index 100% rename from src/lib/orderman/ilink3/generated/PartyDetailRole.h rename to src/lib_spark/spark/orderman/ilink3/generated/PartyDetailRole.h diff --git a/src/lib/orderman/ilink3/generated/PartyDetailsDefinitionRequest518.h b/src/lib_spark/spark/orderman/ilink3/generated/PartyDetailsDefinitionRequest518.h similarity index 100% rename from src/lib/orderman/ilink3/generated/PartyDetailsDefinitionRequest518.h rename to src/lib_spark/spark/orderman/ilink3/generated/PartyDetailsDefinitionRequest518.h diff --git a/src/lib/orderman/ilink3/generated/PartyDetailsDefinitionRequestAck519.h b/src/lib_spark/spark/orderman/ilink3/generated/PartyDetailsDefinitionRequestAck519.h similarity index 100% rename from src/lib/orderman/ilink3/generated/PartyDetailsDefinitionRequestAck519.h rename to src/lib_spark/spark/orderman/ilink3/generated/PartyDetailsDefinitionRequestAck519.h diff --git a/src/lib/orderman/ilink3/generated/PartyDetailsListReport538.h b/src/lib_spark/spark/orderman/ilink3/generated/PartyDetailsListReport538.h similarity index 100% rename from src/lib/orderman/ilink3/generated/PartyDetailsListReport538.h rename to src/lib_spark/spark/orderman/ilink3/generated/PartyDetailsListReport538.h diff --git a/src/lib/orderman/ilink3/generated/PartyDetailsListRequest537.h b/src/lib_spark/spark/orderman/ilink3/generated/PartyDetailsListRequest537.h similarity index 100% rename from src/lib/orderman/ilink3/generated/PartyDetailsListRequest537.h rename to src/lib_spark/spark/orderman/ilink3/generated/PartyDetailsListRequest537.h diff --git a/src/lib/orderman/ilink3/generated/QuoteAckStatus.h b/src/lib_spark/spark/orderman/ilink3/generated/QuoteAckStatus.h similarity index 100% rename from src/lib/orderman/ilink3/generated/QuoteAckStatus.h rename to src/lib_spark/spark/orderman/ilink3/generated/QuoteAckStatus.h diff --git a/src/lib/orderman/ilink3/generated/QuoteCancel528.h b/src/lib_spark/spark/orderman/ilink3/generated/QuoteCancel528.h similarity index 100% rename from src/lib/orderman/ilink3/generated/QuoteCancel528.h rename to src/lib_spark/spark/orderman/ilink3/generated/QuoteCancel528.h diff --git a/src/lib/orderman/ilink3/generated/QuoteCancelAck563.h b/src/lib_spark/spark/orderman/ilink3/generated/QuoteCancelAck563.h similarity index 100% rename from src/lib/orderman/ilink3/generated/QuoteCancelAck563.h rename to src/lib_spark/spark/orderman/ilink3/generated/QuoteCancelAck563.h diff --git a/src/lib/orderman/ilink3/generated/QuoteCxlStatus.h b/src/lib_spark/spark/orderman/ilink3/generated/QuoteCxlStatus.h similarity index 100% rename from src/lib/orderman/ilink3/generated/QuoteCxlStatus.h rename to src/lib_spark/spark/orderman/ilink3/generated/QuoteCxlStatus.h diff --git a/src/lib/orderman/ilink3/generated/QuoteCxlTyp.h b/src/lib_spark/spark/orderman/ilink3/generated/QuoteCxlTyp.h similarity index 100% rename from src/lib/orderman/ilink3/generated/QuoteCxlTyp.h rename to src/lib_spark/spark/orderman/ilink3/generated/QuoteCxlTyp.h diff --git a/src/lib/orderman/ilink3/generated/QuoteTyp.h b/src/lib_spark/spark/orderman/ilink3/generated/QuoteTyp.h similarity index 100% rename from src/lib/orderman/ilink3/generated/QuoteTyp.h rename to src/lib_spark/spark/orderman/ilink3/generated/QuoteTyp.h diff --git a/src/lib/orderman/ilink3/generated/README.txt b/src/lib_spark/spark/orderman/ilink3/generated/README.txt similarity index 100% rename from src/lib/orderman/ilink3/generated/README.txt rename to src/lib_spark/spark/orderman/ilink3/generated/README.txt diff --git a/src/lib/orderman/ilink3/generated/RFQSide.h b/src/lib_spark/spark/orderman/ilink3/generated/RFQSide.h similarity index 100% rename from src/lib/orderman/ilink3/generated/RFQSide.h rename to src/lib_spark/spark/orderman/ilink3/generated/RFQSide.h diff --git a/src/lib/orderman/ilink3/generated/ReqResult.h b/src/lib_spark/spark/orderman/ilink3/generated/ReqResult.h similarity index 100% rename from src/lib/orderman/ilink3/generated/ReqResult.h rename to src/lib_spark/spark/orderman/ilink3/generated/ReqResult.h diff --git a/src/lib/orderman/ilink3/generated/RequestForQuote543.h b/src/lib_spark/spark/orderman/ilink3/generated/RequestForQuote543.h similarity index 100% rename from src/lib/orderman/ilink3/generated/RequestForQuote543.h rename to src/lib_spark/spark/orderman/ilink3/generated/RequestForQuote543.h diff --git a/src/lib/orderman/ilink3/generated/RequestForQuoteAck546.h b/src/lib_spark/spark/orderman/ilink3/generated/RequestForQuoteAck546.h similarity index 100% rename from src/lib/orderman/ilink3/generated/RequestForQuoteAck546.h rename to src/lib_spark/spark/orderman/ilink3/generated/RequestForQuoteAck546.h diff --git a/src/lib/orderman/ilink3/generated/Retransmission509.h b/src/lib_spark/spark/orderman/ilink3/generated/Retransmission509.h similarity index 100% rename from src/lib/orderman/ilink3/generated/Retransmission509.h rename to src/lib_spark/spark/orderman/ilink3/generated/Retransmission509.h diff --git a/src/lib/orderman/ilink3/generated/RetransmitReject510.h b/src/lib_spark/spark/orderman/ilink3/generated/RetransmitReject510.h similarity index 100% rename from src/lib/orderman/ilink3/generated/RetransmitReject510.h rename to src/lib_spark/spark/orderman/ilink3/generated/RetransmitReject510.h diff --git a/src/lib/orderman/ilink3/generated/RetransmitRequest508.h b/src/lib_spark/spark/orderman/ilink3/generated/RetransmitRequest508.h similarity index 100% rename from src/lib/orderman/ilink3/generated/RetransmitRequest508.h rename to src/lib_spark/spark/orderman/ilink3/generated/RetransmitRequest508.h diff --git a/src/lib/orderman/ilink3/generated/SLEDS.h b/src/lib_spark/spark/orderman/ilink3/generated/SLEDS.h similarity index 100% rename from src/lib/orderman/ilink3/generated/SLEDS.h rename to src/lib_spark/spark/orderman/ilink3/generated/SLEDS.h diff --git a/src/lib/orderman/ilink3/generated/SMPI.h b/src/lib_spark/spark/orderman/ilink3/generated/SMPI.h similarity index 100% rename from src/lib/orderman/ilink3/generated/SMPI.h rename to src/lib_spark/spark/orderman/ilink3/generated/SMPI.h diff --git a/src/lib/orderman/ilink3/generated/SecRspTyp.h b/src/lib_spark/spark/orderman/ilink3/generated/SecRspTyp.h similarity index 100% rename from src/lib/orderman/ilink3/generated/SecRspTyp.h rename to src/lib_spark/spark/orderman/ilink3/generated/SecRspTyp.h diff --git a/src/lib/orderman/ilink3/generated/SecurityDefinitionRequest560.h b/src/lib_spark/spark/orderman/ilink3/generated/SecurityDefinitionRequest560.h similarity index 100% rename from src/lib/orderman/ilink3/generated/SecurityDefinitionRequest560.h rename to src/lib_spark/spark/orderman/ilink3/generated/SecurityDefinitionRequest560.h diff --git a/src/lib/orderman/ilink3/generated/SecurityDefinitionResponse561.h b/src/lib_spark/spark/orderman/ilink3/generated/SecurityDefinitionResponse561.h similarity index 100% rename from src/lib/orderman/ilink3/generated/SecurityDefinitionResponse561.h rename to src/lib_spark/spark/orderman/ilink3/generated/SecurityDefinitionResponse561.h diff --git a/src/lib/orderman/ilink3/generated/Sequence506.h b/src/lib_spark/spark/orderman/ilink3/generated/Sequence506.h similarity index 100% rename from src/lib/orderman/ilink3/generated/Sequence506.h rename to src/lib_spark/spark/orderman/ilink3/generated/Sequence506.h diff --git a/src/lib/orderman/ilink3/generated/ShortSaleType.h b/src/lib_spark/spark/orderman/ilink3/generated/ShortSaleType.h similarity index 100% rename from src/lib/orderman/ilink3/generated/ShortSaleType.h rename to src/lib_spark/spark/orderman/ilink3/generated/ShortSaleType.h diff --git a/src/lib/orderman/ilink3/generated/SideNULL.h b/src/lib_spark/spark/orderman/ilink3/generated/SideNULL.h similarity index 100% rename from src/lib/orderman/ilink3/generated/SideNULL.h rename to src/lib_spark/spark/orderman/ilink3/generated/SideNULL.h diff --git a/src/lib/orderman/ilink3/generated/SideReq.h b/src/lib_spark/spark/orderman/ilink3/generated/SideReq.h similarity index 100% rename from src/lib/orderman/ilink3/generated/SideReq.h rename to src/lib_spark/spark/orderman/ilink3/generated/SideReq.h diff --git a/src/lib/orderman/ilink3/generated/SideTimeInForce.h b/src/lib_spark/spark/orderman/ilink3/generated/SideTimeInForce.h similarity index 100% rename from src/lib/orderman/ilink3/generated/SideTimeInForce.h rename to src/lib_spark/spark/orderman/ilink3/generated/SideTimeInForce.h diff --git a/src/lib/orderman/ilink3/generated/SplitMsg.h b/src/lib_spark/spark/orderman/ilink3/generated/SplitMsg.h similarity index 100% rename from src/lib/orderman/ilink3/generated/SplitMsg.h rename to src/lib_spark/spark/orderman/ilink3/generated/SplitMsg.h diff --git a/src/lib/orderman/ilink3/generated/Terminate507.h b/src/lib_spark/spark/orderman/ilink3/generated/Terminate507.h similarity index 100% rename from src/lib/orderman/ilink3/generated/Terminate507.h rename to src/lib_spark/spark/orderman/ilink3/generated/Terminate507.h diff --git a/src/lib/orderman/ilink3/generated/TimeInForce.h b/src/lib_spark/spark/orderman/ilink3/generated/TimeInForce.h similarity index 100% rename from src/lib/orderman/ilink3/generated/TimeInForce.h rename to src/lib_spark/spark/orderman/ilink3/generated/TimeInForce.h diff --git a/src/lib/orderman/ilink3/generated/TradeAddendum.h b/src/lib_spark/spark/orderman/ilink3/generated/TradeAddendum.h similarity index 100% rename from src/lib/orderman/ilink3/generated/TradeAddendum.h rename to src/lib_spark/spark/orderman/ilink3/generated/TradeAddendum.h diff --git a/src/lib/orderman/ilink3/generated/generate.sh b/src/lib_spark/spark/orderman/ilink3/generated/generate.sh similarity index 100% rename from src/lib/orderman/ilink3/generated/generate.sh rename to src/lib_spark/spark/orderman/ilink3/generated/generate.sh diff --git a/src/lib/orderman/ilink3/generated/ilinkbinary.xml b/src/lib_spark/spark/orderman/ilink3/generated/ilinkbinary.xml similarity index 100% rename from src/lib/orderman/ilink3/generated/ilinkbinary.xml rename to src/lib_spark/spark/orderman/ilink3/generated/ilinkbinary.xml diff --git a/src/lib/orderman/ilink3/generated/sbe-all-1.27.0.jar b/src/lib_spark/spark/orderman/ilink3/generated/sbe-all-1.27.0.jar similarity index 100% rename from src/lib/orderman/ilink3/generated/sbe-all-1.27.0.jar rename to src/lib_spark/spark/orderman/ilink3/generated/sbe-all-1.27.0.jar diff --git a/src/lib/orderman/ilink3/test/IL3TestExchange.h b/src/lib_spark/spark/orderman/ilink3/test/IL3TestExchange.h similarity index 100% rename from src/lib/orderman/ilink3/test/IL3TestExchange.h rename to src/lib_spark/spark/orderman/ilink3/test/IL3TestExchange.h diff --git a/src/lib/orderman/ilink3/test/ILinkGWTests.cpp b/src/lib_spark/spark/orderman/ilink3/test/ILinkGWTests.cpp similarity index 99% rename from src/lib/orderman/ilink3/test/ILinkGWTests.cpp rename to src/lib_spark/spark/orderman/ilink3/test/ILinkGWTests.cpp index 8ef70ed60..2e9075bd2 100644 --- a/src/lib/orderman/ilink3/test/ILinkGWTests.cpp +++ b/src/lib_spark/spark/orderman/ilink3/test/ILinkGWTests.cpp @@ -6,8 +6,8 @@ #include "../generated/PartyDetailsDefinitionRequest518.h" #include "../generated/Sequence506.h" #include "IL3TestExchange.h" -#include "lib/domain_model/Security.h" -#include "lib/utils/SecureLogon.h" +#include "spark/domain_model/Security.h" +#include "spark/utils/SecureLogon.h" #include #include diff --git a/src/lib/orderman/limiter/LimitStore.cpp b/src/lib_spark/spark/orderman/limiter/LimitStore.cpp similarity index 100% rename from src/lib/orderman/limiter/LimitStore.cpp rename to src/lib_spark/spark/orderman/limiter/LimitStore.cpp diff --git a/src/lib/orderman/limiter/LimitStore.h b/src/lib_spark/spark/orderman/limiter/LimitStore.h similarity index 97% rename from src/lib/orderman/limiter/LimitStore.h rename to src/lib_spark/spark/orderman/limiter/LimitStore.h index 25c4d2cc7..f1a99da8b 100644 --- a/src/lib/orderman/limiter/LimitStore.h +++ b/src/lib_spark/spark/orderman/limiter/LimitStore.h @@ -3,15 +3,15 @@ #include "Limiter.h" #include "ProductLimitTree.h" #include "SecurityLimitTree.h" -#include "lib/api/service_helpers/AdminServiceUtils.h" -#include "lib/api/services/AdminService.server.pb.h" -#include "lib/api/services/OrderService.pb.h" -#include "lib/api/services/PositionService.server.pb.h" -#include "lib/config/config.h" -#include "lib/config/protos/span.pb.h" -#include "lib/domain_model/Security.pb.h" -#include "lib/orderman/orderman_utils/orderman_common.h" -#include "lib/os/os.h" +#include "spark/api/service_helpers/AdminServiceUtils.h" +#include "spark/api/services/AdminService.server.pb.h" +#include "spark/api/services/OrderService.pb.h" +#include "spark/api/services/PositionService.server.pb.h" +#include "spark/config/config.h" +#include "spark/config/protos/span.pb.h" +#include "spark/domain_model/Security.pb.h" +#include "spark/orderman/orderman_utils/orderman_common.h" +#include "spark/os/os.h" #include namespace bts { diff --git a/src/lib/orderman/limiter/Limiter.cpp b/src/lib_spark/spark/orderman/limiter/Limiter.cpp similarity index 96% rename from src/lib/orderman/limiter/Limiter.cpp rename to src/lib_spark/spark/orderman/limiter/Limiter.cpp index accd4e3e9..24f459eae 100644 --- a/src/lib/orderman/limiter/Limiter.cpp +++ b/src/lib_spark/spark/orderman/limiter/Limiter.cpp @@ -1,12 +1,12 @@ #include "Limiter.h" #include "LimitStore.h" -#include "lib/api/services/AdminService.server.pb.h" -#include "lib/api/services/PositionService.server.pb.h" -#include "lib/config/config.h" -#include "lib/config/protos/toggles.pb.h" -#include "lib/domain_model/Security.pb.h" -#include "lib/logging/logging.h" -#include "lib/utils/PBUtils.h" +#include "spark/api/services/AdminService.server.pb.h" +#include "spark/api/services/PositionService.server.pb.h" +#include "spark/config/config.h" +#include "spark/config/protos/toggles.pb.h" +#include "spark/domain_model/Security.pb.h" +#include "spark/logging/logging.h" +#include "spark/utils/PBUtils.h" namespace bts { namespace orderman { diff --git a/src/lib/orderman/limiter/Limiter.h b/src/lib_spark/spark/orderman/limiter/Limiter.h similarity index 96% rename from src/lib/orderman/limiter/Limiter.h rename to src/lib_spark/spark/orderman/limiter/Limiter.h index 6c2ceb4d4..ccb39d448 100644 --- a/src/lib/orderman/limiter/Limiter.h +++ b/src/lib_spark/spark/orderman/limiter/Limiter.h @@ -1,7 +1,7 @@ #pragma once -#include "lib/api/services/OrderService.pb.h" -#include "lib/orderman/orderman_utils/orderman_common.h" +#include "spark/api/services/OrderService.pb.h" +#include "spark/orderman/orderman_utils/orderman_common.h" #include namespace bts { diff --git a/src/lib/orderman/limiter/LimiterUtils.h b/src/lib_spark/spark/orderman/limiter/LimiterUtils.h similarity index 98% rename from src/lib/orderman/limiter/LimiterUtils.h rename to src/lib_spark/spark/orderman/limiter/LimiterUtils.h index 0bf9aaeeb..b91a1833d 100644 --- a/src/lib/orderman/limiter/LimiterUtils.h +++ b/src/lib_spark/spark/orderman/limiter/LimiterUtils.h @@ -1,7 +1,7 @@ #pragma once #include "Limiter.h" -#include "lib/orderman/orderman_utils/orderman_common.h" +#include "spark/orderman/orderman_utils/orderman_common.h" #include namespace bts { diff --git a/src/lib/orderman/limiter/ProductLimitNode.cpp b/src/lib_spark/spark/orderman/limiter/ProductLimitNode.cpp similarity index 100% rename from src/lib/orderman/limiter/ProductLimitNode.cpp rename to src/lib_spark/spark/orderman/limiter/ProductLimitNode.cpp diff --git a/src/lib/orderman/limiter/ProductLimitNode.h b/src/lib_spark/spark/orderman/limiter/ProductLimitNode.h similarity index 93% rename from src/lib/orderman/limiter/ProductLimitNode.h rename to src/lib_spark/spark/orderman/limiter/ProductLimitNode.h index de7e4bc71..51eed54ce 100644 --- a/src/lib/orderman/limiter/ProductLimitNode.h +++ b/src/lib_spark/spark/orderman/limiter/ProductLimitNode.h @@ -2,11 +2,11 @@ #include "Limiter.h" #include "LimiterUtils.h" -#include "lib/api/service_helpers/AdminServiceUtils.h" -#include "lib/api/services/AdminService.server.pb.h" -#include "lib/api/services/OrderService.pb.h" -#include "lib/domain_model/Security.pb.h" -#include "lib/orderman/orderman_utils/orderman_common.h" +#include "spark/api/service_helpers/AdminServiceUtils.h" +#include "spark/api/services/AdminService.server.pb.h" +#include "spark/api/services/OrderService.pb.h" +#include "spark/domain_model/Security.pb.h" +#include "spark/orderman/orderman_utils/orderman_common.h" #include namespace bts { diff --git a/src/lib/orderman/limiter/ProductLimitTree.cpp b/src/lib_spark/spark/orderman/limiter/ProductLimitTree.cpp similarity index 100% rename from src/lib/orderman/limiter/ProductLimitTree.cpp rename to src/lib_spark/spark/orderman/limiter/ProductLimitTree.cpp diff --git a/src/lib/orderman/limiter/ProductLimitTree.h b/src/lib_spark/spark/orderman/limiter/ProductLimitTree.h similarity index 80% rename from src/lib/orderman/limiter/ProductLimitTree.h rename to src/lib_spark/spark/orderman/limiter/ProductLimitTree.h index 9a513b160..f3f0a2ae6 100644 --- a/src/lib/orderman/limiter/ProductLimitTree.h +++ b/src/lib_spark/spark/orderman/limiter/ProductLimitTree.h @@ -3,11 +3,11 @@ #include "Limiter.h" #include "LimiterUtils.h" #include "ProductLimitNode.h" -#include "lib/api/service_helpers/AdminServiceUtils.h" -#include "lib/api/services/AdminService.server.pb.h" -#include "lib/api/services/OrderService.pb.h" -#include "lib/domain_model/Security.pb.h" -#include "lib/orderman/orderman_utils/orderman_common.h" +#include "spark/api/service_helpers/AdminServiceUtils.h" +#include "spark/api/services/AdminService.server.pb.h" +#include "spark/api/services/OrderService.pb.h" +#include "spark/domain_model/Security.pb.h" +#include "spark/orderman/orderman_utils/orderman_common.h" #include namespace bts { diff --git a/src/lib/orderman/limiter/SecurityLimitNode.cpp b/src/lib_spark/spark/orderman/limiter/SecurityLimitNode.cpp similarity index 100% rename from src/lib/orderman/limiter/SecurityLimitNode.cpp rename to src/lib_spark/spark/orderman/limiter/SecurityLimitNode.cpp diff --git a/src/lib/orderman/limiter/SecurityLimitNode.h b/src/lib_spark/spark/orderman/limiter/SecurityLimitNode.h similarity index 90% rename from src/lib/orderman/limiter/SecurityLimitNode.h rename to src/lib_spark/spark/orderman/limiter/SecurityLimitNode.h index 65641b46a..bbc2546e8 100644 --- a/src/lib/orderman/limiter/SecurityLimitNode.h +++ b/src/lib_spark/spark/orderman/limiter/SecurityLimitNode.h @@ -4,14 +4,14 @@ #include "Limiter.h" #include "LimiterUtils.h" #include "ProductLimitTree.h" -#include "lib/api/service_helpers/AdminServiceUtils.h" -#include "lib/api/service_helpers/PositionUtilities.h" -#include "lib/api/services/AdminService.server.pb.h" -#include "lib/api/services/OrderService.pb.h" -#include "lib/api/services/PositionService.pb.h" -#include "lib/api/services/PositionService.server.pb.h" -#include "lib/domain_model/Security.pb.h" -#include "lib/orderman/orderman_utils/orderman_common.h" +#include "spark/api/service_helpers/AdminServiceUtils.h" +#include "spark/api/service_helpers/PositionUtilities.h" +#include "spark/api/services/AdminService.server.pb.h" +#include "spark/api/services/OrderService.pb.h" +#include "spark/api/services/PositionService.pb.h" +#include "spark/api/services/PositionService.server.pb.h" +#include "spark/domain_model/Security.pb.h" +#include "spark/orderman/orderman_utils/orderman_common.h" #include namespace bts { diff --git a/src/lib/orderman/limiter/SecurityLimitTree.cpp b/src/lib_spark/spark/orderman/limiter/SecurityLimitTree.cpp similarity index 87% rename from src/lib/orderman/limiter/SecurityLimitTree.cpp rename to src/lib_spark/spark/orderman/limiter/SecurityLimitTree.cpp index ee1919876..2b382ed6e 100644 --- a/src/lib/orderman/limiter/SecurityLimitTree.cpp +++ b/src/lib_spark/spark/orderman/limiter/SecurityLimitTree.cpp @@ -1,5 +1,5 @@ -#include "lib/orderman/limiter/SecurityLimitTree.h" -#include "lib/api/service_helpers/AdminServiceUtils.h" +#include "spark/orderman/limiter/SecurityLimitTree.h" +#include "spark/api/service_helpers/AdminServiceUtils.h" using namespace bts::api::admin; using namespace bts::admin; diff --git a/src/lib/orderman/limiter/SecurityLimitTree.h b/src/lib_spark/spark/orderman/limiter/SecurityLimitTree.h similarity index 93% rename from src/lib/orderman/limiter/SecurityLimitTree.h rename to src/lib_spark/spark/orderman/limiter/SecurityLimitTree.h index c03488bfa..b70c0bc98 100644 --- a/src/lib/orderman/limiter/SecurityLimitTree.h +++ b/src/lib_spark/spark/orderman/limiter/SecurityLimitTree.h @@ -4,11 +4,11 @@ #include "Limiter.h" #include "ProductLimitTree.h" #include "SecurityLimitNode.h" -#include "lib/api/service_helpers/AdminServiceUtils.h" -#include "lib/api/services/AdminService.server.pb.h" -#include "lib/api/services/OrderService.pb.h" -#include "lib/domain_model/Security.pb.h" -#include "lib/orderman/orderman_utils/orderman_common.h" +#include "spark/api/service_helpers/AdminServiceUtils.h" +#include "spark/api/services/AdminService.server.pb.h" +#include "spark/api/services/OrderService.pb.h" +#include "spark/domain_model/Security.pb.h" +#include "spark/orderman/orderman_utils/orderman_common.h" #include namespace bts { diff --git a/src/lib/orderman/limiter/tests/limit_tests.cpp b/src/lib_spark/spark/orderman/limiter/tests/limit_tests.cpp similarity index 96% rename from src/lib/orderman/limiter/tests/limit_tests.cpp rename to src/lib_spark/spark/orderman/limiter/tests/limit_tests.cpp index f7db3ef56..86fc93d28 100644 --- a/src/lib/orderman/limiter/tests/limit_tests.cpp +++ b/src/lib_spark/spark/orderman/limiter/tests/limit_tests.cpp @@ -1,11 +1,11 @@ -#include "lib/api/service_helpers/AdminServiceUtils.h" -#include "lib/api/services/AdminService.server.pb.h" -#include "lib/config/config.h" -#include "lib/domain_model/Security.h" -#include "lib/orderman/limiter/LimitStore.h" -#include "lib/orderman/limiter/Limiter.h" -#include "lib/utils/bts_chrono.h" -#include "lib/utils/helper_macros.h" +#include "spark/api/service_helpers/AdminServiceUtils.h" +#include "spark/api/services/AdminService.server.pb.h" +#include "spark/config/config.h" +#include "spark/domain_model/Security.h" +#include "spark/orderman/limiter/LimitStore.h" +#include "spark/orderman/limiter/Limiter.h" +#include "spark/utils/bts_chrono.h" +#include "spark/utils/helper_macros.h" #include #include diff --git a/src/lib/orderman/log_messages/cancel_order_log.cpp b/src/lib_spark/spark/orderman/log_messages/cancel_order_log.cpp similarity index 92% rename from src/lib/orderman/log_messages/cancel_order_log.cpp rename to src/lib_spark/spark/orderman/log_messages/cancel_order_log.cpp index 4dcb6bcfd..56da7fc5c 100644 --- a/src/lib/orderman/log_messages/cancel_order_log.cpp +++ b/src/lib_spark/spark/orderman/log_messages/cancel_order_log.cpp @@ -1,5 +1,5 @@ #include "cancel_order_log.h" -#include "lib/core/TimeStamp.h" +#include "spark/core/TimeStamp.h" #include diff --git a/src/lib/orderman/log_messages/cancel_order_log.h b/src/lib_spark/spark/orderman/log_messages/cancel_order_log.h similarity index 86% rename from src/lib/orderman/log_messages/cancel_order_log.h rename to src/lib_spark/spark/orderman/log_messages/cancel_order_log.h index 6f14ff617..d9e938d9a 100644 --- a/src/lib/orderman/log_messages/cancel_order_log.h +++ b/src/lib_spark/spark/orderman/log_messages/cancel_order_log.h @@ -1,9 +1,9 @@ #pragma once -#include "lib/core/FMT_IMPL.h" -#include "lib/domain_model/Security.h" -#include "lib/domain_model/Side.h" -#include "lib/orderman/CancelOrderMsg.h" +#include "spark/core/FMT_IMPL.h" +#include "spark/domain_model/Security.h" +#include "spark/domain_model/Side.h" +#include "spark/orderman/CancelOrderMsg.h" #include #include diff --git a/src/lib/orderman/log_messages/create_order_log.cpp b/src/lib_spark/spark/orderman/log_messages/create_order_log.cpp similarity index 92% rename from src/lib/orderman/log_messages/create_order_log.cpp rename to src/lib_spark/spark/orderman/log_messages/create_order_log.cpp index 8242027d2..ff0c03d58 100644 --- a/src/lib/orderman/log_messages/create_order_log.cpp +++ b/src/lib_spark/spark/orderman/log_messages/create_order_log.cpp @@ -1,5 +1,5 @@ #include "create_order_log.h" -#include "lib/core/TimeStamp.h" +#include "spark/core/TimeStamp.h" #include diff --git a/src/lib/orderman/log_messages/create_order_log.h b/src/lib_spark/spark/orderman/log_messages/create_order_log.h similarity index 88% rename from src/lib/orderman/log_messages/create_order_log.h rename to src/lib_spark/spark/orderman/log_messages/create_order_log.h index 1625fc69b..24a482cfb 100644 --- a/src/lib/orderman/log_messages/create_order_log.h +++ b/src/lib_spark/spark/orderman/log_messages/create_order_log.h @@ -1,10 +1,9 @@ #pragma once -#include "lib/api/services/OrderService.h" -#include "lib/core/FMT_IMPL.h" -#include "lib/domain_model/Security.h" -#include "lib/domain_model/Security.pb.h" -#include "lib/orderman/CreateOrderMsg.h" +#include "spark/api/services/OrderService.h" +#include "spark/core/FMT_IMPL.h" +#include "spark/domain_model/Security.h" +#include "spark/orderman/CreateOrderMsg.h" #include #include diff --git a/src/lib/orderman/log_messages/execution_report_log.cpp b/src/lib_spark/spark/orderman/log_messages/execution_report_log.cpp similarity index 85% rename from src/lib/orderman/log_messages/execution_report_log.cpp rename to src/lib_spark/spark/orderman/log_messages/execution_report_log.cpp index 1412e38c8..0696eb546 100644 --- a/src/lib/orderman/log_messages/execution_report_log.cpp +++ b/src/lib_spark/spark/orderman/log_messages/execution_report_log.cpp @@ -1,7 +1,7 @@ #include "execution_report_log.h" -#include "lib/core/TimeStamp.h" -#include "lib/orderman/orderman_utils/ExecutionReport.h" -#include "lib/orderman/orderman_utils/orderman_common.h" +#include "spark/core/TimeStamp.h" +#include "spark/orderman/orderman_utils/ExecutionReport.h" +#include "spark/orderman/orderman_utils/orderman_common.h" #include diff --git a/src/lib/orderman/log_messages/execution_report_log.h b/src/lib_spark/spark/orderman/log_messages/execution_report_log.h similarity index 90% rename from src/lib/orderman/log_messages/execution_report_log.h rename to src/lib_spark/spark/orderman/log_messages/execution_report_log.h index 510b41c3d..a9b91111b 100644 --- a/src/lib/orderman/log_messages/execution_report_log.h +++ b/src/lib_spark/spark/orderman/log_messages/execution_report_log.h @@ -1,9 +1,9 @@ #pragma once -#include "lib/api/services/OrderService.h" -#include "lib/domain_model/Security.h" -#include "lib/orderman/orderman_utils/ExecutionReport.h" -#include "lib/orderman/orderman_utils/orderman_common.h" +#include "spark/api/services/OrderService.h" +#include "spark/domain_model/Security.h" +#include "spark/orderman/orderman_utils/ExecutionReport.h" +#include "spark/orderman/orderman_utils/orderman_common.h" #include #include diff --git a/src/lib/orderman/log_messages/modify_order_log.cpp b/src/lib_spark/spark/orderman/log_messages/modify_order_log.cpp similarity index 84% rename from src/lib/orderman/log_messages/modify_order_log.cpp rename to src/lib_spark/spark/orderman/log_messages/modify_order_log.cpp index 9740d9d7a..3638641af 100644 --- a/src/lib/orderman/log_messages/modify_order_log.cpp +++ b/src/lib_spark/spark/orderman/log_messages/modify_order_log.cpp @@ -1,6 +1,6 @@ #include "modify_order_log.h" -#include "lib/core/TimeStamp.h" -#include "lib/orderman/CancelReplaceOrderMsg.h" +#include "spark/core/TimeStamp.h" +#include "spark/orderman/CancelReplaceOrderMsg.h" namespace bts::orderman { diff --git a/src/lib/orderman/log_messages/modify_order_log.h b/src/lib_spark/spark/orderman/log_messages/modify_order_log.h similarity index 91% rename from src/lib/orderman/log_messages/modify_order_log.h rename to src/lib_spark/spark/orderman/log_messages/modify_order_log.h index dbf2b8c8e..a45185ae8 100644 --- a/src/lib/orderman/log_messages/modify_order_log.h +++ b/src/lib_spark/spark/orderman/log_messages/modify_order_log.h @@ -1,8 +1,8 @@ #pragma once -#include "lib/api/services/OrderService.h" -#include "lib/core/FMT_IMPL.h" -#include "lib/orderman/CancelReplaceOrderMsg.h" +#include "spark/api/services/OrderService.h" +#include "spark/core/FMT_IMPL.h" +#include "spark/orderman/CancelReplaceOrderMsg.h" #include #include diff --git a/src/lib/orderman/order_desc.cpp b/src/lib_spark/spark/orderman/order_desc.cpp similarity index 93% rename from src/lib/orderman/order_desc.cpp rename to src/lib_spark/spark/orderman/order_desc.cpp index b02736120..f01f341aa 100644 --- a/src/lib/orderman/order_desc.cpp +++ b/src/lib_spark/spark/orderman/order_desc.cpp @@ -1,5 +1,5 @@ #include "order_desc.h" -#include "lib/api/services/OrderService.pb.h" +#include "spark/api/services/OrderService.pb.h" namespace bts::orderman { diff --git a/src/lib/orderman/order_desc.h b/src/lib_spark/spark/orderman/order_desc.h similarity index 100% rename from src/lib/orderman/order_desc.h rename to src/lib_spark/spark/orderman/order_desc.h diff --git a/src/lib/orderman/order_factory/DynamicAlgoBuilder.h b/src/lib_spark/spark/orderman/order_factory/DynamicAlgoBuilder.h similarity index 100% rename from src/lib/orderman/order_factory/DynamicAlgoBuilder.h rename to src/lib_spark/spark/orderman/order_factory/DynamicAlgoBuilder.h diff --git a/src/lib/orderman/order_factory/DynamicOrderBuilder.h b/src/lib_spark/spark/orderman/order_factory/DynamicOrderBuilder.h similarity index 100% rename from src/lib/orderman/order_factory/DynamicOrderBuilder.h rename to src/lib_spark/spark/orderman/order_factory/DynamicOrderBuilder.h diff --git a/src/lib/orderman/order_factory/DynamicOrderRegistry.cpp b/src/lib_spark/spark/orderman/order_factory/DynamicOrderRegistry.cpp similarity index 90% rename from src/lib/orderman/order_factory/DynamicOrderRegistry.cpp rename to src/lib_spark/spark/orderman/order_factory/DynamicOrderRegistry.cpp index 1bc03ad39..47e1d3dc7 100644 --- a/src/lib/orderman/order_factory/DynamicOrderRegistry.cpp +++ b/src/lib_spark/spark/orderman/order_factory/DynamicOrderRegistry.cpp @@ -1,7 +1,7 @@ #include "DynamicOrderRegistry.h" -#include "lib/orderman/orders/DynamicOrder.h" -#include "lib/orderman/orders/algo/AlgoWrapperOrder.h" -#include "lib/orderman/orders/algo/IAlgoOrder.h" +#include "spark/orderman/orders/DynamicOrder.h" +#include "spark/orderman/orders/algo/AlgoWrapperOrder.h" +#include "spark/orderman/orders/algo/IAlgoOrder.h" #include diff --git a/src/lib/orderman/order_factory/DynamicOrderRegistry.h b/src/lib_spark/spark/orderman/order_factory/DynamicOrderRegistry.h similarity index 81% rename from src/lib/orderman/order_factory/DynamicOrderRegistry.h rename to src/lib_spark/spark/orderman/order_factory/DynamicOrderRegistry.h index 87f04e811..49717761b 100644 --- a/src/lib/orderman/order_factory/DynamicOrderRegistry.h +++ b/src/lib_spark/spark/orderman/order_factory/DynamicOrderRegistry.h @@ -1,9 +1,9 @@ #pragma once -#include "lib/orderman/order_factory/DynamicAlgoBuilder.h" -#include "lib/orderman/order_factory/DynamicOrderBuilder.h" +#include "spark/orderman/order_factory/DynamicAlgoBuilder.h" +#include "spark/orderman/order_factory/DynamicOrderBuilder.h" -#include "lib/api/services/OrderService.pb.h" +#include "spark/api/services/OrderService.pb.h" namespace bts { namespace orderman { diff --git a/src/lib/orderman/order_factory/IOrderFactory.h b/src/lib_spark/spark/orderman/order_factory/IOrderFactory.h similarity index 92% rename from src/lib/orderman/order_factory/IOrderFactory.h rename to src/lib_spark/spark/orderman/order_factory/IOrderFactory.h index 5422dcd89..e3518b6e4 100644 --- a/src/lib/orderman/order_factory/IOrderFactory.h +++ b/src/lib_spark/spark/orderman/order_factory/IOrderFactory.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/orderman/orderman_utils/orderman_common.h" +#include "spark/orderman/orderman_utils/orderman_common.h" namespace bts::orderman { class Order; diff --git a/src/lib/orderman/order_factory/OrderFactory.cpp b/src/lib_spark/spark/orderman/order_factory/OrderFactory.cpp similarity index 82% rename from src/lib/orderman/order_factory/OrderFactory.cpp rename to src/lib_spark/spark/orderman/order_factory/OrderFactory.cpp index 0812a2d5f..1f08119cc 100644 --- a/src/lib/orderman/order_factory/OrderFactory.cpp +++ b/src/lib_spark/spark/orderman/order_factory/OrderFactory.cpp @@ -1,38 +1,38 @@ #include "OrderFactory.h" -#include "lib/api/services/OrderService.pb.h" -#include "lib/domain_model/Security.pb.h" -#include "lib/logging/logging.h" -#include "lib/orderman/orderman_utils/ExecutionReport.h" -#include "lib/orderman/orders/EMNativeOrder.h" -#include "lib/orderman/orders/PreActivationOrderServices.h" -#include "lib/utils/Puid.h" -#include "lib/utils/SpinLock.h" -#include "lib/utils/bts_assert.h" +#include "spark/api/services/OrderService.pb.h" +#include "spark/domain_model/Security.pb.h" +#include "spark/logging/logging.h" +#include "spark/orderman/orderman_utils/ExecutionReport.h" +#include "spark/orderman/orders/EMNativeOrder.h" +#include "spark/orderman/orders/PreActivationOrderServices.h" +#include "spark/utils/Puid.h" +#include "spark/utils/SpinLock.h" +#include "spark/utils/bts_assert.h" // order types -#include "lib/orderman/order_factory/DynamicOrderRegistry.h" -#include "lib/orderman/orders/CompositeOrder.h" -#include "lib/orderman/orders/DynamicOrder.h" -#include "lib/orderman/orders/EMNativeOrder.h" -#include "lib/orderman/orders/GLBXNativeOrder.h" -#include "lib/orderman/orders/ICENativeOrder.h" -#include "lib/orderman/orders/TimeBoxOrder.h" -#include "lib/orderman/orders/TriggerOrder.h" -#include "lib/orderman/orders/algo/AlgoWrapperOrder.h" -#include "lib/orderman/orders/algo/algo_orders/CoverAlgo.h" -#include "lib/orderman/orders/algo/algo_orders/DeleteAndCoverAlgo.h" -#include "lib/orderman/orders/algo/algo_orders/IcebergAlgo.h" -#include "lib/orderman/orders/algo/algo_orders/JoinAlgo.h" -#include "lib/orderman/orders/algo/algo_orders/LeanAlgo.h" -#include "lib/orderman/orders/algo/algo_orders/OffsetAlgo.h" -#include "lib/orderman/orders/algo/algo_orders/ProRataAlgo.h" -#include "lib/orderman/orders/algo/algo_orders/ScratchAlgo.h" -#include "lib/orderman/orders/algo/algo_orders/SplitterAlgo.h" -#include "lib/orderman/orders/algo/algo_orders/TopAlgo.h" -#include "lib/orderman/orders/book_algos/OCOOrder.h" -#include "lib/orderman/orders/book_algos/PricerOrder.h" -#include "lib/orderman/orders/queue_holder/QueueHolderOrder.h" -#include "lib/orderman/orders/spreader_orders/SpreaderOrder.h" +#include "spark/orderman/order_factory/DynamicOrderRegistry.h" +#include "spark/orderman/orders/CompositeOrder.h" +#include "spark/orderman/orders/DynamicOrder.h" +#include "spark/orderman/orders/EMNativeOrder.h" +#include "spark/orderman/orders/GLBXNativeOrder.h" +#include "spark/orderman/orders/ICENativeOrder.h" +#include "spark/orderman/orders/TimeBoxOrder.h" +#include "spark/orderman/orders/TriggerOrder.h" +#include "spark/orderman/orders/algo/AlgoWrapperOrder.h" +#include "spark/orderman/orders/algo/algo_orders/CoverAlgo.h" +#include "spark/orderman/orders/algo/algo_orders/DeleteAndCoverAlgo.h" +#include "spark/orderman/orders/algo/algo_orders/IcebergAlgo.h" +#include "spark/orderman/orders/algo/algo_orders/JoinAlgo.h" +#include "spark/orderman/orders/algo/algo_orders/LeanAlgo.h" +#include "spark/orderman/orders/algo/algo_orders/OffsetAlgo.h" +#include "spark/orderman/orders/algo/algo_orders/ProRataAlgo.h" +#include "spark/orderman/orders/algo/algo_orders/ScratchAlgo.h" +#include "spark/orderman/orders/algo/algo_orders/SplitterAlgo.h" +#include "spark/orderman/orders/algo/algo_orders/TopAlgo.h" +#include "spark/orderman/orders/book_algos/OCOOrder.h" +#include "spark/orderman/orders/book_algos/PricerOrder.h" +#include "spark/orderman/orders/queue_holder/QueueHolderOrder.h" +#include "spark/orderman/orders/spreader_orders/SpreaderOrder.h" #include #include diff --git a/src/lib/orderman/order_factory/OrderFactory.h b/src/lib_spark/spark/orderman/order_factory/OrderFactory.h similarity index 92% rename from src/lib/orderman/order_factory/OrderFactory.h rename to src/lib_spark/spark/orderman/order_factory/OrderFactory.h index 8da4489d8..eab78623f 100644 --- a/src/lib/orderman/order_factory/OrderFactory.h +++ b/src/lib_spark/spark/orderman/order_factory/OrderFactory.h @@ -1,7 +1,7 @@ #pragma once -#include "lib/config/protos/jetfix.pb.h" -#include "lib/orderman/order_factory/IOrderFactory.h" +#include "spark/config/protos/jetfix.pb.h" +#include "spark/orderman/order_factory/IOrderFactory.h" #include // fwd diff --git a/src/lib/orderman/order_key.h b/src/lib_spark/spark/orderman/order_key.h similarity index 81% rename from src/lib/orderman/order_key.h rename to src/lib_spark/spark/orderman/order_key.h index 1d923ba97..8c7f26b0a 100644 --- a/src/lib/orderman/order_key.h +++ b/src/lib_spark/spark/orderman/order_key.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/utils/ValueWrapper.h" +#include "spark/utils/ValueWrapper.h" #include diff --git a/src/lib/orderman/orderman_utils/Book.h b/src/lib_spark/spark/orderman/orderman_utils/Book.h similarity index 93% rename from src/lib/orderman/orderman_utils/Book.h rename to src/lib_spark/spark/orderman/orderman_utils/Book.h index 6c0223b24..3871d813a 100644 --- a/src/lib/orderman/orderman_utils/Book.h +++ b/src/lib_spark/spark/orderman/orderman_utils/Book.h @@ -1,7 +1,7 @@ #pragma once -#include "lib/core/FMT_IMPL.h" -#include "lib/md/PriceSize.h" +#include "spark/core/FMT_IMPL.h" +#include "spark/md/PriceSize.h" #include diff --git a/src/lib/orderman/orderman_utils/BookUtils.cpp b/src/lib_spark/spark/orderman/orderman_utils/BookUtils.cpp similarity index 100% rename from src/lib/orderman/orderman_utils/BookUtils.cpp rename to src/lib_spark/spark/orderman/orderman_utils/BookUtils.cpp diff --git a/src/lib/orderman/orderman_utils/BookUtils.h b/src/lib_spark/spark/orderman/orderman_utils/BookUtils.h similarity index 67% rename from src/lib/orderman/orderman_utils/BookUtils.h rename to src/lib_spark/spark/orderman/orderman_utils/BookUtils.h index d9f2735be..e8a524c09 100644 --- a/src/lib/orderman/orderman_utils/BookUtils.h +++ b/src/lib_spark/spark/orderman/orderman_utils/BookUtils.h @@ -1,10 +1,10 @@ #pragma once -#include "lib/api/services/OrderService.pb.h" -#include "lib/config/protos/market_data.pb.h" -#include "lib/domain_model/Security.h" -#include "lib/domain_model/common.h" -#include "lib/orderman/orderman_utils/Book.h" -#include "lib/orderman/orderman_utils/PriceComp.h" +#include "spark/api/services/OrderService.pb.h" +#include "spark/config/protos/market_data.pb.h" +#include "spark/domain_model/Security.h" +#include "spark/domain_model/common.h" +#include "spark/orderman/orderman_utils/Book.h" +#include "spark/orderman/orderman_utils/PriceComp.h" namespace bts::orderman { struct BookUtils { diff --git a/src/lib/orderman/orderman_utils/CancelReject.h b/src/lib_spark/spark/orderman/orderman_utils/CancelReject.h similarity index 82% rename from src/lib/orderman/orderman_utils/CancelReject.h rename to src/lib_spark/spark/orderman/orderman_utils/CancelReject.h index d371be104..d82f9a63d 100644 --- a/src/lib/orderman/orderman_utils/CancelReject.h +++ b/src/lib_spark/spark/orderman/orderman_utils/CancelReject.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/orderman/orderman_utils/orderman_common.h" +#include "spark/orderman/orderman_utils/orderman_common.h" #include namespace bts { diff --git a/src/lib/orderman/orderman_utils/EventStream.h b/src/lib_spark/spark/orderman/orderman_utils/EventStream.h similarity index 96% rename from src/lib/orderman/orderman_utils/EventStream.h rename to src/lib_spark/spark/orderman/orderman_utils/EventStream.h index 1aa2a3224..f8963c0b9 100644 --- a/src/lib/orderman/orderman_utils/EventStream.h +++ b/src/lib_spark/spark/orderman/orderman_utils/EventStream.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/mercury/actors/ContentSubscription.h" +#include "spark/mercury/actors/ContentSubscription.h" #include #include diff --git a/src/lib/orderman/orderman_utils/ExchangeOpenOrders.h b/src/lib_spark/spark/orderman/orderman_utils/ExchangeOpenOrders.h similarity index 74% rename from src/lib/orderman/orderman_utils/ExchangeOpenOrders.h rename to src/lib_spark/spark/orderman/orderman_utils/ExchangeOpenOrders.h index accc2b1ae..f67892933 100644 --- a/src/lib/orderman/orderman_utils/ExchangeOpenOrders.h +++ b/src/lib_spark/spark/orderman/orderman_utils/ExchangeOpenOrders.h @@ -1,11 +1,11 @@ #pragma once -#include "lib/api/services/OrderService.pb.h" -#include "lib/domain_model/Security.pb.h" -#include "lib/domain_model/common.h" -#include "lib/mercury/common/mercury_common.h" -#include "lib/orderman/orderman_utils/orderman_common.h" -#include "lib/utils/overloaded.h" +#include "spark/api/services/OrderService.pb.h" +#include "spark/domain_model/Security.pb.h" +#include "spark/domain_model/common.h" +#include "spark/mercury/common/mercury_common.h" +#include "spark/orderman/orderman_utils/orderman_common.h" +#include "spark/utils/overloaded.h" #include #include #include diff --git a/src/lib/orderman/orderman_utils/ExchangePosition.h b/src/lib_spark/spark/orderman/orderman_utils/ExchangePosition.h similarity index 74% rename from src/lib/orderman/orderman_utils/ExchangePosition.h rename to src/lib_spark/spark/orderman/orderman_utils/ExchangePosition.h index 4b977a914..59a9e53e8 100644 --- a/src/lib/orderman/orderman_utils/ExchangePosition.h +++ b/src/lib_spark/spark/orderman/orderman_utils/ExchangePosition.h @@ -1,9 +1,9 @@ #pragma once -#include "lib/domain_model/common.h" -#include "lib/mercury/common/mercury_common.h" -#include "lib/orderman/orderman_utils/orderman_common.h" -#include "lib/utils/overloaded.h" +#include "spark/domain_model/common.h" +#include "spark/mercury/common/mercury_common.h" +#include "spark/orderman/orderman_utils/orderman_common.h" +#include "spark/utils/overloaded.h" #include #include #include diff --git a/src/lib/orderman/orderman_utils/ExecutionReport.cpp b/src/lib_spark/spark/orderman/orderman_utils/ExecutionReport.cpp similarity index 92% rename from src/lib/orderman/orderman_utils/ExecutionReport.cpp rename to src/lib_spark/spark/orderman/orderman_utils/ExecutionReport.cpp index 0ce365cac..6bb3872e4 100644 --- a/src/lib/orderman/orderman_utils/ExecutionReport.cpp +++ b/src/lib_spark/spark/orderman/orderman_utils/ExecutionReport.cpp @@ -1,8 +1,8 @@ #include "ExecutionReport.h" -#include "lib/api/services/OrderService.pb.h" -#include "lib/domain_model/Security.h" -#include "lib/orderman/orderman_utils/orderman_common.h" -#include "lib/utils/overloaded.h" +#include "spark/api/services/OrderService.pb.h" +#include "spark/domain_model/Security.h" +#include "spark/orderman/orderman_utils/orderman_common.h" +#include "spark/utils/overloaded.h" #include #include diff --git a/src/lib/orderman/orderman_utils/ExecutionReport.h b/src/lib_spark/spark/orderman/orderman_utils/ExecutionReport.h similarity index 92% rename from src/lib/orderman/orderman_utils/ExecutionReport.h rename to src/lib_spark/spark/orderman/orderman_utils/ExecutionReport.h index 94bf43644..dc815eefc 100644 --- a/src/lib/orderman/orderman_utils/ExecutionReport.h +++ b/src/lib_spark/spark/orderman/orderman_utils/ExecutionReport.h @@ -1,7 +1,7 @@ #pragma once -#include "lib/config/protos/jetfix.pb.h" -#include "lib/orderman/orderman_utils/orderman_common.h" +#include "spark/config/protos/jetfix.pb.h" +#include "spark/orderman/orderman_utils/orderman_common.h" namespace bts::orderman { diff --git a/src/lib/orderman/orderman_utils/Formatter.h b/src/lib_spark/spark/orderman/orderman_utils/Formatter.h similarity index 93% rename from src/lib/orderman/orderman_utils/Formatter.h rename to src/lib_spark/spark/orderman/orderman_utils/Formatter.h index 5ad778c5f..0c62e5041 100644 --- a/src/lib/orderman/orderman_utils/Formatter.h +++ b/src/lib_spark/spark/orderman/orderman_utils/Formatter.h @@ -1,11 +1,11 @@ #pragma once -#include "lib/api/services/OrderService.pb.h" -#include "lib/config/protos/market_data.pb.h" -#include "lib/domain_model/common.h" -#include "lib/md/PriceSize.h" -#include "lib/orderman/orderman_utils/Book.h" -#include "lib/orderman/orders/algo/IAlgoOrder.h" -#include "lib/utils/PBUtils.h" +#include "spark/api/services/OrderService.pb.h" +#include "spark/config/protos/market_data.pb.h" +#include "spark/domain_model/common.h" +#include "spark/md/PriceSize.h" +#include "spark/orderman/orderman_utils/Book.h" +#include "spark/orderman/orders/algo/IAlgoOrder.h" +#include "spark/utils/PBUtils.h" #include #include #include diff --git a/src/lib/orderman/orderman_utils/OkxUtils.h b/src/lib_spark/spark/orderman/orderman_utils/OkxUtils.h similarity index 96% rename from src/lib/orderman/orderman_utils/OkxUtils.h rename to src/lib_spark/spark/orderman/orderman_utils/OkxUtils.h index 9b93c018d..5d32260a5 100644 --- a/src/lib/orderman/orderman_utils/OkxUtils.h +++ b/src/lib_spark/spark/orderman/orderman_utils/OkxUtils.h @@ -1,11 +1,12 @@ -#include "lib/api/services/OrderService.pb.h" -#include "lib/domain_model/Security.pb.h" -#include "lib/logging/logging.h" -#include "lib/md/SecurityOracle.h" -#include "lib/orderman/CreateOrderMsg.h" -#include "lib/orderman/gateways/IExecutionGateway.h" -#include "lib/orderman/orderman_utils/ExecutionReport.h" -#include "lib/utils/bts_assert.h" +#include "spark/api/services/OrderService.pb.h" +#include "spark/domain_model/Security.pb.h" +#include "spark/logging/logging.h" +#include "spark/md/SecurityOracle.h" +#include "spark/orderman/CreateOrderMsg.h" +#include "spark/orderman/gateways/IExecutionGateway.h" +#include "spark/orderman/orderman_utils/ExecutionReport.h" +#include "spark/utils/bts_assert.h" + #include #include #include @@ -30,6 +31,7 @@ #include #include #include + namespace bts::orderman { using json = nlohmann::json; class OkxUtils { diff --git a/src/lib/orderman/orderman_utils/PriceComp.h b/src/lib_spark/spark/orderman/orderman_utils/PriceComp.h similarity index 91% rename from src/lib/orderman/orderman_utils/PriceComp.h rename to src/lib_spark/spark/orderman/orderman_utils/PriceComp.h index bd1f0d02b..c09c169ce 100644 --- a/src/lib/orderman/orderman_utils/PriceComp.h +++ b/src/lib_spark/spark/orderman/orderman_utils/PriceComp.h @@ -1,9 +1,9 @@ #pragma once -#include "lib/domain_model/Security.h" -#include "lib/md/IntPrice.h" -#include "lib/domain_model/Security.pb.h" -#include "lib/utils/ValueWrapper.h" -#include "lib/utils/overloaded.h" +#include "spark/domain_model/Security.h" +#include "spark/md/IntPrice.h" +#include "spark/domain_model/Security.pb.h" +#include "spark/utils/ValueWrapper.h" +#include "spark/utils/overloaded.h" namespace bts { namespace orderman { diff --git a/src/lib/orderman/orderman_utils/fix_order_codec.cpp b/src/lib_spark/spark/orderman/orderman_utils/fix_order_codec.cpp similarity index 100% rename from src/lib/orderman/orderman_utils/fix_order_codec.cpp rename to src/lib_spark/spark/orderman/orderman_utils/fix_order_codec.cpp diff --git a/src/lib/orderman/orderman_utils/fix_order_codec.h b/src/lib_spark/spark/orderman/orderman_utils/fix_order_codec.h similarity index 94% rename from src/lib/orderman/orderman_utils/fix_order_codec.h rename to src/lib_spark/spark/orderman/orderman_utils/fix_order_codec.h index d4828719c..d4ff6a26a 100644 --- a/src/lib/orderman/orderman_utils/fix_order_codec.h +++ b/src/lib_spark/spark/orderman/orderman_utils/fix_order_codec.h @@ -3,11 +3,11 @@ #include #include -#include "lib/jetfix/codec/MessageDefinitions.h" -#include "lib/jetfix/codec/i32_toa.h" -#include "lib/utils/base62.h" -#include "lib/utils/bts_assert.h" -#include "lib/os/os.h" +#include "spark/jetfix/codec/MessageDefinitions.h" +#include "spark/jetfix/codec/i32_toa.h" +#include "spark/utils/base62.h" +#include "spark/utils/bts_assert.h" +#include "spark/os/os.h" #include "orderman_common.h" namespace bts { diff --git a/src/lib/orderman/orderman_utils/orderman_common.h b/src/lib_spark/spark/orderman/orderman_utils/orderman_common.h similarity index 96% rename from src/lib/orderman/orderman_utils/orderman_common.h rename to src/lib_spark/spark/orderman/orderman_utils/orderman_common.h index 14b0a6fa2..359da6492 100644 --- a/src/lib/orderman/orderman_utils/orderman_common.h +++ b/src/lib_spark/spark/orderman/orderman_utils/orderman_common.h @@ -1,5 +1,16 @@ #pragma once +#include "spark/api/services/OrderService.pb.h" +#include "spark/core/FMT_IMPL.h" +#include "spark/domain_model/common.h" +#include "spark/orderman/account_id.h" +#include "spark/orderman/account_name.h" +#include "spark/orderman/order_key.h" +#include "spark/utils/ValueWrapper.h" +#include "spark/utils/bts_assert.h" +#include "spark/utils/bts_chrono.h" +#include "spark/utils/overloaded.h" + #include #include #include @@ -7,17 +18,6 @@ #include #include -#include "lib/api/services/OrderService.pb.h" -#include "lib/core/FMT_IMPL.h" -#include "lib/domain_model/common.h" -#include "lib/orderman/account_id.h" -#include "lib/orderman/account_name.h" -#include "lib/orderman/order_key.h" -#include "lib/utils/ValueWrapper.h" -#include "lib/utils/bts_assert.h" -#include "lib/utils/bts_chrono.h" -#include "lib/utils/overloaded.h" - namespace bts { namespace api { class Security; diff --git a/src/lib/orderman/orderman_utils/orderman_utils.cpp b/src/lib_spark/spark/orderman/orderman_utils/orderman_utils.cpp similarity index 99% rename from src/lib/orderman/orderman_utils/orderman_utils.cpp rename to src/lib_spark/spark/orderman/orderman_utils/orderman_utils.cpp index 9f2daf4be..02a18b952 100644 --- a/src/lib/orderman/orderman_utils/orderman_utils.cpp +++ b/src/lib_spark/spark/orderman/orderman_utils/orderman_utils.cpp @@ -1,5 +1,5 @@ #include "orderman_utils.h" -#include "lib/utils/bts_assert.h" +#include "spark/utils/bts_assert.h" using namespace bts::api::orderman; diff --git a/src/lib/orderman/orderman_utils/orderman_utils.h b/src/lib_spark/spark/orderman/orderman_utils/orderman_utils.h similarity index 99% rename from src/lib/orderman/orderman_utils/orderman_utils.h rename to src/lib_spark/spark/orderman/orderman_utils/orderman_utils.h index b19f6d85d..ac0c27cb2 100644 --- a/src/lib/orderman/orderman_utils/orderman_utils.h +++ b/src/lib_spark/spark/orderman/orderman_utils/orderman_utils.h @@ -1,5 +1,5 @@ #pragma once -#include "lib/api/services/OrderService.pb.h" +#include "spark/api/services/OrderService.pb.h" #include #include diff --git a/src/lib/orderman/orders/CompositeOrder.cpp b/src/lib_spark/spark/orderman/orders/CompositeOrder.cpp similarity index 93% rename from src/lib/orderman/orders/CompositeOrder.cpp rename to src/lib_spark/spark/orderman/orders/CompositeOrder.cpp index dea82e9f1..edd4d7428 100644 --- a/src/lib/orderman/orders/CompositeOrder.cpp +++ b/src/lib_spark/spark/orderman/orders/CompositeOrder.cpp @@ -1,10 +1,10 @@ -#include "lib/orderman/orders/CompositeOrder.h" -#include "lib/api/services/OrderService.pb.h" -#include "lib/orderman/ChildOrder.h" -#include "lib/orderman/OrderBuilder.h" -#include "lib/orderman/orders/PreActivationOrderServices.h" -#include "lib/utils/PBUtils.h" -#include "lib/utils/bts_assert.h" +#include "spark/orderman/orders/CompositeOrder.h" +#include "spark/api/services/OrderService.pb.h" +#include "spark/orderman/ChildOrder.h" +#include "spark/orderman/OrderBuilder.h" +#include "spark/orderman/orders/PreActivationOrderServices.h" +#include "spark/utils/PBUtils.h" +#include "spark/utils/bts_assert.h" namespace bts { namespace orderman { diff --git a/src/lib/orderman/orders/CompositeOrder.h b/src/lib_spark/spark/orderman/orders/CompositeOrder.h similarity index 95% rename from src/lib/orderman/orders/CompositeOrder.h rename to src/lib_spark/spark/orderman/orders/CompositeOrder.h index cc7126b73..84ca9e636 100644 --- a/src/lib/orderman/orders/CompositeOrder.h +++ b/src/lib_spark/spark/orderman/orders/CompositeOrder.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/orderman/orders/Order.h" +#include "spark/orderman/orders/Order.h" namespace bts { namespace orderman { diff --git a/src/lib/orderman/orders/DynamicOrder.cpp b/src/lib_spark/spark/orderman/orders/DynamicOrder.cpp similarity index 95% rename from src/lib/orderman/orders/DynamicOrder.cpp rename to src/lib_spark/spark/orderman/orders/DynamicOrder.cpp index e1b3fe998..f80332339 100644 --- a/src/lib/orderman/orders/DynamicOrder.cpp +++ b/src/lib_spark/spark/orderman/orders/DynamicOrder.cpp @@ -1,6 +1,6 @@ #include "DynamicOrder.h" -#include "lib/logging/logging.h" -#include "lib/orderman/OrderServices.h" +#include "spark/logging/logging.h" +#include "spark/orderman/OrderServices.h" namespace bts { namespace orderman { diff --git a/src/lib/orderman/orders/DynamicOrder.h b/src/lib_spark/spark/orderman/orders/DynamicOrder.h similarity index 87% rename from src/lib/orderman/orders/DynamicOrder.h rename to src/lib_spark/spark/orderman/orders/DynamicOrder.h index fbd3442c6..0a5230d3c 100644 --- a/src/lib/orderman/orders/DynamicOrder.h +++ b/src/lib_spark/spark/orderman/orders/DynamicOrder.h @@ -1,7 +1,7 @@ #pragma once -#include "lib/api/services/OrderService.server.pb.h" -#include "lib/orderman/orders/Order.h" +#include "spark/api/services/OrderService.server.pb.h" +#include "spark/orderman/orders/Order.h" #include namespace bts { diff --git a/src/lib/orderman/orders/EMNativeOrder.cpp b/src/lib_spark/spark/orderman/orders/EMNativeOrder.cpp similarity index 95% rename from src/lib/orderman/orders/EMNativeOrder.cpp rename to src/lib_spark/spark/orderman/orders/EMNativeOrder.cpp index 8dbc280b3..7aa99c2ff 100644 --- a/src/lib/orderman/orders/EMNativeOrder.cpp +++ b/src/lib_spark/spark/orderman/orders/EMNativeOrder.cpp @@ -1,36 +1,35 @@ #include "EMNativeOrder.h" -#include "lib/api/services/OrderService.pb.h" -#include "lib/config/config.h" -#include "lib/config/protos/orderman_cfg.pb.h" -#include "lib/config/protos/toggles.pb.h" -#include "lib/domain/OrderStatus.h" -#include "lib/domain_model/Security.h" -#include "lib/domain_model/Security.pb.h" -#include "lib/domain_model/common.h" -#include "lib/jetfix/codec/FIXFragment.h" -#include "lib/jetfix/codec/FieldDefinitions.h" -#include "lib/logging/logging.h" -#include "lib/orderman/CancelOrderMsg.h" -#include "lib/orderman/CancelReplaceOrderMsg.h" -#include "lib/orderman/CreateOrderMsg.h" -#include "lib/orderman/OrderRouter.h" -#include "lib/orderman/OrderServices.h" -#include "lib/orderman/order_factory/IOrderFactory.h" -#include "lib/orderman/orderman_utils/ExecutionReport.h" -#include "lib/orderman/orderman_utils/fix_order_codec.h" -#include "lib/orderman/orderman_utils/orderman_common.h" -#include "lib/orderman/orders/OrderOpResult.h" -#include "lib/orderman/orders/PreActivationOrderServices.h" -#include "lib/orderman/orders/algo/IAlgoOrder.h" -#include "lib/orderman/orders/glbx/IGLBXOrderEncoder.h" -#include "lib/orderman/orders/glbx/iLink2OrderEncoder.h" -#include "lib/orderman/orders/glbx/iLink3OrderEncoder.h" -#include "lib/orderman/securities/ISecurityDB.h" -#include "lib/os/os.h" -#include "lib/utils/PBUtils.h" -#include "lib/utils/bts_assert.h" -#include "lib/utils/bts_chrono.h" -#include "server/sparkd/md/platforms/emumba/EmMDListener.h" +#include "spark/api/services/OrderService.pb.h" +#include "spark/config/config.h" +#include "spark/config/protos/orderman_cfg.pb.h" +#include "spark/config/protos/toggles.pb.h" +#include "spark/domain/OrderStatus.h" +#include "spark/domain_model/Security.h" +#include "spark/domain_model/common.h" +#include "spark/jetfix/codec/FIXFragment.h" +#include "spark/jetfix/codec/FieldDefinitions.h" +#include "spark/logging/logging.h" +#include "spark/orderman/CancelOrderMsg.h" +#include "spark/orderman/CancelReplaceOrderMsg.h" +#include "spark/orderman/CreateOrderMsg.h" +#include "spark/orderman/OrderRouter.h" +#include "spark/orderman/OrderServices.h" +#include "spark/orderman/order_factory/IOrderFactory.h" +#include "spark/orderman/orderman_utils/ExecutionReport.h" +#include "spark/orderman/orderman_utils/fix_order_codec.h" +#include "spark/orderman/orderman_utils/orderman_common.h" +#include "spark/orderman/orders/OrderOpResult.h" +#include "spark/orderman/orders/PreActivationOrderServices.h" +#include "spark/orderman/orders/algo/IAlgoOrder.h" +#include "spark/orderman/orders/glbx/IGLBXOrderEncoder.h" +#include "spark/orderman/orders/glbx/iLink2OrderEncoder.h" +#include "spark/orderman/orders/glbx/iLink3OrderEncoder.h" +#include "spark/orderman/securities/ISecurityDB.h" +#include "spark/os/os.h" +#include "spark/utils/PBUtils.h" +#include "spark/utils/bts_assert.h" +#include "spark/utils/bts_chrono.h" + #include #include #include diff --git a/src/lib/orderman/orders/EMNativeOrder.h b/src/lib_spark/spark/orderman/orders/EMNativeOrder.h similarity index 90% rename from src/lib/orderman/orders/EMNativeOrder.h rename to src/lib_spark/spark/orderman/orders/EMNativeOrder.h index 55fb3b1ae..6eaf795ec 100644 --- a/src/lib/orderman/orders/EMNativeOrder.h +++ b/src/lib_spark/spark/orderman/orders/EMNativeOrder.h @@ -1,11 +1,12 @@ #pragma once -#include "lib/api/services/OrderService.pb.h" -#include "lib/domain_model/Security.pb.h" -#include "lib/domain_model/common.h" -#include "lib/orderman/CreateOrderMsg.h" -#include "lib/orderman/orders/NativeOrderBase.h" -#include "lib/tracing/PerfLog.h" +#include "spark/api/services/OrderService.pb.h" +#include "spark/domain_model/Security.pb.h" +#include "spark/domain_model/common.h" +#include "spark/orderman/CreateOrderMsg.h" +#include "spark/orderman/orders/NativeOrderBase.h" +#include "spark/tracing/PerfLog.h" + #include namespace bts { diff --git a/src/lib/orderman/orders/GLBXNativeOrder.cpp b/src/lib_spark/spark/orderman/orders/GLBXNativeOrder.cpp similarity index 97% rename from src/lib/orderman/orders/GLBXNativeOrder.cpp rename to src/lib_spark/spark/orderman/orders/GLBXNativeOrder.cpp index e350c1190..8c9fef4f2 100644 --- a/src/lib/orderman/orders/GLBXNativeOrder.cpp +++ b/src/lib_spark/spark/orderman/orders/GLBXNativeOrder.cpp @@ -1,27 +1,27 @@ #include "GLBXNativeOrder.h" -#include "lib/api/services/OrderService.pb.h" -#include "lib/config/config.h" -#include "lib/config/protos/orderman_cfg.pb.h" -#include "lib/config/protos/toggles.pb.h" -#include "lib/domain_model/Security.h" -#include "lib/domain_model/Security.pb.h" -#include "lib/domain_model/common.h" -#include "lib/jetfix/codec/FIXFragment.h" -#include "lib/jetfix/codec/FieldDefinitions.h" -#include "lib/logging/logging.h" -#include "lib/orderman/OrderRouter.h" -#include "lib/orderman/OrderServices.h" -#include "lib/orderman/gateways/sim/SimExecutionGatewayFactory.h" -#include "lib/orderman/order_factory/IOrderFactory.h" -#include "lib/orderman/orderman_utils/ExecutionReport.h" -#include "lib/orderman/orderman_utils/fix_order_codec.h" -#include "lib/orderman/orders/PreActivationOrderServices.h" -#include "lib/orderman/orders/glbx/IGLBXOrderEncoder.h" -#include "lib/orderman/orders/glbx/iLink2OrderEncoder.h" -#include "lib/orderman/orders/glbx/iLink3OrderEncoder.h" -#include "lib/orderman/securities/ISecurityDB.h" -#include "lib/utils/PBUtils.h" -#include "lib/utils/bts_chrono.h" +#include "spark/api/services/OrderService.pb.h" +#include "spark/config/config.h" +#include "spark/config/protos/orderman_cfg.pb.h" +#include "spark/config/protos/toggles.pb.h" +#include "spark/domain_model/Security.h" +#include "spark/domain_model/Security.pb.h" +#include "spark/domain_model/common.h" +#include "spark/jetfix/codec/FIXFragment.h" +#include "spark/jetfix/codec/FieldDefinitions.h" +#include "spark/logging/logging.h" +#include "spark/orderman/OrderRouter.h" +#include "spark/orderman/OrderServices.h" +#include "spark/orderman/gateways/sim/SimExecutionGatewayFactory.h" +#include "spark/orderman/order_factory/IOrderFactory.h" +#include "spark/orderman/orderman_utils/ExecutionReport.h" +#include "spark/orderman/orderman_utils/fix_order_codec.h" +#include "spark/orderman/orders/PreActivationOrderServices.h" +#include "spark/orderman/orders/glbx/IGLBXOrderEncoder.h" +#include "spark/orderman/orders/glbx/iLink2OrderEncoder.h" +#include "spark/orderman/orders/glbx/iLink3OrderEncoder.h" +#include "spark/orderman/securities/ISecurityDB.h" +#include "spark/utils/PBUtils.h" +#include "spark/utils/bts_chrono.h" #include #include diff --git a/src/lib/orderman/orders/GLBXNativeOrder.h b/src/lib_spark/spark/orderman/orders/GLBXNativeOrder.h similarity index 95% rename from src/lib/orderman/orders/GLBXNativeOrder.h rename to src/lib_spark/spark/orderman/orders/GLBXNativeOrder.h index d7678d896..99f112a02 100644 --- a/src/lib/orderman/orders/GLBXNativeOrder.h +++ b/src/lib_spark/spark/orderman/orders/GLBXNativeOrder.h @@ -1,8 +1,8 @@ #pragma once -#include "lib/api/services/OrderService.pb.h" -#include "lib/orderman/orders/NativeOrderBase.h" -#include "lib/tracing/PerfLog.h" +#include "spark/api/services/OrderService.pb.h" +#include "spark/orderman/orders/NativeOrderBase.h" +#include "spark/tracing/PerfLog.h" #include namespace bts { diff --git a/src/lib/orderman/orders/ICENativeOrder.cpp b/src/lib_spark/spark/orderman/orders/ICENativeOrder.cpp similarity index 98% rename from src/lib/orderman/orders/ICENativeOrder.cpp rename to src/lib_spark/spark/orderman/orders/ICENativeOrder.cpp index 03d794aab..179eb69ff 100644 --- a/src/lib/orderman/orders/ICENativeOrder.cpp +++ b/src/lib_spark/spark/orderman/orders/ICENativeOrder.cpp @@ -1,20 +1,20 @@ #include "ICENativeOrder.h" -#include "lib/api/services/OrderService.pb.h" -#include "lib/domain_model/Security.h" -#include "lib/jetfix/codec/FIXFragment.h" -#include "lib/jetfix/codec/FieldDefinitions.h" -#include "lib/logging/logging.h" -#include "lib/md/IntPrice.h" -#include "lib/orderman/OrderRouter.h" -#include "lib/orderman/OrderServices.h" -#include "lib/orderman/order_factory/IOrderFactory.h" -#include "lib/orderman/orderman_utils/ExecutionReport.h" -#include "lib/orderman/orderman_utils/fix_order_codec.h" -#include "lib/orderman/orders/PreActivationOrderServices.h" -#include "lib/orderman/securities/ISecurityDB.h" -#include "lib/utils/PBUtils.h" -#include "lib/utils/Puid.h" -#include "lib/utils/bts_chrono.h" +#include "spark/api/services/OrderService.pb.h" +#include "spark/domain_model/Security.h" +#include "spark/jetfix/codec/FIXFragment.h" +#include "spark/jetfix/codec/FieldDefinitions.h" +#include "spark/logging/logging.h" +#include "spark/md/IntPrice.h" +#include "spark/orderman/OrderRouter.h" +#include "spark/orderman/OrderServices.h" +#include "spark/orderman/order_factory/IOrderFactory.h" +#include "spark/orderman/orderman_utils/ExecutionReport.h" +#include "spark/orderman/orderman_utils/fix_order_codec.h" +#include "spark/orderman/orders/PreActivationOrderServices.h" +#include "spark/orderman/securities/ISecurityDB.h" +#include "spark/utils/PBUtils.h" +#include "spark/utils/Puid.h" +#include "spark/utils/bts_chrono.h" #include #include #include diff --git a/src/lib/orderman/orders/ICENativeOrder.h b/src/lib_spark/spark/orderman/orders/ICENativeOrder.h similarity index 97% rename from src/lib/orderman/orders/ICENativeOrder.h rename to src/lib_spark/spark/orderman/orders/ICENativeOrder.h index 84b9441c3..5460f47c5 100644 --- a/src/lib/orderman/orders/ICENativeOrder.h +++ b/src/lib_spark/spark/orderman/orders/ICENativeOrder.h @@ -1,7 +1,7 @@ #pragma once -#include "lib/orderman/orders/NativeOrderBase.h" -#include "lib/tracing/PerfLog.h" +#include "spark/orderman/orders/NativeOrderBase.h" +#include "spark/tracing/PerfLog.h" #include namespace bts { diff --git a/src/lib/orderman/orders/NativeOrderBase.h b/src/lib_spark/spark/orderman/orders/NativeOrderBase.h similarity index 80% rename from src/lib/orderman/orders/NativeOrderBase.h rename to src/lib_spark/spark/orderman/orders/NativeOrderBase.h index 960d8c84a..0548adccc 100644 --- a/src/lib/orderman/orders/NativeOrderBase.h +++ b/src/lib_spark/spark/orderman/orders/NativeOrderBase.h @@ -1,7 +1,7 @@ #pragma once -#include "lib/api/services/OrderService.pb.h" -#include "lib/orderman/orders/Order.h" +#include "spark/api/services/OrderService.pb.h" +#include "spark/orderman/orders/Order.h" namespace bts { namespace orderman { diff --git a/src/lib/orderman/orders/Order.cpp b/src/lib_spark/spark/orderman/orders/Order.cpp similarity index 96% rename from src/lib/orderman/orders/Order.cpp rename to src/lib_spark/spark/orderman/orders/Order.cpp index 59ff4cc9d..77e5f3efb 100644 --- a/src/lib/orderman/orders/Order.cpp +++ b/src/lib_spark/spark/orderman/orders/Order.cpp @@ -1,5 +1,5 @@ #include "Order.h" -#include "lib/orderman/OrderServices.h" +#include "spark/orderman/OrderServices.h" namespace bts { namespace orderman { diff --git a/src/lib/orderman/orders/Order.h b/src/lib_spark/spark/orderman/orders/Order.h similarity index 96% rename from src/lib/orderman/orders/Order.h rename to src/lib_spark/spark/orderman/orders/Order.h index 53706efba..8f76ab864 100644 --- a/src/lib/orderman/orders/Order.h +++ b/src/lib_spark/spark/orderman/orders/Order.h @@ -1,7 +1,7 @@ #pragma once -#include "lib/orderman/orderman_utils/orderman_common.h" -#include "lib/orderman/orders/OrderOpResult.h" +#include "spark/orderman/orderman_utils/orderman_common.h" +#include "spark/orderman/orders/OrderOpResult.h" #include diff --git a/src/lib/orderman/orders/OrderOpResult.h b/src/lib_spark/spark/orderman/orders/OrderOpResult.h similarity index 92% rename from src/lib/orderman/orders/OrderOpResult.h rename to src/lib_spark/spark/orderman/orders/OrderOpResult.h index 279ca86fd..719ed8f34 100644 --- a/src/lib/orderman/orders/OrderOpResult.h +++ b/src/lib_spark/spark/orderman/orders/OrderOpResult.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/api/services/OrderService.pb.h" +#include "spark/api/services/OrderService.pb.h" #include namespace bts { diff --git a/src/lib/orderman/orders/PreActivationOrderServices.h b/src/lib_spark/spark/orderman/orders/PreActivationOrderServices.h similarity index 94% rename from src/lib/orderman/orders/PreActivationOrderServices.h rename to src/lib_spark/spark/orderman/orders/PreActivationOrderServices.h index 94b870902..45d353fc2 100644 --- a/src/lib/orderman/orders/PreActivationOrderServices.h +++ b/src/lib_spark/spark/orderman/orders/PreActivationOrderServices.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/config/protos/jetfix.pb.h" +#include "spark/config/protos/jetfix.pb.h" #include namespace bts { diff --git a/src/lib/orderman/orders/TimeBoxOrder.cpp b/src/lib_spark/spark/orderman/orders/TimeBoxOrder.cpp similarity index 98% rename from src/lib/orderman/orders/TimeBoxOrder.cpp rename to src/lib_spark/spark/orderman/orders/TimeBoxOrder.cpp index 352c63eae..d3910aa1d 100644 --- a/src/lib/orderman/orders/TimeBoxOrder.cpp +++ b/src/lib_spark/spark/orderman/orders/TimeBoxOrder.cpp @@ -1,7 +1,7 @@ #include "TimeBoxOrder.h" -#include "lib/orderman/OrderBuilder.h" -#include "lib/orderman/orders/PreActivationOrderServices.h" -#include "lib/utils/PBUtils.h" +#include "spark/orderman/OrderBuilder.h" +#include "spark/orderman/orders/PreActivationOrderServices.h" +#include "spark/utils/PBUtils.h" #include namespace bts { diff --git a/src/lib/orderman/orders/TimeBoxOrder.h b/src/lib_spark/spark/orderman/orders/TimeBoxOrder.h similarity index 91% rename from src/lib/orderman/orders/TimeBoxOrder.h rename to src/lib_spark/spark/orderman/orders/TimeBoxOrder.h index b252ae4b4..b100aeac5 100644 --- a/src/lib/orderman/orders/TimeBoxOrder.h +++ b/src/lib_spark/spark/orderman/orders/TimeBoxOrder.h @@ -1,7 +1,7 @@ #pragma once -#include "lib/api/services/OrderService.server.pb.h" -#include "lib/orderman/orders/Order.h" +#include "spark/api/services/OrderService.server.pb.h" +#include "spark/orderman/orders/Order.h" #include namespace bts { diff --git a/src/lib/orderman/orders/TriggerOrder.cpp b/src/lib_spark/spark/orderman/orders/TriggerOrder.cpp similarity index 97% rename from src/lib/orderman/orders/TriggerOrder.cpp rename to src/lib_spark/spark/orderman/orders/TriggerOrder.cpp index 47c24741a..408669aa8 100644 --- a/src/lib/orderman/orders/TriggerOrder.cpp +++ b/src/lib_spark/spark/orderman/orders/TriggerOrder.cpp @@ -1,13 +1,13 @@ #include "TriggerOrder.h" -#include "lib/api/services/OrderService.h" -#include "lib/domain_model/Security.h" -#include "lib/logging/logging.h" -#include "lib/orderman/OrderBuilder.h" -#include "lib/orderman/events/BookUpdateEvent.h" -#include "lib/orderman/orders/PreActivationOrderServices.h" -#include "lib/orderman/orders/spreader_orders/spreader/SpreaderUtils.h" -#include "lib/os/os.h" -#include "lib/utils/PBUtils.h" +#include "spark/api/services/OrderService.h" +#include "spark/domain_model/Security.h" +#include "spark/logging/logging.h" +#include "spark/orderman/OrderBuilder.h" +#include "spark/orderman/events/BookUpdateEvent.h" +#include "spark/orderman/orders/PreActivationOrderServices.h" +#include "spark/orderman/orders/spreader_orders/spreader/SpreaderUtils.h" +#include "spark/os/os.h" +#include "spark/utils/PBUtils.h" #include #include diff --git a/src/lib/orderman/orders/TriggerOrder.h b/src/lib_spark/spark/orderman/orders/TriggerOrder.h similarity index 93% rename from src/lib/orderman/orders/TriggerOrder.h rename to src/lib_spark/spark/orderman/orders/TriggerOrder.h index c9741ec48..38eb99fc9 100644 --- a/src/lib/orderman/orders/TriggerOrder.h +++ b/src/lib_spark/spark/orderman/orders/TriggerOrder.h @@ -1,9 +1,9 @@ #pragma once -#include "lib/api/services/OrderService.server.pb.h" -#include "lib/orderman/orders/Order.h" -#include "lib/orderman/orders/TriggerOrderCancelMode.h" -#include "lib/orderman/orders/TriggerOrderState.h" +#include "spark/api/services/OrderService.server.pb.h" +#include "spark/orderman/orders/Order.h" +#include "spark/orderman/orders/TriggerOrderCancelMode.h" +#include "spark/orderman/orders/TriggerOrderState.h" #include namespace bts { diff --git a/src/lib/orderman/orders/TriggerOrderCancelMode.h b/src/lib_spark/spark/orderman/orders/TriggerOrderCancelMode.h similarity index 94% rename from src/lib/orderman/orders/TriggerOrderCancelMode.h rename to src/lib_spark/spark/orderman/orders/TriggerOrderCancelMode.h index e6ad9d56e..93c409172 100644 --- a/src/lib/orderman/orders/TriggerOrderCancelMode.h +++ b/src/lib_spark/spark/orderman/orders/TriggerOrderCancelMode.h @@ -1,7 +1,7 @@ #pragma once -#include "lib/core/EnumMacros.h" -#include "lib/core/FMT_IMPL.h" +#include "spark/core/EnumMacros.h" +#include "spark/core/FMT_IMPL.h" #include #include diff --git a/src/lib/orderman/orders/TriggerOrderState.h b/src/lib_spark/spark/orderman/orders/TriggerOrderState.h similarity index 94% rename from src/lib/orderman/orders/TriggerOrderState.h rename to src/lib_spark/spark/orderman/orders/TriggerOrderState.h index 53afdb4aa..d46d8e5f9 100644 --- a/src/lib/orderman/orders/TriggerOrderState.h +++ b/src/lib_spark/spark/orderman/orders/TriggerOrderState.h @@ -1,7 +1,7 @@ #pragma once -#include "lib/core/EnumMacros.h" -#include "lib/core/FMT_IMPL.h" +#include "spark/core/EnumMacros.h" +#include "spark/core/FMT_IMPL.h" #include #include diff --git a/src/lib/orderman/orders/algo/AlgoWrapperOrder.cpp b/src/lib_spark/spark/orderman/orders/algo/AlgoWrapperOrder.cpp similarity index 98% rename from src/lib/orderman/orders/algo/AlgoWrapperOrder.cpp rename to src/lib_spark/spark/orderman/orders/algo/AlgoWrapperOrder.cpp index 4e70d976e..d19a2eee4 100644 --- a/src/lib/orderman/orders/algo/AlgoWrapperOrder.cpp +++ b/src/lib_spark/spark/orderman/orders/algo/AlgoWrapperOrder.cpp @@ -1,15 +1,15 @@ -#include "lib/orderman/orders/algo/AlgoWrapperOrder.h" -#include "lib/domain_model/common.h" -#include "lib/logging/logging.h" -#include "lib/orderman/ChildOrder.h" -#include "lib/orderman/OrderBuilder.h" -#include "lib/orderman/OrderServices.h" -#include "lib/orderman/orderman_utils/orderman_common.h" -#include "lib/orderman/orderman_utils/orderman_utils.h" -#include "lib/orderman/orders/PreActivationOrderServices.h" -#include "lib/orderman/orders/algo/ChildTemplate.h" -#include "lib/orderman/orders/algo/IAlgoOrder.h" -#include "lib/utils/bts_assert.h" +#include "spark/orderman/orders/algo/AlgoWrapperOrder.h" +#include "spark/domain_model/common.h" +#include "spark/logging/logging.h" +#include "spark/orderman/ChildOrder.h" +#include "spark/orderman/OrderBuilder.h" +#include "spark/orderman/OrderServices.h" +#include "spark/orderman/orderman_utils/orderman_common.h" +#include "spark/orderman/orderman_utils/orderman_utils.h" +#include "spark/orderman/orders/PreActivationOrderServices.h" +#include "spark/orderman/orders/algo/ChildTemplate.h" +#include "spark/orderman/orders/algo/IAlgoOrder.h" +#include "spark/utils/bts_assert.h" #include #include #include diff --git a/src/lib/orderman/orders/algo/AlgoWrapperOrder.h b/src/lib_spark/spark/orderman/orders/algo/AlgoWrapperOrder.h similarity index 97% rename from src/lib/orderman/orders/algo/AlgoWrapperOrder.h rename to src/lib_spark/spark/orderman/orders/algo/AlgoWrapperOrder.h index 441cea7a9..37dd38b09 100644 --- a/src/lib/orderman/orders/algo/AlgoWrapperOrder.h +++ b/src/lib_spark/spark/orderman/orders/algo/AlgoWrapperOrder.h @@ -1,7 +1,7 @@ #pragma once -#include "lib/orderman/orders/Order.h" -#include "lib/orderman/orders/algo/IAlgoServices.h" +#include "spark/orderman/orders/Order.h" +#include "spark/orderman/orders/algo/IAlgoServices.h" namespace bts { namespace orderman { diff --git a/src/lib/orderman/orders/algo/ChildTemplate.h b/src/lib_spark/spark/orderman/orders/algo/ChildTemplate.h similarity index 100% rename from src/lib/orderman/orders/algo/ChildTemplate.h rename to src/lib_spark/spark/orderman/orders/algo/ChildTemplate.h diff --git a/src/lib/orderman/orders/algo/DynamicHelpers.cpp b/src/lib_spark/spark/orderman/orders/algo/DynamicHelpers.cpp similarity index 100% rename from src/lib/orderman/orders/algo/DynamicHelpers.cpp rename to src/lib_spark/spark/orderman/orders/algo/DynamicHelpers.cpp diff --git a/src/lib/orderman/orders/algo/DynamicHelpers.h b/src/lib_spark/spark/orderman/orders/algo/DynamicHelpers.h similarity index 90% rename from src/lib/orderman/orders/algo/DynamicHelpers.h rename to src/lib_spark/spark/orderman/orders/algo/DynamicHelpers.h index 184f045d0..f7b882cd4 100644 --- a/src/lib/orderman/orders/algo/DynamicHelpers.h +++ b/src/lib_spark/spark/orderman/orders/algo/DynamicHelpers.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/api/services/OrderService.pb.h" +#include "spark/api/services/OrderService.pb.h" namespace bts { namespace orderman { diff --git a/src/lib/orderman/orders/algo/IAlgoOrder.h b/src/lib_spark/spark/orderman/orders/algo/IAlgoOrder.h similarity index 95% rename from src/lib/orderman/orders/algo/IAlgoOrder.h rename to src/lib_spark/spark/orderman/orders/algo/IAlgoOrder.h index 49754253d..0b014a453 100644 --- a/src/lib/orderman/orders/algo/IAlgoOrder.h +++ b/src/lib_spark/spark/orderman/orders/algo/IAlgoOrder.h @@ -1,11 +1,11 @@ #pragma once -#include "lib/core/FMT_IMPL.h" -#include "lib/md/protos/co2.pb.h" -#include "lib/orderman/calculations/ITheoCalculator.h" -#include "lib/orderman/events/TickerUpdateEvent.h" -#include "lib/orderman/orders/OrderOpResult.h" -#include "lib/orderman/orders/algo/PositionUpdate.h" +#include "spark/core/FMT_IMPL.h" +#include "spark/md/protos/co2.pb.h" +#include "spark/orderman/calculations/ITheoCalculator.h" +#include "spark/orderman/events/TickerUpdateEvent.h" +#include "spark/orderman/orders/OrderOpResult.h" +#include "spark/orderman/orders/algo/PositionUpdate.h" #include diff --git a/src/lib_spark/spark/orderman/orders/algo/IAlgoServices.cpp b/src/lib_spark/spark/orderman/orders/algo/IAlgoServices.cpp new file mode 100644 index 000000000..c5b698b75 --- /dev/null +++ b/src/lib_spark/spark/orderman/orders/algo/IAlgoServices.cpp @@ -0,0 +1 @@ +#include "spark/orderman/orders/algo/IAlgoServices.h" diff --git a/src/lib/orderman/orders/algo/IAlgoServices.h b/src/lib_spark/spark/orderman/orders/algo/IAlgoServices.h similarity index 97% rename from src/lib/orderman/orders/algo/IAlgoServices.h rename to src/lib_spark/spark/orderman/orders/algo/IAlgoServices.h index 0735879a8..bfdbdd612 100644 --- a/src/lib/orderman/orders/algo/IAlgoServices.h +++ b/src/lib_spark/spark/orderman/orders/algo/IAlgoServices.h @@ -1,8 +1,8 @@ #pragma once -#include "lib/orderman/orders/algo/IBeforeLaunchAlgoServices.h" -#include "lib/orderman/orders/algo/PositionUpdate.h" -#include "lib/tracing/PerfLog.h" +#include "spark/orderman/orders/algo/IBeforeLaunchAlgoServices.h" +#include "spark/orderman/orders/algo/PositionUpdate.h" +#include "spark/tracing/PerfLog.h" namespace bts { namespace orderman { diff --git a/src/lib/orderman/orders/algo/IBeforeLaunchAlgoServices.cpp b/src/lib_spark/spark/orderman/orders/algo/IBeforeLaunchAlgoServices.cpp similarity index 70% rename from src/lib/orderman/orders/algo/IBeforeLaunchAlgoServices.cpp rename to src/lib_spark/spark/orderman/orders/algo/IBeforeLaunchAlgoServices.cpp index 426290ef4..6ca1e4d11 100644 --- a/src/lib/orderman/orders/algo/IBeforeLaunchAlgoServices.cpp +++ b/src/lib_spark/spark/orderman/orders/algo/IBeforeLaunchAlgoServices.cpp @@ -1,4 +1,4 @@ -#include "lib/orderman/orders/algo/IBeforeLaunchAlgoServices.h" +#include "spark/orderman/orders/algo/IBeforeLaunchAlgoServices.h" namespace bts { namespace orderman { diff --git a/src/lib/orderman/orders/algo/IBeforeLaunchAlgoServices.h b/src/lib_spark/spark/orderman/orders/algo/IBeforeLaunchAlgoServices.h similarity index 90% rename from src/lib/orderman/orders/algo/IBeforeLaunchAlgoServices.h rename to src/lib_spark/spark/orderman/orders/algo/IBeforeLaunchAlgoServices.h index 21dba5e42..f5dff2a9f 100644 --- a/src/lib/orderman/orders/algo/IBeforeLaunchAlgoServices.h +++ b/src/lib_spark/spark/orderman/orders/algo/IBeforeLaunchAlgoServices.h @@ -1,9 +1,9 @@ #pragma once -#include "lib/api/services/OrderService.pb.h" -#include "lib/domain_model/SecurityKey.h" -#include "lib/orderman/orderman_utils/orderman_common.h" -#include "lib/utils/bts_chrono.h" +#include "spark/api/services/OrderService.pb.h" +#include "spark/domain_model/SecurityKey.h" +#include "spark/orderman/orderman_utils/orderman_common.h" +#include "spark/utils/bts_chrono.h" namespace bts { namespace orderman { diff --git a/src/lib/orderman/orders/algo/PositionUpdate.cpp b/src/lib_spark/spark/orderman/orders/algo/PositionUpdate.cpp similarity index 87% rename from src/lib/orderman/orders/algo/PositionUpdate.cpp rename to src/lib_spark/spark/orderman/orders/algo/PositionUpdate.cpp index 56371731d..5a4476510 100644 --- a/src/lib/orderman/orders/algo/PositionUpdate.cpp +++ b/src/lib_spark/spark/orderman/orders/algo/PositionUpdate.cpp @@ -1,5 +1,5 @@ #include "PositionUpdate.h" -#include "lib/orderman/orderman_utils/orderman_common.h" +#include "spark/orderman/orderman_utils/orderman_common.h" namespace bts { namespace orderman { diff --git a/src/lib/orderman/orders/algo/PositionUpdate.h b/src/lib_spark/spark/orderman/orders/algo/PositionUpdate.h similarity index 77% rename from src/lib/orderman/orders/algo/PositionUpdate.h rename to src/lib_spark/spark/orderman/orders/algo/PositionUpdate.h index 77f7b86be..8f66fe37c 100644 --- a/src/lib/orderman/orders/algo/PositionUpdate.h +++ b/src/lib_spark/spark/orderman/orders/algo/PositionUpdate.h @@ -1,7 +1,7 @@ #pragma once -#include "lib/domain_model/common.h" -#include "lib/orderman/orderman_utils/orderman_common.h" +#include "spark/domain_model/common.h" +#include "spark/orderman/orderman_utils/orderman_common.h" namespace bts { namespace api { diff --git a/src/lib/orderman/orders/algo/algo_orders/CoverAlgo.cpp b/src/lib_spark/spark/orderman/orders/algo/algo_orders/CoverAlgo.cpp similarity index 97% rename from src/lib/orderman/orders/algo/algo_orders/CoverAlgo.cpp rename to src/lib_spark/spark/orderman/orders/algo/algo_orders/CoverAlgo.cpp index 6b4fd4daa..c3968f13a 100644 --- a/src/lib/orderman/orders/algo/algo_orders/CoverAlgo.cpp +++ b/src/lib_spark/spark/orderman/orders/algo/algo_orders/CoverAlgo.cpp @@ -1,9 +1,9 @@ -#include "lib/orderman/orders/algo/algo_orders/CoverAlgo.h" +#include "spark/orderman/orders/algo/algo_orders/CoverAlgo.h" -#include "lib/domain_model/Security.h" -#include "lib/orderman/order_factory/IOrderFactory.h" -#include "lib/orderman/orders/algo/IAlgoServices.h" -#include "lib/utils/PBUtils.h" +#include "spark/domain_model/Security.h" +#include "spark/orderman/order_factory/IOrderFactory.h" +#include "spark/orderman/orders/algo/IAlgoServices.h" +#include "spark/utils/PBUtils.h" namespace bts { namespace orderman { diff --git a/src/lib/orderman/orders/algo/algo_orders/CoverAlgo.h b/src/lib_spark/spark/orderman/orders/algo/algo_orders/CoverAlgo.h similarity index 96% rename from src/lib/orderman/orders/algo/algo_orders/CoverAlgo.h rename to src/lib_spark/spark/orderman/orders/algo/algo_orders/CoverAlgo.h index e15234ba0..cc41cb23e 100644 --- a/src/lib/orderman/orders/algo/algo_orders/CoverAlgo.h +++ b/src/lib_spark/spark/orderman/orders/algo/algo_orders/CoverAlgo.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/orderman/orders/algo/IAlgoOrder.h" +#include "spark/orderman/orders/algo/IAlgoOrder.h" namespace bts { namespace orderman { diff --git a/src/lib/orderman/orders/algo/algo_orders/DeleteAndCoverAlgo.cpp b/src/lib_spark/spark/orderman/orders/algo/algo_orders/DeleteAndCoverAlgo.cpp similarity index 92% rename from src/lib/orderman/orders/algo/algo_orders/DeleteAndCoverAlgo.cpp rename to src/lib_spark/spark/orderman/orders/algo/algo_orders/DeleteAndCoverAlgo.cpp index 7b7764528..6bade920b 100644 --- a/src/lib/orderman/orders/algo/algo_orders/DeleteAndCoverAlgo.cpp +++ b/src/lib_spark/spark/orderman/orders/algo/algo_orders/DeleteAndCoverAlgo.cpp @@ -1,13 +1,13 @@ -#include "lib/orderman/orders/algo/algo_orders/DeleteAndCoverAlgo.h" +#include "spark/orderman/orders/algo/algo_orders/DeleteAndCoverAlgo.h" -#include "lib/domain_model/Security.h" -#include "lib/orderman/order_factory/IOrderFactory.h" -#include "lib/orderman/orderman_utils/Book.h" -#include "lib/orderman/orderman_utils/orderman_utils.h" -#include "lib/orderman/orders/algo/IAlgoServices.h" -#include "lib/orderman/orders/spreader_orders/spreader/SpreaderUtils.h" -#include "lib/os/os.h" -#include "lib/utils/PBUtils.h" +#include "spark/domain_model/Security.h" +#include "spark/orderman/order_factory/IOrderFactory.h" +#include "spark/orderman/orderman_utils/Book.h" +#include "spark/orderman/orderman_utils/orderman_utils.h" +#include "spark/orderman/orders/algo/IAlgoServices.h" +#include "spark/orderman/orders/spreader_orders/spreader/SpreaderUtils.h" +#include "spark/os/os.h" +#include "spark/utils/PBUtils.h" namespace bts { namespace orderman { diff --git a/src/lib/orderman/orders/algo/algo_orders/DeleteAndCoverAlgo.h b/src/lib_spark/spark/orderman/orders/algo/algo_orders/DeleteAndCoverAlgo.h similarity index 92% rename from src/lib/orderman/orders/algo/algo_orders/DeleteAndCoverAlgo.h rename to src/lib_spark/spark/orderman/orders/algo/algo_orders/DeleteAndCoverAlgo.h index d7cfd5c45..6ad88359c 100644 --- a/src/lib/orderman/orders/algo/algo_orders/DeleteAndCoverAlgo.h +++ b/src/lib_spark/spark/orderman/orders/algo/algo_orders/DeleteAndCoverAlgo.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/orderman/orders/algo/IAlgoOrder.h" +#include "spark/orderman/orders/algo/IAlgoOrder.h" namespace bts { namespace orderman { diff --git a/src/lib/orderman/orders/algo/algo_orders/DormanAlgo.cpp b/src/lib_spark/spark/orderman/orders/algo/algo_orders/DormanAlgo.cpp similarity index 93% rename from src/lib/orderman/orders/algo/algo_orders/DormanAlgo.cpp rename to src/lib_spark/spark/orderman/orders/algo/algo_orders/DormanAlgo.cpp index 514f13e2d..10935b605 100644 --- a/src/lib/orderman/orders/algo/algo_orders/DormanAlgo.cpp +++ b/src/lib_spark/spark/orderman/orders/algo/algo_orders/DormanAlgo.cpp @@ -1,13 +1,13 @@ #include "DormanAlgo.h" -#include "lib/api/services/OrderService.pb.h" -#include "lib/domain_model/Security.h" -#include "lib/logging/logging.h" -#include "lib/orderman/order_factory/IOrderFactory.h" -#include "lib/orderman/orderman_utils/Book.h" -#include "lib/orderman/orderman_utils/orderman_utils.h" -#include "lib/orderman/orders/algo/IAlgoServices.h" -#include "lib/orderman/orders/algo/utils/Accumulator.h" -#include "lib/utils/PBUtils.h" +#include "spark/api/services/OrderService.pb.h" +#include "spark/domain_model/Security.h" +#include "spark/logging/logging.h" +#include "spark/orderman/order_factory/IOrderFactory.h" +#include "spark/orderman/orderman_utils/Book.h" +#include "spark/orderman/orderman_utils/orderman_utils.h" +#include "spark/orderman/orders/algo/IAlgoServices.h" +#include "spark/orderman/orders/algo/utils/Accumulator.h" +#include "spark/utils/PBUtils.h" namespace bts { namespace orderman { diff --git a/src/lib/orderman/orders/algo/algo_orders/DormanAlgo.h b/src/lib_spark/spark/orderman/orders/algo/algo_orders/DormanAlgo.h similarity index 95% rename from src/lib/orderman/orders/algo/algo_orders/DormanAlgo.h rename to src/lib_spark/spark/orderman/orders/algo/algo_orders/DormanAlgo.h index d0acf5dfa..9b6013c30 100644 --- a/src/lib/orderman/orders/algo/algo_orders/DormanAlgo.h +++ b/src/lib_spark/spark/orderman/orders/algo/algo_orders/DormanAlgo.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/orderman/orders/algo/IAlgoOrder.h" +#include "spark/orderman/orders/algo/IAlgoOrder.h" #include #include #include diff --git a/src/lib/orderman/orders/algo/algo_orders/IcebergAlgo.cpp b/src/lib_spark/spark/orderman/orders/algo/algo_orders/IcebergAlgo.cpp similarity index 94% rename from src/lib/orderman/orders/algo/algo_orders/IcebergAlgo.cpp rename to src/lib_spark/spark/orderman/orders/algo/algo_orders/IcebergAlgo.cpp index 67b1ff10c..85b8cc368 100644 --- a/src/lib/orderman/orders/algo/algo_orders/IcebergAlgo.cpp +++ b/src/lib_spark/spark/orderman/orders/algo/algo_orders/IcebergAlgo.cpp @@ -1,13 +1,12 @@ -#include "lib/orderman/orders/algo/algo_orders/IcebergAlgo.h" -#include "lib/domain_model/common.h" -#include "lib/orderman/order_desc.h" -#include "lib/orderman/orders/algo/IAlgoServices.h" - -#include "lib/domain_model/Security.h" -#include "lib/logging/logging.h" -#include "lib/orderman/order_factory/IOrderFactory.h" -#include "lib/utils/PBUtils.h" -#include "lib/utils/bts_chrono.h" +#include "spark/orderman/orders/algo/algo_orders/IcebergAlgo.h" +#include "spark/domain_model/Security.h" +#include "spark/domain_model/common.h" +#include "spark/logging/logging.h" +#include "spark/orderman/order_desc.h" +#include "spark/orderman/order_factory/IOrderFactory.h" +#include "spark/orderman/orders/algo/IAlgoServices.h" +#include "spark/utils/PBUtils.h" +#include "spark/utils/bts_chrono.h" namespace bts { namespace orderman { diff --git a/src/lib/orderman/orders/algo/algo_orders/IcebergAlgo.h b/src/lib_spark/spark/orderman/orders/algo/algo_orders/IcebergAlgo.h similarity index 94% rename from src/lib/orderman/orders/algo/algo_orders/IcebergAlgo.h rename to src/lib_spark/spark/orderman/orders/algo/algo_orders/IcebergAlgo.h index 0a7c26ecc..887346fe8 100644 --- a/src/lib/orderman/orders/algo/algo_orders/IcebergAlgo.h +++ b/src/lib_spark/spark/orderman/orders/algo/algo_orders/IcebergAlgo.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/orderman/orders/algo/IAlgoOrder.h" +#include "spark/orderman/orders/algo/IAlgoOrder.h" namespace bts { namespace orderman { diff --git a/src/lib/orderman/orders/algo/algo_orders/JoinAlgo.cpp b/src/lib_spark/spark/orderman/orders/algo/algo_orders/JoinAlgo.cpp similarity index 94% rename from src/lib/orderman/orders/algo/algo_orders/JoinAlgo.cpp rename to src/lib_spark/spark/orderman/orders/algo/algo_orders/JoinAlgo.cpp index 75950d0da..c772e1d18 100644 --- a/src/lib/orderman/orders/algo/algo_orders/JoinAlgo.cpp +++ b/src/lib_spark/spark/orderman/orders/algo/algo_orders/JoinAlgo.cpp @@ -1,11 +1,11 @@ -#include "lib/orderman/orders/algo/algo_orders/JoinAlgo.h" -#include "lib/logging/logging.h" -#include "lib/orderman/orders/algo/IAlgoServices.h" +#include "spark/orderman/orders/algo/algo_orders/JoinAlgo.h" +#include "spark/logging/logging.h" +#include "spark/orderman/orders/algo/IAlgoServices.h" -#include "lib/orderman/order_factory/IOrderFactory.h" -#include "lib/orderman/orders/spreader_orders/spreader/SpreaderUtils.h" -#include "lib/os/os.h" -#include "lib/utils/PBUtils.h" +#include "spark/orderman/order_factory/IOrderFactory.h" +#include "spark/orderman/orders/spreader_orders/spreader/SpreaderUtils.h" +#include "spark/os/os.h" +#include "spark/utils/PBUtils.h" namespace bts { namespace orderman { diff --git a/src/lib/orderman/orders/algo/algo_orders/JoinAlgo.h b/src/lib_spark/spark/orderman/orders/algo/algo_orders/JoinAlgo.h similarity index 95% rename from src/lib/orderman/orders/algo/algo_orders/JoinAlgo.h rename to src/lib_spark/spark/orderman/orders/algo/algo_orders/JoinAlgo.h index abc2fba84..db550154b 100644 --- a/src/lib/orderman/orders/algo/algo_orders/JoinAlgo.h +++ b/src/lib_spark/spark/orderman/orders/algo/algo_orders/JoinAlgo.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/orderman/orders/algo/IAlgoOrder.h" +#include "spark/orderman/orders/algo/IAlgoOrder.h" namespace bts { namespace orderman { diff --git a/src/lib/orderman/orders/algo/algo_orders/LeanAlgo.cpp b/src/lib_spark/spark/orderman/orders/algo/algo_orders/LeanAlgo.cpp similarity index 96% rename from src/lib/orderman/orders/algo/algo_orders/LeanAlgo.cpp rename to src/lib_spark/spark/orderman/orders/algo/algo_orders/LeanAlgo.cpp index 518a98ba7..90d8cef06 100644 --- a/src/lib/orderman/orders/algo/algo_orders/LeanAlgo.cpp +++ b/src/lib_spark/spark/orderman/orders/algo/algo_orders/LeanAlgo.cpp @@ -1,13 +1,13 @@ -#include "lib/orderman/orders/algo/algo_orders/LeanAlgo.h" +#include "spark/orderman/orders/algo/algo_orders/LeanAlgo.h" -#include "lib/domain_model/Security.h" -#include "lib/orderman/order_factory/IOrderFactory.h" -#include "lib/orderman/orderman_utils/Book.h" -#include "lib/orderman/orderman_utils/orderman_utils.h" -#include "lib/orderman/orders/algo/IAlgoServices.h" -#include "lib/orderman/orders/spreader_orders/spreader/SpreaderUtils.h" -#include "lib/os/os.h" -#include "lib/utils/PBUtils.h" +#include "spark/domain_model/Security.h" +#include "spark/orderman/order_factory/IOrderFactory.h" +#include "spark/orderman/orderman_utils/Book.h" +#include "spark/orderman/orderman_utils/orderman_utils.h" +#include "spark/orderman/orders/algo/IAlgoServices.h" +#include "spark/orderman/orders/spreader_orders/spreader/SpreaderUtils.h" +#include "spark/os/os.h" +#include "spark/utils/PBUtils.h" namespace bts { namespace orderman { diff --git a/src/lib/orderman/orders/algo/algo_orders/LeanAlgo.h b/src/lib_spark/spark/orderman/orders/algo/algo_orders/LeanAlgo.h similarity index 93% rename from src/lib/orderman/orders/algo/algo_orders/LeanAlgo.h rename to src/lib_spark/spark/orderman/orders/algo/algo_orders/LeanAlgo.h index de89ee03b..6322b433c 100644 --- a/src/lib/orderman/orders/algo/algo_orders/LeanAlgo.h +++ b/src/lib_spark/spark/orderman/orders/algo/algo_orders/LeanAlgo.h @@ -1,8 +1,8 @@ #pragma once -#include "lib/domain_model/Security.pb.h" -#include "lib/md/PriceSize.h" -#include "lib/orderman/orders/algo/IAlgoOrder.h" +#include "spark/domain_model/Security.pb.h" +#include "spark/md/PriceSize.h" +#include "spark/orderman/orders/algo/IAlgoOrder.h" namespace bts { namespace orderman { diff --git a/src/lib/orderman/orders/algo/algo_orders/LimitCoverAlgo.cpp b/src/lib_spark/spark/orderman/orders/algo/algo_orders/LimitCoverAlgo.cpp similarity index 92% rename from src/lib/orderman/orders/algo/algo_orders/LimitCoverAlgo.cpp rename to src/lib_spark/spark/orderman/orders/algo/algo_orders/LimitCoverAlgo.cpp index 7f3fe2dc2..ed0556924 100644 --- a/src/lib/orderman/orders/algo/algo_orders/LimitCoverAlgo.cpp +++ b/src/lib_spark/spark/orderman/orders/algo/algo_orders/LimitCoverAlgo.cpp @@ -1,15 +1,15 @@ -#include "lib/orderman/orders/algo/algo_orders/LimitCoverAlgo.h" -#include "lib/api/services/OrderService.pb.h" -#include "lib/orderman/order_factory/IOrderFactory.h" -#include "lib/orderman/orderman_utils/orderman_utils.h" -#include "lib/orderman/orders/algo/IAlgoServices.h" -#include "lib/orderman/orders/algo/algo_orders/limit_cover/LimitCoverAdapter.h" -#include "lib/orderman/orders/algo/algo_orders/limit_cover/LimitCoverDefinition.h" -#include "lib/orderman/orders/algo/utils/DynamicOrderAdapter.h" -#include "lib/orderman/orders/spreader_orders/spreader/SpreaderUtils.h" -#include "lib/os/os.h" -#include "lib/sparkproto/SparkProtos.pb.h" -#include "lib/utils/PBUtils.h" +#include "spark/orderman/orders/algo/algo_orders/LimitCoverAlgo.h" +#include "spark/api/services/OrderService.pb.h" +#include "spark/orderman/order_factory/IOrderFactory.h" +#include "spark/orderman/orderman_utils/orderman_utils.h" +#include "spark/orderman/orders/algo/IAlgoServices.h" +#include "spark/orderman/orders/algo/algo_orders/limit_cover/LimitCoverAdapter.h" +#include "spark/orderman/orders/algo/algo_orders/limit_cover/LimitCoverDefinition.h" +#include "spark/orderman/orders/algo/utils/DynamicOrderAdapter.h" +#include "spark/orderman/orders/spreader_orders/spreader/SpreaderUtils.h" +#include "spark/os/os.h" +#include "spark/sparkproto/SparkProtos.pb.h" +#include "spark/utils/PBUtils.h" #include #include #include diff --git a/src/lib/orderman/orders/algo/algo_orders/LimitCoverAlgo.h b/src/lib_spark/spark/orderman/orders/algo/algo_orders/LimitCoverAlgo.h similarity index 90% rename from src/lib/orderman/orders/algo/algo_orders/LimitCoverAlgo.h rename to src/lib_spark/spark/orderman/orders/algo/algo_orders/LimitCoverAlgo.h index e05927c89..e4da86a05 100644 --- a/src/lib/orderman/orders/algo/algo_orders/LimitCoverAlgo.h +++ b/src/lib_spark/spark/orderman/orders/algo/algo_orders/LimitCoverAlgo.h @@ -1,9 +1,9 @@ #pragma once -#include "lib/orderman/orderman_utils/BookUtils.h" -#include "lib/orderman/orderman_utils/Formatter.h" -#include "lib/orderman/orders/algo/IAlgoOrder.h" -#include "lib/orderman/orders/algo/algo_orders/limit_cover/LimitCoverDefinition.h" -#include "lib/orderman/orders/algo/algo_orders/limit_cover/LimitCoverGate.h" +#include "spark/orderman/orderman_utils/BookUtils.h" +#include "spark/orderman/orderman_utils/Formatter.h" +#include "spark/orderman/orders/algo/IAlgoOrder.h" +#include "spark/orderman/orders/algo/algo_orders/limit_cover/LimitCoverDefinition.h" +#include "spark/orderman/orders/algo/algo_orders/limit_cover/LimitCoverGate.h" #include namespace bts { diff --git a/src/lib/orderman/orders/algo/algo_orders/OffsetAlgo.cpp b/src/lib_spark/spark/orderman/orders/algo/algo_orders/OffsetAlgo.cpp similarity index 95% rename from src/lib/orderman/orders/algo/algo_orders/OffsetAlgo.cpp rename to src/lib_spark/spark/orderman/orders/algo/algo_orders/OffsetAlgo.cpp index 041fa4ab5..f6b2510cb 100644 --- a/src/lib/orderman/orders/algo/algo_orders/OffsetAlgo.cpp +++ b/src/lib_spark/spark/orderman/orders/algo/algo_orders/OffsetAlgo.cpp @@ -1,9 +1,9 @@ -#include "lib/orderman/orders/algo/algo_orders/OffsetAlgo.h" -#include "lib/orderman/order_factory/IOrderFactory.h" -#include "lib/orderman/orders/algo/IAlgoServices.h" -#include "lib/orderman/orders/spreader_orders/spreader/SpreaderUtils.h" -#include "lib/os/os.h" -#include "lib/utils/PBUtils.h" +#include "spark/orderman/orders/algo/algo_orders/OffsetAlgo.h" +#include "spark/orderman/order_factory/IOrderFactory.h" +#include "spark/orderman/orders/algo/IAlgoServices.h" +#include "spark/orderman/orders/spreader_orders/spreader/SpreaderUtils.h" +#include "spark/os/os.h" +#include "spark/utils/PBUtils.h" namespace bts { namespace orderman { diff --git a/src/lib/orderman/orders/algo/algo_orders/OffsetAlgo.h b/src/lib_spark/spark/orderman/orders/algo/algo_orders/OffsetAlgo.h similarity index 95% rename from src/lib/orderman/orders/algo/algo_orders/OffsetAlgo.h rename to src/lib_spark/spark/orderman/orders/algo/algo_orders/OffsetAlgo.h index 6be7610c6..dc17b9788 100644 --- a/src/lib/orderman/orders/algo/algo_orders/OffsetAlgo.h +++ b/src/lib_spark/spark/orderman/orders/algo/algo_orders/OffsetAlgo.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/orderman/orders/algo/IAlgoOrder.h" +#include "spark/orderman/orders/algo/IAlgoOrder.h" using Update = bts::api::orderman::Update; diff --git a/src/lib/orderman/orders/algo/algo_orders/OnSignalAlgo.cpp b/src/lib_spark/spark/orderman/orders/algo/algo_orders/OnSignalAlgo.cpp similarity index 93% rename from src/lib/orderman/orders/algo/algo_orders/OnSignalAlgo.cpp rename to src/lib_spark/spark/orderman/orders/algo/algo_orders/OnSignalAlgo.cpp index 1718f8d99..2fbeba242 100644 --- a/src/lib/orderman/orders/algo/algo_orders/OnSignalAlgo.cpp +++ b/src/lib_spark/spark/orderman/orders/algo/algo_orders/OnSignalAlgo.cpp @@ -1,15 +1,15 @@ -#include "lib/orderman/orders/algo/algo_orders/OnSignalAlgo.h" +#include "spark/orderman/orders/algo/algo_orders/OnSignalAlgo.h" -#include "lib/domain_model/Security.h" -#include "lib/orderman/actors/SODPosition.h" -#include "lib/orderman/order_factory/IOrderFactory.h" -#include "lib/orderman/orderman_utils/Book.h" -#include "lib/orderman/orderman_utils/orderman_utils.h" -#include "lib/orderman/orders/algo/IAlgoServices.h" -#include "lib/orderman/orders/spreader_orders/spreader/SpreaderUtils.h" -#include "lib/os/os.h" -#include "lib/utils/PBUtils.h" -#include "lib/utils/datetime.h" +#include "spark/domain_model/Security.h" +#include "spark/orderman/actors/SODPosition.h" +#include "spark/orderman/order_factory/IOrderFactory.h" +#include "spark/orderman/orderman_utils/Book.h" +#include "spark/orderman/orderman_utils/orderman_utils.h" +#include "spark/orderman/orders/algo/IAlgoServices.h" +#include "spark/orderman/orders/spreader_orders/spreader/SpreaderUtils.h" +#include "spark/os/os.h" +#include "spark/utils/PBUtils.h" +#include "spark/utils/datetime.h" #include #include #include diff --git a/src/lib/orderman/orders/algo/algo_orders/OnSignalAlgo.h b/src/lib_spark/spark/orderman/orders/algo/algo_orders/OnSignalAlgo.h similarity index 94% rename from src/lib/orderman/orders/algo/algo_orders/OnSignalAlgo.h rename to src/lib_spark/spark/orderman/orders/algo/algo_orders/OnSignalAlgo.h index 430a7088a..43b54e60a 100644 --- a/src/lib/orderman/orders/algo/algo_orders/OnSignalAlgo.h +++ b/src/lib_spark/spark/orderman/orders/algo/algo_orders/OnSignalAlgo.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/orderman/orders/algo/IAlgoOrder.h" +#include "spark/orderman/orders/algo/IAlgoOrder.h" namespace bts { namespace orderman { diff --git a/src/lib/orderman/orders/algo/algo_orders/ProRataAlgo.cpp b/src/lib_spark/spark/orderman/orders/algo/algo_orders/ProRataAlgo.cpp similarity index 97% rename from src/lib/orderman/orders/algo/algo_orders/ProRataAlgo.cpp rename to src/lib_spark/spark/orderman/orders/algo/algo_orders/ProRataAlgo.cpp index 6f9233955..21f3efc3d 100644 --- a/src/lib/orderman/orders/algo/algo_orders/ProRataAlgo.cpp +++ b/src/lib_spark/spark/orderman/orders/algo/algo_orders/ProRataAlgo.cpp @@ -1,12 +1,12 @@ -#include "lib/orderman/orders/algo/algo_orders/ProRataAlgo.h" +#include "spark/orderman/orders/algo/algo_orders/ProRataAlgo.h" -#include "lib/domain_model/Security.h" -#include "lib/orderman/order_factory/IOrderFactory.h" -#include "lib/orderman/orders/algo/DynamicHelpers.h" -#include "lib/orderman/orders/algo/IAlgoServices.h" +#include "spark/domain_model/Security.h" +#include "spark/orderman/order_factory/IOrderFactory.h" +#include "spark/orderman/orders/algo/DynamicHelpers.h" +#include "spark/orderman/orders/algo/IAlgoServices.h" -#include "lib/orderman/orders/spreader_orders/spreader/SpreaderUtils.h" -#include "lib/utils/PBUtils.h" +#include "spark/orderman/orders/spreader_orders/spreader/SpreaderUtils.h" +#include "spark/utils/PBUtils.h" namespace bts { namespace orderman { diff --git a/src/lib/orderman/orders/algo/algo_orders/ProRataAlgo.h b/src/lib_spark/spark/orderman/orders/algo/algo_orders/ProRataAlgo.h similarity index 96% rename from src/lib/orderman/orders/algo/algo_orders/ProRataAlgo.h rename to src/lib_spark/spark/orderman/orders/algo/algo_orders/ProRataAlgo.h index 27c4d17a4..dde3e35ab 100644 --- a/src/lib/orderman/orders/algo/algo_orders/ProRataAlgo.h +++ b/src/lib_spark/spark/orderman/orders/algo/algo_orders/ProRataAlgo.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/orderman/orders/algo/IAlgoOrder.h" +#include "spark/orderman/orders/algo/IAlgoOrder.h" namespace bts { namespace orderman { diff --git a/src/lib/orderman/orders/algo/algo_orders/PyramidAlgo.cpp b/src/lib_spark/spark/orderman/orders/algo/algo_orders/PyramidAlgo.cpp similarity index 97% rename from src/lib/orderman/orders/algo/algo_orders/PyramidAlgo.cpp rename to src/lib_spark/spark/orderman/orders/algo/algo_orders/PyramidAlgo.cpp index be979a231..0aca13388 100644 --- a/src/lib/orderman/orders/algo/algo_orders/PyramidAlgo.cpp +++ b/src/lib_spark/spark/orderman/orders/algo/algo_orders/PyramidAlgo.cpp @@ -1,13 +1,13 @@ -#include "lib/orderman/orders/algo/algo_orders/PyramidAlgo.h" +#include "spark/orderman/orders/algo/algo_orders/PyramidAlgo.h" -#include "lib/domain_model/Security.h" -#include "lib/orderman/order_factory/IOrderFactory.h" -#include "lib/orderman/orderman_utils/Book.h" -#include "lib/orderman/orderman_utils/orderman_utils.h" -#include "lib/orderman/orders/algo/IAlgoServices.h" -#include "lib/orderman/orders/spreader_orders/spreader/SpreaderUtils.h" -#include "lib/os/os.h" -#include "lib/utils/PBUtils.h" +#include "spark/domain_model/Security.h" +#include "spark/orderman/order_factory/IOrderFactory.h" +#include "spark/orderman/orderman_utils/Book.h" +#include "spark/orderman/orderman_utils/orderman_utils.h" +#include "spark/orderman/orders/algo/IAlgoServices.h" +#include "spark/orderman/orders/spreader_orders/spreader/SpreaderUtils.h" +#include "spark/os/os.h" +#include "spark/utils/PBUtils.h" #include namespace bts { diff --git a/src/lib/orderman/orders/algo/algo_orders/PyramidAlgo.h b/src/lib_spark/spark/orderman/orders/algo/algo_orders/PyramidAlgo.h similarity index 97% rename from src/lib/orderman/orders/algo/algo_orders/PyramidAlgo.h rename to src/lib_spark/spark/orderman/orders/algo/algo_orders/PyramidAlgo.h index 432439a9f..1ebb8f444 100644 --- a/src/lib/orderman/orders/algo/algo_orders/PyramidAlgo.h +++ b/src/lib_spark/spark/orderman/orders/algo/algo_orders/PyramidAlgo.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/orderman/orders/algo/IAlgoOrder.h" +#include "spark/orderman/orders/algo/IAlgoOrder.h" namespace bts { namespace orderman { diff --git a/src/lib/orderman/orders/algo/algo_orders/QuotingAlgo.cpp b/src/lib_spark/spark/orderman/orders/algo/algo_orders/QuotingAlgo.cpp similarity index 92% rename from src/lib/orderman/orders/algo/algo_orders/QuotingAlgo.cpp rename to src/lib_spark/spark/orderman/orders/algo/algo_orders/QuotingAlgo.cpp index 3d33f0cb5..6849e6339 100644 --- a/src/lib/orderman/orders/algo/algo_orders/QuotingAlgo.cpp +++ b/src/lib_spark/spark/orderman/orders/algo/algo_orders/QuotingAlgo.cpp @@ -1,19 +1,20 @@ -#include "lib/orderman/orders/algo/algo_orders/QuotingAlgo.h" -#include "lib/api/services/OrderService.pb.h" -#include "lib/domain_model/Security.h" -#include "lib/domain_model/Security.pb.h" -#include "lib/domain_model/SecurityKey.h" -#include "lib/domain_model/common.h" -#include "lib/logging/logging.h" -#include "lib/md/PriceSize.h" -#include "lib/orderman/order_factory/IOrderFactory.h" -#include "lib/orderman/orderman_utils/Book.h" -#include "lib/orderman/orderman_utils/orderman_common.h" -#include "lib/orderman/orderman_utils/orderman_utils.h" -#include "lib/orderman/orders/algo/IAlgoOrder.h" -#include "lib/orderman/orders/algo/IAlgoServices.h" -#include "lib/utils/PBUtils.h" -#include "lib/utils/bts_assert.h" +#include "spark/orderman/orders/algo/algo_orders/QuotingAlgo.h" +#include "spark/api/services/OrderService.pb.h" +#include "spark/domain_model/Security.h" +#include "spark/domain_model/Security.pb.h" +#include "spark/domain_model/SecurityKey.h" +#include "spark/domain_model/common.h" +#include "spark/logging/logging.h" +#include "spark/md/PriceSize.h" +#include "spark/orderman/order_factory/IOrderFactory.h" +#include "spark/orderman/orderman_utils/Book.h" +#include "spark/orderman/orderman_utils/orderman_common.h" +#include "spark/orderman/orderman_utils/orderman_utils.h" +#include "spark/orderman/orders/algo/IAlgoOrder.h" +#include "spark/orderman/orders/algo/IAlgoServices.h" +#include "spark/utils/PBUtils.h" +#include "spark/utils/bts_assert.h" + #include #include #include @@ -317,4 +318,4 @@ void QuotingAlgo::_cxl_and_end(bool is_error, const std::string &err_msg) { } } // namespace orderman -} // namespace bts \ No newline at end of file +} // namespace bts diff --git a/src/lib/orderman/orders/algo/algo_orders/QuotingAlgo.h b/src/lib_spark/spark/orderman/orders/algo/algo_orders/QuotingAlgo.h similarity index 87% rename from src/lib/orderman/orders/algo/algo_orders/QuotingAlgo.h rename to src/lib_spark/spark/orderman/orders/algo/algo_orders/QuotingAlgo.h index 7b8d75b71..13ce97131 100644 --- a/src/lib/orderman/orders/algo/algo_orders/QuotingAlgo.h +++ b/src/lib_spark/spark/orderman/orders/algo/algo_orders/QuotingAlgo.h @@ -1,8 +1,8 @@ #pragma once -#include "lib/domain_model/Security.pb.h" -#include "lib/orderman/orderman_utils/Book.h" -#include "lib/orderman/orders/algo/IAlgoOrder.h" +#include "spark/domain_model/Security.pb.h" +#include "spark/orderman/orderman_utils/Book.h" +#include "spark/orderman/orders/algo/IAlgoOrder.h" namespace bts { namespace orderman { diff --git a/src/lib/orderman/orders/algo/algo_orders/RegisterDorman.cpp b/src/lib_spark/spark/orderman/orders/algo/algo_orders/RegisterDorman.cpp similarity index 94% rename from src/lib/orderman/orders/algo/algo_orders/RegisterDorman.cpp rename to src/lib_spark/spark/orderman/orders/algo/algo_orders/RegisterDorman.cpp index 1f34e66b1..d339eb715 100644 --- a/src/lib/orderman/orders/algo/algo_orders/RegisterDorman.cpp +++ b/src/lib_spark/spark/orderman/orders/algo/algo_orders/RegisterDorman.cpp @@ -6,16 +6,16 @@ #include "SniperAlgo.h" #include "TASAlgo.h" #include "TASCounterAlgo.h" -#include "lib/api/services/OrderService.pb.h" -#include "lib/config/config.h" -#include "lib/config/protos/toggles.pb.h" -#include "lib/orderman/orderman_utils/orderman_utils.h" -#include "lib/orderman/orders/algo/algo_orders/LimitCoverAlgo.h" -#include "lib/orderman/orders/algo/algo_orders/TaskingEyeAlgo.h" -#include "lib/orderman/orders/algo/algo_orders/VolAlgo.h" -#include "lib/orderman/orders/algo/algo_orders/limit_cover/LimitCoverAdapter.h" -#include "lib/orderman/orders/algo/algo_orders/tests/ExecutionTesterAlgo.h" -#include "lib/plugin/SparkServices.h" +#include "spark/api/services/OrderService.pb.h" +#include "spark/config/config.h" +#include "spark/config/protos/toggles.pb.h" +#include "spark/orderman/orderman_utils/orderman_utils.h" +#include "spark/orderman/orders/algo/algo_orders/LimitCoverAlgo.h" +#include "spark/orderman/orders/algo/algo_orders/TaskingEyeAlgo.h" +#include "spark/orderman/orders/algo/algo_orders/VolAlgo.h" +#include "spark/orderman/orders/algo/algo_orders/limit_cover/LimitCoverAdapter.h" +#include "spark/orderman/orders/algo/algo_orders/tests/ExecutionTesterAlgo.h" +#include "spark/plugin/SparkServices.h" #include using namespace bts; diff --git a/src/lib/orderman/orders/algo/algo_orders/ScratchAlgo.cpp b/src/lib_spark/spark/orderman/orders/algo/algo_orders/ScratchAlgo.cpp similarity index 95% rename from src/lib/orderman/orders/algo/algo_orders/ScratchAlgo.cpp rename to src/lib_spark/spark/orderman/orders/algo/algo_orders/ScratchAlgo.cpp index 9e1294e6d..85b613cc4 100644 --- a/src/lib/orderman/orders/algo/algo_orders/ScratchAlgo.cpp +++ b/src/lib_spark/spark/orderman/orders/algo/algo_orders/ScratchAlgo.cpp @@ -1,11 +1,11 @@ -#include "lib/orderman/orders/algo/algo_orders/ScratchAlgo.h" -#include "lib/orderman/orders/algo/DynamicHelpers.h" -#include "lib/orderman/orders/algo/IAlgoServices.h" +#include "spark/orderman/orders/algo/algo_orders/ScratchAlgo.h" +#include "spark/orderman/orders/algo/DynamicHelpers.h" +#include "spark/orderman/orders/algo/IAlgoServices.h" -#include "lib/orderman/order_factory/IOrderFactory.h" -#include "lib/orderman/orders/spreader_orders/spreader/SpreaderUtils.h" -#include "lib/os/os.h" -#include "lib/utils/PBUtils.h" +#include "spark/orderman/order_factory/IOrderFactory.h" +#include "spark/orderman/orders/spreader_orders/spreader/SpreaderUtils.h" +#include "spark/os/os.h" +#include "spark/utils/PBUtils.h" namespace bts { namespace orderman { diff --git a/src/lib/orderman/orders/algo/algo_orders/ScratchAlgo.h b/src/lib_spark/spark/orderman/orders/algo/algo_orders/ScratchAlgo.h similarity index 95% rename from src/lib/orderman/orders/algo/algo_orders/ScratchAlgo.h rename to src/lib_spark/spark/orderman/orders/algo/algo_orders/ScratchAlgo.h index 4e7a08655..ceebfe2e7 100644 --- a/src/lib/orderman/orders/algo/algo_orders/ScratchAlgo.h +++ b/src/lib_spark/spark/orderman/orders/algo/algo_orders/ScratchAlgo.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/orderman/orders/algo/IAlgoOrder.h" +#include "spark/orderman/orders/algo/IAlgoOrder.h" namespace bts { namespace orderman { diff --git a/src/lib/orderman/orders/algo/algo_orders/SniperAlgo.cpp b/src/lib_spark/spark/orderman/orders/algo/algo_orders/SniperAlgo.cpp similarity index 97% rename from src/lib/orderman/orders/algo/algo_orders/SniperAlgo.cpp rename to src/lib_spark/spark/orderman/orders/algo/algo_orders/SniperAlgo.cpp index 0bc33ee0f..43efd3016 100644 --- a/src/lib/orderman/orders/algo/algo_orders/SniperAlgo.cpp +++ b/src/lib_spark/spark/orderman/orders/algo/algo_orders/SniperAlgo.cpp @@ -1,22 +1,22 @@ -#include "lib/orderman/orders/algo/algo_orders/SniperAlgo.h" +#include "spark/orderman/orders/algo/algo_orders/SniperAlgo.h" -#include "lib/config/config.h" -#include "lib/config/protos/spartan.pb.h" -#include "lib/domain_model/Security.h" -#include "lib/orderman/order_factory/IOrderFactory.h" -#include "lib/orderman/orderman_utils/Book.h" -#include "lib/orderman/orderman_utils/orderman_utils.h" -#include "lib/orderman/orders/algo/IAlgoServices.h" -#include "lib/orderman/orders/spreader_orders/spreader/SpreaderUtils.h" +#include "spark/config/config.h" +#include "spark/config/protos/spartan.pb.h" +#include "spark/domain_model/Security.h" +#include "spark/orderman/order_factory/IOrderFactory.h" +#include "spark/orderman/orderman_utils/Book.h" +#include "spark/orderman/orderman_utils/orderman_utils.h" +#include "spark/orderman/orders/algo/IAlgoServices.h" +#include "spark/orderman/orders/spreader_orders/spreader/SpreaderUtils.h" #include #include #include -#include "lib/utils/datetime.h" +#include "spark/utils/datetime.h" -#include "lib/domain_model/Security.h" -#include "lib/os/os.h" -#include "lib/utils/PBUtils.h" -#include "lib/utils/datetime.h" +#include "spark/domain_model/Security.h" +#include "spark/os/os.h" +#include "spark/utils/PBUtils.h" +#include "spark/utils/datetime.h" #include #include #include diff --git a/src/lib/orderman/orders/algo/algo_orders/SniperAlgo.h b/src/lib_spark/spark/orderman/orders/algo/algo_orders/SniperAlgo.h similarity index 97% rename from src/lib/orderman/orders/algo/algo_orders/SniperAlgo.h rename to src/lib_spark/spark/orderman/orders/algo/algo_orders/SniperAlgo.h index 6815fa1e2..7edf47353 100644 --- a/src/lib/orderman/orders/algo/algo_orders/SniperAlgo.h +++ b/src/lib_spark/spark/orderman/orders/algo/algo_orders/SniperAlgo.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/orderman/orders/algo/IAlgoOrder.h" +#include "spark/orderman/orders/algo/IAlgoOrder.h" namespace bts { namespace api { diff --git a/src/lib/orderman/orders/algo/algo_orders/SniperAlgoCommon.h b/src/lib_spark/spark/orderman/orders/algo/algo_orders/SniperAlgoCommon.h similarity index 97% rename from src/lib/orderman/orders/algo/algo_orders/SniperAlgoCommon.h rename to src/lib_spark/spark/orderman/orders/algo/algo_orders/SniperAlgoCommon.h index 11b217d11..0ac20d646 100644 --- a/src/lib/orderman/orders/algo/algo_orders/SniperAlgoCommon.h +++ b/src/lib_spark/spark/orderman/orders/algo/algo_orders/SniperAlgoCommon.h @@ -2,23 +2,23 @@ // mundane stateless sniper helper code -#include "lib/config/config.h" -#include "lib/config/protos/spartan.pb.h" -#include "lib/domain_model/Security.h" -#include "lib/orderman/order_factory/IOrderFactory.h" -#include "lib/orderman/orderman_utils/Book.h" -#include "lib/orderman/orderman_utils/orderman_utils.h" -#include "lib/orderman/orders/algo/IAlgoServices.h" -#include "lib/orderman/orders/spreader_orders/spreader/SpreaderUtils.h" +#include "spark/config/config.h" +#include "spark/config/protos/spartan.pb.h" +#include "spark/domain_model/Security.h" +#include "spark/orderman/order_factory/IOrderFactory.h" +#include "spark/orderman/orderman_utils/Book.h" +#include "spark/orderman/orderman_utils/orderman_utils.h" +#include "spark/orderman/orders/algo/IAlgoServices.h" +#include "spark/orderman/orders/spreader_orders/spreader/SpreaderUtils.h" #include #include #include -#include "lib/utils/datetime.h" +#include "spark/utils/datetime.h" -#include "lib/domain_model/Security.h" -#include "lib/os/os.h" -#include "lib/utils/PBUtils.h" -#include "lib/utils/datetime.h" +#include "spark/domain_model/Security.h" +#include "spark/os/os.h" +#include "spark/utils/PBUtils.h" +#include "spark/utils/datetime.h" #include #include #include diff --git a/src/lib/orderman/orders/algo/algo_orders/SplitterAlgo.cpp b/src/lib_spark/spark/orderman/orders/algo/algo_orders/SplitterAlgo.cpp similarity index 93% rename from src/lib/orderman/orders/algo/algo_orders/SplitterAlgo.cpp rename to src/lib_spark/spark/orderman/orders/algo/algo_orders/SplitterAlgo.cpp index 3cb0b33c8..ea6647c51 100644 --- a/src/lib/orderman/orders/algo/algo_orders/SplitterAlgo.cpp +++ b/src/lib_spark/spark/orderman/orders/algo/algo_orders/SplitterAlgo.cpp @@ -1,10 +1,10 @@ #include "SplitterAlgo.h" -#include "lib/api/services/OrderService.pb.h" -#include "lib/domain_model/Security.h" -#include "lib/logging/logging.h" -#include "lib/orderman/order_factory/IOrderFactory.h" -#include "lib/orderman/orderman_utils/orderman_utils.h" -#include "lib/orderman/orders/algo/IAlgoServices.h" +#include "spark/api/services/OrderService.pb.h" +#include "spark/domain_model/Security.h" +#include "spark/logging/logging.h" +#include "spark/orderman/order_factory/IOrderFactory.h" +#include "spark/orderman/orderman_utils/orderman_utils.h" +#include "spark/orderman/orders/algo/IAlgoServices.h" #include #include diff --git a/src/lib/orderman/orders/algo/algo_orders/SplitterAlgo.h b/src/lib_spark/spark/orderman/orders/algo/algo_orders/SplitterAlgo.h similarity index 94% rename from src/lib/orderman/orders/algo/algo_orders/SplitterAlgo.h rename to src/lib_spark/spark/orderman/orders/algo/algo_orders/SplitterAlgo.h index 98ba304b8..bd38053cc 100644 --- a/src/lib/orderman/orders/algo/algo_orders/SplitterAlgo.h +++ b/src/lib_spark/spark/orderman/orders/algo/algo_orders/SplitterAlgo.h @@ -1,5 +1,5 @@ #pragma once -#include "lib/orderman/orders/algo/IAlgoOrder.h" +#include "spark/orderman/orders/algo/IAlgoOrder.h" namespace bts { namespace orderman { diff --git a/src/lib/orderman/orders/algo/algo_orders/TASAlgo.cpp b/src/lib_spark/spark/orderman/orders/algo/algo_orders/TASAlgo.cpp similarity index 93% rename from src/lib/orderman/orders/algo/algo_orders/TASAlgo.cpp rename to src/lib_spark/spark/orderman/orders/algo/algo_orders/TASAlgo.cpp index d4a140dab..d0fa4bf72 100644 --- a/src/lib/orderman/orders/algo/algo_orders/TASAlgo.cpp +++ b/src/lib_spark/spark/orderman/orders/algo/algo_orders/TASAlgo.cpp @@ -1,14 +1,14 @@ -#include "lib/orderman/orders/algo/algo_orders/TASAlgo.h" +#include "spark/orderman/orders/algo/algo_orders/TASAlgo.h" -#include "lib/domain_model/Security.h" -#include "lib/orderman/order_factory/IOrderFactory.h" -#include "lib/orderman/orderman_utils/Book.h" -#include "lib/orderman/orderman_utils/orderman_utils.h" -#include "lib/orderman/orders/algo/IAlgoServices.h" -#include "lib/orderman/orders/spreader_orders/spreader/SpreaderUtils.h" -#include "lib/os/os.h" -#include "lib/utils/PBUtils.h" -#include "lib/utils/datetime.h" +#include "spark/domain_model/Security.h" +#include "spark/orderman/order_factory/IOrderFactory.h" +#include "spark/orderman/orderman_utils/Book.h" +#include "spark/orderman/orderman_utils/orderman_utils.h" +#include "spark/orderman/orders/algo/IAlgoServices.h" +#include "spark/orderman/orders/spreader_orders/spreader/SpreaderUtils.h" +#include "spark/os/os.h" +#include "spark/utils/PBUtils.h" +#include "spark/utils/datetime.h" #include namespace bts { diff --git a/src/lib/orderman/orders/algo/algo_orders/TASAlgo.h b/src/lib_spark/spark/orderman/orders/algo/algo_orders/TASAlgo.h similarity index 96% rename from src/lib/orderman/orders/algo/algo_orders/TASAlgo.h rename to src/lib_spark/spark/orderman/orders/algo/algo_orders/TASAlgo.h index 74e3ec350..209e2bc9c 100644 --- a/src/lib/orderman/orders/algo/algo_orders/TASAlgo.h +++ b/src/lib_spark/spark/orderman/orders/algo/algo_orders/TASAlgo.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/orderman/orders/algo/IAlgoOrder.h" +#include "spark/orderman/orders/algo/IAlgoOrder.h" namespace bts { namespace orderman { diff --git a/src/lib/orderman/orders/algo/algo_orders/TASCounterAlgo.cpp b/src/lib_spark/spark/orderman/orders/algo/algo_orders/TASCounterAlgo.cpp similarity index 97% rename from src/lib/orderman/orders/algo/algo_orders/TASCounterAlgo.cpp rename to src/lib_spark/spark/orderman/orders/algo/algo_orders/TASCounterAlgo.cpp index fa2f1ac13..debb24a6b 100644 --- a/src/lib/orderman/orders/algo/algo_orders/TASCounterAlgo.cpp +++ b/src/lib_spark/spark/orderman/orders/algo/algo_orders/TASCounterAlgo.cpp @@ -1,14 +1,14 @@ -#include "lib/orderman/orders/algo/algo_orders/TASCounterAlgo.h" -#include "lib/domain_model/Security.h" -#include "lib/orderman/actors/SODPosition.h" -#include "lib/orderman/order_factory/IOrderFactory.h" -#include "lib/orderman/orderman_utils/Book.h" -#include "lib/orderman/orderman_utils/orderman_utils.h" -#include "lib/orderman/orders/algo/IAlgoServices.h" -#include "lib/orderman/orders/spreader_orders/spreader/SpreaderUtils.h" -#include "lib/os/os.h" -#include "lib/utils/PBUtils.h" -#include "lib/utils/datetime.h" +#include "spark/orderman/orders/algo/algo_orders/TASCounterAlgo.h" +#include "spark/domain_model/Security.h" +#include "spark/orderman/actors/SODPosition.h" +#include "spark/orderman/order_factory/IOrderFactory.h" +#include "spark/orderman/orderman_utils/Book.h" +#include "spark/orderman/orderman_utils/orderman_utils.h" +#include "spark/orderman/orders/algo/IAlgoServices.h" +#include "spark/orderman/orders/spreader_orders/spreader/SpreaderUtils.h" +#include "spark/os/os.h" +#include "spark/utils/PBUtils.h" +#include "spark/utils/datetime.h" #include #include #include diff --git a/src/lib/orderman/orders/algo/algo_orders/TASCounterAlgo.h b/src/lib_spark/spark/orderman/orders/algo/algo_orders/TASCounterAlgo.h similarity index 95% rename from src/lib/orderman/orders/algo/algo_orders/TASCounterAlgo.h rename to src/lib_spark/spark/orderman/orders/algo/algo_orders/TASCounterAlgo.h index c2aee79c5..254081a7b 100644 --- a/src/lib/orderman/orders/algo/algo_orders/TASCounterAlgo.h +++ b/src/lib_spark/spark/orderman/orders/algo/algo_orders/TASCounterAlgo.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/orderman/orders/algo/IAlgoOrder.h" +#include "spark/orderman/orders/algo/IAlgoOrder.h" namespace bts { namespace orderman { diff --git a/src/lib/orderman/orders/algo/algo_orders/TaskingEyeAlgo.cpp b/src/lib_spark/spark/orderman/orders/algo/algo_orders/TaskingEyeAlgo.cpp similarity index 94% rename from src/lib/orderman/orders/algo/algo_orders/TaskingEyeAlgo.cpp rename to src/lib_spark/spark/orderman/orders/algo/algo_orders/TaskingEyeAlgo.cpp index ec0bd75fb..8a84ee151 100644 --- a/src/lib/orderman/orders/algo/algo_orders/TaskingEyeAlgo.cpp +++ b/src/lib_spark/spark/orderman/orders/algo/algo_orders/TaskingEyeAlgo.cpp @@ -1,26 +1,26 @@ #include "TaskingEyeAlgo.h" -#include "lib/api/services/OrderService.pb.h" -#include "lib/domain_model/Security.pb.h" -#include "lib/domain_model/SecurityKey.h" -#include "lib/domain_model/common.h" -#include "lib/logging/logging.h" -#include "lib/md/PriceSize.h" -#include "lib/orderman/ChildOrder.h" -#include "lib/orderman/OrderBuilder.h" -#include "lib/orderman/limiter/SecurityLimitNode.h" -#include "lib/orderman/order_factory/IOrderFactory.h" -#include "lib/orderman/orderman_utils/Book.h" -#include "lib/orderman/orderman_utils/orderman_common.h" -#include "lib/orderman/orderman_utils/orderman_utils.h" -#include "lib/orderman/orders/OrderOpResult.h" -#include "lib/orderman/orders/algo/ChildTemplate.h" -#include "lib/orderman/orders/algo/IAlgoOrder.h" -#include "lib/orderman/orders/algo/IAlgoServices.h" -#include "lib/orderman/orders/algo/IBeforeLaunchAlgoServices.h" -#include "lib/os/os.h" -#include "lib/utils/PBUtils.h" -#include "lib/utils/bts_assert.h" +#include "spark/api/services/OrderService.pb.h" +#include "spark/domain_model/Security.pb.h" +#include "spark/domain_model/SecurityKey.h" +#include "spark/domain_model/common.h" +#include "spark/logging/logging.h" +#include "spark/md/PriceSize.h" +#include "spark/orderman/ChildOrder.h" +#include "spark/orderman/OrderBuilder.h" +#include "spark/orderman/limiter/SecurityLimitNode.h" +#include "spark/orderman/order_factory/IOrderFactory.h" +#include "spark/orderman/orderman_utils/Book.h" +#include "spark/orderman/orderman_utils/orderman_common.h" +#include "spark/orderman/orderman_utils/orderman_utils.h" +#include "spark/orderman/orders/OrderOpResult.h" +#include "spark/orderman/orders/algo/ChildTemplate.h" +#include "spark/orderman/orders/algo/IAlgoOrder.h" +#include "spark/orderman/orders/algo/IAlgoServices.h" +#include "spark/orderman/orders/algo/IBeforeLaunchAlgoServices.h" +#include "spark/os/os.h" +#include "spark/utils/PBUtils.h" +#include "spark/utils/bts_assert.h" #include #include #include diff --git a/src/lib/orderman/orders/algo/algo_orders/TaskingEyeAlgo.h b/src/lib_spark/spark/orderman/orders/algo/algo_orders/TaskingEyeAlgo.h similarity index 86% rename from src/lib/orderman/orders/algo/algo_orders/TaskingEyeAlgo.h rename to src/lib_spark/spark/orderman/orders/algo/algo_orders/TaskingEyeAlgo.h index 9bfbb5ff4..7549700a0 100644 --- a/src/lib/orderman/orders/algo/algo_orders/TaskingEyeAlgo.h +++ b/src/lib_spark/spark/orderman/orders/algo/algo_orders/TaskingEyeAlgo.h @@ -1,9 +1,9 @@ #pragma once -#include "lib/domain_model/SecurityKey.h" -#include "lib/domain_model/common.h" -#include "lib/orderman/calculations/ITheoCalculator.h" -#include "lib/orderman/orders/algo/IAlgoOrder.h" +#include "spark/domain_model/SecurityKey.h" +#include "spark/domain_model/common.h" +#include "spark/orderman/calculations/ITheoCalculator.h" +#include "spark/orderman/orders/algo/IAlgoOrder.h" #include namespace bts::orderman { diff --git a/src/lib/orderman/orders/algo/algo_orders/TopAlgo.cpp b/src/lib_spark/spark/orderman/orders/algo/algo_orders/TopAlgo.cpp similarity index 94% rename from src/lib/orderman/orders/algo/algo_orders/TopAlgo.cpp rename to src/lib_spark/spark/orderman/orders/algo/algo_orders/TopAlgo.cpp index 8f63f41f1..8440ed278 100644 --- a/src/lib/orderman/orders/algo/algo_orders/TopAlgo.cpp +++ b/src/lib_spark/spark/orderman/orders/algo/algo_orders/TopAlgo.cpp @@ -1,12 +1,12 @@ -#include "lib/orderman/orders/algo/algo_orders/TopAlgo.h" +#include "spark/orderman/orders/algo/algo_orders/TopAlgo.h" -#include "lib/domain_model/Security.h" -#include "lib/logging/logging.h" -#include "lib/orderman/order_factory/IOrderFactory.h" -#include "lib/orderman/orderman_utils/Book.h" -#include "lib/orderman/orders/algo/IAlgoServices.h" -#include "lib/orderman/orders/spreader_orders/spreader/SpreaderUtils.h" -#include "lib/utils/PBUtils.h" +#include "spark/domain_model/Security.h" +#include "spark/logging/logging.h" +#include "spark/orderman/order_factory/IOrderFactory.h" +#include "spark/orderman/orderman_utils/Book.h" +#include "spark/orderman/orders/algo/IAlgoServices.h" +#include "spark/orderman/orders/spreader_orders/spreader/SpreaderUtils.h" +#include "spark/utils/PBUtils.h" namespace bts { namespace orderman { diff --git a/src/lib/orderman/orders/algo/algo_orders/TopAlgo.h b/src/lib_spark/spark/orderman/orders/algo/algo_orders/TopAlgo.h similarity index 95% rename from src/lib/orderman/orders/algo/algo_orders/TopAlgo.h rename to src/lib_spark/spark/orderman/orders/algo/algo_orders/TopAlgo.h index 3a3b9c90f..804122ed7 100644 --- a/src/lib/orderman/orders/algo/algo_orders/TopAlgo.h +++ b/src/lib_spark/spark/orderman/orders/algo/algo_orders/TopAlgo.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/orderman/orders/algo/IAlgoOrder.h" +#include "spark/orderman/orders/algo/IAlgoOrder.h" namespace bts { namespace orderman { diff --git a/src/lib/orderman/orders/algo/algo_orders/VolAlgo.cpp b/src/lib_spark/spark/orderman/orders/algo/algo_orders/VolAlgo.cpp similarity index 92% rename from src/lib/orderman/orders/algo/algo_orders/VolAlgo.cpp rename to src/lib_spark/spark/orderman/orders/algo/algo_orders/VolAlgo.cpp index 93c2fd577..46eaa3568 100644 --- a/src/lib/orderman/orders/algo/algo_orders/VolAlgo.cpp +++ b/src/lib_spark/spark/orderman/orders/algo/algo_orders/VolAlgo.cpp @@ -1,26 +1,26 @@ #include "VolAlgo.h" -#include "lib/api/services/OrderService.pb.h" -#include "lib/domain_model/Security.h" -#include "lib/domain_model/Security.pb.h" -#include "lib/domain_model/SecurityKey.h" -#include "lib/domain_model/common.h" -#include "lib/logging/logging.h" -#include "lib/md/PriceSize.h" -#include "lib/orderman/ChildOrder.h" -#include "lib/orderman/OrderBuilder.h" -#include "lib/orderman/limiter/SecurityLimitNode.h" -#include "lib/orderman/order_factory/IOrderFactory.h" -#include "lib/orderman/orderman_utils/Book.h" -#include "lib/orderman/orderman_utils/orderman_common.h" -#include "lib/orderman/orderman_utils/orderman_utils.h" -#include "lib/orderman/orders/OrderOpResult.h" -#include "lib/orderman/orders/algo/ChildTemplate.h" -#include "lib/orderman/orders/algo/IAlgoOrder.h" -#include "lib/orderman/orders/algo/IAlgoServices.h" -#include "lib/orderman/orders/algo/IBeforeLaunchAlgoServices.h" -#include "lib/os/os.h" -#include "lib/utils/PBUtils.h" -#include "lib/utils/bts_assert.h" +#include "spark/api/services/OrderService.pb.h" +#include "spark/domain_model/Security.h" +#include "spark/domain_model/Security.pb.h" +#include "spark/domain_model/SecurityKey.h" +#include "spark/domain_model/common.h" +#include "spark/logging/logging.h" +#include "spark/md/PriceSize.h" +#include "spark/orderman/ChildOrder.h" +#include "spark/orderman/OrderBuilder.h" +#include "spark/orderman/limiter/SecurityLimitNode.h" +#include "spark/orderman/order_factory/IOrderFactory.h" +#include "spark/orderman/orderman_utils/Book.h" +#include "spark/orderman/orderman_utils/orderman_common.h" +#include "spark/orderman/orderman_utils/orderman_utils.h" +#include "spark/orderman/orders/OrderOpResult.h" +#include "spark/orderman/orders/algo/ChildTemplate.h" +#include "spark/orderman/orders/algo/IAlgoOrder.h" +#include "spark/orderman/orders/algo/IAlgoServices.h" +#include "spark/orderman/orders/algo/IBeforeLaunchAlgoServices.h" +#include "spark/os/os.h" +#include "spark/utils/PBUtils.h" +#include "spark/utils/bts_assert.h" #include #include #include diff --git a/src/lib/orderman/orders/algo/algo_orders/VolAlgo.h b/src/lib_spark/spark/orderman/orders/algo/algo_orders/VolAlgo.h similarity index 85% rename from src/lib/orderman/orders/algo/algo_orders/VolAlgo.h rename to src/lib_spark/spark/orderman/orders/algo/algo_orders/VolAlgo.h index 64df8b1f5..3a9f17f57 100644 --- a/src/lib/orderman/orders/algo/algo_orders/VolAlgo.h +++ b/src/lib_spark/spark/orderman/orders/algo/algo_orders/VolAlgo.h @@ -1,9 +1,9 @@ #pragma once -#include "lib/domain_model/SecurityKey.h" -#include "lib/domain_model/common.h" -#include "lib/orderman/calculations/ITheoCalculator.h" -#include "lib/orderman/orders/algo/IAlgoOrder.h" +#include "spark/domain_model/SecurityKey.h" +#include "spark/domain_model/common.h" +#include "spark/orderman/calculations/ITheoCalculator.h" +#include "spark/orderman/orders/algo/IAlgoOrder.h" #include namespace bts::orderman { diff --git a/src/lib/orderman/orders/algo/algo_orders/limit_cover/LimitCoverAdapter.cpp b/src/lib_spark/spark/orderman/orders/algo/algo_orders/limit_cover/LimitCoverAdapter.cpp similarity index 94% rename from src/lib/orderman/orders/algo/algo_orders/limit_cover/LimitCoverAdapter.cpp rename to src/lib_spark/spark/orderman/orders/algo/algo_orders/limit_cover/LimitCoverAdapter.cpp index 11c55af5c..9b44a3f6c 100644 --- a/src/lib/orderman/orders/algo/algo_orders/limit_cover/LimitCoverAdapter.cpp +++ b/src/lib_spark/spark/orderman/orders/algo/algo_orders/limit_cover/LimitCoverAdapter.cpp @@ -1,6 +1,6 @@ -#include "lib/orderman/orders/algo/algo_orders/limit_cover/LimitCoverAdapter.h" -#include "lib/orderman/orders/OrderOpResult.h" -#include "lib/orderman/orders/algo/utils/DynamicOrderAdapter.h" +#include "spark/orderman/orders/algo/algo_orders/limit_cover/LimitCoverAdapter.h" +#include "spark/orderman/orders/OrderOpResult.h" +#include "spark/orderman/orders/algo/utils/DynamicOrderAdapter.h" #include namespace bts { diff --git a/src/lib/orderman/orders/algo/algo_orders/limit_cover/LimitCoverAdapter.h b/src/lib_spark/spark/orderman/orders/algo/algo_orders/limit_cover/LimitCoverAdapter.h similarity index 79% rename from src/lib/orderman/orders/algo/algo_orders/limit_cover/LimitCoverAdapter.h rename to src/lib_spark/spark/orderman/orders/algo/algo_orders/limit_cover/LimitCoverAdapter.h index c3aae48b3..6a3a711b6 100644 --- a/src/lib/orderman/orders/algo/algo_orders/limit_cover/LimitCoverAdapter.h +++ b/src/lib_spark/spark/orderman/orders/algo/algo_orders/limit_cover/LimitCoverAdapter.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/api/services/OrderService.pb.h" -#include "lib/orderman/orders/algo/algo_orders/limit_cover/LimitCoverDefinition.h" +#include "spark/api/services/OrderService.pb.h" +#include "spark/orderman/orders/algo/algo_orders/limit_cover/LimitCoverDefinition.h" namespace bts { namespace orderman { diff --git a/src/lib/orderman/orders/algo/algo_orders/limit_cover/LimitCoverDefinition.h b/src/lib_spark/spark/orderman/orders/algo/algo_orders/limit_cover/LimitCoverDefinition.h similarity index 90% rename from src/lib/orderman/orders/algo/algo_orders/limit_cover/LimitCoverDefinition.h rename to src/lib_spark/spark/orderman/orders/algo/algo_orders/limit_cover/LimitCoverDefinition.h index bee413427..1c77cc032 100644 --- a/src/lib/orderman/orders/algo/algo_orders/limit_cover/LimitCoverDefinition.h +++ b/src/lib_spark/spark/orderman/orders/algo/algo_orders/limit_cover/LimitCoverDefinition.h @@ -1,7 +1,7 @@ #pragma once -#include "lib/api/services/OrderService.pb.h" -#include "lib/orderman/orderman_utils/Formatter.h" -#include "lib/orderman/orders/algo/algo_orders/limit_cover/LimitCoverGate.h" +#include "spark/api/services/OrderService.pb.h" +#include "spark/orderman/orderman_utils/Formatter.h" +#include "spark/orderman/orders/algo/algo_orders/limit_cover/LimitCoverGate.h" #include #include #include diff --git a/src/lib/orderman/orders/algo/algo_orders/limit_cover/LimitCoverGate.h b/src/lib_spark/spark/orderman/orders/algo/algo_orders/limit_cover/LimitCoverGate.h similarity index 94% rename from src/lib/orderman/orders/algo/algo_orders/limit_cover/LimitCoverGate.h rename to src/lib_spark/spark/orderman/orders/algo/algo_orders/limit_cover/LimitCoverGate.h index 3a1add6b3..1529de6fb 100644 --- a/src/lib/orderman/orders/algo/algo_orders/limit_cover/LimitCoverGate.h +++ b/src/lib_spark/spark/orderman/orders/algo/algo_orders/limit_cover/LimitCoverGate.h @@ -1,7 +1,7 @@ #pragma once -#include "lib/api/services/OrderService.pb.h" -#include "lib/sparkproto/SparkProtos.pb.h" -#include "lib/utils/PBUtils.h" +#include "spark/api/services/OrderService.pb.h" +#include "spark/sparkproto/SparkProtos.pb.h" +#include "spark/utils/PBUtils.h" #include namespace bts { diff --git a/src/lib/orderman/orders/algo/algo_orders/tests/AlgoTestDriver.cpp b/src/lib_spark/spark/orderman/orders/algo/algo_orders/tests/AlgoTestDriver.cpp similarity index 95% rename from src/lib/orderman/orders/algo/algo_orders/tests/AlgoTestDriver.cpp rename to src/lib_spark/spark/orderman/orders/algo/algo_orders/tests/AlgoTestDriver.cpp index dcf61f44b..3944a3241 100644 --- a/src/lib/orderman/orders/algo/algo_orders/tests/AlgoTestDriver.cpp +++ b/src/lib_spark/spark/orderman/orders/algo/algo_orders/tests/AlgoTestDriver.cpp @@ -1,9 +1,9 @@ #include "AlgoTestDriver.h" -#include "lib/api/services/OrderService.pb.h" -#include "lib/logging/logging.h" -#include "lib/md/relay/RelayRecorder.h" -#include "lib/orderman/calculations/ITheoCalculator.h" -#include "lib/orderman/orderman_utils/Book.h" +#include "spark/api/services/OrderService.pb.h" +#include "spark/logging/logging.h" +#include "spark/md/relay/RelayRecorder.h" +#include "spark/orderman/calculations/ITheoCalculator.h" +#include "spark/orderman/orderman_utils/Book.h" #include #include diff --git a/src/lib/orderman/orders/algo/algo_orders/tests/AlgoTestDriver.h b/src/lib_spark/spark/orderman/orders/algo/algo_orders/tests/AlgoTestDriver.h similarity index 93% rename from src/lib/orderman/orders/algo/algo_orders/tests/AlgoTestDriver.h rename to src/lib_spark/spark/orderman/orders/algo/algo_orders/tests/AlgoTestDriver.h index a69bce523..ddf8cd7ad 100644 --- a/src/lib/orderman/orders/algo/algo_orders/tests/AlgoTestDriver.h +++ b/src/lib_spark/spark/orderman/orders/algo/algo_orders/tests/AlgoTestDriver.h @@ -1,9 +1,9 @@ #pragma once -#include "lib/md/IntPrice.h" -#include "lib/orderman/calculations/ITheoCalculator.h" -#include "lib/orderman/events/TickerUpdateEvent.h" -#include "lib/orderman/orders/algo/IAlgoOrder.h" -#include "lib/orderman/orders/algo/IAlgoServices.h" +#include "spark/md/IntPrice.h" +#include "spark/orderman/calculations/ITheoCalculator.h" +#include "spark/orderman/events/TickerUpdateEvent.h" +#include "spark/orderman/orders/algo/IAlgoOrder.h" +#include "spark/orderman/orders/algo/IAlgoServices.h" #include #include #include diff --git a/src/lib/orderman/orders/algo/algo_orders/tests/ExecutionTesterAlgo.h b/src/lib_spark/spark/orderman/orders/algo/algo_orders/tests/ExecutionTesterAlgo.h similarity index 94% rename from src/lib/orderman/orders/algo/algo_orders/tests/ExecutionTesterAlgo.h rename to src/lib_spark/spark/orderman/orders/algo/algo_orders/tests/ExecutionTesterAlgo.h index 407bf977d..0ffe502e8 100644 --- a/src/lib/orderman/orders/algo/algo_orders/tests/ExecutionTesterAlgo.h +++ b/src/lib_spark/spark/orderman/orders/algo/algo_orders/tests/ExecutionTesterAlgo.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/orderman/orders/algo/IAlgoOrder.h" +#include "spark/orderman/orders/algo/IAlgoOrder.h" namespace bts { namespace orderman { diff --git a/src/lib/orderman/orders/algo/algo_orders/tests/ExecutiontTesterAlgo.cpp b/src/lib_spark/spark/orderman/orders/algo/algo_orders/tests/ExecutiontTesterAlgo.cpp similarity index 90% rename from src/lib/orderman/orders/algo/algo_orders/tests/ExecutiontTesterAlgo.cpp rename to src/lib_spark/spark/orderman/orders/algo/algo_orders/tests/ExecutiontTesterAlgo.cpp index d3dbae45c..0d86fa008 100644 --- a/src/lib/orderman/orders/algo/algo_orders/tests/ExecutiontTesterAlgo.cpp +++ b/src/lib_spark/spark/orderman/orders/algo/algo_orders/tests/ExecutiontTesterAlgo.cpp @@ -1,16 +1,16 @@ #include "ExecutionTesterAlgo.h" -#include "lib/domain_model/Security.h" -#include "lib/logging/logging.h" -#include "lib/orderman/order_factory/IOrderFactory.h" -#include "lib/orderman/orderman_utils/Book.h" -#include "lib/orderman/orderman_utils/orderman_common.h" -#include "lib/orderman/orderman_utils/orderman_utils.h" -#include "lib/orderman/orders/algo/IAlgoServices.h" -#include "lib/orderman/orders/spreader_orders/spreader/SpreaderUtils.h" -#include "lib/os/os.h" -#include "lib/utils/PBUtils.h" -#include "lib/utils/datetime.h" +#include "spark/domain_model/Security.h" +#include "spark/logging/logging.h" +#include "spark/orderman/order_factory/IOrderFactory.h" +#include "spark/orderman/orderman_utils/Book.h" +#include "spark/orderman/orderman_utils/orderman_common.h" +#include "spark/orderman/orderman_utils/orderman_utils.h" +#include "spark/orderman/orders/algo/IAlgoServices.h" +#include "spark/orderman/orders/spreader_orders/spreader/SpreaderUtils.h" +#include "spark/os/os.h" +#include "spark/utils/PBUtils.h" +#include "spark/utils/datetime.h" #include #include #include diff --git a/src/lib/orderman/orders/algo/algo_orders/tests/LimitCoverTests.cpp b/src/lib_spark/spark/orderman/orders/algo/algo_orders/tests/LimitCoverTests.cpp similarity index 88% rename from src/lib/orderman/orders/algo/algo_orders/tests/LimitCoverTests.cpp rename to src/lib_spark/spark/orderman/orders/algo/algo_orders/tests/LimitCoverTests.cpp index 6f4a5a30c..d27faa77d 100644 --- a/src/lib/orderman/orders/algo/algo_orders/tests/LimitCoverTests.cpp +++ b/src/lib_spark/spark/orderman/orders/algo/algo_orders/tests/LimitCoverTests.cpp @@ -1,18 +1,19 @@ -#include "lib/api/services/OrderService.pb.h" -#include "lib/domain_model/Security.h" -#include "lib/orderman/orderman_utils/Book.h" -#include "lib/orderman/orderman_utils/BookUtils.h" -#include "lib/orderman/orderman_utils/Formatter.h" -#include "lib/orderman/orderman_utils/PriceComp.h" -#include "lib/orderman/orderman_utils/orderman_utils.h" -#include "lib/orderman/orders/algo/algo_orders/LimitCoverAlgo.h" -#include "lib/orderman/orders/algo/algo_orders/limit_cover/LimitCoverAdapter.h" -#include "lib/orderman/orders/algo/algo_orders/tests/AlgoTestDriver.h" -#include "lib/orderman/orders/algo/algo_orders/tests/limit_cover/LimitCoverState.h" -#include "lib/orderman/orders/algo/algo_orders/tests/limit_cover/LimitCoverTestUtils.h" -#include "lib/orderman/orders/algo/algo_orders/tests/limit_cover/TestSteps.h" -#include "lib/sparkproto/SparkProtos.pb.h" -#include "lib/utils/PBUtils.h" +#include "spark/api/services/OrderService.pb.h" +#include "spark/domain_model/Security.h" +#include "spark/orderman/orderman_utils/Book.h" +#include "spark/orderman/orderman_utils/BookUtils.h" +#include "spark/orderman/orderman_utils/Formatter.h" +#include "spark/orderman/orderman_utils/PriceComp.h" +#include "spark/orderman/orderman_utils/orderman_utils.h" +#include "spark/orderman/orders/algo/algo_orders/LimitCoverAlgo.h" +#include "spark/orderman/orders/algo/algo_orders/limit_cover/LimitCoverAdapter.h" +#include "spark/orderman/orders/algo/algo_orders/tests/AlgoTestDriver.h" +#include "spark/orderman/orders/algo/algo_orders/tests/limit_cover/LimitCoverState.h" +#include "spark/orderman/orders/algo/algo_orders/tests/limit_cover/LimitCoverTestUtils.h" +#include "spark/orderman/orders/algo/algo_orders/tests/limit_cover/TestSteps.h" +#include "spark/sparkproto/SparkProtos.pb.h" +#include "spark/utils/PBUtils.h" + #include #include #include diff --git a/src/lib/orderman/orders/algo/algo_orders/tests/dorman_tests.cpp b/src/lib_spark/spark/orderman/orders/algo/algo_orders/tests/dorman_tests.cpp similarity index 95% rename from src/lib/orderman/orders/algo/algo_orders/tests/dorman_tests.cpp rename to src/lib_spark/spark/orderman/orders/algo/algo_orders/tests/dorman_tests.cpp index 44766b116..349feaef1 100644 --- a/src/lib/orderman/orders/algo/algo_orders/tests/dorman_tests.cpp +++ b/src/lib_spark/spark/orderman/orders/algo/algo_orders/tests/dorman_tests.cpp @@ -1,8 +1,8 @@ -#include "../DormanAlgo.h" -#include "AlgoTestDriver.h" -#include "lib/domain_model/Security.h" -#include "lib/orderman/orderman_utils/Book.h" -#include "lib/orderman/orderman_utils/orderman_utils.h" +#include "spark/domain_model/Security.h" +#include "spark/orderman/orderman_utils/Book.h" +#include "spark/orderman/orderman_utils/orderman_utils.h" +#include "spark/orderman/orders/algo/algo_orders/DormanAlgo.h" +#include "spark/orderman/orders/algo/algo_orders/tests/AlgoTestDriver.h" #include #include diff --git a/src/lib/orderman/orders/algo/algo_orders/tests/limit_cover/LimitCoverState.cpp b/src/lib_spark/spark/orderman/orders/algo/algo_orders/tests/limit_cover/LimitCoverState.cpp similarity index 90% rename from src/lib/orderman/orders/algo/algo_orders/tests/limit_cover/LimitCoverState.cpp rename to src/lib_spark/spark/orderman/orders/algo/algo_orders/tests/limit_cover/LimitCoverState.cpp index 8bb1b4a7b..cfc0a7d2f 100644 --- a/src/lib/orderman/orders/algo/algo_orders/tests/limit_cover/LimitCoverState.cpp +++ b/src/lib_spark/spark/orderman/orders/algo/algo_orders/tests/limit_cover/LimitCoverState.cpp @@ -1,11 +1,11 @@ -#include "lib/orderman/orders/algo/algo_orders/tests/limit_cover/LimitCoverState.h" -#include "lib/domain_model/Security.h" -#include "lib/md/IntPrice.h" -#include "lib/orderman/order_factory/IOrderFactory.h" -#include "lib/orderman/orderman_utils/BookUtils.h" -#include "lib/orderman/orderman_utils/Formatter.h" -#include "lib/orderman/orders/algo/algo_orders/limit_cover/LimitCoverAdapter.h" -#include "lib/orderman/orders/algo/algo_orders/tests/limit_cover/LimitCoverTestUtils.h" +#include "spark/orderman/orders/algo/algo_orders/tests/limit_cover/LimitCoverState.h" +#include "spark/domain_model/Security.h" +#include "spark/md/IntPrice.h" +#include "spark/orderman/order_factory/IOrderFactory.h" +#include "spark/orderman/orderman_utils/BookUtils.h" +#include "spark/orderman/orderman_utils/Formatter.h" +#include "spark/orderman/orders/algo/algo_orders/limit_cover/LimitCoverAdapter.h" +#include "spark/orderman/orders/algo/algo_orders/tests/limit_cover/LimitCoverTestUtils.h" #include diff --git a/src/lib/orderman/orders/algo/algo_orders/tests/limit_cover/LimitCoverState.h b/src/lib_spark/spark/orderman/orders/algo/algo_orders/tests/limit_cover/LimitCoverState.h similarity index 87% rename from src/lib/orderman/orders/algo/algo_orders/tests/limit_cover/LimitCoverState.h rename to src/lib_spark/spark/orderman/orders/algo/algo_orders/tests/limit_cover/LimitCoverState.h index c4a6ec90e..3a86c6fc2 100644 --- a/src/lib/orderman/orders/algo/algo_orders/tests/limit_cover/LimitCoverState.h +++ b/src/lib_spark/spark/orderman/orders/algo/algo_orders/tests/limit_cover/LimitCoverState.h @@ -1,11 +1,11 @@ #pragma once -#include "lib/api/services/OrderService.pb.h" -#include "lib/domain_model/Security.h" -#include "lib/orderman/orderman_utils/Book.h" -#include "lib/orderman/orders/algo/algo_orders/LimitCoverAlgo.h" -#include "lib/orderman/orders/algo/algo_orders/limit_cover/LimitCoverDefinition.h" -#include "lib/orderman/orders/algo/algo_orders/tests/AlgoTestDriver.h" -#include "lib/sparkproto/SparkProtos.pb.h" +#include "spark/api/services/OrderService.pb.h" +#include "spark/domain_model/Security.h" +#include "spark/orderman/orderman_utils/Book.h" +#include "spark/orderman/orders/algo/algo_orders/LimitCoverAlgo.h" +#include "spark/orderman/orders/algo/algo_orders/limit_cover/LimitCoverDefinition.h" +#include "spark/orderman/orders/algo/algo_orders/tests/AlgoTestDriver.h" +#include "spark/sparkproto/SparkProtos.pb.h" #include #include #include diff --git a/src/lib/orderman/orders/algo/algo_orders/tests/limit_cover/LimitCoverTestUtils.h b/src/lib_spark/spark/orderman/orders/algo/algo_orders/tests/limit_cover/LimitCoverTestUtils.h similarity index 80% rename from src/lib/orderman/orders/algo/algo_orders/tests/limit_cover/LimitCoverTestUtils.h rename to src/lib_spark/spark/orderman/orders/algo/algo_orders/tests/limit_cover/LimitCoverTestUtils.h index 9add0e2ea..bfaa40672 100644 --- a/src/lib/orderman/orders/algo/algo_orders/tests/limit_cover/LimitCoverTestUtils.h +++ b/src/lib_spark/spark/orderman/orders/algo/algo_orders/tests/limit_cover/LimitCoverTestUtils.h @@ -1,8 +1,8 @@ #pragma once -#include "lib/api/services/OrderService.pb.h" -#include "lib/md/IntPrice.h" -#include "lib/orderman/orderman_utils/Formatter.h" -#include "lib/sparkproto/SparkProtos.pb.h" +#include "spark/api/services/OrderService.pb.h" +#include "spark/md/IntPrice.h" +#include "spark/orderman/orderman_utils/Formatter.h" +#include "spark/sparkproto/SparkProtos.pb.h" #include #define SUMMARIZE(...) Summary __summary__(Formatter::fmt(__VA_ARGS__)) diff --git a/src/lib/orderman/orders/algo/algo_orders/tests/limit_cover/TestSteps.cpp b/src/lib_spark/spark/orderman/orders/algo/algo_orders/tests/limit_cover/TestSteps.cpp similarity index 93% rename from src/lib/orderman/orders/algo/algo_orders/tests/limit_cover/TestSteps.cpp rename to src/lib_spark/spark/orderman/orders/algo/algo_orders/tests/limit_cover/TestSteps.cpp index 5ea6f225b..2ee487926 100644 --- a/src/lib/orderman/orders/algo/algo_orders/tests/limit_cover/TestSteps.cpp +++ b/src/lib_spark/spark/orderman/orders/algo/algo_orders/tests/limit_cover/TestSteps.cpp @@ -1,7 +1,7 @@ -#include "lib/orderman/orders/algo/algo_orders/tests/limit_cover/TestSteps.h" -#include "lib/api/services/OrderService.pb.h" -#include "lib/orderman/order_factory/IOrderFactory.h" -#include "lib/orderman/orders/algo/algo_orders/tests/limit_cover/LimitCoverTestUtils.h" +#include "spark/orderman/orders/algo/algo_orders/tests/limit_cover/TestSteps.h" +#include "spark/api/services/OrderService.pb.h" +#include "spark/orderman/order_factory/IOrderFactory.h" +#include "spark/orderman/orders/algo/algo_orders/tests/limit_cover/LimitCoverTestUtils.h" #include #include diff --git a/src/lib/orderman/orders/algo/algo_orders/tests/limit_cover/TestSteps.h b/src/lib_spark/spark/orderman/orders/algo/algo_orders/tests/limit_cover/TestSteps.h similarity index 93% rename from src/lib/orderman/orders/algo/algo_orders/tests/limit_cover/TestSteps.h rename to src/lib_spark/spark/orderman/orders/algo/algo_orders/tests/limit_cover/TestSteps.h index 2e06c8454..562dae903 100644 --- a/src/lib/orderman/orders/algo/algo_orders/tests/limit_cover/TestSteps.h +++ b/src/lib_spark/spark/orderman/orders/algo/algo_orders/tests/limit_cover/TestSteps.h @@ -1,6 +1,7 @@ #pragma once -#include "lib/api/services/OrderService.pb.h" -#include "lib/orderman/orders/algo/algo_orders/tests/limit_cover/LimitCoverState.h" + +#include "spark/api/services/OrderService.pb.h" +#include "spark/orderman/orders/algo/algo_orders/tests/limit_cover/LimitCoverState.h" #include #include diff --git a/src/lib/orderman/orders/algo/algo_orders/tests/splitter_tests.cpp b/src/lib_spark/spark/orderman/orders/algo/algo_orders/tests/splitter_tests.cpp similarity index 95% rename from src/lib/orderman/orders/algo/algo_orders/tests/splitter_tests.cpp rename to src/lib_spark/spark/orderman/orders/algo/algo_orders/tests/splitter_tests.cpp index a2fc1d95a..c198f8dee 100644 --- a/src/lib/orderman/orders/algo/algo_orders/tests/splitter_tests.cpp +++ b/src/lib_spark/spark/orderman/orders/algo/algo_orders/tests/splitter_tests.cpp @@ -1,8 +1,7 @@ - -#include "../SplitterAlgo.h" -#include "AlgoTestDriver.h" -#include "lib/orderman/orderman_utils/Book.h" -#include "lib/utils/bts_chrono.h" +#include "spark/orderman/orderman_utils/Book.h" +#include "spark/orderman/orders/algo/algo_orders/SplitterAlgo.h" +#include "spark/orderman/orders/algo/algo_orders/tests/AlgoTestDriver.h" +#include "spark/utils/bts_chrono.h" #include #include @@ -12,7 +11,6 @@ #include using namespace std; -using namespace bts::orderman::splitter; using namespace bts::api::orderman; namespace bts { @@ -29,9 +27,13 @@ namespace test { */ +using bts::orderman::splitter::MinMax; +using bts::orderman::splitter::SplitterAlgo; + constexpr auto some_price = md::IntPrice{128000, -3}; using ExpectedCount = utils::ValueWrapper; + struct SimpleCase { ExpectedCount expected_orders; Quantity target; diff --git a/src/lib/orderman/orders/algo/doc/algo_wrapper_sm.png b/src/lib_spark/spark/orderman/orders/algo/doc/algo_wrapper_sm.png similarity index 100% rename from src/lib/orderman/orders/algo/doc/algo_wrapper_sm.png rename to src/lib_spark/spark/orderman/orders/algo/doc/algo_wrapper_sm.png diff --git a/src/lib/orderman/orders/algo/doc/state_machine.org b/src/lib_spark/spark/orderman/orders/algo/doc/state_machine.org similarity index 100% rename from src/lib/orderman/orders/algo/doc/state_machine.org rename to src/lib_spark/spark/orderman/orders/algo/doc/state_machine.org diff --git a/src/lib/orderman/orders/algo/utils/Accumulator.h b/src/lib_spark/spark/orderman/orders/algo/utils/Accumulator.h similarity index 93% rename from src/lib/orderman/orders/algo/utils/Accumulator.h rename to src/lib_spark/spark/orderman/orders/algo/utils/Accumulator.h index 3ca0b8c01..f26227c81 100644 --- a/src/lib/orderman/orders/algo/utils/Accumulator.h +++ b/src/lib_spark/spark/orderman/orders/algo/utils/Accumulator.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/utils/bts_chrono.h" +#include "spark/utils/bts_chrono.h" #include namespace bts { diff --git a/src/lib/orderman/orders/algo/utils/DynamicOrderAdapter.h b/src/lib_spark/spark/orderman/orders/algo/utils/DynamicOrderAdapter.h similarity index 95% rename from src/lib/orderman/orders/algo/utils/DynamicOrderAdapter.h rename to src/lib_spark/spark/orderman/orders/algo/utils/DynamicOrderAdapter.h index 34c3e0890..6973fccab 100644 --- a/src/lib/orderman/orders/algo/utils/DynamicOrderAdapter.h +++ b/src/lib_spark/spark/orderman/orders/algo/utils/DynamicOrderAdapter.h @@ -1,8 +1,8 @@ #pragma once -#include "lib/api/services/OrderService.pb.h" -#include "lib/orderman/orderman_utils/orderman_utils.h" -#include "lib/plugin/SparkServices.h" -#include "lib/utils/bts_assert.h" +#include "spark/api/services/OrderService.pb.h" +#include "spark/orderman/orderman_utils/orderman_utils.h" +#include "spark/plugin/SparkServices.h" +#include "spark/utils/bts_assert.h" #include #include #include diff --git a/src/lib/orderman/orders/book_algos/BookAlgo.cpp b/src/lib_spark/spark/orderman/orders/book_algos/BookAlgo.cpp similarity index 95% rename from src/lib/orderman/orders/book_algos/BookAlgo.cpp rename to src/lib_spark/spark/orderman/orders/book_algos/BookAlgo.cpp index 44282bfc1..222d69e7e 100644 --- a/src/lib/orderman/orders/book_algos/BookAlgo.cpp +++ b/src/lib_spark/spark/orderman/orders/book_algos/BookAlgo.cpp @@ -1,8 +1,8 @@ #include "BookAlgo.h" -#include "lib/orderman/OrderBuilder.h" -#include "lib/orderman/orders/PreActivationOrderServices.h" -#include "lib/utils/PBUtils.h" -#include "lib/utils/helper_macros.h" +#include "spark/orderman/OrderBuilder.h" +#include "spark/orderman/orders/PreActivationOrderServices.h" +#include "spark/utils/PBUtils.h" +#include "spark/utils/helper_macros.h" #include namespace bts { diff --git a/src/lib/orderman/orders/book_algos/BookAlgo.h b/src/lib_spark/spark/orderman/orders/book_algos/BookAlgo.h similarity index 92% rename from src/lib/orderman/orders/book_algos/BookAlgo.h rename to src/lib_spark/spark/orderman/orders/book_algos/BookAlgo.h index 59e69c061..3180e02d0 100644 --- a/src/lib/orderman/orders/book_algos/BookAlgo.h +++ b/src/lib_spark/spark/orderman/orders/book_algos/BookAlgo.h @@ -1,8 +1,8 @@ #pragma once -#include "lib/api/services/OrderService.server.pb.h" -#include "lib/orderman/OrderBuilder.h" -#include "lib/orderman/orders/Order.h" +#include "spark/api/services/OrderService.server.pb.h" +#include "spark/orderman/OrderBuilder.h" +#include "spark/orderman/orders/Order.h" #include #include diff --git a/src/lib/orderman/orders/book_algos/BookOrderBase.cpp b/src/lib_spark/spark/orderman/orders/book_algos/BookOrderBase.cpp similarity index 98% rename from src/lib/orderman/orders/book_algos/BookOrderBase.cpp rename to src/lib_spark/spark/orderman/orders/book_algos/BookOrderBase.cpp index d22ae6c1a..1c2132cde 100644 --- a/src/lib/orderman/orders/book_algos/BookOrderBase.cpp +++ b/src/lib_spark/spark/orderman/orders/book_algos/BookOrderBase.cpp @@ -1,11 +1,11 @@ #include "BookOrderBase.h" -#include "lib/domain_model/Security.h" -#include "lib/orderman/ChildOrder.h" -#include "lib/orderman/orderman_utils/orderman_utils.h" -#include "lib/orderman/orders/PreActivationOrderServices.h" -#include "lib/utils/PBUtils.h" -#include "lib/utils/bts_assert.h" -#include "lib/utils/type_name.h" +#include "spark/domain_model/Security.h" +#include "spark/orderman/ChildOrder.h" +#include "spark/orderman/orderman_utils/orderman_utils.h" +#include "spark/orderman/orders/PreActivationOrderServices.h" +#include "spark/utils/PBUtils.h" +#include "spark/utils/bts_assert.h" +#include "spark/utils/type_name.h" namespace bts { namespace orderman { diff --git a/src/lib/orderman/orders/book_algos/BookOrderBase.h b/src/lib_spark/spark/orderman/orders/book_algos/BookOrderBase.h similarity index 94% rename from src/lib/orderman/orders/book_algos/BookOrderBase.h rename to src/lib_spark/spark/orderman/orders/book_algos/BookOrderBase.h index 4086aec5c..89783a1d1 100644 --- a/src/lib/orderman/orders/book_algos/BookOrderBase.h +++ b/src/lib_spark/spark/orderman/orders/book_algos/BookOrderBase.h @@ -1,9 +1,9 @@ #pragma once -#include "lib/api/services/OrderService.server.pb.h" -#include "lib/logging/logging.h" -#include "lib/md/PriceSize.h" -#include "lib/orderman/orders/Order.h" +#include "spark/api/services/OrderService.server.pb.h" +#include "spark/logging/logging.h" +#include "spark/md/PriceSize.h" +#include "spark/orderman/orders/Order.h" #include diff --git a/src/lib/orderman/orders/book_algos/OCOOrder.cpp b/src/lib_spark/spark/orderman/orders/book_algos/OCOOrder.cpp similarity index 97% rename from src/lib/orderman/orders/book_algos/OCOOrder.cpp rename to src/lib_spark/spark/orderman/orders/book_algos/OCOOrder.cpp index 06ed38556..6e6ba083f 100644 --- a/src/lib/orderman/orders/book_algos/OCOOrder.cpp +++ b/src/lib_spark/spark/orderman/orders/book_algos/OCOOrder.cpp @@ -1,9 +1,9 @@ #include "OCOOrder.h" -#include "lib/orderman/OrderBuilder.h" -#include "lib/orderman/orders/spreader_orders/spreader/SpreaderUtils.h" -#include "lib/utils/PBUtils.h" -#include "lib/utils/helper_macros.h" +#include "spark/orderman/OrderBuilder.h" +#include "spark/orderman/orders/spreader_orders/spreader/SpreaderUtils.h" +#include "spark/utils/PBUtils.h" +#include "spark/utils/helper_macros.h" #include namespace bts { diff --git a/src/lib/orderman/orders/book_algos/OCOOrder.h b/src/lib_spark/spark/orderman/orders/book_algos/OCOOrder.h similarity index 95% rename from src/lib/orderman/orders/book_algos/OCOOrder.h rename to src/lib_spark/spark/orderman/orders/book_algos/OCOOrder.h index f7619f6ac..139a0b7ae 100644 --- a/src/lib/orderman/orders/book_algos/OCOOrder.h +++ b/src/lib_spark/spark/orderman/orders/book_algos/OCOOrder.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/orderman/orders/book_algos/BookAlgo.h" +#include "spark/orderman/orders/book_algos/BookAlgo.h" namespace bts { namespace orderman { diff --git a/src/lib/orderman/orders/book_algos/PricerOrder.cpp b/src/lib_spark/spark/orderman/orders/book_algos/PricerOrder.cpp similarity index 85% rename from src/lib/orderman/orders/book_algos/PricerOrder.cpp rename to src/lib_spark/spark/orderman/orders/book_algos/PricerOrder.cpp index 034c57de0..18aff4d35 100644 --- a/src/lib/orderman/orders/book_algos/PricerOrder.cpp +++ b/src/lib_spark/spark/orderman/orders/book_algos/PricerOrder.cpp @@ -1,8 +1,8 @@ #include "PricerOrder.h" -#include "lib/orderman/OrderBuilder.h" -#include "lib/orderman/orders/spreader_orders/spreader/SpreaderUtils.h" -#include "lib/utils/PBUtils.h" +#include "spark/orderman/OrderBuilder.h" +#include "spark/orderman/orders/spreader_orders/spreader/SpreaderUtils.h" +#include "spark/utils/PBUtils.h" #include namespace bts { diff --git a/src/lib/orderman/orders/book_algos/PricerOrder.h b/src/lib_spark/spark/orderman/orders/book_algos/PricerOrder.h similarity index 92% rename from src/lib/orderman/orders/book_algos/PricerOrder.h rename to src/lib_spark/spark/orderman/orders/book_algos/PricerOrder.h index fb79e506c..bca22ed24 100644 --- a/src/lib/orderman/orders/book_algos/PricerOrder.h +++ b/src/lib_spark/spark/orderman/orders/book_algos/PricerOrder.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/orderman/orders/book_algos/BookAlgo.h" +#include "spark/orderman/orders/book_algos/BookAlgo.h" namespace bts { namespace orderman { diff --git a/src/lib/orderman/orders/glbx/IGLBXOrderEncoder.cpp b/src/lib_spark/spark/orderman/orders/glbx/IGLBXOrderEncoder.cpp similarity index 100% rename from src/lib/orderman/orders/glbx/IGLBXOrderEncoder.cpp rename to src/lib_spark/spark/orderman/orders/glbx/IGLBXOrderEncoder.cpp diff --git a/src/lib/orderman/orders/glbx/IGLBXOrderEncoder.h b/src/lib_spark/spark/orderman/orders/glbx/IGLBXOrderEncoder.h similarity index 96% rename from src/lib/orderman/orders/glbx/IGLBXOrderEncoder.h rename to src/lib_spark/spark/orderman/orders/glbx/IGLBXOrderEncoder.h index 2d10d4abd..8a6c389c8 100644 --- a/src/lib/orderman/orders/glbx/IGLBXOrderEncoder.h +++ b/src/lib_spark/spark/orderman/orders/glbx/IGLBXOrderEncoder.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/orderman/orderman_utils/orderman_common.h" +#include "spark/orderman/orderman_utils/orderman_common.h" #include namespace bts { diff --git a/src/lib/orderman/orders/glbx/iLink2OrderEncoder.cpp b/src/lib_spark/spark/orderman/orders/glbx/iLink2OrderEncoder.cpp similarity index 97% rename from src/lib/orderman/orders/glbx/iLink2OrderEncoder.cpp rename to src/lib_spark/spark/orderman/orders/glbx/iLink2OrderEncoder.cpp index 6e4aa74cb..954f5f660 100644 --- a/src/lib/orderman/orders/glbx/iLink2OrderEncoder.cpp +++ b/src/lib_spark/spark/orderman/orders/glbx/iLink2OrderEncoder.cpp @@ -1,12 +1,12 @@ #include "iLink2OrderEncoder.h" -#include "lib/api/services/OrderService.pb.h" -#include "lib/config/config.h" -#include "lib/config/protos/orderman_cfg.pb.h" -#include "lib/domain_model/Security.h" -#include "lib/jetfix/codec/FIXFragment.h" -#include "lib/jetfix/codec/FieldDefinitions.h" -#include "lib/orderman/OrderServices.h" -#include "lib/orderman/orderman_utils/fix_order_codec.h" +#include "spark/api/services/OrderService.pb.h" +#include "spark/config/config.h" +#include "spark/config/protos/orderman_cfg.pb.h" +#include "spark/domain_model/Security.h" +#include "spark/jetfix/codec/FIXFragment.h" +#include "spark/jetfix/codec/FieldDefinitions.h" +#include "spark/orderman/OrderServices.h" +#include "spark/orderman/orderman_utils/fix_order_codec.h" namespace bts { namespace orderman { diff --git a/src/lib/orderman/orders/glbx/iLink2OrderEncoder.h b/src/lib_spark/spark/orderman/orders/glbx/iLink2OrderEncoder.h similarity index 96% rename from src/lib/orderman/orders/glbx/iLink2OrderEncoder.h rename to src/lib_spark/spark/orderman/orders/glbx/iLink2OrderEncoder.h index abaa777c7..d31a0ff14 100644 --- a/src/lib/orderman/orders/glbx/iLink2OrderEncoder.h +++ b/src/lib_spark/spark/orderman/orders/glbx/iLink2OrderEncoder.h @@ -1,5 +1,5 @@ #pragma once -#include "lib/orderman/orders/glbx/IGLBXOrderEncoder.h" +#include "spark/orderman/orders/glbx/IGLBXOrderEncoder.h" namespace bts { namespace orderman { diff --git a/src/lib/orderman/orders/glbx/iLink3OrderEncoder.cpp b/src/lib_spark/spark/orderman/orders/glbx/iLink3OrderEncoder.cpp similarity index 95% rename from src/lib/orderman/orders/glbx/iLink3OrderEncoder.cpp rename to src/lib_spark/spark/orderman/orders/glbx/iLink3OrderEncoder.cpp index e41622e14..e890a1afb 100644 --- a/src/lib/orderman/orders/glbx/iLink3OrderEncoder.cpp +++ b/src/lib_spark/spark/orderman/orders/glbx/iLink3OrderEncoder.cpp @@ -1,10 +1,10 @@ #include "iLink3OrderEncoder.h" -#include "lib/api/services/OrderService.pb.h" -#include "lib/domain_model/Security.h" -#include "lib/orderman/gateways/IExecutionGateway.h" -#include "lib/orderman/OrderServices.h" -#include "lib/orderman/orderman_utils/fix_order_codec.h" +#include "spark/api/services/OrderService.pb.h" +#include "spark/domain_model/Security.h" +#include "spark/orderman/gateways/IExecutionGateway.h" +#include "spark/orderman/OrderServices.h" +#include "spark/orderman/orderman_utils/fix_order_codec.h" namespace bts { namespace orderman { diff --git a/src/lib/orderman/orders/glbx/iLink3OrderEncoder.h b/src/lib_spark/spark/orderman/orders/glbx/iLink3OrderEncoder.h similarity index 96% rename from src/lib/orderman/orders/glbx/iLink3OrderEncoder.h rename to src/lib_spark/spark/orderman/orders/glbx/iLink3OrderEncoder.h index 60cdbd8c8..b13306a12 100644 --- a/src/lib/orderman/orders/glbx/iLink3OrderEncoder.h +++ b/src/lib_spark/spark/orderman/orders/glbx/iLink3OrderEncoder.h @@ -1,5 +1,5 @@ #pragma once -#include "lib/orderman/orders/glbx/IGLBXOrderEncoder.h" +#include "spark/orderman/orders/glbx/IGLBXOrderEncoder.h" namespace bts { namespace orderman { diff --git a/src/lib/orderman/orders/queue_holder/IQueueHolderOrderStateWorker.h b/src/lib_spark/spark/orderman/orders/queue_holder/IQueueHolderOrderStateWorker.h similarity index 91% rename from src/lib/orderman/orders/queue_holder/IQueueHolderOrderStateWorker.h rename to src/lib_spark/spark/orderman/orders/queue_holder/IQueueHolderOrderStateWorker.h index 6f5381be1..af22caa0e 100644 --- a/src/lib/orderman/orders/queue_holder/IQueueHolderOrderStateWorker.h +++ b/src/lib_spark/spark/orderman/orders/queue_holder/IQueueHolderOrderStateWorker.h @@ -1,7 +1,7 @@ #pragma once -#include "lib/orderman/orderman_utils/orderman_common.h" -#include "lib/orderman/orders/queue_holder/QueueHolderOrderState.h" -#include "lib/utils/bts_chrono.h" +#include "spark/orderman/orderman_utils/orderman_common.h" +#include "spark/orderman/orders/queue_holder/QueueHolderOrderState.h" +#include "spark/utils/bts_chrono.h" namespace bts { namespace trace { diff --git a/src/lib/orderman/orders/queue_holder/QHOOrderManager.h b/src/lib_spark/spark/orderman/orders/queue_holder/QHOOrderManager.h similarity index 98% rename from src/lib/orderman/orders/queue_holder/QHOOrderManager.h rename to src/lib_spark/spark/orderman/orders/queue_holder/QHOOrderManager.h index 58ae062ee..02e6cba00 100644 --- a/src/lib/orderman/orders/queue_holder/QHOOrderManager.h +++ b/src/lib_spark/spark/orderman/orders/queue_holder/QHOOrderManager.h @@ -1,8 +1,8 @@ #pragma once -#include "lib/domain_model/Security.h" -#include "lib/orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.h" -#include "lib/os/os.h" +#include "spark/domain_model/Security.h" +#include "spark/orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.h" +#include "spark/os/os.h" namespace bts { namespace orderman { diff --git a/src/lib/orderman/orders/queue_holder/QueueHolderOrder.cpp b/src/lib_spark/spark/orderman/orders/queue_holder/QueueHolderOrder.cpp similarity index 94% rename from src/lib/orderman/orders/queue_holder/QueueHolderOrder.cpp rename to src/lib_spark/spark/orderman/orders/queue_holder/QueueHolderOrder.cpp index 372741e9d..f72c0198f 100644 --- a/src/lib/orderman/orders/queue_holder/QueueHolderOrder.cpp +++ b/src/lib_spark/spark/orderman/orders/queue_holder/QueueHolderOrder.cpp @@ -1,12 +1,12 @@ #include "QueueHolderOrder.h" -#include "lib/api/services/OrderService.h" -#include "lib/domain_model/Security.h" -#include "lib/logging/logging.h" -#include "lib/orderman/OrderBuilder.h" -#include "lib/orderman/events/BookUpdateEvent.h" -#include "lib/orderman/orders/spreader_orders/spreader/SpreaderUtils.h" -#include "lib/os/os.h" -#include "lib/utils/PBUtils.h" +#include "spark/api/services/OrderService.h" +#include "spark/domain_model/Security.h" +#include "spark/logging/logging.h" +#include "spark/orderman/OrderBuilder.h" +#include "spark/orderman/events/BookUpdateEvent.h" +#include "spark/orderman/orders/spreader_orders/spreader/SpreaderUtils.h" +#include "spark/os/os.h" +#include "spark/utils/PBUtils.h" #include #include diff --git a/src/lib/orderman/orders/queue_holder/QueueHolderOrder.h b/src/lib_spark/spark/orderman/orders/queue_holder/QueueHolderOrder.h similarity index 88% rename from src/lib/orderman/orders/queue_holder/QueueHolderOrder.h rename to src/lib_spark/spark/orderman/orders/queue_holder/QueueHolderOrder.h index 695210e53..df521dd9a 100644 --- a/src/lib/orderman/orders/queue_holder/QueueHolderOrder.h +++ b/src/lib_spark/spark/orderman/orders/queue_holder/QueueHolderOrder.h @@ -1,16 +1,16 @@ #pragma once -#include "lib/api/services/OrderService.server.pb.h" -#include "lib/domain_model/Security.h" -#include "lib/orderman/orders/Order.h" -#include "lib/orderman/orders/OrderOpResult.h" -#include "lib/orderman/orders/queue_holder/IQueueHolderOrderStateWorker.h" -#include "lib/orderman/orders/queue_holder/QHOOrderManager.h" -#include "lib/orderman/orders/queue_holder/state_workers/QHOEndStateWorker.h" -#include "lib/orderman/orders/queue_holder/state_workers/QHOStartStateWorker.h" -#include "lib/orderman/orders/queue_holder/state_workers/QHOWaitingForAckStateWorker.h" -#include "lib/orderman/orders/queue_holder/state_workers/QHOWaitingForCancelAllStateWorker.h" -#include "lib/orderman/orders/queue_holder/state_workers/QHOWorkingStateWorker.h" +#include "spark/api/services/OrderService.server.pb.h" +#include "spark/domain_model/Security.h" +#include "spark/orderman/orders/Order.h" +#include "spark/orderman/orders/OrderOpResult.h" +#include "spark/orderman/orders/queue_holder/IQueueHolderOrderStateWorker.h" +#include "spark/orderman/orders/queue_holder/QHOOrderManager.h" +#include "spark/orderman/orders/queue_holder/state_workers/QHOEndStateWorker.h" +#include "spark/orderman/orders/queue_holder/state_workers/QHOStartStateWorker.h" +#include "spark/orderman/orders/queue_holder/state_workers/QHOWaitingForAckStateWorker.h" +#include "spark/orderman/orders/queue_holder/state_workers/QHOWaitingForCancelAllStateWorker.h" +#include "spark/orderman/orders/queue_holder/state_workers/QHOWorkingStateWorker.h" #include namespace bts { diff --git a/src/lib/orderman/orders/queue_holder/QueueHolderOrderState.h b/src/lib_spark/spark/orderman/orders/queue_holder/QueueHolderOrderState.h similarity index 100% rename from src/lib/orderman/orders/queue_holder/QueueHolderOrderState.h rename to src/lib_spark/spark/orderman/orders/queue_holder/QueueHolderOrderState.h diff --git a/src/lib/orderman/orders/queue_holder/state_workers/QHOEndStateWorker.cpp b/src/lib_spark/spark/orderman/orders/queue_holder/state_workers/QHOEndStateWorker.cpp similarity index 76% rename from src/lib/orderman/orders/queue_holder/state_workers/QHOEndStateWorker.cpp rename to src/lib_spark/spark/orderman/orders/queue_holder/state_workers/QHOEndStateWorker.cpp index e79c66d05..1386f03ad 100644 --- a/src/lib/orderman/orders/queue_holder/state_workers/QHOEndStateWorker.cpp +++ b/src/lib_spark/spark/orderman/orders/queue_holder/state_workers/QHOEndStateWorker.cpp @@ -1,12 +1,12 @@ -#include "lib/orderman/orders/queue_holder/state_workers/QHOEndStateWorker.h" -#include "lib/domain_model/Security.h" -#include "lib/logging/logging.h" -#include "lib/orderman/OrderBuilder.h" -#include "lib/orderman/events/BookUpdateEvent.h" -#include "lib/orderman/orders/queue_holder/QueueHolderOrder.h" -#include "lib/orderman/orders/spreader_orders/spreader/SpreaderUtils.h" -#include "lib/os/os.h" -#include "lib/utils/PBUtils.h" +#include "spark/orderman/orders/queue_holder/state_workers/QHOEndStateWorker.h" +#include "spark/domain_model/Security.h" +#include "spark/logging/logging.h" +#include "spark/orderman/OrderBuilder.h" +#include "spark/orderman/events/BookUpdateEvent.h" +#include "spark/orderman/orders/queue_holder/QueueHolderOrder.h" +#include "spark/orderman/orders/spreader_orders/spreader/SpreaderUtils.h" +#include "spark/os/os.h" +#include "spark/utils/PBUtils.h" #include #include diff --git a/src/lib/orderman/orders/queue_holder/state_workers/QHOEndStateWorker.h b/src/lib_spark/spark/orderman/orders/queue_holder/state_workers/QHOEndStateWorker.h similarity index 93% rename from src/lib/orderman/orders/queue_holder/state_workers/QHOEndStateWorker.h rename to src/lib_spark/spark/orderman/orders/queue_holder/state_workers/QHOEndStateWorker.h index 82f49eb68..771bfcb79 100644 --- a/src/lib/orderman/orders/queue_holder/state_workers/QHOEndStateWorker.h +++ b/src/lib_spark/spark/orderman/orders/queue_holder/state_workers/QHOEndStateWorker.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/orderman/orders/queue_holder/IQueueHolderOrderStateWorker.h" +#include "spark/orderman/orders/queue_holder/IQueueHolderOrderStateWorker.h" namespace bts { namespace orderman { diff --git a/src/lib/orderman/orders/queue_holder/state_workers/QHOStartStateWorker.cpp b/src/lib_spark/spark/orderman/orders/queue_holder/state_workers/QHOStartStateWorker.cpp similarity index 89% rename from src/lib/orderman/orders/queue_holder/state_workers/QHOStartStateWorker.cpp rename to src/lib_spark/spark/orderman/orders/queue_holder/state_workers/QHOStartStateWorker.cpp index 3b21a48b5..0122999bd 100644 --- a/src/lib/orderman/orders/queue_holder/state_workers/QHOStartStateWorker.cpp +++ b/src/lib_spark/spark/orderman/orders/queue_holder/state_workers/QHOStartStateWorker.cpp @@ -1,13 +1,13 @@ -#include "lib/orderman/orders/queue_holder/state_workers/QHOStartStateWorker.h" -#include "lib/domain_model/Security.h" -#include "lib/logging/logging.h" -#include "lib/orderman/OrderBuilder.h" -#include "lib/orderman/events/BookUpdateEvent.h" -#include "lib/orderman/orders/PreActivationOrderServices.h" -#include "lib/orderman/orders/queue_holder/QueueHolderOrder.h" -#include "lib/orderman/orders/spreader_orders/spreader/SpreaderUtils.h" -#include "lib/os/os.h" -#include "lib/utils/PBUtils.h" +#include "spark/orderman/orders/queue_holder/state_workers/QHOStartStateWorker.h" +#include "spark/domain_model/Security.h" +#include "spark/logging/logging.h" +#include "spark/orderman/OrderBuilder.h" +#include "spark/orderman/events/BookUpdateEvent.h" +#include "spark/orderman/orders/PreActivationOrderServices.h" +#include "spark/orderman/orders/queue_holder/QueueHolderOrder.h" +#include "spark/orderman/orders/spreader_orders/spreader/SpreaderUtils.h" +#include "spark/os/os.h" +#include "spark/utils/PBUtils.h" #include #include diff --git a/src/lib/orderman/orders/queue_holder/state_workers/QHOStartStateWorker.h b/src/lib_spark/spark/orderman/orders/queue_holder/state_workers/QHOStartStateWorker.h similarity index 94% rename from src/lib/orderman/orders/queue_holder/state_workers/QHOStartStateWorker.h rename to src/lib_spark/spark/orderman/orders/queue_holder/state_workers/QHOStartStateWorker.h index 78fb7e4f3..d1005516e 100644 --- a/src/lib/orderman/orders/queue_holder/state_workers/QHOStartStateWorker.h +++ b/src/lib_spark/spark/orderman/orders/queue_holder/state_workers/QHOStartStateWorker.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/orderman/orders/queue_holder/IQueueHolderOrderStateWorker.h" +#include "spark/orderman/orders/queue_holder/IQueueHolderOrderStateWorker.h" namespace bts { namespace orderman { diff --git a/src/lib/orderman/orders/queue_holder/state_workers/QHOWaitingForAckStateWorker.cpp b/src/lib_spark/spark/orderman/orders/queue_holder/state_workers/QHOWaitingForAckStateWorker.cpp similarity index 83% rename from src/lib/orderman/orders/queue_holder/state_workers/QHOWaitingForAckStateWorker.cpp rename to src/lib_spark/spark/orderman/orders/queue_holder/state_workers/QHOWaitingForAckStateWorker.cpp index c209ce947..ddcd77d7b 100644 --- a/src/lib/orderman/orders/queue_holder/state_workers/QHOWaitingForAckStateWorker.cpp +++ b/src/lib_spark/spark/orderman/orders/queue_holder/state_workers/QHOWaitingForAckStateWorker.cpp @@ -1,12 +1,12 @@ -#include "lib/orderman/orders/queue_holder/state_workers/QHOWaitingForAckStateWorker.h" -#include "lib/domain_model/Security.h" -#include "lib/logging/logging.h" -#include "lib/orderman/OrderBuilder.h" -#include "lib/orderman/events/BookUpdateEvent.h" -#include "lib/orderman/orders/queue_holder/QueueHolderOrder.h" -#include "lib/orderman/orders/spreader_orders/spreader/SpreaderUtils.h" -#include "lib/os/os.h" -#include "lib/utils/PBUtils.h" +#include "spark/orderman/orders/queue_holder/state_workers/QHOWaitingForAckStateWorker.h" +#include "spark/domain_model/Security.h" +#include "spark/logging/logging.h" +#include "spark/orderman/OrderBuilder.h" +#include "spark/orderman/events/BookUpdateEvent.h" +#include "spark/orderman/orders/queue_holder/QueueHolderOrder.h" +#include "spark/orderman/orders/spreader_orders/spreader/SpreaderUtils.h" +#include "spark/os/os.h" +#include "spark/utils/PBUtils.h" #include #include diff --git a/src/lib/orderman/orders/queue_holder/state_workers/QHOWaitingForAckStateWorker.h b/src/lib_spark/spark/orderman/orders/queue_holder/state_workers/QHOWaitingForAckStateWorker.h similarity index 94% rename from src/lib/orderman/orders/queue_holder/state_workers/QHOWaitingForAckStateWorker.h rename to src/lib_spark/spark/orderman/orders/queue_holder/state_workers/QHOWaitingForAckStateWorker.h index c4f92d9bb..54085f308 100644 --- a/src/lib/orderman/orders/queue_holder/state_workers/QHOWaitingForAckStateWorker.h +++ b/src/lib_spark/spark/orderman/orders/queue_holder/state_workers/QHOWaitingForAckStateWorker.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/orderman/orders/queue_holder/IQueueHolderOrderStateWorker.h" +#include "spark/orderman/orders/queue_holder/IQueueHolderOrderStateWorker.h" namespace bts { namespace orderman { diff --git a/src/lib/orderman/orders/queue_holder/state_workers/QHOWaitingForCancelAllStateWorker.cpp b/src/lib_spark/spark/orderman/orders/queue_holder/state_workers/QHOWaitingForCancelAllStateWorker.cpp similarity index 82% rename from src/lib/orderman/orders/queue_holder/state_workers/QHOWaitingForCancelAllStateWorker.cpp rename to src/lib_spark/spark/orderman/orders/queue_holder/state_workers/QHOWaitingForCancelAllStateWorker.cpp index 6fd0f737b..70756df74 100644 --- a/src/lib/orderman/orders/queue_holder/state_workers/QHOWaitingForCancelAllStateWorker.cpp +++ b/src/lib_spark/spark/orderman/orders/queue_holder/state_workers/QHOWaitingForCancelAllStateWorker.cpp @@ -1,12 +1,12 @@ -#include "lib/orderman/orders/queue_holder/state_workers/QHOWaitingForCancelAllStateWorker.h" -#include "lib/domain_model/Security.h" -#include "lib/logging/logging.h" -#include "lib/orderman/OrderBuilder.h" -#include "lib/orderman/events/BookUpdateEvent.h" -#include "lib/orderman/orders/queue_holder/QueueHolderOrder.h" -#include "lib/orderman/orders/spreader_orders/spreader/SpreaderUtils.h" -#include "lib/os/os.h" -#include "lib/utils/PBUtils.h" +#include "spark/orderman/orders/queue_holder/state_workers/QHOWaitingForCancelAllStateWorker.h" +#include "spark/domain_model/Security.h" +#include "spark/logging/logging.h" +#include "spark/orderman/OrderBuilder.h" +#include "spark/orderman/events/BookUpdateEvent.h" +#include "spark/orderman/orders/queue_holder/QueueHolderOrder.h" +#include "spark/orderman/orders/spreader_orders/spreader/SpreaderUtils.h" +#include "spark/os/os.h" +#include "spark/utils/PBUtils.h" #include #include diff --git a/src/lib/orderman/orders/queue_holder/state_workers/QHOWaitingForCancelAllStateWorker.h b/src/lib_spark/spark/orderman/orders/queue_holder/state_workers/QHOWaitingForCancelAllStateWorker.h similarity index 94% rename from src/lib/orderman/orders/queue_holder/state_workers/QHOWaitingForCancelAllStateWorker.h rename to src/lib_spark/spark/orderman/orders/queue_holder/state_workers/QHOWaitingForCancelAllStateWorker.h index f2416fb1f..d8499a547 100644 --- a/src/lib/orderman/orders/queue_holder/state_workers/QHOWaitingForCancelAllStateWorker.h +++ b/src/lib_spark/spark/orderman/orders/queue_holder/state_workers/QHOWaitingForCancelAllStateWorker.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/orderman/orders/queue_holder/IQueueHolderOrderStateWorker.h" +#include "spark/orderman/orders/queue_holder/IQueueHolderOrderStateWorker.h" namespace bts { namespace orderman { diff --git a/src/lib/orderman/orders/queue_holder/state_workers/QHOWorkingStateWorker.cpp b/src/lib_spark/spark/orderman/orders/queue_holder/state_workers/QHOWorkingStateWorker.cpp similarity index 90% rename from src/lib/orderman/orders/queue_holder/state_workers/QHOWorkingStateWorker.cpp rename to src/lib_spark/spark/orderman/orders/queue_holder/state_workers/QHOWorkingStateWorker.cpp index ef489db08..ecabae4df 100644 --- a/src/lib/orderman/orders/queue_holder/state_workers/QHOWorkingStateWorker.cpp +++ b/src/lib_spark/spark/orderman/orders/queue_holder/state_workers/QHOWorkingStateWorker.cpp @@ -1,12 +1,12 @@ -#include "lib/orderman/orders/queue_holder/state_workers/QHOWorkingStateWorker.h" -#include "lib/domain_model/Security.h" -#include "lib/logging/logging.h" -#include "lib/orderman/OrderBuilder.h" -#include "lib/orderman/events/BookUpdateEvent.h" -#include "lib/orderman/orders/queue_holder/QueueHolderOrder.h" -#include "lib/orderman/orders/spreader_orders/spreader/SpreaderUtils.h" -#include "lib/os/os.h" -#include "lib/utils/PBUtils.h" +#include "spark/orderman/orders/queue_holder/state_workers/QHOWorkingStateWorker.h" +#include "spark/domain_model/Security.h" +#include "spark/logging/logging.h" +#include "spark/orderman/OrderBuilder.h" +#include "spark/orderman/events/BookUpdateEvent.h" +#include "spark/orderman/orders/queue_holder/QueueHolderOrder.h" +#include "spark/orderman/orders/spreader_orders/spreader/SpreaderUtils.h" +#include "spark/os/os.h" +#include "spark/utils/PBUtils.h" #include #include diff --git a/src/lib/orderman/orders/queue_holder/state_workers/QHOWorkingStateWorker.h b/src/lib_spark/spark/orderman/orders/queue_holder/state_workers/QHOWorkingStateWorker.h similarity index 93% rename from src/lib/orderman/orders/queue_holder/state_workers/QHOWorkingStateWorker.h rename to src/lib_spark/spark/orderman/orders/queue_holder/state_workers/QHOWorkingStateWorker.h index 845030374..511f48d76 100644 --- a/src/lib/orderman/orders/queue_holder/state_workers/QHOWorkingStateWorker.h +++ b/src/lib_spark/spark/orderman/orders/queue_holder/state_workers/QHOWorkingStateWorker.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/orderman/orders/queue_holder/IQueueHolderOrderStateWorker.h" +#include "spark/orderman/orders/queue_holder/IQueueHolderOrderStateWorker.h" namespace bts { namespace orderman { diff --git a/src/lib/orderman/orders/spreader_orders/ISpreaderStateWorker.h b/src/lib_spark/spark/orderman/orders/spreader_orders/ISpreaderStateWorker.h similarity index 84% rename from src/lib/orderman/orders/spreader_orders/ISpreaderStateWorker.h rename to src/lib_spark/spark/orderman/orders/spreader_orders/ISpreaderStateWorker.h index e5101aa8c..7861ccc1f 100644 --- a/src/lib/orderman/orders/spreader_orders/ISpreaderStateWorker.h +++ b/src/lib_spark/spark/orderman/orders/spreader_orders/ISpreaderStateWorker.h @@ -1,11 +1,11 @@ #pragma once -#include "lib/domain_model/Security.pb.h" -#include "lib/orderman/events/SettlementUpdateEvent.h" -#include "lib/orderman/orderman_utils/orderman_common.h" -#include "lib/orderman/orders/spreader_orders/spreader/SpreaderLegData.h" // fix this (not needed, all the headers can be fwd ref's) -#include "lib/orderman/orders/spreader_orders/spreader_states/SpreaderState.h" -#include "lib/sparkproto/SparkProtos.pb.h" -#include "lib/utils/bts_chrono.h" +#include "spark/domain_model/Security.pb.h" +#include "spark/orderman/events/SettlementUpdateEvent.h" +#include "spark/orderman/orderman_utils/orderman_common.h" +#include "spark/orderman/orders/spreader_orders/spreader/SpreaderLegData.h" // fix this (not needed, all the headers can be fwd ref's) +#include "spark/orderman/orders/spreader_orders/spreader_states/SpreaderState.h" +#include "spark/sparkproto/SparkProtos.pb.h" +#include "spark/utils/bts_chrono.h" namespace bts { namespace api { diff --git a/src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp b/src/lib_spark/spark/orderman/orders/spreader_orders/SpreaderOrder.cpp similarity index 96% rename from src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp rename to src/lib_spark/spark/orderman/orders/spreader_orders/SpreaderOrder.cpp index 769929c17..5c83f7deb 100644 --- a/src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp +++ b/src/lib_spark/spark/orderman/orders/spreader_orders/SpreaderOrder.cpp @@ -1,21 +1,21 @@ #include "SpreaderOrder.h" -#include "lib/config/config.h" -#include "lib/config/protos/spreader.pb.h" -#include "lib/logging/logging.h" -#include "lib/orderman/events/SettlementUpdateEvent.h" -#include "lib/orderman/orderman_utils/orderman_common.h" -#include "lib/orderman/orders/spreader_orders/spreader/LegPropertyData.h" -#include "lib/orderman/orders/spreader_orders/spreader/NLegsHedgeRecompData.h" -#include "lib/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.h" -#include "lib/orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.h" -#include "lib/orderman/orders/spreader_orders/spreader/SpreaderLegData.h" -#include "lib/orderman/orders/spreader_orders/spreader/SpreaderUtils.h" -#include "lib/orderman/orders/spreader_orders/spreader/external_interfacing/IAlternateOrderGateway.h" -#include "lib/os/os.h" -#include "lib/tracing/bts_trace.h" -#include "lib/utils/PBUtils.h" -#include "lib/utils/bts_assert.h" -#include "lib/utils/helper_macros.h" +#include "spark/config/config.h" +#include "spark/config/protos/spreader.pb.h" +#include "spark/logging/logging.h" +#include "spark/orderman/events/SettlementUpdateEvent.h" +#include "spark/orderman/orderman_utils/orderman_common.h" +#include "spark/orderman/orders/spreader_orders/spreader/LegPropertyData.h" +#include "spark/orderman/orders/spreader_orders/spreader/NLegsHedgeRecompData.h" +#include "spark/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.h" +#include "spark/orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.h" +#include "spark/orderman/orders/spreader_orders/spreader/SpreaderLegData.h" +#include "spark/orderman/orders/spreader_orders/spreader/SpreaderUtils.h" +#include "spark/orderman/orders/spreader_orders/spreader/external_interfacing/IAlternateOrderGateway.h" +#include "spark/os/os.h" +#include "spark/tracing/bts_trace.h" +#include "spark/utils/PBUtils.h" +#include "spark/utils/bts_assert.h" +#include "spark/utils/helper_macros.h" namespace bts { namespace orderman { diff --git a/src/lib/orderman/orders/spreader_orders/SpreaderOrder.h b/src/lib_spark/spark/orderman/orders/spreader_orders/SpreaderOrder.h similarity index 92% rename from src/lib/orderman/orders/spreader_orders/SpreaderOrder.h rename to src/lib_spark/spark/orderman/orders/spreader_orders/SpreaderOrder.h index 0ada8d233..0bc6b57e3 100644 --- a/src/lib/orderman/orders/spreader_orders/SpreaderOrder.h +++ b/src/lib_spark/spark/orderman/orders/spreader_orders/SpreaderOrder.h @@ -1,26 +1,27 @@ #pragma once -#include "lib/api/services/OrderService.h" -#include "lib/domain_model/Security.pb.h" -#include "lib/logging/logging.h" -#include "lib/mercury/events/TimerEvent.h" -#include "lib/orderman/events/BookUpdateEvent.h" -#include "lib/orderman/events/OrderStateUpdateEvent.h" -#include "lib/orderman/orderman_utils/orderman_common.h" -#include "lib/orderman/orders/Order.h" -#include "lib/orderman/orders/spreader_orders/spreader/ISpreaderManager.h" -#include "lib/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.h" -#include "lib/orderman/orders/spreader_orders/spreader/SpreaderCacheWarmingState.h" -#include "lib/orderman/orders/spreader_orders/spreader_states/SpreaderEndStateWorker.h" -#include "lib/orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.h" -#include "lib/orderman/orders/spreader_orders/spreader_states/SpreaderState.h" -#include "lib/orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.h" -#include "lib/orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForInitialDataStateWorker.h" -#include "lib/orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.h" -#include "lib/sparkproto/SparkProtos.pb.h" -#include "lib/utils/bts_assert.h" -#include "lib/utils/bts_chrono.h" -#include "lib/utils/is_unittest_environment.h" +#include "spark/api/services/OrderService.h" +#include "spark/domain_model/Security.pb.h" +#include "spark/logging/logging.h" +#include "spark/mercury/events/TimerEvent.h" +#include "spark/orderman/events/BookUpdateEvent.h" +#include "spark/orderman/events/OrderStateUpdateEvent.h" +#include "spark/orderman/orderman_utils/orderman_common.h" +#include "spark/orderman/orders/Order.h" +#include "spark/orderman/orders/spreader_orders/spreader/ISpreaderManager.h" +#include "spark/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.h" +#include "spark/orderman/orders/spreader_orders/spreader/SpreaderCacheWarmingState.h" +#include "spark/orderman/orders/spreader_orders/spreader_states/SpreaderEndStateWorker.h" +#include "spark/orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.h" +#include "spark/orderman/orders/spreader_orders/spreader_states/SpreaderState.h" +#include "spark/orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.h" +#include "spark/orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForInitialDataStateWorker.h" +#include "spark/orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.h" +#include "spark/sparkproto/SparkProtos.pb.h" +#include "spark/utils/bts_assert.h" +#include "spark/utils/bts_chrono.h" +#include "spark/utils/is_unittest_environment.h" + #include namespace bts { diff --git a/src/lib/orderman/orders/spreader_orders/SpreaderOrderHeader.h b/src/lib_spark/spark/orderman/orders/spreader_orders/SpreaderOrderHeader.h similarity index 100% rename from src/lib/orderman/orders/spreader_orders/SpreaderOrderHeader.h rename to src/lib_spark/spark/orderman/orders/spreader_orders/SpreaderOrderHeader.h diff --git a/src/lib/orderman/orders/spreader_orders/spreader/ISpreaderManager.h b/src/lib_spark/spark/orderman/orders/spreader_orders/spreader/ISpreaderManager.h similarity index 89% rename from src/lib/orderman/orders/spreader_orders/spreader/ISpreaderManager.h rename to src/lib_spark/spark/orderman/orders/spreader_orders/spreader/ISpreaderManager.h index 01a100e97..ae95deee6 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/ISpreaderManager.h +++ b/src/lib_spark/spark/orderman/orders/spreader_orders/spreader/ISpreaderManager.h @@ -1,12 +1,12 @@ #pragma once -#include "SpreaderFractionalQtyHelper.h" -#include "lib/api/services/OrderService.pb.h" -#include "lib/domain_model/SecurityKey.h" -#include "lib/domain_model/common.h" -#include "lib/orderman/ChildOrder.h" -#include "lib/orderman/orderman_utils/Book.h" -#include "lib/sparkproto/SparkProtos.pb.h" -#include + +#include "spark/api/services/OrderService.pb.h" +#include "spark/domain_model/SecurityKey.h" +#include "spark/domain_model/common.h" +#include "spark/orderman/ChildOrder.h" +#include "spark/orderman/orderman_utils/Book.h" +#include "spark/orderman/orders/spreader_orders/spreader/SpreaderFractionalQtyHelper.h" +#include "spark/sparkproto/SparkProtos.pb.h" namespace bts { namespace orderman { diff --git a/src/lib/orderman/orders/spreader_orders/spreader/LegFillState.cpp b/src/lib_spark/spark/orderman/orders/spreader_orders/spreader/LegFillState.cpp similarity index 100% rename from src/lib/orderman/orders/spreader_orders/spreader/LegFillState.cpp rename to src/lib_spark/spark/orderman/orders/spreader_orders/spreader/LegFillState.cpp diff --git a/src/lib/orderman/orders/spreader_orders/spreader/LegFillState.h b/src/lib_spark/spark/orderman/orders/spreader_orders/spreader/LegFillState.h similarity index 85% rename from src/lib/orderman/orders/spreader_orders/spreader/LegFillState.h rename to src/lib_spark/spark/orderman/orders/spreader_orders/spreader/LegFillState.h index 78afc6d9b..f7533c608 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/LegFillState.h +++ b/src/lib_spark/spark/orderman/orders/spreader_orders/spreader/LegFillState.h @@ -1,5 +1,5 @@ #pragma once -#include "lib/orderman/orderman_utils/orderman_common.h" +#include "spark/orderman/orderman_utils/orderman_common.h" namespace bts { namespace orderman { diff --git a/src/lib/orderman/orders/spreader_orders/spreader/LegPropertyData.cpp b/src/lib_spark/spark/orderman/orders/spreader_orders/spreader/LegPropertyData.cpp similarity index 94% rename from src/lib/orderman/orders/spreader_orders/spreader/LegPropertyData.cpp rename to src/lib_spark/spark/orderman/orders/spreader_orders/spreader/LegPropertyData.cpp index b9e165436..69db5d25e 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/LegPropertyData.cpp +++ b/src/lib_spark/spark/orderman/orders/spreader_orders/spreader/LegPropertyData.cpp @@ -1,8 +1,8 @@ #include "LegPropertyData.h" #include "ISpreaderManager.h" #include "SpreaderUtils.h" -#include "lib/sparkproto/SparkProtos.pb.h" -#include "lib/utils/bts_assert.h" +#include "spark/sparkproto/SparkProtos.pb.h" +#include "spark/utils/bts_assert.h" namespace bts { namespace orderman { @@ -49,4 +49,4 @@ LegPropertyData::LegPropertyData( leg_index, leg_contract.security().id(), trading_side); } } // namespace orderman -} // namespace bts \ No newline at end of file +} // namespace bts diff --git a/src/lib/orderman/orders/spreader_orders/spreader/LegPropertyData.h b/src/lib_spark/spark/orderman/orders/spreader_orders/spreader/LegPropertyData.h similarity index 93% rename from src/lib/orderman/orders/spreader_orders/spreader/LegPropertyData.h rename to src/lib_spark/spark/orderman/orders/spreader_orders/spreader/LegPropertyData.h index e01b1e9f8..ceb3488c0 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/LegPropertyData.h +++ b/src/lib_spark/spark/orderman/orders/spreader_orders/spreader/LegPropertyData.h @@ -1,9 +1,9 @@ #pragma once -#include "lib/api/services/OrderService.pb.h" -#include "lib/domain_model/Security.pb.h" -#include "lib/orderman/orderman_utils/orderman_common.h" -#include "lib/sparkproto/SparkProtos.pb.h" +#include "spark/api/services/OrderService.pb.h" +#include "spark/domain_model/Security.pb.h" +#include "spark/orderman/orderman_utils/orderman_common.h" +#include "spark/sparkproto/SparkProtos.pb.h" namespace bts { namespace orderman { diff --git a/src/lib/orderman/orders/spreader_orders/spreader/NLegsHedgeRecompData.cpp b/src/lib_spark/spark/orderman/orders/spreader_orders/spreader/NLegsHedgeRecompData.cpp similarity index 88% rename from src/lib/orderman/orders/spreader_orders/spreader/NLegsHedgeRecompData.cpp rename to src/lib_spark/spark/orderman/orders/spreader_orders/spreader/NLegsHedgeRecompData.cpp index 708fa1e9c..5a2c62976 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/NLegsHedgeRecompData.cpp +++ b/src/lib_spark/spark/orderman/orders/spreader_orders/spreader/NLegsHedgeRecompData.cpp @@ -1,6 +1,6 @@ #include "NLegsHedgeRecompData.h" -#include "lib/config/config.h" -#include "lib/config/protos/spreader.pb.h" +#include "spark/config/config.h" +#include "spark/config/protos/spreader.pb.h" namespace bts { namespace orderman { diff --git a/src/lib/orderman/orders/spreader_orders/spreader/NLegsHedgeRecompData.h b/src/lib_spark/spark/orderman/orders/spreader_orders/spreader/NLegsHedgeRecompData.h similarity index 93% rename from src/lib/orderman/orders/spreader_orders/spreader/NLegsHedgeRecompData.h rename to src/lib_spark/spark/orderman/orders/spreader_orders/spreader/NLegsHedgeRecompData.h index e6b990fa1..439dbf485 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/NLegsHedgeRecompData.h +++ b/src/lib_spark/spark/orderman/orders/spreader_orders/spreader/NLegsHedgeRecompData.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/orderman/orderman_utils/orderman_common.h" -#include "lib/sparkproto/SparkProtos.pb.h" +#include "spark/orderman/orderman_utils/orderman_common.h" +#include "spark/sparkproto/SparkProtos.pb.h" namespace bts { namespace orderman { diff --git a/src/lib/orderman/orders/spreader_orders/spreader/QuoteLegPriceQuantityState.cpp b/src/lib_spark/spark/orderman/orders/spreader_orders/spreader/QuoteLegPriceQuantityState.cpp similarity index 100% rename from src/lib/orderman/orders/spreader_orders/spreader/QuoteLegPriceQuantityState.cpp rename to src/lib_spark/spark/orderman/orders/spreader_orders/spreader/QuoteLegPriceQuantityState.cpp diff --git a/src/lib/orderman/orders/spreader_orders/spreader/QuoteLegPriceQuantityState.h b/src/lib_spark/spark/orderman/orders/spreader_orders/spreader/QuoteLegPriceQuantityState.h similarity index 94% rename from src/lib/orderman/orders/spreader_orders/spreader/QuoteLegPriceQuantityState.h rename to src/lib_spark/spark/orderman/orders/spreader_orders/spreader/QuoteLegPriceQuantityState.h index c0cc239d8..0a3dd8619 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/QuoteLegPriceQuantityState.h +++ b/src/lib_spark/spark/orderman/orders/spreader_orders/spreader/QuoteLegPriceQuantityState.h @@ -1,10 +1,10 @@ #pragma once -#include "lib/domain_model/common.h" -#include "lib/logging/logging.h" -#include "lib/orderman/orderman_utils/orderman_common.h" -#include "lib/orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.h" -#include "lib/utils/bts_assert.h" +#include "spark/domain_model/common.h" +#include "spark/logging/logging.h" +#include "spark/orderman/orderman_utils/orderman_common.h" +#include "spark/orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.h" +#include "spark/utils/bts_assert.h" namespace bts { namespace orderman { diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SingleFillHedger.cpp b/src/lib_spark/spark/orderman/orders/spreader_orders/spreader/SingleFillHedger.cpp similarity index 100% rename from src/lib/orderman/orders/spreader_orders/spreader/SingleFillHedger.cpp rename to src/lib_spark/spark/orderman/orders/spreader_orders/spreader/SingleFillHedger.cpp diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SingleFillHedger.h b/src/lib_spark/spark/orderman/orders/spreader_orders/spreader/SingleFillHedger.h similarity index 84% rename from src/lib/orderman/orders/spreader_orders/spreader/SingleFillHedger.h rename to src/lib_spark/spark/orderman/orders/spreader_orders/spreader/SingleFillHedger.h index d902ef9ce..69dd2b0c9 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SingleFillHedger.h +++ b/src/lib_spark/spark/orderman/orders/spreader_orders/spreader/SingleFillHedger.h @@ -1,15 +1,15 @@ #pragma once -#include "lib/orderman/orderman_utils/orderman_common.h" -#include "lib/orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.h" -#include "lib/orderman/orders/spreader_orders/spreader/hedger/HedgePriceQuantityState.h" -#include "lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerEndStateWorker.h" -#include "lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerStartStateWorker.h" -#include "lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.h" -#include "lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelledStateWorker.h" -#include "lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckStateWorker.h" -#include "lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWorkingStateWorker.h" -#include "lib/utils/bts_chrono.h" +#include "spark/orderman/orderman_utils/orderman_common.h" +#include "spark/orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.h" +#include "spark/orderman/orders/spreader_orders/spreader/hedger/HedgePriceQuantityState.h" +#include "spark/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerEndStateWorker.h" +#include "spark/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerStartStateWorker.h" +#include "spark/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.h" +#include "spark/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelledStateWorker.h" +#include "spark/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckStateWorker.h" +#include "spark/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWorkingStateWorker.h" +#include "spark/utils/bts_chrono.h" #include #include diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SingleLegQuoter.cpp b/src/lib_spark/spark/orderman/orders/spreader_orders/spreader/SingleLegQuoter.cpp similarity index 96% rename from src/lib/orderman/orders/spreader_orders/spreader/SingleLegQuoter.cpp rename to src/lib_spark/spark/orderman/orders/spreader_orders/spreader/SingleLegQuoter.cpp index 886efafa7..2b9f442a7 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SingleLegQuoter.cpp +++ b/src/lib_spark/spark/orderman/orders/spreader_orders/spreader/SingleLegQuoter.cpp @@ -1,12 +1,13 @@ #include "SingleLegQuoter.h" -#include "ISpreaderManager.h" -#include "LegPropertyData.h" -#include "SpreaderChildOrderState.h" -#include "SpreaderUtils.h" -#include "lib/config/config.h" -#include "lib/logging/logging.h" -#include "lib/orderman/orderman_utils/orderman_common.h" -#include "lib/orderman/orders/spreader_orders/spreader/SpreaderCacheWarmingState.h" +#include "spark/config/config.h" +#include "spark/logging/logging.h" +#include "spark/orderman/orderman_utils/orderman_common.h" +#include "spark/orderman/orders/spreader_orders/spreader/ISpreaderManager.h" +#include "spark/orderman/orders/spreader_orders/spreader/LegPropertyData.h" +#include "spark/orderman/orders/spreader_orders/spreader/SpreaderCacheWarmingState.h" +#include "spark/orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.h" +#include "spark/orderman/orders/spreader_orders/spreader/SpreaderUtils.h" + #include namespace bts { diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SingleLegQuoter.h b/src/lib_spark/spark/orderman/orders/spreader_orders/spreader/SingleLegQuoter.h similarity index 87% rename from src/lib/orderman/orders/spreader_orders/spreader/SingleLegQuoter.h rename to src/lib_spark/spark/orderman/orders/spreader_orders/spreader/SingleLegQuoter.h index 97022a665..895fa4657 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SingleLegQuoter.h +++ b/src/lib_spark/spark/orderman/orders/spreader_orders/spreader/SingleLegQuoter.h @@ -1,22 +1,22 @@ #pragma once #include "LegPropertyData.h" #include "QuoteLegPriceQuantityState.h" -#include "lib/domain_model/Security.pb.h" -#include "lib/orderman/ChildOrder.h" -#include "lib/orderman/orderman_utils/orderman_common.h" -#include "lib/orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.h" -#include "lib/orderman/orders/spreader_orders/spreader/quoter/QuoteDriverSetHistory.h" -#include "lib/orderman/orders/spreader_orders/spreader/quoter/QuoteLegDriver.h" -#include "lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterEndStateWorker.h" -#include "lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterStartStateWorker.h" -#include "lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.h" -#include "lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.h" -#include "lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.h" -#include "lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForIOCWorker.h" -#include "lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.h" -#include "lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWorkingStateWorker.h" -#include "lib/sparkproto/SparkProtos.pb.h" -#include "lib/utils/bts_chrono.h" +#include "spark/domain_model/Security.pb.h" +#include "spark/orderman/ChildOrder.h" +#include "spark/orderman/orderman_utils/orderman_common.h" +#include "spark/orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.h" +#include "spark/orderman/orders/spreader_orders/spreader/quoter/QuoteDriverSetHistory.h" +#include "spark/orderman/orders/spreader_orders/spreader/quoter/QuoteLegDriver.h" +#include "spark/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterEndStateWorker.h" +#include "spark/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterStartStateWorker.h" +#include "spark/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.h" +#include "spark/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.h" +#include "spark/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.h" +#include "spark/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForIOCWorker.h" +#include "spark/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.h" +#include "spark/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWorkingStateWorker.h" +#include "spark/sparkproto/SparkProtos.pb.h" +#include "spark/utils/bts_chrono.h" #include #include diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp b/src/lib_spark/spark/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp similarity index 92% rename from src/lib/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp rename to src/lib_spark/spark/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp index 96e594c31..fc504ef1f 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp +++ b/src/lib_spark/spark/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp @@ -1,11 +1,11 @@ #include "SpreaderBookkeepingData.h" -#include "lib/domain_model/common.h" -#include "lib/logging/logging.h" -#include "lib/orderman/orders/spreader_orders/spreader/LegPropertyData.h" -#include "lib/orderman/orders/spreader_orders/spreader/SpreaderFractionalQtyHelper.h" -#include "lib/orderman/orders/spreader_orders/spreader/SpreaderUtils.h" -#include "lib/os/os.h" -#include "lib/utils/PBUtils.h" +#include "spark/domain_model/common.h" +#include "spark/logging/logging.h" +#include "spark/orderman/orders/spreader_orders/spreader/LegPropertyData.h" +#include "spark/orderman/orders/spreader_orders/spreader/SpreaderFractionalQtyHelper.h" +#include "spark/orderman/orders/spreader_orders/spreader/SpreaderUtils.h" +#include "spark/os/os.h" +#include "spark/utils/PBUtils.h" namespace bts { namespace orderman { @@ -120,4 +120,4 @@ void SpreaderBookkeepingData::total_fills( out_price = Price(avg_price); } } // namespace orderman -} // namespace bts \ No newline at end of file +} // namespace bts diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.h b/src/lib_spark/spark/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.h similarity index 87% rename from src/lib/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.h rename to src/lib_spark/spark/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.h index 3df729d3f..5c59ef243 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.h +++ b/src/lib_spark/spark/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.h @@ -1,24 +1,24 @@ #pragma once -#include "lib/domain_model/SecurityKey.h" -#include "lib/logging/logging.h" -#include "lib/orderman/orderman_utils/Book.h" -#include "lib/orderman/orderman_utils/orderman_common.h" +#include "spark/api/services/OrderService.pb.h" +#include "spark/domain_model/SecurityKey.h" +#include "spark/logging/logging.h" +#include "spark/orderman/OrderBuilder.h" +#include "spark/orderman/orderman_utils/Book.h" +#include "spark/orderman/orderman_utils/orderman_common.h" +#include "spark/orderman/orders/PreActivationOrderServices.h" +#include "spark/orderman/orders/spreader_orders/spreader/NLegsHedgeRecompData.h" +#include "spark/orderman/orders/spreader_orders/spreader/SpreaderFractionalQtyHelper.h" +#include "spark/orderman/orders/spreader_orders/spreader/SpreaderLegData.h" +#include "spark/orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderBuilder.h" +#include "spark/orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderPreActivationOrderServices.h" +#include "spark/orderman/orders/spreader_orders/spreader/hedger/HedgerManager.h" +#include "spark/orderman/orders/spreader_orders/spreader/hedger/UnhedgedDelta.h" +#include "spark/sparkproto/SparkProtos.pb.h" + #include #include #include -#include "NLegsHedgeRecompData.h" -#include "SpreaderLegData.h" -#include "lib/api/services/OrderService.pb.h" -#include "lib/orderman/OrderBuilder.h" -#include "lib/orderman/orders/PreActivationOrderServices.h" -#include "lib/orderman/orders/spreader_orders/spreader/SpreaderFractionalQtyHelper.h" -#include "lib/orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderBuilder.h" -#include "lib/orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderPreActivationOrderServices.h" -#include "lib/orderman/orders/spreader_orders/spreader/hedger/HedgerManager.h" -#include "lib/orderman/orders/spreader_orders/spreader/hedger/UnhedgedDelta.h" -#include "lib/sparkproto/SparkProtos.pb.h" - namespace bts { namespace orderman { class SingleFillHedger; diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderCacheWarmingState.h b/src/lib_spark/spark/orderman/orders/spreader_orders/spreader/SpreaderCacheWarmingState.h similarity index 96% rename from src/lib/orderman/orders/spreader_orders/spreader/SpreaderCacheWarmingState.h rename to src/lib_spark/spark/orderman/orders/spreader_orders/spreader/SpreaderCacheWarmingState.h index 19eb12b9f..27b376ec3 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderCacheWarmingState.h +++ b/src/lib_spark/spark/orderman/orders/spreader_orders/spreader/SpreaderCacheWarmingState.h @@ -1,7 +1,7 @@ #pragma once -#include "lib/config/config.h" -#include "lib/config/protos/spreader.pb.h" +#include "spark/config/config.h" +#include "spark/config/protos/spreader.pb.h" #include namespace bts { diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.cpp b/src/lib_spark/spark/orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.cpp similarity index 100% rename from src/lib/orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.cpp rename to src/lib_spark/spark/orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.cpp diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.h b/src/lib_spark/spark/orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.h similarity index 93% rename from src/lib/orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.h rename to src/lib_spark/spark/orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.h index f883bb670..5d7d4571f 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.h +++ b/src/lib_spark/spark/orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.h @@ -1,15 +1,15 @@ #pragma once -#include "SpreaderUtils.h" -#include "external_interfacing/IAlternateOrderGateway.h" -#include "lib/api/services/OrderService.pb.h" -#include "lib/domain_model/SecurityKey.h" -#include "lib/domain_model/common.h" -#include "lib/logging/logging.h" -#include "lib/orderman/events/OrderStateUpdateEvent.h" -#include "lib/orderman/orderman_utils/orderman_common.h" -#include "lib/orderman/orders/spreader_orders/spreader/ISpreaderManager.h" -#include "lib/orderman/orders/spreader_orders/spreader/SpreaderFractionalQtyHelper.h" +#include "spark/api/services/OrderService.pb.h" +#include "spark/domain_model/SecurityKey.h" +#include "spark/domain_model/common.h" +#include "spark/logging/logging.h" +#include "spark/orderman/events/OrderStateUpdateEvent.h" +#include "spark/orderman/orderman_utils/orderman_common.h" +#include "spark/orderman/orders/spreader_orders/spreader/ISpreaderManager.h" +#include "spark/orderman/orders/spreader_orders/spreader/SpreaderFractionalQtyHelper.h" +#include "spark/orderman/orders/spreader_orders/spreader/SpreaderUtils.h" +#include "spark/orderman/orders/spreader_orders/spreader/external_interfacing/IAlternateOrderGateway.h" namespace bts { namespace orderman { diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderFractionalQtyHelper.cpp b/src/lib_spark/spark/orderman/orders/spreader_orders/spreader/SpreaderFractionalQtyHelper.cpp similarity index 92% rename from src/lib/orderman/orders/spreader_orders/spreader/SpreaderFractionalQtyHelper.cpp rename to src/lib_spark/spark/orderman/orders/spreader_orders/spreader/SpreaderFractionalQtyHelper.cpp index 6de78d840..704987c5c 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderFractionalQtyHelper.cpp +++ b/src/lib_spark/spark/orderman/orders/spreader_orders/spreader/SpreaderFractionalQtyHelper.cpp @@ -1,20 +1,20 @@ #include "SpreaderFractionalQtyHelper.h" -#include "lib/config/config.h" -#include "lib/config/protos/spreader.pb.h" -#include "lib/domain_model/Security.pb.h" -#include "lib/domain_model/SecurityKey.h" -#include "lib/domain_model/common.h" -#include "lib/logging/logging.h" -#include "lib/md/PriceSize.h" -#include "lib/orderman/events/BookUpdateEvent.h" -#include "lib/orderman/events/OrderStateUpdateEvent.h" -//#include "lib/orderman/orders/spreader_orders/SpreaderOrder.h" -#include "lib/orderman/orderman_utils/orderman_common.h" -#include "lib/orderman/orders/spreader_orders/spreader/LegPropertyData.h" -#include "lib/orderman/orders/spreader_orders/spreader/SpreaderUtils.h" -#include "lib/os/os.h" -#include "lib/utils/PBUtils.h" -#include "lib/utils/bts_assert.h" +#include "spark/config/config.h" +#include "spark/config/protos/spreader.pb.h" +#include "spark/domain_model/Security.pb.h" +#include "spark/domain_model/SecurityKey.h" +#include "spark/domain_model/common.h" +#include "spark/logging/logging.h" +#include "spark/md/PriceSize.h" +#include "spark/orderman/events/BookUpdateEvent.h" +#include "spark/orderman/events/OrderStateUpdateEvent.h" +#include "spark/orderman/orderman_utils/orderman_common.h" +#include "spark/orderman/orders/spreader_orders/spreader/LegPropertyData.h" +#include "spark/orderman/orders/spreader_orders/spreader/SpreaderUtils.h" +#include "spark/os/os.h" +#include "spark/utils/PBUtils.h" +#include "spark/utils/bts_assert.h" + #include #include #include diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderFractionalQtyHelper.h b/src/lib_spark/spark/orderman/orders/spreader_orders/spreader/SpreaderFractionalQtyHelper.h similarity index 85% rename from src/lib/orderman/orders/spreader_orders/spreader/SpreaderFractionalQtyHelper.h rename to src/lib_spark/spark/orderman/orders/spreader_orders/spreader/SpreaderFractionalQtyHelper.h index afe496dbe..9871e310e 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderFractionalQtyHelper.h +++ b/src/lib_spark/spark/orderman/orders/spreader_orders/spreader/SpreaderFractionalQtyHelper.h @@ -1,12 +1,8 @@ #pragma once -//#include "SpreaderLegData.h" -//#include "lib/domain_model/common.h" -//#include "lib/orderman/orderman_utils/orderman_common.h" -#include "lib/api/services/OrderService.pb.h" -#include "lib/domain_model/SecurityKey.h" -//#include "lib/orderman/orders/spreader_orders/SpreaderOrder.h" -#include "lib/orderman/orders/spreader_orders/spreader/LegPropertyData.h" +#include "spark/api/services/OrderService.pb.h" +#include "spark/domain_model/SecurityKey.h" +#include "spark/orderman/orders/spreader_orders/spreader/LegPropertyData.h" namespace bts::api::orderman { class OrderState; diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderLegData.cpp b/src/lib_spark/spark/orderman/orders/spreader_orders/spreader/SpreaderLegData.cpp similarity index 100% rename from src/lib/orderman/orders/spreader_orders/spreader/SpreaderLegData.cpp rename to src/lib_spark/spark/orderman/orders/spreader_orders/spreader/SpreaderLegData.cpp diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderLegData.h b/src/lib_spark/spark/orderman/orders/spreader_orders/spreader/SpreaderLegData.h similarity index 93% rename from src/lib/orderman/orders/spreader_orders/spreader/SpreaderLegData.h rename to src/lib_spark/spark/orderman/orders/spreader_orders/spreader/SpreaderLegData.h index 0c27e1d41..9378de854 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderLegData.h +++ b/src/lib_spark/spark/orderman/orders/spreader_orders/spreader/SpreaderLegData.h @@ -3,13 +3,13 @@ #include "SingleFillHedger.h" #include "SingleLegQuoter.h" #include "SpreaderChildOrderState.h" -#include "lib/logging/logging.h" -#include "lib/orderman/OrderBuilder.h" -#include "lib/orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderBuilder.h" -#include "lib/orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderPreActivationOrderServices.h" -#include "lib/orderman/orders/spreader_orders/spreader/hedger/HedgerManager.h" -#include "lib/orderman/orders/spreader_orders/spreader/hedger/UnhedgedDelta.h" -#include "lib/os/os.h" +#include "spark/logging/logging.h" +#include "spark/orderman/OrderBuilder.h" +#include "spark/orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderBuilder.h" +#include "spark/orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderPreActivationOrderServices.h" +#include "spark/orderman/orders/spreader_orders/spreader/hedger/HedgerManager.h" +#include "spark/orderman/orders/spreader_orders/spreader/hedger/UnhedgedDelta.h" +#include "spark/os/os.h" namespace bts { namespace orderman { diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderUtils.cpp b/src/lib_spark/spark/orderman/orders/spreader_orders/spreader/SpreaderUtils.cpp similarity index 95% rename from src/lib/orderman/orders/spreader_orders/spreader/SpreaderUtils.cpp rename to src/lib_spark/spark/orderman/orders/spreader_orders/spreader/SpreaderUtils.cpp index 144d7453d..0bc81a795 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderUtils.cpp +++ b/src/lib_spark/spark/orderman/orders/spreader_orders/spreader/SpreaderUtils.cpp @@ -1,16 +1,18 @@ #include "SpreaderUtils.h" -#include "lib/domain_model/common.h" -#include "lib/logging/logging.h" -#include "lib/md/PriceSize.h" -#include "lib/orderman/events/BookUpdateEvent.h" -#include "lib/orderman/orderman_utils/Book.h" -#include "lib/orderman/orders/PreActivationOrderServices.h" -#include "lib/orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderBuilder.h" -#include "lib/orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderPreActivationOrderServices.h" -#include "lib/sparkproto/SparkProtos.pb.h" -#include "lib/utils/PBUtils.h" -#include "lib/utils/bts_assert.h" +#include "spark/domain_model/common.h" +#include "spark/logging/logging.h" +#include "spark/md/PriceSize.h" +#include "spark/orderman/events/BookUpdateEvent.h" +#include "spark/orderman/orderman_utils/Book.h" +#include "spark/orderman/orders/PreActivationOrderServices.h" +#include "spark/orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderBuilder.h" +#include "spark/orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderPreActivationOrderServices.h" +#include "spark/sparkproto/SparkProtos.pb.h" +#include "spark/utils/PBUtils.h" +#include "spark/utils/bts_assert.h" + #include + namespace bts { namespace orderman { diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderUtils.h b/src/lib_spark/spark/orderman/orders/spreader_orders/spreader/SpreaderUtils.h similarity index 98% rename from src/lib/orderman/orders/spreader_orders/spreader/SpreaderUtils.h rename to src/lib_spark/spark/orderman/orders/spreader_orders/spreader/SpreaderUtils.h index 5160b1324..9bfef82b9 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderUtils.h +++ b/src/lib_spark/spark/orderman/orders/spreader_orders/spreader/SpreaderUtils.h @@ -1,23 +1,24 @@ #pragma once -#include "lib/api/services/OrderService.pb.h" -#include "lib/domain_model/Security.h" -#include "lib/domain_model/Security.pb.h" -#include "lib/domain_model/common.h" -#include "lib/jetfix/codec/FieldDefinitions.h" -#include "lib/logging/logging.h" -#include "lib/md/IntPrice.h" -#include "lib/md/PriceSize.h" -#include "lib/md/Shm/MDStructure.h" -#include "lib/orderman/OrderBuilder.h" -#include "lib/orderman/orderman_utils/Book.h" -#include "lib/orderman/orderman_utils/fix_order_codec.h" -#include "lib/orderman/orders/spreader_orders/spreader/ISpreaderManager.h" -#include "lib/orderman/orders/spreader_orders/spreader/LegPropertyData.h" -#include "lib/orderman/orders/spreader_orders/spreader/quoter/QuoteLegDriver.h" -#include "lib/os/os.h" -#include "lib/utils/bts_assert.h" -#include "lib/utils/bts_chrono.h" +#include "spark/api/services/OrderService.pb.h" +#include "spark/domain_model/Security.h" +#include "spark/domain_model/Security.pb.h" +#include "spark/domain_model/common.h" +#include "spark/jetfix/codec/FieldDefinitions.h" +#include "spark/logging/logging.h" +#include "spark/md/IntPrice.h" +#include "spark/md/PriceSize.h" +#include "spark/md/Shm/MDStructure.h" +#include "spark/orderman/OrderBuilder.h" +#include "spark/orderman/orderman_utils/Book.h" +#include "spark/orderman/orderman_utils/fix_order_codec.h" +#include "spark/orderman/orders/spreader_orders/spreader/ISpreaderManager.h" +#include "spark/orderman/orders/spreader_orders/spreader/LegPropertyData.h" +#include "spark/orderman/orders/spreader_orders/spreader/quoter/QuoteLegDriver.h" +#include "spark/os/os.h" +#include "spark/utils/bts_assert.h" +#include "spark/utils/bts_chrono.h" + #include #include #include diff --git a/src/lib/orderman/orders/spreader_orders/spreader/external_interfacing/IAlternateOrderGateway.h b/src/lib_spark/spark/orderman/orders/spreader_orders/spreader/external_interfacing/IAlternateOrderGateway.h similarity index 83% rename from src/lib/orderman/orders/spreader_orders/spreader/external_interfacing/IAlternateOrderGateway.h rename to src/lib_spark/spark/orderman/orders/spreader_orders/spreader/external_interfacing/IAlternateOrderGateway.h index a8546d0a6..e5edd05f4 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/external_interfacing/IAlternateOrderGateway.h +++ b/src/lib_spark/spark/orderman/orders/spreader_orders/spreader/external_interfacing/IAlternateOrderGateway.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/orderman/ChildOrder.h" -#include "lib/orderman/orderman_utils/Book.h" +#include "spark/orderman/ChildOrder.h" +#include "spark/orderman/orderman_utils/Book.h" namespace bts { namespace orderman { diff --git a/src/lib/orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderBuilder.cpp b/src/lib_spark/spark/orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderBuilder.cpp similarity index 92% rename from src/lib/orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderBuilder.cpp rename to src/lib_spark/spark/orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderBuilder.cpp index 99db18b09..dca953d56 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderBuilder.cpp +++ b/src/lib_spark/spark/orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderBuilder.cpp @@ -1,5 +1,5 @@ #include "SpreaderOrderBuilder.h" -#include "lib/orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderPreActivationOrderServices.h" +#include "spark/orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderPreActivationOrderServices.h" using namespace bts::api::orderman; diff --git a/src/lib/orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderBuilder.h b/src/lib_spark/spark/orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderBuilder.h similarity index 84% rename from src/lib/orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderBuilder.h rename to src/lib_spark/spark/orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderBuilder.h index ffd6a6218..8443ac4c6 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderBuilder.h +++ b/src/lib_spark/spark/orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderBuilder.h @@ -1,11 +1,11 @@ #pragma once #include "SpreaderOrderServices.h" -#include "lib/api/services/OrderService.pb.h" -#include "lib/domain_model/Security.pb.h" -#include "lib/orderman/ChildOrder.h" -#include "lib/orderman/OrderBuilder.h" -#include "lib/orderman/orders/PreActivationOrderServices.h" -#include "lib/tracing/PerfLog.h" +#include "spark/api/services/OrderService.pb.h" +#include "spark/domain_model/Security.pb.h" +#include "spark/orderman/ChildOrder.h" +#include "spark/orderman/OrderBuilder.h" +#include "spark/orderman/orders/PreActivationOrderServices.h" +#include "spark/tracing/PerfLog.h" #include namespace bts { diff --git a/src/lib/orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderServices.cpp b/src/lib_spark/spark/orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderServices.cpp similarity index 100% rename from src/lib/orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderServices.cpp rename to src/lib_spark/spark/orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderServices.cpp diff --git a/src/lib/orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderServices.h b/src/lib_spark/spark/orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderServices.h similarity index 78% rename from src/lib/orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderServices.h rename to src/lib_spark/spark/orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderServices.h index 49d821e05..311309038 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderServices.h +++ b/src/lib_spark/spark/orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderServices.h @@ -1,10 +1,10 @@ #pragma once -#include "lib/api/services/OrderService.pb.h" -#include "lib/domain_model/Security.pb.h" -#include "lib/orderman/ChildOrder.h" -#include "lib/orderman/OrderBuilder.h" -#include "lib/orderman/orders/PreActivationOrderServices.h" -#include "lib/tracing/PerfLog.h" +#include "spark/api/services/OrderService.pb.h" +#include "spark/domain_model/Security.pb.h" +#include "spark/orderman/ChildOrder.h" +#include "spark/orderman/OrderBuilder.h" +#include "spark/orderman/orders/PreActivationOrderServices.h" +#include "spark/tracing/PerfLog.h" #include namespace bts { diff --git a/src/lib/orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderPreActivationOrderServices.cpp b/src/lib_spark/spark/orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderPreActivationOrderServices.cpp similarity index 95% rename from src/lib/orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderPreActivationOrderServices.cpp rename to src/lib_spark/spark/orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderPreActivationOrderServices.cpp index bbdc118fc..a216cf803 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderPreActivationOrderServices.cpp +++ b/src/lib_spark/spark/orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderPreActivationOrderServices.cpp @@ -1,6 +1,6 @@ #include "SpreaderPreActivationOrderServices.h" #include "SpreaderOrderBuilder.h" -#include "lib/orderman/order_factory/OrderFactory.h" +#include "spark/orderman/order_factory/OrderFactory.h" using namespace bts::api; diff --git a/src/lib/orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderPreActivationOrderServices.h b/src/lib_spark/spark/orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderPreActivationOrderServices.h similarity index 77% rename from src/lib/orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderPreActivationOrderServices.h rename to src/lib_spark/spark/orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderPreActivationOrderServices.h index f3dd0af74..7e55845d2 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderPreActivationOrderServices.h +++ b/src/lib_spark/spark/orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderPreActivationOrderServices.h @@ -1,8 +1,8 @@ #pragma once -#include "lib/api/services/OrderService.pb.h" -#include "lib/domain_model/Security.pb.h" -#include "lib/domain_model/SecurityKey.h" -#include "lib/orderman/orders/PreActivationOrderServices.h" +#include "spark/api/services/OrderService.pb.h" +#include "spark/domain_model/Security.pb.h" +#include "spark/domain_model/SecurityKey.h" +#include "spark/orderman/orders/PreActivationOrderServices.h" namespace bts { namespace orderman { diff --git a/src/lib/orderman/orders/spreader_orders/spreader/hedger/HedgePriceQuantityState.h b/src/lib_spark/spark/orderman/orders/spreader_orders/spreader/hedger/HedgePriceQuantityState.h similarity index 93% rename from src/lib/orderman/orders/spreader_orders/spreader/hedger/HedgePriceQuantityState.h rename to src/lib_spark/spark/orderman/orders/spreader_orders/spreader/hedger/HedgePriceQuantityState.h index ace37666f..fe2a2a1da 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/hedger/HedgePriceQuantityState.h +++ b/src/lib_spark/spark/orderman/orders/spreader_orders/spreader/hedger/HedgePriceQuantityState.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/api/services/OrderService.pb.h" -#include "lib/orderman/orderman_utils/orderman_common.h" +#include "spark/api/services/OrderService.pb.h" +#include "spark/orderman/orderman_utils/orderman_common.h" namespace bts { namespace orderman { diff --git a/src/lib/orderman/orders/spreader_orders/spreader/hedger/HedgerManager.cpp b/src/lib_spark/spark/orderman/orders/spreader_orders/spreader/hedger/HedgerManager.cpp similarity index 100% rename from src/lib/orderman/orders/spreader_orders/spreader/hedger/HedgerManager.cpp rename to src/lib_spark/spark/orderman/orders/spreader_orders/spreader/hedger/HedgerManager.cpp diff --git a/src/lib/orderman/orders/spreader_orders/spreader/hedger/HedgerManager.h b/src/lib_spark/spark/orderman/orders/spreader_orders/spreader/hedger/HedgerManager.h similarity index 97% rename from src/lib/orderman/orders/spreader_orders/spreader/hedger/HedgerManager.h rename to src/lib_spark/spark/orderman/orders/spreader_orders/spreader/hedger/HedgerManager.h index cfca8f204..ee9827c09 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/hedger/HedgerManager.h +++ b/src/lib_spark/spark/orderman/orders/spreader_orders/spreader/hedger/HedgerManager.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/orderman/orders/spreader_orders/spreader/SingleFillHedger.h" +#include "spark/orderman/orders/spreader_orders/spreader/SingleFillHedger.h" //#include namespace bts { diff --git a/src/lib/orderman/orders/spreader_orders/spreader/hedger/IHedgerStateWorker.h b/src/lib_spark/spark/orderman/orders/spreader_orders/spreader/hedger/IHedgerStateWorker.h similarity index 84% rename from src/lib/orderman/orders/spreader_orders/spreader/hedger/IHedgerStateWorker.h rename to src/lib_spark/spark/orderman/orders/spreader_orders/spreader/hedger/IHedgerStateWorker.h index a8cea68cd..07587f81c 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/hedger/IHedgerStateWorker.h +++ b/src/lib_spark/spark/orderman/orders/spreader_orders/spreader/hedger/IHedgerStateWorker.h @@ -1,8 +1,8 @@ #pragma once -#include "lib/orderman/ChildOrder.h" -#include "lib/orderman/orderman_utils/orderman_common.h" -#include "lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerState.h" -#include "lib/utils/bts_chrono.h" +#include "spark/orderman/ChildOrder.h" +#include "spark/orderman/orderman_utils/orderman_common.h" +#include "spark/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerState.h" +#include "spark/utils/bts_chrono.h" namespace bts { namespace trace { diff --git a/src/lib/orderman/orders/spreader_orders/spreader/hedger/UnhedgedDelta.cpp b/src/lib_spark/spark/orderman/orders/spreader_orders/spreader/hedger/UnhedgedDelta.cpp similarity index 85% rename from src/lib/orderman/orders/spreader_orders/spreader/hedger/UnhedgedDelta.cpp rename to src/lib_spark/spark/orderman/orders/spreader_orders/spreader/hedger/UnhedgedDelta.cpp index e122cbc42..9ef2497af 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/hedger/UnhedgedDelta.cpp +++ b/src/lib_spark/spark/orderman/orders/spreader_orders/spreader/hedger/UnhedgedDelta.cpp @@ -1,6 +1,6 @@ #include "UnhedgedDelta.h" -#include "lib/orderman/orders/spreader_orders/spreader/SpreaderUtils.h" -#include "lib/utils/bts_assert.h" +#include "spark/orderman/orders/spreader_orders/spreader/SpreaderUtils.h" +#include "spark/utils/bts_assert.h" #include namespace bts { diff --git a/src/lib/orderman/orders/spreader_orders/spreader/hedger/UnhedgedDelta.h b/src/lib_spark/spark/orderman/orders/spreader_orders/spreader/hedger/UnhedgedDelta.h similarity index 100% rename from src/lib/orderman/orders/spreader_orders/spreader/hedger/UnhedgedDelta.h rename to src/lib_spark/spark/orderman/orders/spreader_orders/spreader/hedger/UnhedgedDelta.h diff --git a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerEndStateWorker.cpp b/src/lib_spark/spark/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerEndStateWorker.cpp similarity index 74% rename from src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerEndStateWorker.cpp rename to src/lib_spark/spark/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerEndStateWorker.cpp index 960fe93c3..a67676e98 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerEndStateWorker.cpp +++ b/src/lib_spark/spark/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerEndStateWorker.cpp @@ -1,6 +1,6 @@ -#include "lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerEndStateWorker.h" -#include "lib/orderman/orders/spreader_orders/spreader/SingleFillHedger.h" -#include "lib/orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.h" +#include "spark/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerEndStateWorker.h" +#include "spark/orderman/orders/spreader_orders/spreader/SingleFillHedger.h" +#include "spark/orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.h" namespace bts { namespace orderman { diff --git a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerEndStateWorker.h b/src/lib_spark/spark/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerEndStateWorker.h similarity index 92% rename from src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerEndStateWorker.h rename to src/lib_spark/spark/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerEndStateWorker.h index 4ea78cd07..e4a448223 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerEndStateWorker.h +++ b/src/lib_spark/spark/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerEndStateWorker.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/orderman/orders/spreader_orders/spreader/hedger/IHedgerStateWorker.h" +#include "spark/orderman/orders/spreader_orders/spreader/hedger/IHedgerStateWorker.h" namespace bts { namespace orderman { diff --git a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerStartStateWorker.cpp b/src/lib_spark/spark/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerStartStateWorker.cpp similarity index 76% rename from src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerStartStateWorker.cpp rename to src/lib_spark/spark/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerStartStateWorker.cpp index 6e53c4fe5..be16529c7 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerStartStateWorker.cpp +++ b/src/lib_spark/spark/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerStartStateWorker.cpp @@ -1,7 +1,7 @@ -#include "lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerStartStateWorker.h" -#include "lib/orderman/orders/spreader_orders/spreader/ISpreaderManager.h" -#include "lib/orderman/orders/spreader_orders/spreader/SingleFillHedger.h" -#include "lib/orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.h" +#include "spark/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerStartStateWorker.h" +#include "spark/orderman/orders/spreader_orders/spreader/ISpreaderManager.h" +#include "spark/orderman/orders/spreader_orders/spreader/SingleFillHedger.h" +#include "spark/orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.h" namespace bts { namespace orderman { diff --git a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerStartStateWorker.h b/src/lib_spark/spark/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerStartStateWorker.h similarity index 92% rename from src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerStartStateWorker.h rename to src/lib_spark/spark/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerStartStateWorker.h index 3cbcedb17..7f98a5fcd 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerStartStateWorker.h +++ b/src/lib_spark/spark/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerStartStateWorker.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/orderman/orders/spreader_orders/spreader/hedger/IHedgerStateWorker.h" +#include "spark/orderman/orders/spreader_orders/spreader/hedger/IHedgerStateWorker.h" namespace bts { namespace orderman { diff --git a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerState.h b/src/lib_spark/spark/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerState.h similarity index 100% rename from src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerState.h rename to src/lib_spark/spark/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerState.h diff --git a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.cpp b/src/lib_spark/spark/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.cpp similarity index 76% rename from src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.cpp rename to src/lib_spark/spark/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.cpp index 27c5391ba..7d5cb1370 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.cpp +++ b/src/lib_spark/spark/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.cpp @@ -1,6 +1,6 @@ -#include "lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.h" -#include "lib/orderman/orders/spreader_orders/spreader/SingleFillHedger.h" -#include "lib/orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.h" +#include "spark/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.h" +#include "spark/orderman/orders/spreader_orders/spreader/SingleFillHedger.h" +#include "spark/orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.h" namespace bts { namespace orderman { diff --git a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.h b/src/lib_spark/spark/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.h similarity index 92% rename from src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.h rename to src/lib_spark/spark/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.h index 6bb7c340e..954940742 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.h +++ b/src/lib_spark/spark/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/orderman/orders/spreader_orders/spreader/hedger/IHedgerStateWorker.h" +#include "spark/orderman/orders/spreader_orders/spreader/hedger/IHedgerStateWorker.h" namespace bts { namespace orderman { diff --git a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelledStateWorker.cpp b/src/lib_spark/spark/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelledStateWorker.cpp similarity index 75% rename from src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelledStateWorker.cpp rename to src/lib_spark/spark/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelledStateWorker.cpp index 862d449b2..a45017c37 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelledStateWorker.cpp +++ b/src/lib_spark/spark/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelledStateWorker.cpp @@ -1,7 +1,7 @@ -#include "lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelledStateWorker.h" -#include "lib/orderman/orders/spreader_orders/spreader/ISpreaderManager.h" -#include "lib/orderman/orders/spreader_orders/spreader/SingleFillHedger.h" -#include "lib/orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.h" +#include "spark/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelledStateWorker.h" +#include "spark/orderman/orders/spreader_orders/spreader/ISpreaderManager.h" +#include "spark/orderman/orders/spreader_orders/spreader/SingleFillHedger.h" +#include "spark/orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.h" namespace bts { namespace orderman { diff --git a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelledStateWorker.h b/src/lib_spark/spark/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelledStateWorker.h similarity index 92% rename from src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelledStateWorker.h rename to src/lib_spark/spark/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelledStateWorker.h index 77279f1b8..690476004 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelledStateWorker.h +++ b/src/lib_spark/spark/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelledStateWorker.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/orderman/orders/spreader_orders/spreader/hedger/IHedgerStateWorker.h" +#include "spark/orderman/orders/spreader_orders/spreader/hedger/IHedgerStateWorker.h" namespace bts { namespace orderman { diff --git a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckStateWorker.cpp b/src/lib_spark/spark/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckStateWorker.cpp similarity index 78% rename from src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckStateWorker.cpp rename to src/lib_spark/spark/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckStateWorker.cpp index 876e3b571..18350b3dd 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckStateWorker.cpp +++ b/src/lib_spark/spark/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckStateWorker.cpp @@ -1,6 +1,6 @@ -#include "lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckStateWorker.h" -#include "lib/orderman/orders/spreader_orders/spreader/SingleFillHedger.h" -#include "lib/orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.h" +#include "spark/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckStateWorker.h" +#include "spark/orderman/orders/spreader_orders/spreader/SingleFillHedger.h" +#include "spark/orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.h" namespace bts { namespace orderman { diff --git a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckStateWorker.h b/src/lib_spark/spark/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckStateWorker.h similarity index 92% rename from src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckStateWorker.h rename to src/lib_spark/spark/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckStateWorker.h index ad75e000e..8403e2777 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckStateWorker.h +++ b/src/lib_spark/spark/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckStateWorker.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/orderman/orders/spreader_orders/spreader/hedger/IHedgerStateWorker.h" +#include "spark/orderman/orders/spreader_orders/spreader/hedger/IHedgerStateWorker.h" namespace bts { namespace orderman { diff --git a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWorkingStateWorker.cpp b/src/lib_spark/spark/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWorkingStateWorker.cpp similarity index 83% rename from src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWorkingStateWorker.cpp rename to src/lib_spark/spark/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWorkingStateWorker.cpp index 8c542a632..043059daa 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWorkingStateWorker.cpp +++ b/src/lib_spark/spark/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWorkingStateWorker.cpp @@ -1,7 +1,7 @@ -#include "lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWorkingStateWorker.h" -#include "lib/orderman/orders/spreader_orders/spreader/ISpreaderManager.h" -#include "lib/orderman/orders/spreader_orders/spreader/SingleFillHedger.h" -#include "lib/orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.h" +#include "spark/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWorkingStateWorker.h" +#include "spark/orderman/orders/spreader_orders/spreader/ISpreaderManager.h" +#include "spark/orderman/orders/spreader_orders/spreader/SingleFillHedger.h" +#include "spark/orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.h" namespace bts { namespace orderman { diff --git a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWorkingStateWorker.h b/src/lib_spark/spark/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWorkingStateWorker.h similarity index 92% rename from src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWorkingStateWorker.h rename to src/lib_spark/spark/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWorkingStateWorker.h index 2cb0ddaf6..7d3017738 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWorkingStateWorker.h +++ b/src/lib_spark/spark/orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWorkingStateWorker.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/orderman/orders/spreader_orders/spreader/hedger/IHedgerStateWorker.h" +#include "spark/orderman/orders/spreader_orders/spreader/hedger/IHedgerStateWorker.h" namespace bts { namespace orderman { diff --git a/src/lib/orderman/orders/spreader_orders/spreader/quoter/IQuoterStateWorker.h b/src/lib_spark/spark/orderman/orders/spreader_orders/spreader/quoter/IQuoterStateWorker.h similarity index 89% rename from src/lib/orderman/orders/spreader_orders/spreader/quoter/IQuoterStateWorker.h rename to src/lib_spark/spark/orderman/orders/spreader_orders/spreader/quoter/IQuoterStateWorker.h index 57398e6fd..bb8d3ae57 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/quoter/IQuoterStateWorker.h +++ b/src/lib_spark/spark/orderman/orders/spreader_orders/spreader/quoter/IQuoterStateWorker.h @@ -1,8 +1,8 @@ #pragma once -#include "lib/orderman/orderman_utils/orderman_common.h" -#include "lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterState.h" -#include "lib/utils/bts_chrono.h" +#include "spark/orderman/orderman_utils/orderman_common.h" +#include "spark/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterState.h" +#include "spark/utils/bts_chrono.h" namespace bts { namespace orderman { diff --git a/src/lib/orderman/orders/spreader_orders/spreader/quoter/QuoteDriverSet.cpp b/src/lib_spark/spark/orderman/orders/spreader_orders/spreader/quoter/QuoteDriverSet.cpp similarity index 100% rename from src/lib/orderman/orders/spreader_orders/spreader/quoter/QuoteDriverSet.cpp rename to src/lib_spark/spark/orderman/orders/spreader_orders/spreader/quoter/QuoteDriverSet.cpp diff --git a/src/lib/orderman/orders/spreader_orders/spreader/quoter/QuoteDriverSet.h b/src/lib_spark/spark/orderman/orders/spreader_orders/spreader/quoter/QuoteDriverSet.h similarity index 100% rename from src/lib/orderman/orders/spreader_orders/spreader/quoter/QuoteDriverSet.h rename to src/lib_spark/spark/orderman/orders/spreader_orders/spreader/quoter/QuoteDriverSet.h diff --git a/src/lib/orderman/orders/spreader_orders/spreader/quoter/QuoteDriverSetHistory.cpp b/src/lib_spark/spark/orderman/orders/spreader_orders/spreader/quoter/QuoteDriverSetHistory.cpp similarity index 97% rename from src/lib/orderman/orders/spreader_orders/spreader/quoter/QuoteDriverSetHistory.cpp rename to src/lib_spark/spark/orderman/orders/spreader_orders/spreader/quoter/QuoteDriverSetHistory.cpp index 1f31bccd0..7bf8ea56f 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/quoter/QuoteDriverSetHistory.cpp +++ b/src/lib_spark/spark/orderman/orders/spreader_orders/spreader/quoter/QuoteDriverSetHistory.cpp @@ -1,5 +1,5 @@ #include "QuoteDriverSetHistory.h" -#include "lib/domain_model/Security.h" +#include "spark/domain_model/Security.h" namespace bts { namespace orderman { diff --git a/src/lib/orderman/orders/spreader_orders/spreader/quoter/QuoteDriverSetHistory.h b/src/lib_spark/spark/orderman/orders/spreader_orders/spreader/quoter/QuoteDriverSetHistory.h similarity index 100% rename from src/lib/orderman/orders/spreader_orders/spreader/quoter/QuoteDriverSetHistory.h rename to src/lib_spark/spark/orderman/orders/spreader_orders/spreader/quoter/QuoteDriverSetHistory.h diff --git a/src/lib/orderman/orders/spreader_orders/spreader/quoter/QuoteLegDriver.cpp b/src/lib_spark/spark/orderman/orders/spreader_orders/spreader/quoter/QuoteLegDriver.cpp similarity index 100% rename from src/lib/orderman/orders/spreader_orders/spreader/quoter/QuoteLegDriver.cpp rename to src/lib_spark/spark/orderman/orders/spreader_orders/spreader/quoter/QuoteLegDriver.cpp diff --git a/src/lib/orderman/orders/spreader_orders/spreader/quoter/QuoteLegDriver.h b/src/lib_spark/spark/orderman/orders/spreader_orders/spreader/quoter/QuoteLegDriver.h similarity index 95% rename from src/lib/orderman/orders/spreader_orders/spreader/quoter/QuoteLegDriver.h rename to src/lib_spark/spark/orderman/orders/spreader_orders/spreader/quoter/QuoteLegDriver.h index 49b25fbe0..130722aeb 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/quoter/QuoteLegDriver.h +++ b/src/lib_spark/spark/orderman/orders/spreader_orders/spreader/quoter/QuoteLegDriver.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/orderman/orderman_utils/orderman_common.h" +#include "spark/orderman/orderman_utils/orderman_common.h" namespace bts { namespace orderman { diff --git a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterEndStateWorker.cpp b/src/lib_spark/spark/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterEndStateWorker.cpp similarity index 76% rename from src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterEndStateWorker.cpp rename to src/lib_spark/spark/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterEndStateWorker.cpp index d8381e681..21f4df085 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterEndStateWorker.cpp +++ b/src/lib_spark/spark/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterEndStateWorker.cpp @@ -1,10 +1,10 @@ -#include "lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterEndStateWorker.h" -#include "lib/domain_model/common.h" -#include "lib/logging/logging.h" -#include "lib/orderman/orders/spreader_orders/spreader/ISpreaderManager.h" -#include "lib/orderman/orders/spreader_orders/spreader/SingleLegQuoter.h" -#include "lib/orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.h" -#include "lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterState.h" +#include "spark/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterEndStateWorker.h" +#include "spark/domain_model/common.h" +#include "spark/logging/logging.h" +#include "spark/orderman/orders/spreader_orders/spreader/ISpreaderManager.h" +#include "spark/orderman/orders/spreader_orders/spreader/SingleLegQuoter.h" +#include "spark/orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.h" +#include "spark/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterState.h" namespace bts { namespace orderman { diff --git a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterEndStateWorker.h b/src/lib_spark/spark/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterEndStateWorker.h similarity index 80% rename from src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterEndStateWorker.h rename to src/lib_spark/spark/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterEndStateWorker.h index be25cf07c..f50d0b388 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterEndStateWorker.h +++ b/src/lib_spark/spark/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterEndStateWorker.h @@ -1,9 +1,9 @@ #pragma once -#include "lib/orderman/orderman_utils/orderman_common.h" -#include "lib/orderman/orders/spreader_orders/spreader/quoter/IQuoterStateWorker.h" -#include "lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterState.h" -#include "lib/utils/bts_chrono.h" +#include "spark/orderman/orderman_utils/orderman_common.h" +#include "spark/orderman/orders/spreader_orders/spreader/quoter/IQuoterStateWorker.h" +#include "spark/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterState.h" +#include "spark/utils/bts_chrono.h" namespace bts { namespace orderman { diff --git a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterStartStateWorker.cpp b/src/lib_spark/spark/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterStartStateWorker.cpp similarity index 86% rename from src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterStartStateWorker.cpp rename to src/lib_spark/spark/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterStartStateWorker.cpp index 547a3cd93..61c602a4b 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterStartStateWorker.cpp +++ b/src/lib_spark/spark/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterStartStateWorker.cpp @@ -1,7 +1,7 @@ -#include "lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterStartStateWorker.h" -#include "lib/orderman/orders/spreader_orders/spreader/SingleLegQuoter.h" -#include "lib/orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.h" -#include "lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterState.h" +#include "spark/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterStartStateWorker.h" +#include "spark/orderman/orders/spreader_orders/spreader/SingleLegQuoter.h" +#include "spark/orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.h" +#include "spark/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterState.h" namespace bts { namespace orderman { diff --git a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterStartStateWorker.h b/src/lib_spark/spark/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterStartStateWorker.h similarity index 78% rename from src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterStartStateWorker.h rename to src/lib_spark/spark/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterStartStateWorker.h index 65cfadb7e..a41d6f329 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterStartStateWorker.h +++ b/src/lib_spark/spark/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterStartStateWorker.h @@ -1,9 +1,9 @@ #pragma once -#include "lib/orderman/orderman_utils/orderman_common.h" -#include "lib/orderman/orders/spreader_orders/spreader/quoter/IQuoterStateWorker.h" -#include "lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterState.h" -#include "lib/utils/bts_chrono.h" +#include "spark/orderman/orderman_utils/orderman_common.h" +#include "spark/orderman/orders/spreader_orders/spreader/quoter/IQuoterStateWorker.h" +#include "spark/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterState.h" +#include "spark/utils/bts_chrono.h" namespace bts { namespace orderman { diff --git a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterState.h b/src/lib_spark/spark/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterState.h similarity index 100% rename from src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterState.h rename to src/lib_spark/spark/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterState.h diff --git a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.cpp b/src/lib_spark/spark/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.cpp similarity index 78% rename from src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.cpp rename to src/lib_spark/spark/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.cpp index 8d283ecb4..5ed827413 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.cpp +++ b/src/lib_spark/spark/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.cpp @@ -1,7 +1,7 @@ -#include "lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.h" -#include "lib/orderman/orders/spreader_orders/spreader/SingleLegQuoter.h" -#include "lib/orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.h" -#include "lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterState.h" +#include "spark/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.h" +#include "spark/orderman/orders/spreader_orders/spreader/SingleLegQuoter.h" +#include "spark/orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.h" +#include "spark/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterState.h" namespace bts { namespace orderman { diff --git a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.h b/src/lib_spark/spark/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.h similarity index 80% rename from src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.h rename to src/lib_spark/spark/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.h index d712f98ff..94e7a706e 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.h +++ b/src/lib_spark/spark/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.h @@ -1,9 +1,9 @@ #pragma once -#include "lib/orderman/orderman_utils/orderman_common.h" -#include "lib/orderman/orders/spreader_orders/spreader/quoter/IQuoterStateWorker.h" -#include "lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterState.h" -#include "lib/utils/bts_chrono.h" +#include "spark/orderman/orderman_utils/orderman_common.h" +#include "spark/orderman/orders/spreader_orders/spreader/quoter/IQuoterStateWorker.h" +#include "spark/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterState.h" +#include "spark/utils/bts_chrono.h" namespace bts { namespace orderman { diff --git a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.cpp b/src/lib_spark/spark/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.cpp similarity index 76% rename from src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.cpp rename to src/lib_spark/spark/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.cpp index 3cb037070..832eb2937 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.cpp +++ b/src/lib_spark/spark/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.cpp @@ -1,8 +1,8 @@ -#include "lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.h" -#include "lib/orderman/orders/spreader_orders/spreader/ISpreaderManager.h" -#include "lib/orderman/orders/spreader_orders/spreader/SingleLegQuoter.h" -#include "lib/orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.h" -#include "lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterState.h" +#include "spark/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.h" +#include "spark/orderman/orders/spreader_orders/spreader/ISpreaderManager.h" +#include "spark/orderman/orders/spreader_orders/spreader/SingleLegQuoter.h" +#include "spark/orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.h" +#include "spark/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterState.h" namespace bts { namespace orderman { diff --git a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.h b/src/lib_spark/spark/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.h similarity index 84% rename from src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.h rename to src/lib_spark/spark/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.h index 38bb01d5d..a60e88582 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.h +++ b/src/lib_spark/spark/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.h @@ -1,9 +1,9 @@ #pragma once -#include "lib/orderman/orderman_utils/orderman_common.h" -#include "lib/orderman/orders/spreader_orders/spreader/quoter/IQuoterStateWorker.h" -#include "lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterState.h" -#include "lib/utils/bts_chrono.h" +#include "spark/orderman/orderman_utils/orderman_common.h" +#include "spark/orderman/orders/spreader_orders/spreader/quoter/IQuoterStateWorker.h" +#include "spark/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterState.h" +#include "spark/utils/bts_chrono.h" namespace bts { namespace orderman { diff --git a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.cpp b/src/lib_spark/spark/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.cpp similarity index 83% rename from src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.cpp rename to src/lib_spark/spark/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.cpp index 74027c6f9..d1c74ad16 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.cpp +++ b/src/lib_spark/spark/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.cpp @@ -1,7 +1,7 @@ -#include "lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.h" -#include "lib/orderman/orders/spreader_orders/spreader/SingleLegQuoter.h" -#include "lib/orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.h" -#include "lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterState.h" +#include "spark/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.h" +#include "spark/orderman/orders/spreader_orders/spreader/SingleLegQuoter.h" +#include "spark/orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.h" +#include "spark/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterState.h" namespace bts { namespace orderman { diff --git a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.h b/src/lib_spark/spark/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.h similarity index 83% rename from src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.h rename to src/lib_spark/spark/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.h index 87d3437c8..56d9bb683 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.h +++ b/src/lib_spark/spark/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.h @@ -1,9 +1,9 @@ #pragma once -#include "lib/orderman/orderman_utils/orderman_common.h" -#include "lib/orderman/orders/spreader_orders/spreader/quoter/IQuoterStateWorker.h" -#include "lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterState.h" -#include "lib/utils/bts_chrono.h" +#include "spark/orderman/orderman_utils/orderman_common.h" +#include "spark/orderman/orders/spreader_orders/spreader/quoter/IQuoterStateWorker.h" +#include "spark/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterState.h" +#include "spark/utils/bts_chrono.h" namespace bts { namespace orderman { diff --git a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForIOCWorker.cpp b/src/lib_spark/spark/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForIOCWorker.cpp similarity index 78% rename from src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForIOCWorker.cpp rename to src/lib_spark/spark/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForIOCWorker.cpp index e6dae34dc..a8877360c 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForIOCWorker.cpp +++ b/src/lib_spark/spark/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForIOCWorker.cpp @@ -1,7 +1,7 @@ -#include "lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForIOCWorker.h" -#include "lib/orderman/orders/spreader_orders/spreader/SingleLegQuoter.h" -#include "lib/orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.h" -#include "lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterState.h" +#include "spark/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForIOCWorker.h" +#include "spark/orderman/orders/spreader_orders/spreader/SingleLegQuoter.h" +#include "spark/orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.h" +#include "spark/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterState.h" namespace bts { namespace orderman { diff --git a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForIOCWorker.h b/src/lib_spark/spark/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForIOCWorker.h similarity index 82% rename from src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForIOCWorker.h rename to src/lib_spark/spark/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForIOCWorker.h index f7a96ffca..c04b785c0 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForIOCWorker.h +++ b/src/lib_spark/spark/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForIOCWorker.h @@ -1,9 +1,9 @@ #pragma once -#include "lib/orderman/orderman_utils/orderman_common.h" -#include "lib/orderman/orders/spreader_orders/spreader/quoter/IQuoterStateWorker.h" -#include "lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterState.h" -#include "lib/utils/bts_chrono.h" +#include "spark/orderman/orderman_utils/orderman_common.h" +#include "spark/orderman/orders/spreader_orders/spreader/quoter/IQuoterStateWorker.h" +#include "spark/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterState.h" +#include "spark/utils/bts_chrono.h" namespace bts { namespace orderman { diff --git a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.cpp b/src/lib_spark/spark/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.cpp similarity index 89% rename from src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.cpp rename to src/lib_spark/spark/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.cpp index 63949f99b..ddc9f3b97 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.cpp +++ b/src/lib_spark/spark/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.cpp @@ -1,18 +1,18 @@ -#include "lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.h" -#include "lib/domain_model/Security.pb.h" -#include "lib/domain_model/common.h" -#include "lib/logging/logging.h" -#include "lib/md/PriceSize.h" -#include "lib/orderman/orderman_utils/Book.h" -#include "lib/orderman/orders/spreader_orders/spreader/ISpreaderManager.h" -#include "lib/orderman/orders/spreader_orders/spreader/LegPropertyData.h" -#include "lib/orderman/orders/spreader_orders/spreader/SingleLegQuoter.h" -#include "lib/orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.h" -#include "lib/orderman/orders/spreader_orders/spreader/SpreaderUtils.h" -#include "lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterState.h" -#include "lib/os/os.h" -#include "lib/sparkproto/SparkProtos.pb.h" -#include "lib/utils/bts_assert.h" +#include "QuoterWaitingForSizeStateWorker.h" +#include "spark/domain_model/Security.pb.h" +#include "spark/domain_model/common.h" +#include "spark/logging/logging.h" +#include "spark/md/PriceSize.h" +#include "spark/orderman/orderman_utils/Book.h" +#include "spark/orderman/orders/spreader_orders/spreader/ISpreaderManager.h" +#include "spark/orderman/orders/spreader_orders/spreader/LegPropertyData.h" +#include "spark/orderman/orders/spreader_orders/spreader/SingleLegQuoter.h" +#include "spark/orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.h" +#include "spark/orderman/orders/spreader_orders/spreader/SpreaderUtils.h" +#include "spark/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterState.h" +#include "spark/os/os.h" +#include "spark/sparkproto/SparkProtos.pb.h" +#include "spark/utils/bts_assert.h" namespace bts { namespace orderman { diff --git a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.h b/src/lib_spark/spark/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.h similarity index 84% rename from src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.h rename to src/lib_spark/spark/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.h index 33f4dc3d9..14fddf6ea 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.h +++ b/src/lib_spark/spark/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.h @@ -1,9 +1,9 @@ #pragma once -#include "lib/orderman/orderman_utils/orderman_common.h" -#include "lib/orderman/orders/spreader_orders/spreader/quoter/IQuoterStateWorker.h" -#include "lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterState.h" -#include "lib/utils/bts_chrono.h" +#include "spark/orderman/orderman_utils/orderman_common.h" +#include "spark/orderman/orders/spreader_orders/spreader/quoter/IQuoterStateWorker.h" +#include "spark/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterState.h" +#include "spark/utils/bts_chrono.h" namespace bts { namespace orderman { diff --git a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWorkingStateWorker.cpp b/src/lib_spark/spark/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWorkingStateWorker.cpp similarity index 88% rename from src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWorkingStateWorker.cpp rename to src/lib_spark/spark/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWorkingStateWorker.cpp index 7661b467f..2a2e337b1 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWorkingStateWorker.cpp +++ b/src/lib_spark/spark/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWorkingStateWorker.cpp @@ -1,10 +1,10 @@ -#include "lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWorkingStateWorker.h" -#include "lib/orderman/orderman_utils/orderman_common.h" -#include "lib/orderman/orders/spreader_orders/spreader/ISpreaderManager.h" -#include "lib/orderman/orders/spreader_orders/spreader/SingleLegQuoter.h" -#include "lib/orderman/orders/spreader_orders/spreader/SpreaderCacheWarmingState.h" -#include "lib/orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.h" -#include "lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterState.h" +#include "spark/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWorkingStateWorker.h" +#include "spark/orderman/orderman_utils/orderman_common.h" +#include "spark/orderman/orders/spreader_orders/spreader/ISpreaderManager.h" +#include "spark/orderman/orders/spreader_orders/spreader/SingleLegQuoter.h" +#include "spark/orderman/orders/spreader_orders/spreader/SpreaderCacheWarmingState.h" +#include "spark/orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.h" +#include "spark/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterState.h" namespace bts { namespace orderman { diff --git a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWorkingStateWorker.h b/src/lib_spark/spark/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWorkingStateWorker.h similarity index 84% rename from src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWorkingStateWorker.h rename to src/lib_spark/spark/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWorkingStateWorker.h index 3197bd88f..043678c21 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWorkingStateWorker.h +++ b/src/lib_spark/spark/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWorkingStateWorker.h @@ -1,9 +1,9 @@ #pragma once -#include "lib/orderman/orderman_utils/orderman_common.h" -#include "lib/orderman/orders/spreader_orders/spreader/quoter/IQuoterStateWorker.h" -#include "lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterState.h" -#include "lib/utils/bts_chrono.h" +#include "spark/orderman/orderman_utils/orderman_common.h" +#include "spark/orderman/orders/spreader_orders/spreader/quoter/IQuoterStateWorker.h" +#include "spark/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterState.h" +#include "spark/utils/bts_chrono.h" namespace bts { namespace orderman { diff --git a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderEndStateWorker.cpp b/src/lib_spark/spark/orderman/orders/spreader_orders/spreader_states/SpreaderEndStateWorker.cpp similarity index 96% rename from src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderEndStateWorker.cpp rename to src/lib_spark/spark/orderman/orders/spreader_orders/spreader_states/SpreaderEndStateWorker.cpp index 5149e40c5..cdf91c9df 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderEndStateWorker.cpp +++ b/src/lib_spark/spark/orderman/orders/spreader_orders/spreader_states/SpreaderEndStateWorker.cpp @@ -1,5 +1,5 @@ #include "SpreaderEndStateWorker.h" -#include "lib/orderman/orders/spreader_orders/SpreaderOrder.h" +#include "spark/orderman/orders/spreader_orders/SpreaderOrder.h" namespace bts { namespace orderman { diff --git a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderEndStateWorker.h b/src/lib_spark/spark/orderman/orders/spreader_orders/spreader_states/SpreaderEndStateWorker.h similarity index 94% rename from src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderEndStateWorker.h rename to src/lib_spark/spark/orderman/orders/spreader_orders/spreader_states/SpreaderEndStateWorker.h index b76c21bda..1831595c1 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderEndStateWorker.h +++ b/src/lib_spark/spark/orderman/orders/spreader_orders/spreader_states/SpreaderEndStateWorker.h @@ -1,5 +1,5 @@ #pragma once -#include "lib/orderman/orders/spreader_orders/ISpreaderStateWorker.h" +#include "spark/orderman/orders/spreader_orders/ISpreaderStateWorker.h" namespace bts { namespace orderman { diff --git a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp b/src/lib_spark/spark/orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp similarity index 95% rename from src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp rename to src/lib_spark/spark/orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp index d36131ecd..aeb1abc63 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp +++ b/src/lib_spark/spark/orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp @@ -1,11 +1,11 @@ #include "SpreaderStartStateWorker.h" -#include "lib/domain_model/common.h" -#include "lib/logging/logging.h" -#include "lib/orderman/OrderBuilder.h" -#include "lib/orderman/orders/PreActivationOrderServices.h" -#include "lib/orderman/orders/spreader_orders/SpreaderOrder.h" -#include "lib/orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderBuilder.h" -#include "lib/orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderPreActivationOrderServices.h" +#include "spark/domain_model/common.h" +#include "spark/logging/logging.h" +#include "spark/orderman/OrderBuilder.h" +#include "spark/orderman/orders/PreActivationOrderServices.h" +#include "spark/orderman/orders/spreader_orders/SpreaderOrder.h" +#include "spark/orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderBuilder.h" +#include "spark/orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderPreActivationOrderServices.h" namespace bts { namespace orderman { diff --git a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.h b/src/lib_spark/spark/orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.h similarity index 95% rename from src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.h rename to src/lib_spark/spark/orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.h index 07793d480..b0dfb646c 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.h +++ b/src/lib_spark/spark/orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.h @@ -1,5 +1,5 @@ #pragma once -#include "lib/orderman/orders/spreader_orders/ISpreaderStateWorker.h" +#include "spark/orderman/orders/spreader_orders/ISpreaderStateWorker.h" namespace bts { namespace orderman { diff --git a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderState.h b/src/lib_spark/spark/orderman/orders/spreader_orders/spreader_states/SpreaderState.h similarity index 100% rename from src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderState.h rename to src/lib_spark/spark/orderman/orders/spreader_orders/spreader_states/SpreaderState.h diff --git a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.cpp b/src/lib_spark/spark/orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.cpp similarity index 97% rename from src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.cpp rename to src/lib_spark/spark/orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.cpp index 7caf6259a..0e584e7af 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.cpp +++ b/src/lib_spark/spark/orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.cpp @@ -1,5 +1,5 @@ #include "SpreaderWaitingForCancelAllStateWorker.h" -#include "lib/orderman/orders/spreader_orders/SpreaderOrder.h" +#include "spark/orderman/orders/spreader_orders/SpreaderOrder.h" namespace bts { namespace orderman { diff --git a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.h b/src/lib_spark/spark/orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.h similarity index 95% rename from src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.h rename to src/lib_spark/spark/orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.h index fec1d9e5f..3a185ade0 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.h +++ b/src/lib_spark/spark/orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.h @@ -1,5 +1,5 @@ #pragma once -#include "lib/orderman/orders/spreader_orders/ISpreaderStateWorker.h" +#include "spark/orderman/orders/spreader_orders/ISpreaderStateWorker.h" namespace bts { namespace orderman { diff --git a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForInitialDataStateWorker.cpp b/src/lib_spark/spark/orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForInitialDataStateWorker.cpp similarity index 98% rename from src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForInitialDataStateWorker.cpp rename to src/lib_spark/spark/orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForInitialDataStateWorker.cpp index 5a4c210ea..f18c508b8 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForInitialDataStateWorker.cpp +++ b/src/lib_spark/spark/orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForInitialDataStateWorker.cpp @@ -1,5 +1,5 @@ #include "SpreaderWaitingForInitialDataStateWorker.h" -#include "lib/orderman/orders/spreader_orders/SpreaderOrder.h" +#include "spark/orderman/orders/spreader_orders/SpreaderOrder.h" namespace bts { namespace orderman { diff --git a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForInitialDataStateWorker.h b/src/lib_spark/spark/orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForInitialDataStateWorker.h similarity index 95% rename from src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForInitialDataStateWorker.h rename to src/lib_spark/spark/orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForInitialDataStateWorker.h index d3256bde6..ffbb0dc33 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForInitialDataStateWorker.h +++ b/src/lib_spark/spark/orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForInitialDataStateWorker.h @@ -1,5 +1,5 @@ #pragma once -#include "lib/orderman/orders/spreader_orders/ISpreaderStateWorker.h" +#include "spark/orderman/orders/spreader_orders/ISpreaderStateWorker.h" namespace bts { namespace orderman { diff --git a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp b/src/lib_spark/spark/orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp similarity index 97% rename from src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp rename to src/lib_spark/spark/orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp index e68a9a382..d93d0602b 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp +++ b/src/lib_spark/spark/orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp @@ -1,9 +1,9 @@ #include "SpreaderWorkingStateWorker.h" -#include "lib/domain_model/common.h" -#include "lib/logging/logging.h" -#include "lib/orderman/orders/spreader_orders/SpreaderOrder.h" -#include "lib/orderman/orders/spreader_orders/spreader/SpreaderUtils.h" -#include "lib/sparkproto/SparkProtos.pb.h" +#include "spark/domain_model/common.h" +#include "spark/logging/logging.h" +#include "spark/orderman/orders/spreader_orders/SpreaderOrder.h" +#include "spark/orderman/orders/spreader_orders/spreader/SpreaderUtils.h" +#include "spark/sparkproto/SparkProtos.pb.h" namespace bts { namespace orderman { diff --git a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.h b/src/lib_spark/spark/orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.h similarity index 94% rename from src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.h rename to src/lib_spark/spark/orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.h index 7fc2db6b0..6ade3b695 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.h +++ b/src/lib_spark/spark/orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.h @@ -1,5 +1,5 @@ #pragma once -#include "lib/orderman/orders/spreader_orders/ISpreaderStateWorker.h" +#include "spark/orderman/orders/spreader_orders/ISpreaderStateWorker.h" namespace bts { namespace orderman { diff --git a/src/lib/orderman/orders/spreader_orders/tests/spreader_tests.cpp b/src/lib_spark/spark/orderman/orders/spreader_orders/tests/spreader_tests.cpp similarity index 99% rename from src/lib/orderman/orders/spreader_orders/tests/spreader_tests.cpp rename to src/lib_spark/spark/orderman/orders/spreader_orders/tests/spreader_tests.cpp index 44ab75898..e4e820ce3 100644 --- a/src/lib/orderman/orders/spreader_orders/tests/spreader_tests.cpp +++ b/src/lib_spark/spark/orderman/orders/spreader_orders/tests/spreader_tests.cpp @@ -1,15 +1,16 @@ -#include "lib/domain_model/Security.h" -#include "lib/domain_model/Security.pb.h" -#include "lib/domain_model/common.h" -#include "lib/io/websocket/WebsocketClient.h" -#include "lib/md/IMarketDataListener.h" -#include "lib/orderman/orderman_utils/Book.h" -#include "lib/orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.h" -#include "lib/orderman/orders/spreader_orders/spreader/SpreaderUtils.h" -#include "lib/orderman/orders/spreader_orders/spreader_states/SpreaderState.h" -#include "lib/orderman/orders/spreader_orders/tests/tests_common.h" -#include "lib/os/os.h" -#include "lib/utils/helper_macros.h" +#include "spark/domain_model/Security.h" +#include "spark/domain_model/Security.pb.h" +#include "spark/domain_model/common.h" +#include "spark/io/websocket/WebsocketClient.h" +#include "spark/md/IMarketDataListener.h" +#include "spark/orderman/orderman_utils/Book.h" +#include "spark/orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.h" +#include "spark/orderman/orders/spreader_orders/spreader/SpreaderUtils.h" +#include "spark/orderman/orders/spreader_orders/spreader_states/SpreaderState.h" +#include "spark/orderman/orders/spreader_orders/tests/tests_common.h" +#include "spark/os/os.h" +#include "spark/utils/helper_macros.h" + #include #include #include diff --git a/src/lib/orderman/orders/spreader_orders/tests/tests_common.h b/src/lib_spark/spark/orderman/orders/spreader_orders/tests/tests_common.h similarity index 94% rename from src/lib/orderman/orders/spreader_orders/tests/tests_common.h rename to src/lib_spark/spark/orderman/orders/spreader_orders/tests/tests_common.h index 60871fedc..7521efea3 100644 --- a/src/lib/orderman/orders/spreader_orders/tests/tests_common.h +++ b/src/lib_spark/spark/orderman/orders/spreader_orders/tests/tests_common.h @@ -1,28 +1,26 @@ #pragma once -#include -#include "lib/domain_model/Security.h" -#include "lib/domain_model/Security.pb.h" -#include "lib/domain_model/common.h" -#include "lib/logging/logging.h" -#include "lib/md/PriceSize.h" -#include "lib/orderman/orderman_utils/orderman_common.h" -#include "lib/orderman/securities/ISecurityDB.h" -#include "lib/sparkproto/SparkProtos.pb.h" -#include "lib/utils/bts_assert.h" -#include "lib/utils/bts_chrono.h" -//#include "lib/utils/REQUIRE.h" -#include "lib/orderman/orders/spreader_orders/SpreaderOrder.h" -#include "lib/orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.h" -#include "lib/orderman/orders/spreader_orders/spreader/SpreaderFractionalQtyHelper.h" -#include "lib/orderman/orders/spreader_orders/spreader/SpreaderLegData.h" -#include "lib/orderman/orders/spreader_orders/spreader/external_interfacing/IAlternateOrderGateway.h" -#include "lib/orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderBuilder.h" -#include "lib/orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderPreActivationOrderServices.h" -#include "lib/os/os.h" -#include "lib/utils/PBUtils.h" -#include "lib/utils/bts_chrono.h" -#include "lib/utils/datetime.h" +#include "spark/domain_model/Security.h" +#include "spark/domain_model/Security.pb.h" +#include "spark/domain_model/common.h" +#include "spark/logging/logging.h" +#include "spark/md/PriceSize.h" +#include "spark/orderman/orderman_utils/orderman_common.h" +#include "spark/orderman/orders/spreader_orders/SpreaderOrder.h" +#include "spark/orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.h" +#include "spark/orderman/orders/spreader_orders/spreader/SpreaderFractionalQtyHelper.h" +#include "spark/orderman/orders/spreader_orders/spreader/SpreaderLegData.h" +#include "spark/orderman/orders/spreader_orders/spreader/external_interfacing/IAlternateOrderGateway.h" +#include "spark/orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderBuilder.h" +#include "spark/orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderPreActivationOrderServices.h" +#include "spark/orderman/securities/ISecurityDB.h" +#include "spark/os/os.h" +#include "spark/sparkproto/SparkProtos.pb.h" +#include "spark/utils/PBUtils.h" +#include "spark/utils/bts_assert.h" +#include "spark/utils/bts_chrono.h" +#include "spark/utils/datetime.h" + #include #include #include diff --git a/src/lib/orderman/perf_analysis/obsolete/analyze_logs.py b/src/lib_spark/spark/orderman/perf_analysis/obsolete/analyze_logs.py similarity index 100% rename from src/lib/orderman/perf_analysis/obsolete/analyze_logs.py rename to src/lib_spark/spark/orderman/perf_analysis/obsolete/analyze_logs.py diff --git a/src/lib/orderman/perf_analysis/obsolete/load_data.py b/src/lib_spark/spark/orderman/perf_analysis/obsolete/load_data.py similarity index 100% rename from src/lib/orderman/perf_analysis/obsolete/load_data.py rename to src/lib_spark/spark/orderman/perf_analysis/obsolete/load_data.py diff --git a/src/lib/orderman/perf_analysis/obsolete/logs/latency_data/import.sql b/src/lib_spark/spark/orderman/perf_analysis/obsolete/logs/latency_data/import.sql similarity index 100% rename from src/lib/orderman/perf_analysis/obsolete/logs/latency_data/import.sql rename to src/lib_spark/spark/orderman/perf_analysis/obsolete/logs/latency_data/import.sql diff --git a/src/lib/orderman/perf_analysis/obsolete/logs/latency_data/trace.csv b/src/lib_spark/spark/orderman/perf_analysis/obsolete/logs/latency_data/trace.csv similarity index 100% rename from src/lib/orderman/perf_analysis/obsolete/logs/latency_data/trace.csv rename to src/lib_spark/spark/orderman/perf_analysis/obsolete/logs/latency_data/trace.csv diff --git a/src/lib/orderman/perf_analysis/obsolete/logs/latency_data/trace.sqlite b/src/lib_spark/spark/orderman/perf_analysis/obsolete/logs/latency_data/trace.sqlite similarity index 100% rename from src/lib/orderman/perf_analysis/obsolete/logs/latency_data/trace.sqlite rename to src/lib_spark/spark/orderman/perf_analysis/obsolete/logs/latency_data/trace.sqlite diff --git a/src/lib/orderman/perf_analysis/obsolete/logs/load.sh b/src/lib_spark/spark/orderman/perf_analysis/obsolete/logs/load.sh similarity index 100% rename from src/lib/orderman/perf_analysis/obsolete/logs/load.sh rename to src/lib_spark/spark/orderman/perf_analysis/obsolete/logs/load.sh diff --git a/src/lib/orderman/perf_analysis/obsolete/logs/parse_helper.py b/src/lib_spark/spark/orderman/perf_analysis/obsolete/logs/parse_helper.py similarity index 100% rename from src/lib/orderman/perf_analysis/obsolete/logs/parse_helper.py rename to src/lib_spark/spark/orderman/perf_analysis/obsolete/logs/parse_helper.py diff --git a/src/lib/orderman/perf_analysis/obsolete/logs/quick_stats.sh b/src/lib_spark/spark/orderman/perf_analysis/obsolete/logs/quick_stats.sh similarity index 100% rename from src/lib/orderman/perf_analysis/obsolete/logs/quick_stats.sh rename to src/lib_spark/spark/orderman/perf_analysis/obsolete/logs/quick_stats.sh diff --git a/src/lib/orderman/perf_analysis/obsolete/logs/sync_to_bts-netx-dc3-01 b/src/lib_spark/spark/orderman/perf_analysis/obsolete/logs/sync_to_bts-netx-dc3-01 similarity index 100% rename from src/lib/orderman/perf_analysis/obsolete/logs/sync_to_bts-netx-dc3-01 rename to src/lib_spark/spark/orderman/perf_analysis/obsolete/logs/sync_to_bts-netx-dc3-01 diff --git a/src/lib/orderman/perf_analysis/obsolete/lttng/load.sh b/src/lib_spark/spark/orderman/perf_analysis/obsolete/lttng/load.sh similarity index 100% rename from src/lib/orderman/perf_analysis/obsolete/lttng/load.sh rename to src/lib_spark/spark/orderman/perf_analysis/obsolete/lttng/load.sh diff --git a/src/lib/orderman/perf_analysis/obsolete/lttng/parse.sh b/src/lib_spark/spark/orderman/perf_analysis/obsolete/lttng/parse.sh similarity index 100% rename from src/lib/orderman/perf_analysis/obsolete/lttng/parse.sh rename to src/lib_spark/spark/orderman/perf_analysis/obsolete/lttng/parse.sh diff --git a/src/lib/orderman/perf_analysis/obsolete/lttng/parse_helper.py b/src/lib_spark/spark/orderman/perf_analysis/obsolete/lttng/parse_helper.py similarity index 100% rename from src/lib/orderman/perf_analysis/obsolete/lttng/parse_helper.py rename to src/lib_spark/spark/orderman/perf_analysis/obsolete/lttng/parse_helper.py diff --git a/src/lib/orderman/perf_analysis/obsolete/lttng/sync_to_bts-host12 b/src/lib_spark/spark/orderman/perf_analysis/obsolete/lttng/sync_to_bts-host12 similarity index 100% rename from src/lib/orderman/perf_analysis/obsolete/lttng/sync_to_bts-host12 rename to src/lib_spark/spark/orderman/perf_analysis/obsolete/lttng/sync_to_bts-host12 diff --git a/src/lib/orderman/perf_analysis/obsolete/lttng/trace.sh b/src/lib_spark/spark/orderman/perf_analysis/obsolete/lttng/trace.sh similarity index 100% rename from src/lib/orderman/perf_analysis/obsolete/lttng/trace.sh rename to src/lib_spark/spark/orderman/perf_analysis/obsolete/lttng/trace.sh diff --git a/src/lib/orderman/perf_analysis/perf_log.sh b/src/lib_spark/spark/orderman/perf_analysis/perf_log.sh similarity index 100% rename from src/lib/orderman/perf_analysis/perf_log.sh rename to src/lib_spark/spark/orderman/perf_analysis/perf_log.sh diff --git a/src/lib/orderman/securities/ISecurityDB.h b/src/lib_spark/spark/orderman/securities/ISecurityDB.h similarity index 92% rename from src/lib/orderman/securities/ISecurityDB.h rename to src/lib_spark/spark/orderman/securities/ISecurityDB.h index b8e0280e8..b0eb6dc02 100644 --- a/src/lib/orderman/securities/ISecurityDB.h +++ b/src/lib_spark/spark/orderman/securities/ISecurityDB.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/domain_model/common.h" +#include "spark/domain_model/common.h" #include #include diff --git a/src/lib/orderman/securities/MapSecurityDB.h b/src/lib_spark/spark/orderman/securities/MapSecurityDB.h similarity index 85% rename from src/lib/orderman/securities/MapSecurityDB.h rename to src/lib_spark/spark/orderman/securities/MapSecurityDB.h index 7ec75229e..24a7f4a3c 100644 --- a/src/lib/orderman/securities/MapSecurityDB.h +++ b/src/lib_spark/spark/orderman/securities/MapSecurityDB.h @@ -1,7 +1,7 @@ #pragma once -#include "lib/md/SecurityOracle.h" -#include "lib/orderman/securities/ISecurityDB.h" +#include "spark/md/SecurityOracle.h" +#include "spark/orderman/securities/ISecurityDB.h" #include namespace bts { diff --git a/src/lib/orderman/tests/CCApiExecutionTests.cpp b/src/lib_spark/spark/orderman/tests/CCApiExecutionTests.cpp similarity index 93% rename from src/lib/orderman/tests/CCApiExecutionTests.cpp rename to src/lib_spark/spark/orderman/tests/CCApiExecutionTests.cpp index 453a1e406..75734c9de 100644 --- a/src/lib/orderman/tests/CCApiExecutionTests.cpp +++ b/src/lib_spark/spark/orderman/tests/CCApiExecutionTests.cpp @@ -1,21 +1,20 @@ +#include "spark/api/service_helpers/AdminServiceUtils.h" +#include "spark/api/services/AdminService.server.pb.h" +#include "spark/config/config.h" +#include "spark/logging/logging.h" +#include "spark/utils/bts_assert.h" +#include "spark/utils/bts_chrono.h" +#include "spark/utils/helper_macros.h" -#include "lib/api/service_helpers/AdminServiceUtils.h" -#include "lib/api/services/AdminService.server.pb.h" -#include "lib/config/config.h" -#include "lib/logging/logging.h" -#include "lib/utils/bts_assert.h" -#include "lib/utils/bts_chrono.h" -#include "lib/utils/helper_macros.h" #include #include #include #include +#include #include #include #include #include - -#include "ccapi_cpp/ccapi_session.h" #include namespace bts::orderman { diff --git a/src/lib/orderman/tests/fat_wrapper_tests.cpp b/src/lib_spark/spark/orderman/tests/fat_wrapper_tests.cpp similarity index 95% rename from src/lib/orderman/tests/fat_wrapper_tests.cpp rename to src/lib_spark/spark/orderman/tests/fat_wrapper_tests.cpp index 30fa9448e..d929552f2 100644 --- a/src/lib/orderman/tests/fat_wrapper_tests.cpp +++ b/src/lib_spark/spark/orderman/tests/fat_wrapper_tests.cpp @@ -1,4 +1,4 @@ -#include "lib/mercury/common/FatWrapper.h" +#include "spark/mercury/common/FatWrapper.h" #include diff --git a/src/lib/os/os.cpp b/src/lib_spark/spark/os/os.cpp similarity index 99% rename from src/lib/os/os.cpp rename to src/lib_spark/spark/os/os.cpp index 1c9e5764d..130cdb14f 100644 --- a/src/lib/os/os.cpp +++ b/src/lib_spark/spark/os/os.cpp @@ -1,10 +1,10 @@ #include "os.h" -#include "lib/config/config.h" -#include "lib/config/protos/system_config.pb.h" -#include "lib/utils/bts_array_size.h" -#include "lib/utils/bts_assert.h" -#include "lib/utils/bts_debugger.h" -#include "lib/utils/helper_macros.h" +#include "spark/config/config.h" +#include "spark/config/protos/system_config.pb.h" +#include "spark/utils/bts_array_size.h" +#include "spark/utils/bts_assert.h" +#include "spark/utils/bts_debugger.h" +#include "spark/utils/helper_macros.h" #include #include diff --git a/src/lib/os/os.h b/src/lib_spark/spark/os/os.h similarity index 99% rename from src/lib/os/os.h rename to src/lib_spark/spark/os/os.h index f41642b57..4cfcab46f 100644 --- a/src/lib/os/os.h +++ b/src/lib_spark/spark/os/os.h @@ -1,7 +1,7 @@ #ifndef OS_H_ #define OS_H_ -#include "lib/utils/bts_export.h" +#include "spark/utils/bts_export.h" #include #include #include diff --git a/src/lib/os/spark_data_directory.cpp b/src/lib_spark/spark/os/spark_data_directory.cpp similarity index 92% rename from src/lib/os/spark_data_directory.cpp rename to src/lib_spark/spark/os/spark_data_directory.cpp index bbe67a96a..6e50f2c52 100644 --- a/src/lib/os/spark_data_directory.cpp +++ b/src/lib_spark/spark/os/spark_data_directory.cpp @@ -1,9 +1,9 @@ #include "spark_data_directory.h" -#include "lib/config/config.h" -#include "lib/config/protos/system_config.pb.h" -#include "lib/logging/logging.h" -#include "lib/os/os.h" -#include "lib/utils/file_utils.h" +#include "spark/config/config.h" +#include "spark/config/protos/system_config.pb.h" +#include "spark/logging/logging.h" +#include "spark/os/os.h" +#include "spark/utils/file_utils.h" #include #include diff --git a/src/lib/os/spark_data_directory.h b/src/lib_spark/spark/os/spark_data_directory.h similarity index 100% rename from src/lib/os/spark_data_directory.h rename to src/lib_spark/spark/os/spark_data_directory.h diff --git a/src/lib/os/tests/os_tests.cpp b/src/lib_spark/spark/os/tests/os_tests.cpp similarity index 100% rename from src/lib/os/tests/os_tests.cpp rename to src/lib_spark/spark/os/tests/os_tests.cpp diff --git a/src/lib/persistence/IDGenerator.cpp b/src/lib_spark/spark/persistence/IDGenerator.cpp similarity index 95% rename from src/lib/persistence/IDGenerator.cpp rename to src/lib_spark/spark/persistence/IDGenerator.cpp index 86e0848ce..2a0e2046d 100644 --- a/src/lib/persistence/IDGenerator.cpp +++ b/src/lib_spark/spark/persistence/IDGenerator.cpp @@ -1,7 +1,7 @@ #include "IDGenerator.h" -#include "lib/logging/logging.h" -#include "lib/persistence/SqliteStore.h" -#include "lib/utils/bts_assert.h" +#include "spark/logging/logging.h" +#include "spark/persistence/SqliteStore.h" +#include "spark/utils/bts_assert.h" #include #include #include diff --git a/src/lib/persistence/IDGenerator.h b/src/lib_spark/spark/persistence/IDGenerator.h similarity index 93% rename from src/lib/persistence/IDGenerator.h rename to src/lib_spark/spark/persistence/IDGenerator.h index 908997aee..59019cebb 100644 --- a/src/lib/persistence/IDGenerator.h +++ b/src/lib_spark/spark/persistence/IDGenerator.h @@ -1,7 +1,7 @@ #pragma once -#include "lib/api/domain/SecurityType.pb.h" -#include "lib/api/domain/Venue.pb.h" +#include "spark/api/domain/SecurityType.pb.h" +#include "spark/api/domain/Venue.pb.h" #include #include diff --git a/src/lib/persistence/IStore.cpp b/src/lib_spark/spark/persistence/IStore.cpp similarity index 100% rename from src/lib/persistence/IStore.cpp rename to src/lib_spark/spark/persistence/IStore.cpp diff --git a/src/lib/persistence/IStore.h b/src/lib_spark/spark/persistence/IStore.h similarity index 97% rename from src/lib/persistence/IStore.h rename to src/lib_spark/spark/persistence/IStore.h index 29e38eb7a..ad8ccd1af 100644 --- a/src/lib/persistence/IStore.h +++ b/src/lib_spark/spark/persistence/IStore.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/persistence/store_row.h" +#include "spark/persistence/store_row.h" #include #include diff --git a/src/lib/persistence/PersistenceServiceServer.cpp b/src/lib_spark/spark/persistence/PersistenceServiceServer.cpp similarity index 98% rename from src/lib/persistence/PersistenceServiceServer.cpp rename to src/lib_spark/spark/persistence/PersistenceServiceServer.cpp index 58f8e1b02..b8b31b58e 100644 --- a/src/lib/persistence/PersistenceServiceServer.cpp +++ b/src/lib_spark/spark/persistence/PersistenceServiceServer.cpp @@ -1,11 +1,11 @@ #include "PersistenceServiceServer.h" #include "SqliteStore.h" -#include "lib/logging/logging.h" -#include "lib/os/os.h" -#include "lib/utils/bts_assert.h" -#include "lib/utils/bts_no_copy.h" -#include "lib/utils/file_utils.h" +#include "spark/logging/logging.h" +#include "spark/os/os.h" +#include "spark/utils/bts_assert.h" +#include "spark/utils/bts_no_copy.h" +#include "spark/utils/file_utils.h" namespace bts { namespace persistence { diff --git a/src/lib/persistence/PersistenceServiceServer.h b/src/lib_spark/spark/persistence/PersistenceServiceServer.h similarity index 95% rename from src/lib/persistence/PersistenceServiceServer.h rename to src/lib_spark/spark/persistence/PersistenceServiceServer.h index 62aa1e254..8e262854b 100644 --- a/src/lib/persistence/PersistenceServiceServer.h +++ b/src/lib_spark/spark/persistence/PersistenceServiceServer.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/api/services/PersistenceService.server.pb.h" +#include "spark/api/services/PersistenceService.server.pb.h" #include namespace bts { diff --git a/src/lib/persistence/SqliteStore.cpp b/src/lib_spark/spark/persistence/SqliteStore.cpp similarity index 97% rename from src/lib/persistence/SqliteStore.cpp rename to src/lib_spark/spark/persistence/SqliteStore.cpp index 50bf7cbf6..e763c6b06 100644 --- a/src/lib/persistence/SqliteStore.cpp +++ b/src/lib_spark/spark/persistence/SqliteStore.cpp @@ -1,16 +1,16 @@ #include "SqliteStore.h" -#include "lib/config/config.h" -#include "lib/config/protos/system_config.pb.h" -#include "lib/logging/logging.h" -#include "lib/os/os.h" -#include "lib/persistence/persistence_utils.h" -#include "lib/utils/Sqlite_utils.h" -#include "lib/utils/bts_assert.h" -#include "lib/utils/bts_chrono.h" -#include "lib/utils/bts_no_copy.h" -#include "lib/utils/defer.h" -#include "lib/utils/file_utils.h" +#include "spark/config/config.h" +#include "spark/config/protos/system_config.pb.h" +#include "spark/logging/logging.h" +#include "spark/os/os.h" +#include "spark/persistence/persistence_utils.h" +#include "spark/utils/Sqlite_utils.h" +#include "spark/utils/bts_assert.h" +#include "spark/utils/bts_chrono.h" +#include "spark/utils/bts_no_copy.h" +#include "spark/utils/defer.h" +#include "spark/utils/file_utils.h" #include #include diff --git a/src/lib/persistence/SqliteStore.h b/src/lib_spark/spark/persistence/SqliteStore.h similarity index 91% rename from src/lib/persistence/SqliteStore.h rename to src/lib_spark/spark/persistence/SqliteStore.h index 6a833df80..7524fc860 100644 --- a/src/lib/persistence/SqliteStore.h +++ b/src/lib_spark/spark/persistence/SqliteStore.h @@ -1,8 +1,8 @@ #pragma once -#include "IStore.h" -#include "lib/persistence/store_row.h" -#include "lib/utils/Sqlite_utils.h" +#include "spark/persistence/IStore.h" +#include "spark/persistence/store_row.h" +#include "spark/utils/Sqlite_utils.h" #include #include diff --git a/src/lib/persistence/persistence_utils.cpp b/src/lib_spark/spark/persistence/persistence_utils.cpp similarity index 75% rename from src/lib/persistence/persistence_utils.cpp rename to src/lib_spark/spark/persistence/persistence_utils.cpp index 4ea6b12d8..f4fd86737 100644 --- a/src/lib/persistence/persistence_utils.cpp +++ b/src/lib_spark/spark/persistence/persistence_utils.cpp @@ -1,8 +1,8 @@ -#include "lib/persistence/persistence_utils.h" -#include "lib/config/config.h" -#include "lib/config/protos/system_config.pb.h" -#include "lib/os/os.h" -#include "lib/utils/file_utils.h" +#include "spark/persistence/persistence_utils.h" +#include "spark/config/config.h" +#include "spark/config/protos/system_config.pb.h" +#include "spark/os/os.h" +#include "spark/utils/file_utils.h" #include diff --git a/src/lib/persistence/persistence_utils.h b/src/lib_spark/spark/persistence/persistence_utils.h similarity index 100% rename from src/lib/persistence/persistence_utils.h rename to src/lib_spark/spark/persistence/persistence_utils.h diff --git a/src/lib/persistence/store_row.h b/src/lib_spark/spark/persistence/store_row.h similarity index 100% rename from src/lib/persistence/store_row.h rename to src/lib_spark/spark/persistence/store_row.h diff --git a/src/lib/persistence/tests/PersistenceServiceTests.cpp b/src/lib_spark/spark/persistence/tests/PersistenceServiceTests.cpp similarity index 96% rename from src/lib/persistence/tests/PersistenceServiceTests.cpp rename to src/lib_spark/spark/persistence/tests/PersistenceServiceTests.cpp index 8815eab9b..4fd94d3e3 100644 --- a/src/lib/persistence/tests/PersistenceServiceTests.cpp +++ b/src/lib_spark/spark/persistence/tests/PersistenceServiceTests.cpp @@ -1,10 +1,10 @@ #include "../PersistenceServiceServer.h" -#include "lib/api/public/ServiceContext.h" -#include "lib/api/services/PersistenceService.client.pb.h" -#include "lib/persistence/SqliteStore.h" -#include "lib/utils/TempDir.h" -#include "lib/utils/Uuid.h" -#include "lib/utils/bts_chrono.h" +#include "spark/api/public/ServiceContext.h" +#include "spark/api/services/PersistenceService.client.pb.h" +#include "spark/persistence/SqliteStore.h" +#include "spark/utils/TempDir.h" +#include "spark/utils/Uuid.h" +#include "spark/utils/bts_chrono.h" #include #include diff --git a/src/lib/plugin/SparkServices.cpp b/src/lib_spark/spark/plugin/SparkServices.cpp similarity index 96% rename from src/lib/plugin/SparkServices.cpp rename to src/lib_spark/spark/plugin/SparkServices.cpp index caed13b13..395d87fda 100644 --- a/src/lib/plugin/SparkServices.cpp +++ b/src/lib_spark/spark/plugin/SparkServices.cpp @@ -1,6 +1,6 @@ #include "SparkServices.h" -#include "lib/logging/logging.h" -#include "lib/orderman/order_factory/DynamicOrderRegistry.h" +#include "spark/logging/logging.h" +#include "spark/orderman/order_factory/DynamicOrderRegistry.h" namespace bts { diff --git a/src/lib/plugin/SparkServices.h b/src/lib_spark/spark/plugin/SparkServices.h similarity index 94% rename from src/lib/plugin/SparkServices.h rename to src/lib_spark/spark/plugin/SparkServices.h index 6cac616f3..38694d485 100644 --- a/src/lib/plugin/SparkServices.h +++ b/src/lib_spark/spark/plugin/SparkServices.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/api/services/OrderService.pb.h" +#include "spark/api/services/OrderService.pb.h" #include #include diff --git a/src/lib/plugin/plugin.cpp b/src/lib_spark/spark/plugin/plugin.cpp similarity index 89% rename from src/lib/plugin/plugin.cpp rename to src/lib_spark/spark/plugin/plugin.cpp index 30d85cc8f..fddb4e127 100644 --- a/src/lib/plugin/plugin.cpp +++ b/src/lib_spark/spark/plugin/plugin.cpp @@ -1,9 +1,9 @@ -#include "lib/config/config.h" -#include "lib/config/protos/deployment_type.pb.h" -#include "lib/logging/logging.h" -#include "lib/orderman/OrderBuilder.h" -#include "lib/plugin/SparkServices.h" -#include "lib/utils/PBUtils.h" +#include "spark/config/config.h" +#include "spark/config/protos/deployment_type.pb.h" +#include "spark/logging/logging.h" +#include "spark/orderman/OrderBuilder.h" +#include "spark/plugin/SparkServices.h" +#include "spark/utils/PBUtils.h" #include #include diff --git a/src/lib/plugin/plugin.h b/src/lib_spark/spark/plugin/plugin.h similarity index 100% rename from src/lib/plugin/plugin.h rename to src/lib_spark/spark/plugin/plugin.h diff --git a/src/lib/quickbus/core/Advertisement.h b/src/lib_spark/spark/quickbus/core/Advertisement.h similarity index 89% rename from src/lib/quickbus/core/Advertisement.h rename to src/lib_spark/spark/quickbus/core/Advertisement.h index ee00ee54b..a7cdd83d9 100644 --- a/src/lib/quickbus/core/Advertisement.h +++ b/src/lib_spark/spark/quickbus/core/Advertisement.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/quickbus/core/Topic.h" +#include "spark/quickbus/core/Topic.h" #include namespace bts { diff --git a/src/lib/quickbus/core/LocalNode.cpp b/src/lib_spark/spark/quickbus/core/LocalNode.cpp similarity index 94% rename from src/lib/quickbus/core/LocalNode.cpp rename to src/lib_spark/spark/quickbus/core/LocalNode.cpp index b48a7134a..1acd96ef7 100644 --- a/src/lib/quickbus/core/LocalNode.cpp +++ b/src/lib_spark/spark/quickbus/core/LocalNode.cpp @@ -1,10 +1,10 @@ #include "LocalNode.h" -#include "lib/logging/logging.h" -#include "lib/quickbus/core/Quickbus.h" -#include "lib/quickbus/routing/NodeID.h" -#include "lib/quickbus/routing/Router.h" -#include "lib/utils/bts_assert.h" +#include "spark/logging/logging.h" +#include "spark/quickbus/core/Quickbus.h" +#include "spark/quickbus/routing/NodeID.h" +#include "spark/quickbus/routing/Router.h" +#include "spark/utils/bts_assert.h" namespace bts { namespace qbus { diff --git a/src/lib/quickbus/core/LocalNode.h b/src/lib_spark/spark/quickbus/core/LocalNode.h similarity index 96% rename from src/lib/quickbus/core/LocalNode.h rename to src/lib_spark/spark/quickbus/core/LocalNode.h index 11fcf2cb3..daaa32ece 100644 --- a/src/lib/quickbus/core/LocalNode.h +++ b/src/lib_spark/spark/quickbus/core/LocalNode.h @@ -3,8 +3,8 @@ #include #include -#include "lib/quickbus/routing/INode.h" -#include "lib/utils/warn_ctrl.h" +#include "spark/quickbus/routing/INode.h" +#include "spark/utils/warn_ctrl.h" namespace bts { namespace qbus { diff --git a/src/lib/quickbus/core/Quickbus.cpp b/src/lib_spark/spark/quickbus/core/Quickbus.cpp similarity index 89% rename from src/lib/quickbus/core/Quickbus.cpp rename to src/lib_spark/spark/quickbus/core/Quickbus.cpp index 31acf1ad5..df476134c 100644 --- a/src/lib/quickbus/core/Quickbus.cpp +++ b/src/lib_spark/spark/quickbus/core/Quickbus.cpp @@ -1,13 +1,13 @@ #include "Quickbus.h" -#include "lib/config/config.h" -#include "lib/config/protos/quickbus_cfg.pb.h" -#include "lib/logging/logging.h" -#include "lib/os/os.h" -#include "lib/quickbus/network/QBConnectionManager.h" -#include "lib/quickbus/routing/Router.h" -#include "lib/utils/bts_assert.h" -#include "lib/utils/thread_manager.h" +#include "spark/config/config.h" +#include "spark/config/protos/quickbus_cfg.pb.h" +#include "spark/logging/logging.h" +#include "spark/os/os.h" +#include "spark/quickbus/network/QBConnectionManager.h" +#include "spark/quickbus/routing/Router.h" +#include "spark/utils/bts_assert.h" +#include "spark/utils/thread_manager.h" #include #include diff --git a/src/lib/quickbus/core/Quickbus.h b/src/lib_spark/spark/quickbus/core/Quickbus.h similarity index 82% rename from src/lib/quickbus/core/Quickbus.h rename to src/lib_spark/spark/quickbus/core/Quickbus.h index f6b448949..a0969c4e1 100644 --- a/src/lib/quickbus/core/Quickbus.h +++ b/src/lib_spark/spark/quickbus/core/Quickbus.h @@ -1,12 +1,12 @@ #pragma once -#include "lib/core/EnumMacros.h" -#include "lib/quickbus/core/QuickbusThreadOptions.h" -#include "lib/quickbus/core/Topic.h" -#include "lib/quickbus/message_model/Update.h" -#include "lib/quickbus/pubsub/TableEvent.h" -#include "lib/quickbus/pubsub/TableFilter.h" -#include "lib/utils/bts_export.h" +#include "spark/core/EnumMacros.h" +#include "spark/quickbus/core/QuickbusThreadOptions.h" +#include "spark/quickbus/core/Topic.h" +#include "spark/quickbus/message_model/Update.h" +#include "spark/quickbus/pubsub/TableEvent.h" +#include "spark/quickbus/pubsub/TableFilter.h" +#include "spark/utils/bts_export.h" #include diff --git a/src/lib/quickbus/core/QuickbusThreadOptions.h b/src/lib_spark/spark/quickbus/core/QuickbusThreadOptions.h similarity index 90% rename from src/lib/quickbus/core/QuickbusThreadOptions.h rename to src/lib_spark/spark/quickbus/core/QuickbusThreadOptions.h index cb2b53c22..f144dd439 100644 --- a/src/lib/quickbus/core/QuickbusThreadOptions.h +++ b/src/lib_spark/spark/quickbus/core/QuickbusThreadOptions.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/core/EnumMacros.h" -#include "lib/core/FMT_IMPL.h" +#include "spark/core/EnumMacros.h" +#include "spark/core/FMT_IMPL.h" #include #include #include diff --git a/src/lib/quickbus/core/SubscriptionID.cpp b/src/lib_spark/spark/quickbus/core/SubscriptionID.cpp similarity index 100% rename from src/lib/quickbus/core/SubscriptionID.cpp rename to src/lib_spark/spark/quickbus/core/SubscriptionID.cpp diff --git a/src/lib/quickbus/core/SubscriptionID.h b/src/lib_spark/spark/quickbus/core/SubscriptionID.h similarity index 91% rename from src/lib/quickbus/core/SubscriptionID.h rename to src/lib_spark/spark/quickbus/core/SubscriptionID.h index bf2a429dc..70c2f14a7 100644 --- a/src/lib/quickbus/core/SubscriptionID.h +++ b/src/lib_spark/spark/quickbus/core/SubscriptionID.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/utils/ValueWrapper.h" +#include "spark/utils/ValueWrapper.h" #include namespace bts { diff --git a/src/lib/quickbus/core/TableID.cpp b/src/lib_spark/spark/quickbus/core/TableID.cpp similarity index 83% rename from src/lib/quickbus/core/TableID.cpp rename to src/lib_spark/spark/quickbus/core/TableID.cpp index 8495e4017..42097bf36 100644 --- a/src/lib/quickbus/core/TableID.cpp +++ b/src/lib_spark/spark/quickbus/core/TableID.cpp @@ -1,5 +1,5 @@ #include "TableID.h" -#include "lib/utils/Uuid.h" +#include "spark/utils/Uuid.h" namespace bts { namespace qbus { diff --git a/src/lib/quickbus/core/TableID.h b/src/lib_spark/spark/quickbus/core/TableID.h similarity index 92% rename from src/lib/quickbus/core/TableID.h rename to src/lib_spark/spark/quickbus/core/TableID.h index 8f9780268..137d27162 100644 --- a/src/lib/quickbus/core/TableID.h +++ b/src/lib_spark/spark/quickbus/core/TableID.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/utils/ValueWrapper.h" +#include "spark/utils/ValueWrapper.h" #include namespace bts { diff --git a/src/lib/quickbus/core/Topic.h b/src/lib_spark/spark/quickbus/core/Topic.h similarity index 82% rename from src/lib/quickbus/core/Topic.h rename to src/lib_spark/spark/quickbus/core/Topic.h index da3515f2d..726746702 100644 --- a/src/lib/quickbus/core/Topic.h +++ b/src/lib_spark/spark/quickbus/core/Topic.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/utils/ValueWrapper.h" +#include "spark/utils/ValueWrapper.h" #include namespace bts { diff --git a/src/lib/quickbus/message_model/Change.h b/src/lib_spark/spark/quickbus/message_model/Change.h similarity index 79% rename from src/lib/quickbus/message_model/Change.h rename to src/lib_spark/spark/quickbus/message_model/Change.h index df38103d0..13d6ed0b8 100644 --- a/src/lib/quickbus/message_model/Change.h +++ b/src/lib_spark/spark/quickbus/message_model/Change.h @@ -1,7 +1,7 @@ #pragma once -#include "lib/quickbus/message_model/Record.h" -#include "lib/quickbus/message_model/RecordKey.h" +#include "spark/quickbus/message_model/Record.h" +#include "spark/quickbus/message_model/RecordKey.h" #include namespace bts { diff --git a/src/lib/quickbus/message_model/Record.h b/src/lib_spark/spark/quickbus/message_model/Record.h similarity index 86% rename from src/lib/quickbus/message_model/Record.h rename to src/lib_spark/spark/quickbus/message_model/Record.h index a17d2642e..caf476b6c 100644 --- a/src/lib/quickbus/message_model/Record.h +++ b/src/lib_spark/spark/quickbus/message_model/Record.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/utils/ValueWrapper.h" +#include "spark/utils/ValueWrapper.h" #include namespace bts { diff --git a/src/lib/quickbus/message_model/RecordKey.h b/src/lib_spark/spark/quickbus/message_model/RecordKey.h similarity index 92% rename from src/lib/quickbus/message_model/RecordKey.h rename to src/lib_spark/spark/quickbus/message_model/RecordKey.h index 7006a592a..346e9bd38 100644 --- a/src/lib/quickbus/message_model/RecordKey.h +++ b/src/lib_spark/spark/quickbus/message_model/RecordKey.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/utils/ValueWrapper.h" +#include "spark/utils/ValueWrapper.h" namespace bts { namespace qbus { diff --git a/src/lib/quickbus/message_model/RecordValue.h b/src/lib_spark/spark/quickbus/message_model/RecordValue.h similarity index 100% rename from src/lib/quickbus/message_model/RecordValue.h rename to src/lib_spark/spark/quickbus/message_model/RecordValue.h diff --git a/src/lib/quickbus/message_model/Update.cpp b/src/lib_spark/spark/quickbus/message_model/Update.cpp similarity index 100% rename from src/lib/quickbus/message_model/Update.cpp rename to src/lib_spark/spark/quickbus/message_model/Update.cpp diff --git a/src/lib/quickbus/message_model/Update.h b/src/lib_spark/spark/quickbus/message_model/Update.h similarity index 74% rename from src/lib/quickbus/message_model/Update.h rename to src/lib_spark/spark/quickbus/message_model/Update.h index 28f502386..eaa7d723c 100644 --- a/src/lib/quickbus/message_model/Update.h +++ b/src/lib_spark/spark/quickbus/message_model/Update.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/quickbus/message_model/Change.h" +#include "spark/quickbus/message_model/Change.h" #include #include diff --git a/src/lib/quickbus/message_model/merge_updates.cpp b/src/lib_spark/spark/quickbus/message_model/merge_updates.cpp similarity index 95% rename from src/lib/quickbus/message_model/merge_updates.cpp rename to src/lib_spark/spark/quickbus/message_model/merge_updates.cpp index df9984e45..02a502ff2 100644 --- a/src/lib/quickbus/message_model/merge_updates.cpp +++ b/src/lib_spark/spark/quickbus/message_model/merge_updates.cpp @@ -1,5 +1,5 @@ #include "merge_updates.h" -#include "lib/quickbus/network/quickbus_msgs.pb.h" +#include "spark/quickbus/network/quickbus_msgs.pb.h" namespace bts { namespace qbus { diff --git a/src/lib/quickbus/message_model/merge_updates.h b/src/lib_spark/spark/quickbus/message_model/merge_updates.h similarity index 71% rename from src/lib/quickbus/message_model/merge_updates.h rename to src/lib_spark/spark/quickbus/message_model/merge_updates.h index d2bb77f2a..a6ff0480f 100644 --- a/src/lib/quickbus/message_model/merge_updates.h +++ b/src/lib_spark/spark/quickbus/message_model/merge_updates.h @@ -1,8 +1,8 @@ #pragma once -#include "lib/quickbus/message_model/Change.h" -#include "lib/quickbus/message_model/RecordKey.h" -#include "lib/quickbus/message_model/Update.h" +#include "spark/quickbus/message_model/Change.h" +#include "spark/quickbus/message_model/RecordKey.h" +#include "spark/quickbus/message_model/Update.h" #include namespace bts { diff --git a/src/lib/quickbus/network/QBConnection.cpp b/src/lib_spark/spark/quickbus/network/QBConnection.cpp similarity index 97% rename from src/lib/quickbus/network/QBConnection.cpp rename to src/lib_spark/spark/quickbus/network/QBConnection.cpp index 291a18c65..212f38df2 100644 --- a/src/lib/quickbus/network/QBConnection.cpp +++ b/src/lib_spark/spark/quickbus/network/QBConnection.cpp @@ -1,17 +1,17 @@ #include "QBConnection.h" -#include "lib/logging/logging.h" -#include "lib/os/os.h" -#include "lib/utils/PBUtils.h" -#include "lib/utils/bts_assert.h" -#include "lib/utils/datetime.h" +#include "spark/logging/logging.h" +#include "spark/os/os.h" +#include "spark/utils/PBUtils.h" +#include "spark/utils/bts_assert.h" +#include "spark/utils/datetime.h" -#include "lib/quickbus/core/Advertisement.h" -#include "lib/quickbus/network/endpoint_description.h" -#include "lib/quickbus/routing/Router.h" +#include "spark/quickbus/core/Advertisement.h" +#include "spark/quickbus/network/endpoint_description.h" +#include "spark/quickbus/routing/Router.h" -#include "lib/config/protos/quickbus_cfg.pb.h" -#include "lib/quickbus/network/quickbus_msgs.pb.h" +#include "spark/config/protos/quickbus_cfg.pb.h" +#include "spark/quickbus/network/quickbus_msgs.pb.h" #include #include diff --git a/src/lib/quickbus/network/QBConnection.h b/src/lib_spark/spark/quickbus/network/QBConnection.h similarity index 95% rename from src/lib/quickbus/network/QBConnection.h rename to src/lib_spark/spark/quickbus/network/QBConnection.h index 6cf113a8d..603a10cbb 100644 --- a/src/lib/quickbus/network/QBConnection.h +++ b/src/lib_spark/spark/quickbus/network/QBConnection.h @@ -1,7 +1,7 @@ #pragma once -#include "lib/quickbus/routing/INode.h" -#include "lib/utils/warn_ctrl.h" +#include "spark/quickbus/routing/INode.h" +#include "spark/utils/warn_ctrl.h" #include #include diff --git a/src/lib/quickbus/network/QBConnectionManager.cpp b/src/lib_spark/spark/quickbus/network/QBConnectionManager.cpp similarity index 93% rename from src/lib/quickbus/network/QBConnectionManager.cpp rename to src/lib_spark/spark/quickbus/network/QBConnectionManager.cpp index beea3461d..8c7074fe8 100644 --- a/src/lib/quickbus/network/QBConnectionManager.cpp +++ b/src/lib_spark/spark/quickbus/network/QBConnectionManager.cpp @@ -1,12 +1,12 @@ #include "QBConnectionManager.h" -#include "lib/logging/logging.h" -#include "lib/quickbus/network/QBConnection.h" -#include "lib/quickbus/network/endpoint_description.h" -#include "lib/quickbus/routing/Router.h" -#include "lib/utils/bts_assert.h" +#include "spark/logging/logging.h" +#include "spark/quickbus/network/QBConnection.h" +#include "spark/quickbus/network/endpoint_description.h" +#include "spark/quickbus/routing/Router.h" +#include "spark/utils/bts_assert.h" -#include "lib/config/protos/quickbus_cfg.pb.h" +#include "spark/config/protos/quickbus_cfg.pb.h" #include #include diff --git a/src/lib/quickbus/network/QBConnectionManager.h b/src/lib_spark/spark/quickbus/network/QBConnectionManager.h similarity index 100% rename from src/lib/quickbus/network/QBConnectionManager.h rename to src/lib_spark/spark/quickbus/network/QBConnectionManager.h diff --git a/src/lib/quickbus/network/endpoint_description.cpp b/src/lib_spark/spark/quickbus/network/endpoint_description.cpp similarity index 100% rename from src/lib/quickbus/network/endpoint_description.cpp rename to src/lib_spark/spark/quickbus/network/endpoint_description.cpp diff --git a/src/lib/quickbus/network/endpoint_description.h b/src/lib_spark/spark/quickbus/network/endpoint_description.h similarity index 100% rename from src/lib/quickbus/network/endpoint_description.h rename to src/lib_spark/spark/quickbus/network/endpoint_description.h diff --git a/src/lib/quickbus/network/quickbus_msgs.proto b/src/lib_spark/spark/quickbus/network/quickbus_msgs.proto similarity index 100% rename from src/lib/quickbus/network/quickbus_msgs.proto rename to src/lib_spark/spark/quickbus/network/quickbus_msgs.proto diff --git a/src/lib/quickbus/pubsub/TableEvent.h b/src/lib_spark/spark/quickbus/pubsub/TableEvent.h similarity index 82% rename from src/lib/quickbus/pubsub/TableEvent.h rename to src/lib_spark/spark/quickbus/pubsub/TableEvent.h index af5ebdc27..fb8d7443e 100644 --- a/src/lib/quickbus/pubsub/TableEvent.h +++ b/src/lib_spark/spark/quickbus/pubsub/TableEvent.h @@ -1,9 +1,9 @@ #pragma once #include -#include "lib/quickbus/core/TableID.h" -#include "lib/quickbus/core/Topic.h" -#include "lib/quickbus/message_model/Update.h" +#include "spark/quickbus/core/TableID.h" +#include "spark/quickbus/core/Topic.h" +#include "spark/quickbus/message_model/Update.h" namespace bts { namespace qbus { diff --git a/src/lib/quickbus/pubsub/TableFilter.h b/src/lib_spark/spark/quickbus/pubsub/TableFilter.h similarity index 87% rename from src/lib/quickbus/pubsub/TableFilter.h rename to src/lib_spark/spark/quickbus/pubsub/TableFilter.h index b6efaeedb..dd6ff45c7 100644 --- a/src/lib/quickbus/pubsub/TableFilter.h +++ b/src/lib_spark/spark/quickbus/pubsub/TableFilter.h @@ -1,5 +1,5 @@ #pragma once -#include "lib/quickbus/core/Advertisement.h" +#include "spark/quickbus/core/Advertisement.h" #include #include diff --git a/src/lib/quickbus/pubsub/TablePublisher.cpp b/src/lib_spark/spark/quickbus/pubsub/TablePublisher.cpp similarity index 92% rename from src/lib/quickbus/pubsub/TablePublisher.cpp rename to src/lib_spark/spark/quickbus/pubsub/TablePublisher.cpp index 0818d94f0..b42ffd40e 100644 --- a/src/lib/quickbus/pubsub/TablePublisher.cpp +++ b/src/lib_spark/spark/quickbus/pubsub/TablePublisher.cpp @@ -1,11 +1,11 @@ #include "TablePublisher.h" -#include "lib/quickbus/core/Advertisement.h" -#include "lib/quickbus/core/LocalNode.h" -#include "lib/quickbus/core/SubscriptionID.h" -#include "lib/quickbus/core/TableID.h" -#include "lib/quickbus/message_model/merge_updates.h" -#include "lib/utils/bts_assert.h" +#include "spark/quickbus/core/Advertisement.h" +#include "spark/quickbus/core/LocalNode.h" +#include "spark/quickbus/core/SubscriptionID.h" +#include "spark/quickbus/core/TableID.h" +#include "spark/quickbus/message_model/merge_updates.h" +#include "spark/utils/bts_assert.h" #include diff --git a/src/lib/quickbus/pubsub/TablePublisher.h b/src/lib_spark/spark/quickbus/pubsub/TablePublisher.h similarity index 92% rename from src/lib/quickbus/pubsub/TablePublisher.h rename to src/lib_spark/spark/quickbus/pubsub/TablePublisher.h index 4eeb38f6f..a2008175a 100644 --- a/src/lib/quickbus/pubsub/TablePublisher.h +++ b/src/lib_spark/spark/quickbus/pubsub/TablePublisher.h @@ -3,8 +3,8 @@ #include #include -#include "lib/quickbus/core/Topic.h" -#include "lib/utils/bts_export.h" +#include "spark/quickbus/core/Topic.h" +#include "spark/utils/bts_export.h" namespace bts { namespace qbus { diff --git a/src/lib/quickbus/pubsub/TableSubscriber.cpp b/src/lib_spark/spark/quickbus/pubsub/TableSubscriber.cpp similarity index 94% rename from src/lib/quickbus/pubsub/TableSubscriber.cpp rename to src/lib_spark/spark/quickbus/pubsub/TableSubscriber.cpp index 306816dfe..e46c5f239 100644 --- a/src/lib/quickbus/pubsub/TableSubscriber.cpp +++ b/src/lib_spark/spark/quickbus/pubsub/TableSubscriber.cpp @@ -1,10 +1,10 @@ #include "TableSubscriber.h" -#include "lib/quickbus/core/Advertisement.h" -#include "lib/quickbus/core/LocalNode.h" -#include "lib/quickbus/core/SubscriptionID.h" -#include "lib/quickbus/routing/NodeID.h" -#include "lib/utils/bts_assert.h" +#include "spark/quickbus/core/Advertisement.h" +#include "spark/quickbus/core/LocalNode.h" +#include "spark/quickbus/core/SubscriptionID.h" +#include "spark/quickbus/routing/NodeID.h" +#include "spark/utils/bts_assert.h" #include #include diff --git a/src/lib/quickbus/pubsub/TableSubscriber.h b/src/lib_spark/spark/quickbus/pubsub/TableSubscriber.h similarity index 85% rename from src/lib/quickbus/pubsub/TableSubscriber.h rename to src/lib_spark/spark/quickbus/pubsub/TableSubscriber.h index 64d14fa8e..6ae3d877b 100644 --- a/src/lib/quickbus/pubsub/TableSubscriber.h +++ b/src/lib_spark/spark/quickbus/pubsub/TableSubscriber.h @@ -1,11 +1,11 @@ #pragma once -#include "lib/quickbus/pubsub/TableEvent.h" -#include "lib/quickbus/pubsub/TableFilter.h" +#include "spark/quickbus/pubsub/TableEvent.h" +#include "spark/quickbus/pubsub/TableFilter.h" #include #include -#include "lib/utils/bts_export.h" +#include "spark/utils/bts_export.h" // fwds namespace bts { diff --git a/src/lib/quickbus/pubsub/tests/qb_pubsub_tests.cpp b/src/lib_spark/spark/quickbus/pubsub/tests/qb_pubsub_tests.cpp similarity index 98% rename from src/lib/quickbus/pubsub/tests/qb_pubsub_tests.cpp rename to src/lib_spark/spark/quickbus/pubsub/tests/qb_pubsub_tests.cpp index 6d1317d90..6c9b4853e 100644 --- a/src/lib/quickbus/pubsub/tests/qb_pubsub_tests.cpp +++ b/src/lib_spark/spark/quickbus/pubsub/tests/qb_pubsub_tests.cpp @@ -1,7 +1,7 @@ -#include "lib/config/config.h" -#include "lib/os/os.h" -#include "lib/quickbus/quickbus.h" -#include "lib/utils/bts_chrono.h" +#include "spark/config/config.h" +#include "spark/os/os.h" +#include "spark/quickbus/quickbus.h" +#include "spark/utils/bts_chrono.h" #include #include diff --git a/src/lib_spark/spark/quickbus/quickbus.h b/src/lib_spark/spark/quickbus/quickbus.h new file mode 100644 index 000000000..38008515f --- /dev/null +++ b/src/lib_spark/spark/quickbus/quickbus.h @@ -0,0 +1,11 @@ +#pragma once + +#include "spark/quickbus/core/Quickbus.h" +#include "spark/quickbus/core/Topic.h" +#include "spark/quickbus/pubsub/TableEvent.h" +#include "spark/quickbus/pubsub/TablePublisher.h" +#include "spark/quickbus/pubsub/TableSubscriber.h" +#include "spark/quickbus/rpc/RPCClient.h" +#include "spark/quickbus/rpc/RPCServer.h" + +#include "spark/config/protos/quickbus_cfg.pb.h" diff --git a/src/lib/quickbus/routing/INode.cpp b/src/lib_spark/spark/quickbus/routing/INode.cpp similarity index 69% rename from src/lib/quickbus/routing/INode.cpp rename to src/lib_spark/spark/quickbus/routing/INode.cpp index c5a339be6..d1c1192cf 100644 --- a/src/lib/quickbus/routing/INode.cpp +++ b/src/lib_spark/spark/quickbus/routing/INode.cpp @@ -1,4 +1,4 @@ -#include "lib/quickbus/routing/INode.h" +#include "spark/quickbus/routing/INode.h" namespace bts { namespace qbus { diff --git a/src/lib/quickbus/routing/INode.h b/src/lib_spark/spark/quickbus/routing/INode.h similarity index 76% rename from src/lib/quickbus/routing/INode.h rename to src/lib_spark/spark/quickbus/routing/INode.h index 10847fcd2..366f8a6a0 100644 --- a/src/lib/quickbus/routing/INode.h +++ b/src/lib_spark/spark/quickbus/routing/INode.h @@ -1,10 +1,10 @@ #pragma once -#include "lib/quickbus/core/SubscriptionID.h" -#include "lib/quickbus/core/TableID.h" -#include "lib/quickbus/core/Topic.h" -#include "lib/quickbus/message_model/Update.h" -#include "lib/quickbus/routing/NodeID.h" +#include "spark/quickbus/core/SubscriptionID.h" +#include "spark/quickbus/core/TableID.h" +#include "spark/quickbus/core/Topic.h" +#include "spark/quickbus/message_model/Update.h" +#include "spark/quickbus/routing/NodeID.h" namespace bts { namespace qbus { diff --git a/src/lib/quickbus/routing/INodePtr.h b/src/lib_spark/spark/quickbus/routing/INodePtr.h similarity index 100% rename from src/lib/quickbus/routing/INodePtr.h rename to src/lib_spark/spark/quickbus/routing/INodePtr.h diff --git a/src/lib/quickbus/routing/NodeID.cpp b/src/lib_spark/spark/quickbus/routing/NodeID.cpp similarity index 83% rename from src/lib/quickbus/routing/NodeID.cpp rename to src/lib_spark/spark/quickbus/routing/NodeID.cpp index 4346793fd..4b3995b91 100644 --- a/src/lib/quickbus/routing/NodeID.cpp +++ b/src/lib_spark/spark/quickbus/routing/NodeID.cpp @@ -1,5 +1,5 @@ #include "NodeID.h" -#include "lib/utils/Uuid.h" +#include "spark/utils/Uuid.h" namespace bts { namespace qbus { diff --git a/src/lib/quickbus/routing/NodeID.h b/src/lib_spark/spark/quickbus/routing/NodeID.h similarity index 84% rename from src/lib/quickbus/routing/NodeID.h rename to src/lib_spark/spark/quickbus/routing/NodeID.h index fe5fda81c..dd5f88670 100644 --- a/src/lib/quickbus/routing/NodeID.h +++ b/src/lib_spark/spark/quickbus/routing/NodeID.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/utils/ValueWrapper.h" +#include "spark/utils/ValueWrapper.h" #include namespace bts { diff --git a/src/lib/quickbus/routing/Router.cpp b/src/lib_spark/spark/quickbus/routing/Router.cpp similarity index 97% rename from src/lib/quickbus/routing/Router.cpp rename to src/lib_spark/spark/quickbus/routing/Router.cpp index d282769b2..40705ba2a 100644 --- a/src/lib/quickbus/routing/Router.cpp +++ b/src/lib_spark/spark/quickbus/routing/Router.cpp @@ -1,12 +1,12 @@ #include "Router.h" -#include "lib/logging/logging.h" -#include "lib/quickbus/core/Advertisement.h" -#include "lib/quickbus/message_model/merge_updates.h" -#include "lib/utils/PBUtils.h" -#include "lib/utils/bts_assert.h" +#include "spark/logging/logging.h" +#include "spark/quickbus/core/Advertisement.h" +#include "spark/quickbus/message_model/merge_updates.h" +#include "spark/utils/PBUtils.h" +#include "spark/utils/bts_assert.h" -#include "lib/quickbus/network/quickbus_msgs.pb.h" +#include "spark/quickbus/network/quickbus_msgs.pb.h" #include #include diff --git a/src/lib/quickbus/routing/Router.h b/src/lib_spark/spark/quickbus/routing/Router.h similarity index 93% rename from src/lib/quickbus/routing/Router.h rename to src/lib_spark/spark/quickbus/routing/Router.h index 18d6f9c00..25ebcf083 100644 --- a/src/lib/quickbus/routing/Router.h +++ b/src/lib_spark/spark/quickbus/routing/Router.h @@ -1,7 +1,7 @@ #pragma once -#include "lib/quickbus/routing/INode.h" -#include "lib/quickbus/routing/INodePtr.h" +#include "spark/quickbus/routing/INode.h" +#include "spark/quickbus/routing/INodePtr.h" namespace bts { namespace qbus { diff --git a/src/lib/quickbus/rpc/OnRPCReply.h b/src/lib_spark/spark/quickbus/rpc/OnRPCReply.h similarity index 68% rename from src/lib/quickbus/rpc/OnRPCReply.h rename to src/lib_spark/spark/quickbus/rpc/OnRPCReply.h index 54cae9534..b85ecf570 100644 --- a/src/lib/quickbus/rpc/OnRPCReply.h +++ b/src/lib_spark/spark/quickbus/rpc/OnRPCReply.h @@ -1,7 +1,7 @@ #pragma once -#include "lib/quickbus/rpc/RPCError.h" -#include "lib/quickbus/rpc/RPCReply.h" +#include "spark/quickbus/rpc/RPCError.h" +#include "spark/quickbus/rpc/RPCReply.h" #include #include diff --git a/src/lib/quickbus/rpc/OnRPCRequest.h b/src/lib_spark/spark/quickbus/rpc/OnRPCRequest.h similarity index 77% rename from src/lib/quickbus/rpc/OnRPCRequest.h rename to src/lib_spark/spark/quickbus/rpc/OnRPCRequest.h index 489719f8f..bb346c8bf 100644 --- a/src/lib/quickbus/rpc/OnRPCRequest.h +++ b/src/lib_spark/spark/quickbus/rpc/OnRPCRequest.h @@ -1,7 +1,7 @@ #pragma once -#include "lib/quickbus/rpc/RPCReply.h" -#include "lib/quickbus/rpc/RPCRequest.h" +#include "spark/quickbus/rpc/RPCReply.h" +#include "spark/quickbus/rpc/RPCRequest.h" #include #include diff --git a/src/lib/quickbus/rpc/RPCClient.cpp b/src/lib_spark/spark/quickbus/rpc/RPCClient.cpp similarity index 95% rename from src/lib/quickbus/rpc/RPCClient.cpp rename to src/lib_spark/spark/quickbus/rpc/RPCClient.cpp index 392432d32..7d8564464 100644 --- a/src/lib/quickbus/rpc/RPCClient.cpp +++ b/src/lib_spark/spark/quickbus/rpc/RPCClient.cpp @@ -1,17 +1,17 @@ #include "RPCClient.h" -#include "lib/logging/logging.h" -#include "lib/quickbus/core/Advertisement.h" -#include "lib/quickbus/core/LocalNode.h" -#include "lib/quickbus/core/SubscriptionID.h" -#include "lib/quickbus/core/Topic.h" -#include "lib/quickbus/rpc/RPCSessionID.h" -#include "lib/quickbus/rpc/rpc_utils.h" -#include "lib/utils/bts_assert.h" -#include "lib/utils/bts_chrono.h" -#include "lib/utils/datetime.h" +#include "spark/logging/logging.h" +#include "spark/quickbus/core/Advertisement.h" +#include "spark/quickbus/core/LocalNode.h" +#include "spark/quickbus/core/SubscriptionID.h" +#include "spark/quickbus/core/Topic.h" +#include "spark/quickbus/rpc/RPCSessionID.h" +#include "spark/quickbus/rpc/rpc_utils.h" +#include "spark/utils/bts_assert.h" +#include "spark/utils/bts_chrono.h" +#include "spark/utils/datetime.h" -#include "lib/quickbus/network/quickbus_msgs.pb.h" +#include "spark/quickbus/network/quickbus_msgs.pb.h" #include #include diff --git a/src/lib/quickbus/rpc/RPCClient.h b/src/lib_spark/spark/quickbus/rpc/RPCClient.h similarity index 84% rename from src/lib/quickbus/rpc/RPCClient.h rename to src/lib_spark/spark/quickbus/rpc/RPCClient.h index 0ec7cd89e..6d43de2e3 100644 --- a/src/lib/quickbus/rpc/RPCClient.h +++ b/src/lib_spark/spark/quickbus/rpc/RPCClient.h @@ -1,9 +1,9 @@ #pragma once -#include "lib/quickbus/rpc/OnRPCReply.h" -#include "lib/quickbus/rpc/RPCRequest.h" -#include "lib/quickbus/rpc/RPCServiceName.h" -#include "lib/utils/bts_export.h" +#include "spark/quickbus/rpc/OnRPCReply.h" +#include "spark/quickbus/rpc/RPCRequest.h" +#include "spark/quickbus/rpc/RPCServiceName.h" +#include "spark/utils/bts_export.h" #include namespace bts { diff --git a/src/lib/quickbus/rpc/RPCError.h b/src/lib_spark/spark/quickbus/rpc/RPCError.h similarity index 100% rename from src/lib/quickbus/rpc/RPCError.h rename to src/lib_spark/spark/quickbus/rpc/RPCError.h diff --git a/src/lib/quickbus/rpc/RPCReply.h b/src/lib_spark/spark/quickbus/rpc/RPCReply.h similarity index 76% rename from src/lib/quickbus/rpc/RPCReply.h rename to src/lib_spark/spark/quickbus/rpc/RPCReply.h index b34eb541a..ff795f655 100644 --- a/src/lib/quickbus/rpc/RPCReply.h +++ b/src/lib_spark/spark/quickbus/rpc/RPCReply.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/quickbus/message_model/Record.h" +#include "spark/quickbus/message_model/Record.h" #include namespace bts { diff --git a/src/lib/quickbus/rpc/RPCRequest.h b/src/lib_spark/spark/quickbus/rpc/RPCRequest.h similarity index 77% rename from src/lib/quickbus/rpc/RPCRequest.h rename to src/lib_spark/spark/quickbus/rpc/RPCRequest.h index 37190d123..75938c2ea 100644 --- a/src/lib/quickbus/rpc/RPCRequest.h +++ b/src/lib_spark/spark/quickbus/rpc/RPCRequest.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/quickbus/message_model/Record.h" +#include "spark/quickbus/message_model/Record.h" #include namespace bts { diff --git a/src/lib/quickbus/rpc/RPCServer.cpp b/src/lib_spark/spark/quickbus/rpc/RPCServer.cpp similarity index 95% rename from src/lib/quickbus/rpc/RPCServer.cpp rename to src/lib_spark/spark/quickbus/rpc/RPCServer.cpp index a76597aa2..4b97c5d82 100644 --- a/src/lib/quickbus/rpc/RPCServer.cpp +++ b/src/lib_spark/spark/quickbus/rpc/RPCServer.cpp @@ -1,11 +1,11 @@ #include "RPCServer.h" -#include "lib/logging/logging.h" -#include "lib/quickbus/core/Advertisement.h" -#include "lib/quickbus/core/LocalNode.h" -#include "lib/quickbus/rpc/RPCSessionID.h" -#include "lib/quickbus/rpc/rpc_utils.h" -#include "lib/utils/bts_assert.h" +#include "spark/logging/logging.h" +#include "spark/quickbus/core/Advertisement.h" +#include "spark/quickbus/core/LocalNode.h" +#include "spark/quickbus/rpc/RPCSessionID.h" +#include "spark/quickbus/rpc/rpc_utils.h" +#include "spark/utils/bts_assert.h" #include #include diff --git a/src/lib/quickbus/rpc/RPCServer.h b/src/lib_spark/spark/quickbus/rpc/RPCServer.h similarity index 70% rename from src/lib/quickbus/rpc/RPCServer.h rename to src/lib_spark/spark/quickbus/rpc/RPCServer.h index 894df4e42..eff19e4e3 100644 --- a/src/lib/quickbus/rpc/RPCServer.h +++ b/src/lib_spark/spark/quickbus/rpc/RPCServer.h @@ -1,10 +1,10 @@ #pragma once -#include "lib/quickbus/rpc/OnRPCReply.h" -#include "lib/quickbus/rpc/OnRPCRequest.h" -#include "lib/quickbus/rpc/RPCRequest.h" -#include "lib/quickbus/rpc/RPCServiceName.h" -#include "lib/utils/bts_export.h" +#include "spark/quickbus/rpc/OnRPCReply.h" +#include "spark/quickbus/rpc/OnRPCRequest.h" +#include "spark/quickbus/rpc/RPCRequest.h" +#include "spark/quickbus/rpc/RPCServiceName.h" +#include "spark/utils/bts_export.h" #include namespace bts { diff --git a/src/lib/quickbus/rpc/RPCServiceName.h b/src/lib_spark/spark/quickbus/rpc/RPCServiceName.h similarity index 85% rename from src/lib/quickbus/rpc/RPCServiceName.h rename to src/lib_spark/spark/quickbus/rpc/RPCServiceName.h index 9c80ee5c5..6a9dbc04b 100644 --- a/src/lib/quickbus/rpc/RPCServiceName.h +++ b/src/lib_spark/spark/quickbus/rpc/RPCServiceName.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/utils/ValueWrapper.h" +#include "spark/utils/ValueWrapper.h" #include #include diff --git a/src/lib/quickbus/rpc/RPCSessionID.cpp b/src/lib_spark/spark/quickbus/rpc/RPCSessionID.cpp similarity index 85% rename from src/lib/quickbus/rpc/RPCSessionID.cpp rename to src/lib_spark/spark/quickbus/rpc/RPCSessionID.cpp index 2ca40eb11..32e09e2fb 100644 --- a/src/lib/quickbus/rpc/RPCSessionID.cpp +++ b/src/lib_spark/spark/quickbus/rpc/RPCSessionID.cpp @@ -1,5 +1,5 @@ #include "RPCSessionID.h" -#include "lib/utils/Uuid.h" +#include "spark/utils/Uuid.h" namespace bts { namespace qbus { diff --git a/src/lib/quickbus/rpc/RPCSessionID.h b/src/lib_spark/spark/quickbus/rpc/RPCSessionID.h similarity index 93% rename from src/lib/quickbus/rpc/RPCSessionID.h rename to src/lib_spark/spark/quickbus/rpc/RPCSessionID.h index b7128f79b..3d85227c3 100644 --- a/src/lib/quickbus/rpc/RPCSessionID.h +++ b/src/lib_spark/spark/quickbus/rpc/RPCSessionID.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/utils/ValueWrapper.h" +#include "spark/utils/ValueWrapper.h" #include #include diff --git a/src/lib/quickbus/rpc/rpc_utils.cpp b/src/lib_spark/spark/quickbus/rpc/rpc_utils.cpp similarity index 92% rename from src/lib/quickbus/rpc/rpc_utils.cpp rename to src/lib_spark/spark/quickbus/rpc/rpc_utils.cpp index 41b152762..5b6b27153 100644 --- a/src/lib/quickbus/rpc/rpc_utils.cpp +++ b/src/lib_spark/spark/quickbus/rpc/rpc_utils.cpp @@ -1,7 +1,7 @@ #include "rpc_utils.h" -#include "lib/quickbus/rpc/RPCSessionID.h" -#include "lib/utils/bts_assert.h" +#include "spark/quickbus/rpc/RPCSessionID.h" +#include "spark/utils/bts_assert.h" #include #include diff --git a/src/lib/quickbus/rpc/rpc_utils.h b/src/lib_spark/spark/quickbus/rpc/rpc_utils.h similarity index 69% rename from src/lib/quickbus/rpc/rpc_utils.h rename to src/lib_spark/spark/quickbus/rpc/rpc_utils.h index 6847681a3..b411be256 100644 --- a/src/lib/quickbus/rpc/rpc_utils.h +++ b/src/lib_spark/spark/quickbus/rpc/rpc_utils.h @@ -1,9 +1,9 @@ #pragma once -#include "lib/quickbus/core/SubscriptionID.h" -#include "lib/quickbus/core/Topic.h" -#include "lib/quickbus/rpc/RPCServiceName.h" -#include "lib/quickbus/rpc/RPCSessionID.h" +#include "spark/quickbus/core/SubscriptionID.h" +#include "spark/quickbus/core/Topic.h" +#include "spark/quickbus/rpc/RPCServiceName.h" +#include "spark/quickbus/rpc/RPCSessionID.h" #include diff --git a/src/lib/quickbus/rpc/tests/qb_rpc_tests.cpp b/src/lib_spark/spark/quickbus/rpc/tests/qb_rpc_tests.cpp similarity index 97% rename from src/lib/quickbus/rpc/tests/qb_rpc_tests.cpp rename to src/lib_spark/spark/quickbus/rpc/tests/qb_rpc_tests.cpp index cfdc2c57c..a3e5d6f08 100644 --- a/src/lib/quickbus/rpc/tests/qb_rpc_tests.cpp +++ b/src/lib_spark/spark/quickbus/rpc/tests/qb_rpc_tests.cpp @@ -1,9 +1,9 @@ -#include "lib/config/config.h" -#include "lib/config/protos/quickbus_cfg.pb.h" -#include "lib/os/os.h" -#include "lib/quickbus/quickbus.h" -#include "lib/utils/TimeStamp.h" -#include "lib/utils/benchmarking_utils.h" +#include "spark/config/config.h" +#include "spark/config/protos/quickbus_cfg.pb.h" +#include "spark/os/os.h" +#include "spark/quickbus/quickbus.h" +#include "spark/utils/TimeStamp.h" +#include "spark/utils/benchmarking_utils.h" #include #include diff --git a/src/lib/quickbus/tests/quickbus_tests.cpp b/src/lib_spark/spark/quickbus/tests/quickbus_tests.cpp similarity index 99% rename from src/lib/quickbus/tests/quickbus_tests.cpp rename to src/lib_spark/spark/quickbus/tests/quickbus_tests.cpp index 5190e2924..038e23d76 100644 --- a/src/lib/quickbus/tests/quickbus_tests.cpp +++ b/src/lib_spark/spark/quickbus/tests/quickbus_tests.cpp @@ -1,5 +1,5 @@ -#include "lib/quickbus/quickbus.h" -#include "lib/quickbus/routing/Router.h" +#include "spark/quickbus/quickbus.h" +#include "spark/quickbus/routing/Router.h" #include #include diff --git a/src/lib/sparkproto/SparkProtos.proto b/src/lib_spark/spark/sparkproto/SparkProtos.proto similarity index 100% rename from src/lib/sparkproto/SparkProtos.proto rename to src/lib_spark/spark/sparkproto/SparkProtos.proto diff --git a/src/lib/testing/catch_test_runner.cpp b/src/lib_spark/spark/testing/catch_test_runner.cpp similarity index 81% rename from src/lib/testing/catch_test_runner.cpp rename to src/lib_spark/spark/testing/catch_test_runner.cpp index 6bc04860b..24b2fdc90 100644 --- a/src/lib/testing/catch_test_runner.cpp +++ b/src/lib_spark/spark/testing/catch_test_runner.cpp @@ -1,10 +1,10 @@ #define CATCH_CONFIG_RUNNER #include "catch_test_runner.h" -#include "lib/config/config.h" -#include "lib/config/protos/logging.pb.h" -#include "lib/logging/logging.h" -#include "lib/utils/bts_assert.h" -#include "lib/utils/is_unittest_environment.h" +#include "spark/config/config.h" +#include "spark/config/protos/logging.pb.h" +#include "spark/logging/logging.h" +#include "spark/utils/bts_assert.h" +#include "spark/utils/is_unittest_environment.h" #include diff --git a/src/lib/testing/catch_test_runner.h b/src/lib_spark/spark/testing/catch_test_runner.h similarity index 100% rename from src/lib/testing/catch_test_runner.h rename to src/lib_spark/spark/testing/catch_test_runner.h diff --git a/src/lib/tracing/PerfLog.cpp b/src/lib_spark/spark/tracing/PerfLog.cpp similarity index 97% rename from src/lib/tracing/PerfLog.cpp rename to src/lib_spark/spark/tracing/PerfLog.cpp index 9e33999b5..07947b3c8 100644 --- a/src/lib/tracing/PerfLog.cpp +++ b/src/lib_spark/spark/tracing/PerfLog.cpp @@ -1,12 +1,12 @@ -#include "lib/tracing/PerfLog.h" -#include "lib/config/config.h" -#include "lib/config/protos/perflog_cfg.pb.h" -#include "lib/config/protos/system_config.pb.h" -#include "lib/persistence/persistence_utils.h" -#include "lib/utils/bts_array_size.h" -#include "lib/utils/datetime.h" -#include "lib/utils/stats.h" -#include "lib/utils/thread_manager.h" +#include "spark/tracing/PerfLog.h" +#include "spark/config/config.h" +#include "spark/config/protos/perflog_cfg.pb.h" +#include "spark/config/protos/system_config.pb.h" +#include "spark/persistence/persistence_utils.h" +#include "spark/utils/bts_array_size.h" +#include "spark/utils/datetime.h" +#include "spark/utils/stats.h" +#include "spark/utils/thread_manager.h" #include #include diff --git a/src/lib/tracing/PerfLog.h b/src/lib_spark/spark/tracing/PerfLog.h similarity index 99% rename from src/lib/tracing/PerfLog.h rename to src/lib_spark/spark/tracing/PerfLog.h index e7032092a..0aa5b92bb 100644 --- a/src/lib/tracing/PerfLog.h +++ b/src/lib_spark/spark/tracing/PerfLog.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/utils/TimeStamp.h" +#include "spark/utils/TimeStamp.h" #include #include #include diff --git a/src/lib_spark/spark/tracing/bts_trace.cpp b/src/lib_spark/spark/tracing/bts_trace.cpp new file mode 100644 index 000000000..2dcbaf183 --- /dev/null +++ b/src/lib_spark/spark/tracing/bts_trace.cpp @@ -0,0 +1 @@ +#include "spark/tracing/bts_trace_c.c" diff --git a/src/lib/tracing/bts_trace.h b/src/lib_spark/spark/tracing/bts_trace.h similarity index 100% rename from src/lib/tracing/bts_trace.h rename to src/lib_spark/spark/tracing/bts_trace.h diff --git a/src/lib/tracing/bts_trace_c.c b/src/lib_spark/spark/tracing/bts_trace_c.c similarity index 100% rename from src/lib/tracing/bts_trace_c.c rename to src/lib_spark/spark/tracing/bts_trace_c.c diff --git a/src/lib/tracing/bts_trace_c.h b/src/lib_spark/spark/tracing/bts_trace_c.h similarity index 95% rename from src/lib/tracing/bts_trace_c.h rename to src/lib_spark/spark/tracing/bts_trace_c.h index de9511aea..13238312c 100644 --- a/src/lib/tracing/bts_trace_c.h +++ b/src/lib_spark/spark/tracing/bts_trace_c.h @@ -2,7 +2,7 @@ #define TRACEPOINT_PROVIDER bts_trace #undef TRACEPOINT_INCLUDE -#define TRACEPOINT_INCLUDE "lib/tracing/bts_trace_c.h" +#define TRACEPOINT_INCLUDE "spark/tracing/bts_trace_c.h" #if !defined(_BTS_TP_H) || defined(TRACEPOINT_HEADER_MULTI_READ) #define _BTS_TP_H diff --git a/src/lib/utils/AuthSessionManager.cpp b/src/lib_spark/spark/utils/AuthSessionManager.cpp similarity index 87% rename from src/lib/utils/AuthSessionManager.cpp rename to src/lib_spark/spark/utils/AuthSessionManager.cpp index 310633f67..7d781e964 100644 --- a/src/lib/utils/AuthSessionManager.cpp +++ b/src/lib_spark/spark/utils/AuthSessionManager.cpp @@ -1,20 +1,20 @@ #ifndef _WIN32 #include "AuthSessionManager.h" -#include "lib/utils/FileUtils.h" -#include "lib/utils/crypto/CryptoInit.h" -#include "lib/utils/crypto/KeyCodeHelper.h" -#include "lib/utils/crypto/PrivateKey.h" -#include "lib/utils/crypto/PublicKey.h" -#include "lib/utils/datetime.h" +#include "spark/utils/FileUtils.h" +#include "spark/utils/crypto/CryptoInit.h" +#include "spark/utils/crypto/KeyCodeHelper.h" +#include "spark/utils/crypto/PrivateKey.h" +#include "spark/utils/crypto/PublicKey.h" +#include "spark/utils/datetime.h" -#include "lib/config/config.h" -#include "lib/config/protos/keycode.pb.h" -#include "lib/config/protos/ports.pb.h" -#include "lib/logging/logging.h" -#include "lib/utils/bts_assert.h" -#include "lib/utils/helper_macros.h" +#include "spark/config/config.h" +#include "spark/config/protos/keycode.pb.h" +#include "spark/config/protos/ports.pb.h" +#include "spark/logging/logging.h" +#include "spark/utils/bts_assert.h" +#include "spark/utils/helper_macros.h" #include diff --git a/src/lib/utils/AuthSessionManager.h b/src/lib_spark/spark/utils/AuthSessionManager.h similarity index 82% rename from src/lib/utils/AuthSessionManager.h rename to src/lib_spark/spark/utils/AuthSessionManager.h index 1f6ec8731..e9edbcf8f 100644 --- a/src/lib/utils/AuthSessionManager.h +++ b/src/lib_spark/spark/utils/AuthSessionManager.h @@ -1,8 +1,8 @@ #pragma once #ifndef _WIN32 -#include "lib/api/services/AdminService.client.pb.h" -#include "lib/api/services/AuthService.pb.h" -#include "lib/utils/datetime.h" +#include "spark/api/services/AdminService.client.pb.h" +#include "spark/api/services/AuthService.pb.h" +#include "spark/utils/datetime.h" #include namespace bts { diff --git a/src/lib/utils/AuthToken.cpp b/src/lib_spark/spark/utils/AuthToken.cpp similarity index 95% rename from src/lib/utils/AuthToken.cpp rename to src/lib_spark/spark/utils/AuthToken.cpp index 0d7ec0395..66ad9cabf 100644 --- a/src/lib/utils/AuthToken.cpp +++ b/src/lib_spark/spark/utils/AuthToken.cpp @@ -2,8 +2,8 @@ #ifndef _WIN32 #include "base64.hpp" #include "datetime.h" -#include "lib/utils/base64.hpp" -#include "lib/utils/bts_assert.h" +#include "spark/utils/base64.hpp" +#include "spark/utils/bts_assert.h" #include "AuthSessionManager.h" diff --git a/src/lib/utils/AuthToken.h b/src/lib_spark/spark/utils/AuthToken.h similarity index 77% rename from src/lib/utils/AuthToken.h rename to src/lib_spark/spark/utils/AuthToken.h index 7abff9b3e..cd7ec4a70 100644 --- a/src/lib/utils/AuthToken.h +++ b/src/lib_spark/spark/utils/AuthToken.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/api/services/AdminService.client.pb.h" -#include "lib/api/services/AuthService.pb.h" +#include "spark/api/services/AdminService.client.pb.h" +#include "spark/api/services/AuthService.pb.h" #include namespace bts { diff --git a/src/lib/utils/CallTimer.h b/src/lib_spark/spark/utils/CallTimer.h similarity index 96% rename from src/lib/utils/CallTimer.h rename to src/lib_spark/spark/utils/CallTimer.h index ab76ff6df..80b4f1f41 100644 --- a/src/lib/utils/CallTimer.h +++ b/src/lib_spark/spark/utils/CallTimer.h @@ -1,9 +1,9 @@ #pragma once -#include "lib/utils/bts_no_copy.h" +#include "spark/utils/bts_no_copy.h" #include "datetime.h" -#include "lib/logging/logging.h" +#include "spark/logging/logging.h" #include #include diff --git a/src/lib/utils/ConcurrentAppendCollection.h b/src/lib_spark/spark/utils/ConcurrentAppendCollection.h similarity index 100% rename from src/lib/utils/ConcurrentAppendCollection.h rename to src/lib_spark/spark/utils/ConcurrentAppendCollection.h diff --git a/src/lib/utils/ConcurrentPool.h b/src/lib_spark/spark/utils/ConcurrentPool.h similarity index 100% rename from src/lib/utils/ConcurrentPool.h rename to src/lib_spark/spark/utils/ConcurrentPool.h diff --git a/src/lib/utils/Delegate.h b/src/lib_spark/spark/utils/Delegate.h similarity index 100% rename from src/lib/utils/Delegate.h rename to src/lib_spark/spark/utils/Delegate.h diff --git a/src/lib/utils/Dispatcher.cpp b/src/lib_spark/spark/utils/Dispatcher.cpp similarity index 98% rename from src/lib/utils/Dispatcher.cpp rename to src/lib_spark/spark/utils/Dispatcher.cpp index a142915b0..c9839cdd6 100644 --- a/src/lib/utils/Dispatcher.cpp +++ b/src/lib_spark/spark/utils/Dispatcher.cpp @@ -1,10 +1,10 @@ #ifndef NO_CPP0X #include "Dispatcher.h" -#include "defer.h" -#include "lib/utils/bts_assert.h" -#include "lib/utils/thread_manager.h" -#include "lib/utils/type_name.h" +#include "spark/utils/bts_assert.h" +#include "spark/utils/defer.h" +#include "spark/utils/thread_manager.h" +#include "spark/utils/type_name.h" #include #include diff --git a/src/lib/utils/Dispatcher.h b/src/lib_spark/spark/utils/Dispatcher.h similarity index 98% rename from src/lib/utils/Dispatcher.h rename to src/lib_spark/spark/utils/Dispatcher.h index 1e89616e1..bd31f5081 100644 --- a/src/lib/utils/Dispatcher.h +++ b/src/lib_spark/spark/utils/Dispatcher.h @@ -1,8 +1,8 @@ #pragma once #ifndef NO_CPP0X -#include "lib/utils/bts_export.h" -#include "lib/utils/bts_no_copy.h" +#include "spark/utils/bts_export.h" +#include "spark/utils/bts_no_copy.h" #include #include diff --git a/src/lib/utils/Event.h b/src/lib_spark/spark/utils/Event.h similarity index 100% rename from src/lib/utils/Event.h rename to src/lib_spark/spark/utils/Event.h diff --git a/src/lib/utils/FileUtils.cpp b/src/lib_spark/spark/utils/FileUtils.cpp similarity index 100% rename from src/lib/utils/FileUtils.cpp rename to src/lib_spark/spark/utils/FileUtils.cpp diff --git a/src/lib/utils/FileUtils.h b/src/lib_spark/spark/utils/FileUtils.h similarity index 100% rename from src/lib/utils/FileUtils.h rename to src/lib_spark/spark/utils/FileUtils.h diff --git a/src/lib/utils/GrowableSPSCQueue.cpp b/src/lib_spark/spark/utils/GrowableSPSCQueue.cpp similarity index 100% rename from src/lib/utils/GrowableSPSCQueue.cpp rename to src/lib_spark/spark/utils/GrowableSPSCQueue.cpp diff --git a/src/lib/utils/GrowableSPSCQueue.h b/src/lib_spark/spark/utils/GrowableSPSCQueue.h similarity index 100% rename from src/lib/utils/GrowableSPSCQueue.h rename to src/lib_spark/spark/utils/GrowableSPSCQueue.h diff --git a/src/lib/utils/HTTPStream.cpp b/src/lib_spark/spark/utils/HTTPStream.cpp similarity index 96% rename from src/lib/utils/HTTPStream.cpp rename to src/lib_spark/spark/utils/HTTPStream.cpp index 97d676521..26fa1e9ca 100644 --- a/src/lib/utils/HTTPStream.cpp +++ b/src/lib_spark/spark/utils/HTTPStream.cpp @@ -1,7 +1,7 @@ #include "HTTPStream.h" -#include "lib/logging/logging.h" -#include "lib/utils/bts_assert.h" -#include "lib/utils/defer.h" +#include "spark/logging/logging.h" +#include "spark/utils/bts_assert.h" +#include "spark/utils/defer.h" #include #include diff --git a/src/lib/utils/HTTPStream.h b/src/lib_spark/spark/utils/HTTPStream.h similarity index 90% rename from src/lib/utils/HTTPStream.h rename to src/lib_spark/spark/utils/HTTPStream.h index a1dce67e8..c7196bf9a 100644 --- a/src/lib/utils/HTTPStream.h +++ b/src/lib_spark/spark/utils/HTTPStream.h @@ -1,7 +1,7 @@ #pragma once #include "bts_export.h" -#include "lib/utils/bts_no_copy.h" -#include "lib/utils/windows_wrapper.h" +#include "spark/utils/bts_no_copy.h" +#include "spark/utils/windows_wrapper.h" #include #include diff --git a/src/lib/utils/LockBox.h b/src/lib_spark/spark/utils/LockBox.h similarity index 100% rename from src/lib/utils/LockBox.h rename to src/lib_spark/spark/utils/LockBox.h diff --git a/src/lib/utils/MapUtils.cc b/src/lib_spark/spark/utils/MapUtils.cc similarity index 100% rename from src/lib/utils/MapUtils.cc rename to src/lib_spark/spark/utils/MapUtils.cc diff --git a/src/lib/utils/MapUtils.h b/src/lib_spark/spark/utils/MapUtils.h similarity index 100% rename from src/lib/utils/MapUtils.h rename to src/lib_spark/spark/utils/MapUtils.h diff --git a/src/lib/utils/MathUtils.cc b/src/lib_spark/spark/utils/MathUtils.cc similarity index 100% rename from src/lib/utils/MathUtils.cc rename to src/lib_spark/spark/utils/MathUtils.cc diff --git a/src/lib/utils/MathUtils.cpp b/src/lib_spark/spark/utils/MathUtils.cpp similarity index 100% rename from src/lib/utils/MathUtils.cpp rename to src/lib_spark/spark/utils/MathUtils.cpp diff --git a/src/lib/utils/MathUtils.h b/src/lib_spark/spark/utils/MathUtils.h similarity index 100% rename from src/lib/utils/MathUtils.h rename to src/lib_spark/spark/utils/MathUtils.h diff --git a/src/lib/utils/Optimistic.h b/src/lib_spark/spark/utils/Optimistic.h similarity index 100% rename from src/lib/utils/Optimistic.h rename to src/lib_spark/spark/utils/Optimistic.h diff --git a/src/lib/utils/PBUtils.cpp b/src/lib_spark/spark/utils/PBUtils.cpp similarity index 100% rename from src/lib/utils/PBUtils.cpp rename to src/lib_spark/spark/utils/PBUtils.cpp diff --git a/src/lib/utils/PBUtils.h b/src/lib_spark/spark/utils/PBUtils.h similarity index 98% rename from src/lib/utils/PBUtils.h rename to src/lib_spark/spark/utils/PBUtils.h index de35893ee..f8ed56e05 100644 --- a/src/lib/utils/PBUtils.h +++ b/src/lib_spark/spark/utils/PBUtils.h @@ -12,8 +12,8 @@ #endif #include "bts_export.h" -#include "lib/utils/bts_assert.h" -#include "lib/utils/datetime.h" +#include "spark/utils/bts_assert.h" +#include "spark/utils/datetime.h" namespace google { namespace protobuf { diff --git a/src/lib/utils/Puid.cpp b/src/lib_spark/spark/utils/Puid.cpp similarity index 99% rename from src/lib/utils/Puid.cpp rename to src/lib_spark/spark/utils/Puid.cpp index b54ea6b00..b736d4e1a 100644 --- a/src/lib/utils/Puid.cpp +++ b/src/lib_spark/spark/utils/Puid.cpp @@ -1,8 +1,8 @@ #include #ifndef _WIN32 #include "Puid.h" -#include "lib/config/config.h" -#include "lib/config/protos/system_config.pb.h" +#include "spark/config/config.h" +#include "spark/config/protos/system_config.pb.h" #include "../os/os.h" #include "../utils/bts_assert.h" diff --git a/src/lib/utils/Puid.h b/src/lib_spark/spark/utils/Puid.h similarity index 98% rename from src/lib/utils/Puid.h rename to src/lib_spark/spark/utils/Puid.h index b5c356a03..b7107b5d4 100644 --- a/src/lib/utils/Puid.h +++ b/src/lib_spark/spark/utils/Puid.h @@ -1,7 +1,7 @@ #pragma once #include "bts_export.h" -#include "lib/utils/bts_assert.h" +#include "spark/utils/bts_assert.h" #include #include diff --git a/src/lib/utils/ReentrancyGuard.h b/src/lib_spark/spark/utils/ReentrancyGuard.h similarity index 100% rename from src/lib/utils/ReentrancyGuard.h rename to src/lib_spark/spark/utils/ReentrancyGuard.h diff --git a/src/lib/utils/ResultEnum.h b/src/lib_spark/spark/utils/ResultEnum.h similarity index 100% rename from src/lib/utils/ResultEnum.h rename to src/lib_spark/spark/utils/ResultEnum.h diff --git a/src/lib/utils/SecureLogon.cpp b/src/lib_spark/spark/utils/SecureLogon.cpp similarity index 92% rename from src/lib/utils/SecureLogon.cpp rename to src/lib_spark/spark/utils/SecureLogon.cpp index 635344884..527799b02 100644 --- a/src/lib/utils/SecureLogon.cpp +++ b/src/lib_spark/spark/utils/SecureLogon.cpp @@ -2,11 +2,11 @@ #include "SecureLogon.h" #ifndef BTS_EDGE -#include "lib/config/config.h" -#include "lib/config/protos/deployment_type.pb.h" -#include "lib/config/protos/system_config.pb.h" -#include "lib/utils/bts_assert.h" -#include "lib/utils/datetime.h" +#include "spark/config/config.h" +#include "spark/config/protos/deployment_type.pb.h" +#include "spark/config/protos/system_config.pb.h" +#include "spark/utils/bts_assert.h" +#include "spark/utils/datetime.h" #else #include "bts_assert.h" #include "core/bts_core/config/config.h" diff --git a/src/lib/utils/SecureLogon.h b/src/lib_spark/spark/utils/SecureLogon.h similarity index 100% rename from src/lib/utils/SecureLogon.h rename to src/lib_spark/spark/utils/SecureLogon.h diff --git a/src/lib/utils/SharedList.h b/src/lib_spark/spark/utils/SharedList.h similarity index 97% rename from src/lib/utils/SharedList.h rename to src/lib_spark/spark/utils/SharedList.h index 7cb2c0c3c..1a793a554 100644 --- a/src/lib/utils/SharedList.h +++ b/src/lib_spark/spark/utils/SharedList.h @@ -1,15 +1,15 @@ #pragma once -#include "lib/logging/logging.h" -#include "lib/utils/SharedMemory.h" -#include "lib/utils/bts_array_size.h" -#include "lib/utils/bts_assert.h" -#include "lib/utils/bts_no_copy.h" -#include "lib/utils/defer.h" +#include "spark/logging/logging.h" +#include "spark/utils/SharedMemory.h" +#include "spark/utils/bts_array_size.h" +#include "spark/utils/bts_assert.h" +#include "spark/utils/bts_no_copy.h" +#include "spark/utils/defer.h" -#include "lib/config/config.h" -#include "lib/config/protos/system_config.pb.h" -#include "lib/os/os.h" +#include "spark/config/config.h" +#include "spark/config/protos/system_config.pb.h" +#include "spark/os/os.h" #include #include diff --git a/src/lib/utils/SharedMemory.cpp b/src/lib_spark/spark/utils/SharedMemory.cpp similarity index 98% rename from src/lib/utils/SharedMemory.cpp rename to src/lib_spark/spark/utils/SharedMemory.cpp index ea1c8d8d1..be19bacf9 100644 --- a/src/lib/utils/SharedMemory.cpp +++ b/src/lib_spark/spark/utils/SharedMemory.cpp @@ -1,8 +1,8 @@ #ifndef NO_CPP0X #include "SharedMemory.h" -#include "lib/logging/logging.h" -#include "lib/utils/bts_assert.h" +#include "spark/logging/logging.h" +#include "spark/utils/bts_assert.h" #include #include diff --git a/src/lib/utils/SharedMemory.h b/src/lib_spark/spark/utils/SharedMemory.h similarity index 90% rename from src/lib/utils/SharedMemory.h rename to src/lib_spark/spark/utils/SharedMemory.h index 30f5b8f1f..2651b7508 100644 --- a/src/lib/utils/SharedMemory.h +++ b/src/lib_spark/spark/utils/SharedMemory.h @@ -1,7 +1,7 @@ #pragma once -#include "lib/utils/bts_export.h" -#include "lib/utils/bts_no_copy.h" +#include "spark/utils/bts_export.h" +#include "spark/utils/bts_no_copy.h" #include #include diff --git a/src/lib/utils/Shuffle.h b/src/lib_spark/spark/utils/Shuffle.h similarity index 100% rename from src/lib/utils/Shuffle.h rename to src/lib_spark/spark/utils/Shuffle.h diff --git a/src/lib/utils/SpinLock.h b/src/lib_spark/spark/utils/SpinLock.h similarity index 100% rename from src/lib/utils/SpinLock.h rename to src/lib_spark/spark/utils/SpinLock.h diff --git a/src/lib/utils/Sqlite_utils.cpp b/src/lib_spark/spark/utils/Sqlite_utils.cpp similarity index 100% rename from src/lib/utils/Sqlite_utils.cpp rename to src/lib_spark/spark/utils/Sqlite_utils.cpp diff --git a/src/lib/utils/Sqlite_utils.h b/src/lib_spark/spark/utils/Sqlite_utils.h similarity index 96% rename from src/lib/utils/Sqlite_utils.h rename to src/lib_spark/spark/utils/Sqlite_utils.h index 5a9f2ad5b..9bbe17220 100644 --- a/src/lib/utils/Sqlite_utils.h +++ b/src/lib_spark/spark/utils/Sqlite_utils.h @@ -1,6 +1,6 @@ #pragma once #ifndef _WIN32 -#include "lib/utils/bts_assert.h" +#include "spark/utils/bts_assert.h" #include #include diff --git a/src/lib/utils/StringSplitter.h b/src/lib_spark/spark/utils/StringSplitter.h similarity index 100% rename from src/lib/utils/StringSplitter.h rename to src/lib_spark/spark/utils/StringSplitter.h diff --git a/src/lib/utils/TempDir.h b/src/lib_spark/spark/utils/TempDir.h similarity index 97% rename from src/lib/utils/TempDir.h rename to src/lib_spark/spark/utils/TempDir.h index a38ec6e46..19533cc28 100644 --- a/src/lib/utils/TempDir.h +++ b/src/lib_spark/spark/utils/TempDir.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/os/os.h" +#include "spark/os/os.h" #include #include diff --git a/src/lib/utils/TempFile.h b/src/lib_spark/spark/utils/TempFile.h similarity index 98% rename from src/lib/utils/TempFile.h rename to src/lib_spark/spark/utils/TempFile.h index e8d864bd6..994018427 100644 --- a/src/lib/utils/TempFile.h +++ b/src/lib_spark/spark/utils/TempFile.h @@ -1,7 +1,7 @@ #ifndef TEMPFILE_H_ #define TEMPFILE_H_ -#include "lib/os/os.h" +#include "spark/os/os.h" #ifdef _WIN32 #include diff --git a/src/lib/utils/ThrowIf.h b/src/lib_spark/spark/utils/ThrowIf.h similarity index 100% rename from src/lib/utils/ThrowIf.h rename to src/lib_spark/spark/utils/ThrowIf.h diff --git a/src/lib/utils/TimeStamp.h b/src/lib_spark/spark/utils/TimeStamp.h similarity index 100% rename from src/lib/utils/TimeStamp.h rename to src/lib_spark/spark/utils/TimeStamp.h diff --git a/src/lib/utils/UNUSED_PARAM.h b/src/lib_spark/spark/utils/UNUSED_PARAM.h similarity index 100% rename from src/lib/utils/UNUSED_PARAM.h rename to src/lib_spark/spark/utils/UNUSED_PARAM.h diff --git a/src/lib/utils/Uuid.cpp b/src/lib_spark/spark/utils/Uuid.cpp similarity index 98% rename from src/lib/utils/Uuid.cpp rename to src/lib_spark/spark/utils/Uuid.cpp index 9e4374012..b79bbf174 100644 --- a/src/lib/utils/Uuid.cpp +++ b/src/lib_spark/spark/utils/Uuid.cpp @@ -2,7 +2,7 @@ #include "bts_array_size.h" #include "bts_assert.h" -#include "lib/os/os.h" +#include "spark/os/os.h" #include #include #include diff --git a/src/lib/utils/Uuid.h b/src/lib_spark/spark/utils/Uuid.h similarity index 100% rename from src/lib/utils/Uuid.h rename to src/lib_spark/spark/utils/Uuid.h diff --git a/src/lib/utils/ValueWrapper.h b/src/lib_spark/spark/utils/ValueWrapper.h similarity index 100% rename from src/lib/utils/ValueWrapper.h rename to src/lib_spark/spark/utils/ValueWrapper.h diff --git a/src/lib/utils/WaitFreeQueue.h b/src/lib_spark/spark/utils/WaitFreeQueue.h similarity index 99% rename from src/lib/utils/WaitFreeQueue.h rename to src/lib_spark/spark/utils/WaitFreeQueue.h index 855e6e72a..56160fafe 100644 --- a/src/lib/utils/WaitFreeQueue.h +++ b/src/lib_spark/spark/utils/WaitFreeQueue.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/utils/bts_no_copy.h" +#include "spark/utils/bts_no_copy.h" #include #include #include diff --git a/src/lib/utils/auto_init_shared_ptr.h b/src/lib_spark/spark/utils/auto_init_shared_ptr.h similarity index 100% rename from src/lib/utils/auto_init_shared_ptr.h rename to src/lib_spark/spark/utils/auto_init_shared_ptr.h diff --git a/src/lib/utils/base62.h b/src/lib_spark/spark/utils/base62.h similarity index 96% rename from src/lib/utils/base62.h rename to src/lib_spark/spark/utils/base62.h index e00d8ea67..ba394d553 100644 --- a/src/lib/utils/base62.h +++ b/src/lib_spark/spark/utils/base62.h @@ -5,7 +5,7 @@ #include #include -#include "lib/utils/bts_assert.h" +#include "spark/utils/bts_assert.h" namespace bts { namespace utils { diff --git a/src/lib/utils/base64.hpp b/src/lib_spark/spark/utils/base64.hpp similarity index 100% rename from src/lib/utils/base64.hpp rename to src/lib_spark/spark/utils/base64.hpp diff --git a/src/lib/utils/benchmarking_utils.h b/src/lib_spark/spark/utils/benchmarking_utils.h similarity index 100% rename from src/lib/utils/benchmarking_utils.h rename to src/lib_spark/spark/utils/benchmarking_utils.h diff --git a/src/lib/utils/bts_array_size.h b/src/lib_spark/spark/utils/bts_array_size.h similarity index 100% rename from src/lib/utils/bts_array_size.h rename to src/lib_spark/spark/utils/bts_array_size.h diff --git a/src/lib/utils/bts_assert.h b/src/lib_spark/spark/utils/bts_assert.h similarity index 96% rename from src/lib/utils/bts_assert.h rename to src/lib_spark/spark/utils/bts_assert.h index 1815d4acc..ee55fa82a 100644 --- a/src/lib/utils/bts_assert.h +++ b/src/lib_spark/spark/utils/bts_assert.h @@ -4,8 +4,8 @@ #include #include -#include "lib/logging/logging.h" -#include "lib/utils/bts_debugger.h" +#include "spark/logging/logging.h" +#include "spark/utils/bts_debugger.h" #ifdef _WIN32 #define TERMINATE ::_exit(-1); diff --git a/src/lib/utils/bts_chrono.h b/src/lib_spark/spark/utils/bts_chrono.h similarity index 100% rename from src/lib/utils/bts_chrono.h rename to src/lib_spark/spark/utils/bts_chrono.h diff --git a/src/lib/utils/bts_concat.h b/src/lib_spark/spark/utils/bts_concat.h similarity index 100% rename from src/lib/utils/bts_concat.h rename to src/lib_spark/spark/utils/bts_concat.h diff --git a/src/lib/utils/bts_debugger.h b/src/lib_spark/spark/utils/bts_debugger.h similarity index 100% rename from src/lib/utils/bts_debugger.h rename to src/lib_spark/spark/utils/bts_debugger.h diff --git a/src/lib/utils/bts_export.h b/src/lib_spark/spark/utils/bts_export.h similarity index 100% rename from src/lib/utils/bts_export.h rename to src/lib_spark/spark/utils/bts_export.h diff --git a/src/lib/utils/bts_fatal.h b/src/lib_spark/spark/utils/bts_fatal.h similarity index 96% rename from src/lib/utils/bts_fatal.h rename to src/lib_spark/spark/utils/bts_fatal.h index 62a02919d..3d661aa85 100644 --- a/src/lib/utils/bts_fatal.h +++ b/src/lib_spark/spark/utils/bts_fatal.h @@ -4,8 +4,8 @@ #include #include -#include "lib/logging/logging.h" -#include "lib/utils/bts_debugger.h" +#include "spark/logging/logging.h" +#include "spark/utils/bts_debugger.h" #define BTS_FATAL_MSG(msg) \ { \ diff --git a/src/lib/utils/bts_lock_guard.h b/src/lib_spark/spark/utils/bts_lock_guard.h similarity index 87% rename from src/lib/utils/bts_lock_guard.h rename to src/lib_spark/spark/utils/bts_lock_guard.h index e3d6745a5..761578695 100644 --- a/src/lib/utils/bts_lock_guard.h +++ b/src/lib_spark/spark/utils/bts_lock_guard.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/utils/bts_concat.h" +#include "spark/utils/bts_concat.h" #define BTS_LOCK_GUARD(lockable) \ std::lock_guard BTS_CONCAT(__lock_guard_, __LINE__) { \ diff --git a/src/lib/utils/bts_no_copy.h b/src/lib_spark/spark/utils/bts_no_copy.h similarity index 100% rename from src/lib/utils/bts_no_copy.h rename to src/lib_spark/spark/utils/bts_no_copy.h diff --git a/src/lib/utils/checked_arithmetic.h b/src/lib_spark/spark/utils/checked_arithmetic.h similarity index 100% rename from src/lib/utils/checked_arithmetic.h rename to src/lib_spark/spark/utils/checked_arithmetic.h diff --git a/src/lib/utils/checked_cast.h b/src/lib_spark/spark/utils/checked_cast.h similarity index 100% rename from src/lib/utils/checked_cast.h rename to src/lib_spark/spark/utils/checked_cast.h diff --git a/src/lib/utils/crypto/AlgoType.h b/src/lib_spark/spark/utils/crypto/AlgoType.h similarity index 100% rename from src/lib/utils/crypto/AlgoType.h rename to src/lib_spark/spark/utils/crypto/AlgoType.h diff --git a/src/lib/utils/crypto/CipherType.cpp b/src/lib_spark/spark/utils/crypto/CipherType.cpp similarity index 100% rename from src/lib/utils/crypto/CipherType.cpp rename to src/lib_spark/spark/utils/crypto/CipherType.cpp diff --git a/src/lib/utils/crypto/CipherType.h b/src/lib_spark/spark/utils/crypto/CipherType.h similarity index 100% rename from src/lib/utils/crypto/CipherType.h rename to src/lib_spark/spark/utils/crypto/CipherType.h diff --git a/src/lib/utils/crypto/CryptoInit.cpp b/src/lib_spark/spark/utils/crypto/CryptoInit.cpp similarity index 100% rename from src/lib/utils/crypto/CryptoInit.cpp rename to src/lib_spark/spark/utils/crypto/CryptoInit.cpp diff --git a/src/lib/utils/crypto/CryptoInit.h b/src/lib_spark/spark/utils/crypto/CryptoInit.h similarity index 80% rename from src/lib/utils/crypto/CryptoInit.h rename to src/lib_spark/spark/utils/crypto/CryptoInit.h index cbdb741bb..e3904a8ea 100644 --- a/src/lib/utils/crypto/CryptoInit.h +++ b/src/lib_spark/spark/utils/crypto/CryptoInit.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/utils/bts_no_copy.h" +#include "spark/utils/bts_no_copy.h" namespace bts { namespace crypto { diff --git a/src/lib/utils/crypto/Digest.cpp b/src/lib_spark/spark/utils/crypto/Digest.cpp similarity index 94% rename from src/lib/utils/crypto/Digest.cpp rename to src/lib_spark/spark/utils/crypto/Digest.cpp index 1fe168baa..9f16903f1 100644 --- a/src/lib/utils/crypto/Digest.cpp +++ b/src/lib_spark/spark/utils/crypto/Digest.cpp @@ -2,7 +2,7 @@ #include "Digest.h" #include "PrivateKey.h" -#include "lib/utils/bts_assert.h" +#include "spark/utils/bts_assert.h" namespace openssl { #include diff --git a/src/lib/utils/crypto/Digest.h b/src/lib_spark/spark/utils/crypto/Digest.h similarity index 90% rename from src/lib/utils/crypto/Digest.h rename to src/lib_spark/spark/utils/crypto/Digest.h index 06716ec14..47a4c7581 100644 --- a/src/lib/utils/crypto/Digest.h +++ b/src/lib_spark/spark/utils/crypto/Digest.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/utils/bts_no_copy.h" +#include "spark/utils/bts_no_copy.h" #include diff --git a/src/lib/utils/crypto/KeyCodeHelper.cpp b/src/lib_spark/spark/utils/crypto/KeyCodeHelper.cpp similarity index 76% rename from src/lib/utils/crypto/KeyCodeHelper.cpp rename to src/lib_spark/spark/utils/crypto/KeyCodeHelper.cpp index e8b3cac91..41a4d3731 100644 --- a/src/lib/utils/crypto/KeyCodeHelper.cpp +++ b/src/lib_spark/spark/utils/crypto/KeyCodeHelper.cpp @@ -1,12 +1,12 @@ #ifndef _WIN32 #include "KeyCodeHelper.h" -#include "lib/utils/crypto/CryptoInit.h" -#include "lib/utils/crypto/PrivateKey.h" -#include "lib/utils/crypto/PublicKey.h" -#include "lib/utils/datetime.h" +#include "spark/utils/crypto/CryptoInit.h" +#include "spark/utils/crypto/PrivateKey.h" +#include "spark/utils/crypto/PublicKey.h" +#include "spark/utils/datetime.h" -#include "lib/config/protos/keycode.pb.h" +#include "spark/config/protos/keycode.pb.h" #include #include #include diff --git a/src/lib/utils/crypto/KeyCodeHelper.h b/src/lib_spark/spark/utils/crypto/KeyCodeHelper.h similarity index 100% rename from src/lib/utils/crypto/KeyCodeHelper.h rename to src/lib_spark/spark/utils/crypto/KeyCodeHelper.h diff --git a/src/lib/utils/crypto/PasswordCallback.cpp b/src/lib_spark/spark/utils/crypto/PasswordCallback.cpp similarity index 100% rename from src/lib/utils/crypto/PasswordCallback.cpp rename to src/lib_spark/spark/utils/crypto/PasswordCallback.cpp diff --git a/src/lib/utils/crypto/PasswordCallback.h b/src/lib_spark/spark/utils/crypto/PasswordCallback.h similarity index 92% rename from src/lib/utils/crypto/PasswordCallback.h rename to src/lib_spark/spark/utils/crypto/PasswordCallback.h index afba63237..467cc1aa9 100644 --- a/src/lib/utils/crypto/PasswordCallback.h +++ b/src/lib_spark/spark/utils/crypto/PasswordCallback.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/utils/bts_no_copy.h" +#include "spark/utils/bts_no_copy.h" #include diff --git a/src/lib/utils/crypto/PrivateKey.cpp b/src/lib_spark/spark/utils/crypto/PrivateKey.cpp similarity index 94% rename from src/lib/utils/crypto/PrivateKey.cpp rename to src/lib_spark/spark/utils/crypto/PrivateKey.cpp index 31573111b..0428b9f3c 100644 --- a/src/lib/utils/crypto/PrivateKey.cpp +++ b/src/lib_spark/spark/utils/crypto/PrivateKey.cpp @@ -3,13 +3,12 @@ #pragma GCC diagnostic ignored "-Wdeprecated-declarations" #include "PrivateKey.h" - -#include "CryptoInit.h" -#include "PublicKey.h" -#include "iostreambio.h" -#include "lib/logging/logging.h" -#include "lib/utils/bts_assert.h" -#include "lib/utils/helper_macros.h" +#include "spark/logging/logging.h" +#include "spark/utils/bts_assert.h" +#include "spark/utils/crypto/CryptoInit.h" +#include "spark/utils/crypto/PublicKey.h" +#include "spark/utils/crypto/iostreambio.h" +#include "spark/utils/helper_macros.h" #include #include diff --git a/src/lib/utils/crypto/PrivateKey.h b/src/lib_spark/spark/utils/crypto/PrivateKey.h similarity index 94% rename from src/lib/utils/crypto/PrivateKey.h rename to src/lib_spark/spark/utils/crypto/PrivateKey.h index 9cbcdf165..0cbb34773 100644 --- a/src/lib/utils/crypto/PrivateKey.h +++ b/src/lib_spark/spark/utils/crypto/PrivateKey.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/utils/bts_no_copy.h" +#include "spark/utils/bts_no_copy.h" #include "AlgoType.h" #include "CipherType.h" diff --git a/src/lib/utils/crypto/PublicKey.cpp b/src/lib_spark/spark/utils/crypto/PublicKey.cpp similarity index 89% rename from src/lib/utils/crypto/PublicKey.cpp rename to src/lib_spark/spark/utils/crypto/PublicKey.cpp index a263603bd..73ad40ea3 100644 --- a/src/lib/utils/crypto/PublicKey.cpp +++ b/src/lib_spark/spark/utils/crypto/PublicKey.cpp @@ -1,12 +1,12 @@ -#include "lib/utils/crypto/PrivateKey.h" #ifndef _WIN32 #include "PublicKey.h" -#include "lib/config/protos/keycode.pb.h" -#include "lib/logging/logging.h" -#include "lib/utils/FileUtils.h" -#include "lib/utils/bts_assert.h" -#include "lib/utils/crypto/iostreambio.h" -#include "lib/utils/helper_macros.h" +#include "spark/config/protos/keycode.pb.h" +#include "spark/logging/logging.h" +#include "spark/utils/FileUtils.h" +#include "spark/utils/bts_assert.h" +#include "spark/utils/crypto/PrivateKey.h" +#include "spark/utils/crypto/iostreambio.h" +#include "spark/utils/helper_macros.h" #include #include diff --git a/src/lib/utils/crypto/PublicKey.h b/src/lib_spark/spark/utils/crypto/PublicKey.h similarity index 93% rename from src/lib/utils/crypto/PublicKey.h rename to src/lib_spark/spark/utils/crypto/PublicKey.h index c6bc3842b..d10c964b3 100644 --- a/src/lib/utils/crypto/PublicKey.h +++ b/src/lib_spark/spark/utils/crypto/PublicKey.h @@ -1,6 +1,6 @@ #pragma once #include "PrivateKey.h" -#include "lib/utils/bts_no_copy.h" +#include "spark/utils/bts_no_copy.h" namespace bts::config { class PublicKey; diff --git a/src/lib/utils/crypto/base64_chars.h b/src/lib_spark/spark/utils/crypto/base64_chars.h similarity index 100% rename from src/lib/utils/crypto/base64_chars.h rename to src/lib_spark/spark/utils/crypto/base64_chars.h diff --git a/src/lib/utils/crypto/ed25519.cpp b/src/lib_spark/spark/utils/crypto/ed25519.cpp similarity index 93% rename from src/lib/utils/crypto/ed25519.cpp rename to src/lib_spark/spark/utils/crypto/ed25519.cpp index a065d12e7..a173ad032 100644 --- a/src/lib/utils/crypto/ed25519.cpp +++ b/src/lib_spark/spark/utils/crypto/ed25519.cpp @@ -1,9 +1,9 @@ #include "ed25519.h" -#include "lib/logging/logging.h" -#include "lib/utils/crypto/base64_chars.h" -#include "lib/utils/crypto/evp_md_ctx.h" -#include "lib/utils/crypto/evp_pkey.h" -#include "lib/utils/crypto/file.h" +#include "spark/logging/logging.h" +#include "spark/utils/crypto/base64_chars.h" +#include "spark/utils/crypto/evp_md_ctx.h" +#include "spark/utils/crypto/evp_pkey.h" +#include "spark/utils/crypto/file.h" #include #include diff --git a/src/lib/utils/crypto/ed25519.h b/src/lib_spark/spark/utils/crypto/ed25519.h similarity index 100% rename from src/lib/utils/crypto/ed25519.h rename to src/lib_spark/spark/utils/crypto/ed25519.h diff --git a/src/lib/utils/crypto/evp_md_ctx.h b/src/lib_spark/spark/utils/crypto/evp_md_ctx.h similarity index 100% rename from src/lib/utils/crypto/evp_md_ctx.h rename to src/lib_spark/spark/utils/crypto/evp_md_ctx.h diff --git a/src/lib/utils/crypto/evp_pkey.cpp b/src/lib_spark/spark/utils/crypto/evp_pkey.cpp similarity index 90% rename from src/lib/utils/crypto/evp_pkey.cpp rename to src/lib_spark/spark/utils/crypto/evp_pkey.cpp index 8769772bb..357871f5a 100644 --- a/src/lib/utils/crypto/evp_pkey.cpp +++ b/src/lib_spark/spark/utils/crypto/evp_pkey.cpp @@ -1,5 +1,5 @@ #include "evp_pkey.h" -#include "lib/utils/crypto/file.h" +#include "spark/utils/crypto/file.h" #include #include diff --git a/src/lib/utils/crypto/evp_pkey.h b/src/lib_spark/spark/utils/crypto/evp_pkey.h similarity index 100% rename from src/lib/utils/crypto/evp_pkey.h rename to src/lib_spark/spark/utils/crypto/evp_pkey.h diff --git a/src/lib/utils/crypto/file.h b/src/lib_spark/spark/utils/crypto/file.h similarity index 100% rename from src/lib/utils/crypto/file.h rename to src/lib_spark/spark/utils/crypto/file.h diff --git a/src/lib/utils/crypto/hmac.cpp b/src/lib_spark/spark/utils/crypto/hmac.cpp similarity index 100% rename from src/lib/utils/crypto/hmac.cpp rename to src/lib_spark/spark/utils/crypto/hmac.cpp diff --git a/src/lib/utils/crypto/hmac.h b/src/lib_spark/spark/utils/crypto/hmac.h similarity index 100% rename from src/lib/utils/crypto/hmac.h rename to src/lib_spark/spark/utils/crypto/hmac.h diff --git a/src/lib/utils/crypto/iostreambio.cpp b/src/lib_spark/spark/utils/crypto/iostreambio.cpp similarity index 93% rename from src/lib/utils/crypto/iostreambio.cpp rename to src/lib_spark/spark/utils/crypto/iostreambio.cpp index 47569a256..b5ceac7f8 100644 --- a/src/lib/utils/crypto/iostreambio.cpp +++ b/src/lib_spark/spark/utils/crypto/iostreambio.cpp @@ -1,10 +1,9 @@ #ifndef _WIN32 #include "iostreambio.h" - -#include "lib/logging/logging.h" -#include "lib/utils/bts_assert.h" -#include "lib/utils/helper_macros.h" -#include "openssl_compat.h" +#include "spark/logging/logging.h" +#include "spark/utils/bts_assert.h" +#include "spark/utils/crypto/openssl_compat.h" +#include "spark/utils/helper_macros.h" #include #include diff --git a/src/lib/utils/crypto/iostreambio.h b/src/lib_spark/spark/utils/crypto/iostreambio.h similarity index 100% rename from src/lib/utils/crypto/iostreambio.h rename to src/lib_spark/spark/utils/crypto/iostreambio.h diff --git a/src/lib/utils/crypto/openssl_compat.h b/src/lib_spark/spark/utils/crypto/openssl_compat.h similarity index 100% rename from src/lib/utils/crypto/openssl_compat.h rename to src/lib_spark/spark/utils/crypto/openssl_compat.h diff --git a/src/lib/utils/crypto/spark_private.pem b/src/lib_spark/spark/utils/crypto/spark_private.pem similarity index 100% rename from src/lib/utils/crypto/spark_private.pem rename to src/lib_spark/spark/utils/crypto/spark_private.pem diff --git a/src/lib/utils/crypto/spark_public.pem b/src/lib_spark/spark/utils/crypto/spark_public.pem similarity index 100% rename from src/lib/utils/crypto/spark_public.pem rename to src/lib_spark/spark/utils/crypto/spark_public.pem diff --git a/src/lib/utils/datetime.cpp b/src/lib_spark/spark/utils/datetime.cpp similarity index 100% rename from src/lib/utils/datetime.cpp rename to src/lib_spark/spark/utils/datetime.cpp diff --git a/src/lib/utils/datetime.h b/src/lib_spark/spark/utils/datetime.h similarity index 100% rename from src/lib/utils/datetime.h rename to src/lib_spark/spark/utils/datetime.h diff --git a/src/lib/utils/defer.h b/src/lib_spark/spark/utils/defer.h similarity index 100% rename from src/lib/utils/defer.h rename to src/lib_spark/spark/utils/defer.h diff --git a/src/lib/utils/download.cpp b/src/lib_spark/spark/utils/download.cpp similarity index 93% rename from src/lib/utils/download.cpp rename to src/lib_spark/spark/utils/download.cpp index c7e6e2457..b388dc51d 100644 --- a/src/lib/utils/download.cpp +++ b/src/lib_spark/spark/utils/download.cpp @@ -1,5 +1,5 @@ #include "download.h" -#include "lib/logging/logging.h" +#include "spark/logging/logging.h" #include #include diff --git a/src/lib/utils/download.h b/src/lib_spark/spark/utils/download.h similarity index 100% rename from src/lib/utils/download.h rename to src/lib_spark/spark/utils/download.h diff --git a/src/lib/utils/file_utils.cpp b/src/lib_spark/spark/utils/file_utils.cpp similarity index 97% rename from src/lib/utils/file_utils.cpp rename to src/lib_spark/spark/utils/file_utils.cpp index 9bbc3ac37..5c9286f63 100644 --- a/src/lib/utils/file_utils.cpp +++ b/src/lib_spark/spark/utils/file_utils.cpp @@ -1,6 +1,6 @@ #include "file_utils.h" #include "bts_assert.h" -#include "lib/os/os.h" +#include "spark/os/os.h" #include #include diff --git a/src/lib/utils/file_utils.h b/src/lib_spark/spark/utils/file_utils.h similarity index 100% rename from src/lib/utils/file_utils.h rename to src/lib_spark/spark/utils/file_utils.h diff --git a/src/lib/utils/formatters/error_code_formatter.h b/src/lib_spark/spark/utils/formatters/error_code_formatter.h similarity index 100% rename from src/lib/utils/formatters/error_code_formatter.h rename to src/lib_spark/spark/utils/formatters/error_code_formatter.h diff --git a/src/lib/utils/formatters/exception_formatter.h b/src/lib_spark/spark/utils/formatters/exception_formatter.h similarity index 100% rename from src/lib/utils/formatters/exception_formatter.h rename to src/lib_spark/spark/utils/formatters/exception_formatter.h diff --git a/src/lib/utils/helper_macros.h b/src/lib_spark/spark/utils/helper_macros.h similarity index 100% rename from src/lib/utils/helper_macros.h rename to src/lib_spark/spark/utils/helper_macros.h diff --git a/src/lib/utils/init_spark_lib.cpp b/src/lib_spark/spark/utils/init_spark_lib.cpp similarity index 87% rename from src/lib/utils/init_spark_lib.cpp rename to src/lib_spark/spark/utils/init_spark_lib.cpp index 7bab1ba6a..8d4cdefa9 100644 --- a/src/lib/utils/init_spark_lib.cpp +++ b/src/lib_spark/spark/utils/init_spark_lib.cpp @@ -1,7 +1,7 @@ #include "init_spark_lib.h" -#include "lib/logging/logging.h" -#include "lib/utils/bts_assert.h" -#include "lib/utils/thread_manager.h" +#include "spark/logging/logging.h" +#include "spark/utils/bts_assert.h" +#include "spark/utils/thread_manager.h" namespace bts { namespace utils { diff --git a/src/lib/utils/init_spark_lib.h b/src/lib_spark/spark/utils/init_spark_lib.h similarity index 100% rename from src/lib/utils/init_spark_lib.h rename to src/lib_spark/spark/utils/init_spark_lib.h diff --git a/src/lib/utils/inplace_function.h b/src/lib_spark/spark/utils/inplace_function.h similarity index 100% rename from src/lib/utils/inplace_function.h rename to src/lib_spark/spark/utils/inplace_function.h diff --git a/src/lib/utils/is_unittest_environment.cpp b/src/lib_spark/spark/utils/is_unittest_environment.cpp similarity index 100% rename from src/lib/utils/is_unittest_environment.cpp rename to src/lib_spark/spark/utils/is_unittest_environment.cpp diff --git a/src/lib/utils/is_unittest_environment.h b/src/lib_spark/spark/utils/is_unittest_environment.h similarity index 86% rename from src/lib/utils/is_unittest_environment.h rename to src/lib_spark/spark/utils/is_unittest_environment.h index 93c41784f..f92b10924 100644 --- a/src/lib/utils/is_unittest_environment.h +++ b/src/lib_spark/spark/utils/is_unittest_environment.h @@ -1,5 +1,5 @@ #pragma once -#include "lib/utils/bts_export.h" +#include "spark/utils/bts_export.h" namespace bts { namespace utils { namespace internal { diff --git a/src/lib/utils/lazy.h b/src/lib_spark/spark/utils/lazy.h similarity index 100% rename from src/lib/utils/lazy.h rename to src/lib_spark/spark/utils/lazy.h diff --git a/src/lib/utils/meta_programming.h b/src/lib_spark/spark/utils/meta_programming.h similarity index 100% rename from src/lib/utils/meta_programming.h rename to src/lib_spark/spark/utils/meta_programming.h diff --git a/src/lib/utils/mpmc_bounded_queue.h b/src/lib_spark/spark/utils/mpmc_bounded_queue.h similarity index 99% rename from src/lib/utils/mpmc_bounded_queue.h rename to src/lib_spark/spark/utils/mpmc_bounded_queue.h index 19ee96797..aca11a97c 100644 --- a/src/lib/utils/mpmc_bounded_queue.h +++ b/src/lib_spark/spark/utils/mpmc_bounded_queue.h @@ -35,7 +35,7 @@ Distributed under the MIT License (http://opensource.org/licenses/MIT) #pragma once -#include "lib/utils/warn_ctrl.h" +#include "spark/utils/warn_ctrl.h" #include #include diff --git a/src/lib/utils/object_pool.h b/src/lib_spark/spark/utils/object_pool.h similarity index 95% rename from src/lib/utils/object_pool.h rename to src/lib_spark/spark/utils/object_pool.h index 39334fdd2..689b44013 100644 --- a/src/lib/utils/object_pool.h +++ b/src/lib_spark/spark/utils/object_pool.h @@ -1,7 +1,7 @@ #pragma once -#include "lib/utils/bts_assert.h" -#include "lib/utils/type_name.h" +#include "spark/utils/bts_assert.h" +#include "spark/utils/type_name.h" #include #include diff --git a/src/lib/utils/observable_value_store.h b/src/lib_spark/spark/utils/observable_value_store.h similarity index 98% rename from src/lib/utils/observable_value_store.h rename to src/lib_spark/spark/utils/observable_value_store.h index 240037877..c85a495e6 100644 --- a/src/lib/utils/observable_value_store.h +++ b/src/lib_spark/spark/utils/observable_value_store.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/utils/Delegate.h" +#include "spark/utils/Delegate.h" #include #include diff --git a/src/lib/utils/overloaded.h b/src/lib_spark/spark/utils/overloaded.h similarity index 100% rename from src/lib/utils/overloaded.h rename to src/lib_spark/spark/utils/overloaded.h diff --git a/src/lib/utils/parse_enum.h b/src/lib_spark/spark/utils/parse_enum.h similarity index 100% rename from src/lib/utils/parse_enum.h rename to src/lib_spark/spark/utils/parse_enum.h diff --git a/src/lib/utils/pb_json_macros.h b/src/lib_spark/spark/utils/pb_json_macros.h similarity index 100% rename from src/lib/utils/pb_json_macros.h rename to src/lib_spark/spark/utils/pb_json_macros.h diff --git a/src/lib/utils/proto_helper.h b/src/lib_spark/spark/utils/proto_helper.h similarity index 99% rename from src/lib/utils/proto_helper.h rename to src/lib_spark/spark/utils/proto_helper.h index c61a711b4..f62c174d9 100644 --- a/src/lib/utils/proto_helper.h +++ b/src/lib_spark/spark/utils/proto_helper.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/utils/bts_assert.h" +#include "spark/utils/bts_assert.h" #include #include #include diff --git a/src/lib/utils/sane_algorithm.h b/src/lib_spark/spark/utils/sane_algorithm.h similarity index 100% rename from src/lib/utils/sane_algorithm.h rename to src/lib_spark/spark/utils/sane_algorithm.h diff --git a/src/lib/utils/sftp.cpp b/src/lib_spark/spark/utils/sftp.cpp similarity index 96% rename from src/lib/utils/sftp.cpp rename to src/lib_spark/spark/utils/sftp.cpp index f8d5a95f3..f2550ad9b 100644 --- a/src/lib/utils/sftp.cpp +++ b/src/lib_spark/spark/utils/sftp.cpp @@ -1,9 +1,9 @@ #ifndef _WIN32 -#include "lib/utils/sftp.h" -#include "lib/logging/logging.h" -#include "lib/utils/Dispatcher.h" -#include "lib/utils/base64.hpp" -#include "lib/utils/defer.h" +#include "spark/utils/sftp.h" +#include "spark/logging/logging.h" +#include "spark/utils/Dispatcher.h" +#include "spark/utils/base64.hpp" +#include "spark/utils/defer.h" #include #include diff --git a/src/lib/utils/sftp.h b/src/lib_spark/spark/utils/sftp.h similarity index 100% rename from src/lib/utils/sftp.h rename to src/lib_spark/spark/utils/sftp.h diff --git a/src/lib/utils/stats.cpp b/src/lib_spark/spark/utils/stats.cpp similarity index 93% rename from src/lib/utils/stats.cpp rename to src/lib_spark/spark/utils/stats.cpp index 09e2ae072..7ab6c8d05 100644 --- a/src/lib/utils/stats.cpp +++ b/src/lib_spark/spark/utils/stats.cpp @@ -1,6 +1,6 @@ -#include "lib/utils/stats.h" -#include "lib/os/os.h" -#include "lib/utils/bts_assert.h" +#include "spark/utils/stats.h" +#include "spark/os/os.h" +#include "spark/utils/bts_assert.h" #include #include diff --git a/src/lib/utils/stats.h b/src/lib_spark/spark/utils/stats.h similarity index 100% rename from src/lib/utils/stats.h rename to src/lib_spark/spark/utils/stats.h diff --git a/src/lib/utils/stopwatch.h b/src/lib_spark/spark/utils/stopwatch.h similarity index 96% rename from src/lib/utils/stopwatch.h rename to src/lib_spark/spark/utils/stopwatch.h index d8b966499..06d614e94 100644 --- a/src/lib/utils/stopwatch.h +++ b/src/lib_spark/spark/utils/stopwatch.h @@ -1,7 +1,7 @@ #pragma once -#include "lib/core/TimeSpan.h" -#include "lib/core/TimeStamp.h" +#include "spark/core/TimeSpan.h" +#include "spark/core/TimeStamp.h" namespace bts::utils { diff --git a/src/lib/utils/string_utils.h b/src/lib_spark/spark/utils/string_utils.h similarity index 100% rename from src/lib/utils/string_utils.h rename to src/lib_spark/spark/utils/string_utils.h diff --git a/src/lib/utils/tests/AuthTokenTests.cpp b/src/lib_spark/spark/utils/tests/AuthTokenTests.cpp similarity index 93% rename from src/lib/utils/tests/AuthTokenTests.cpp rename to src/lib_spark/spark/utils/tests/AuthTokenTests.cpp index bd085161f..c26542ce3 100644 --- a/src/lib/utils/tests/AuthTokenTests.cpp +++ b/src/lib_spark/spark/utils/tests/AuthTokenTests.cpp @@ -1,6 +1,6 @@ #ifndef _WIN32 -#include "../AuthToken.h" -#include "lib/config/config.h" +#include "spark/config/config.h" +#include "spark/utils/AuthToken.h" #include namespace bts { diff --git a/src/lib/utils/tests/IDGeneratorTests.cpp b/src/lib_spark/spark/utils/tests/IDGeneratorTests.cpp similarity index 100% rename from src/lib/utils/tests/IDGeneratorTests.cpp rename to src/lib_spark/spark/utils/tests/IDGeneratorTests.cpp diff --git a/src/lib/utils/tests/MathUtilsTests.cpp b/src/lib_spark/spark/utils/tests/MathUtilsTests.cpp similarity index 97% rename from src/lib/utils/tests/MathUtilsTests.cpp rename to src/lib_spark/spark/utils/tests/MathUtilsTests.cpp index eac2089f7..df67de800 100644 --- a/src/lib/utils/tests/MathUtilsTests.cpp +++ b/src/lib_spark/spark/utils/tests/MathUtilsTests.cpp @@ -1,5 +1,5 @@ #ifndef _WIN32 -#include "lib/utils/MathUtils.h" +#include "spark/utils/MathUtils.h" #include diff --git a/src/lib/utils/tests/SingleWriterConcurrentVectorTests.cpp b/src/lib_spark/spark/utils/tests/SingleWriterConcurrentVectorTests.cpp similarity index 100% rename from src/lib/utils/tests/SingleWriterConcurrentVectorTests.cpp rename to src/lib_spark/spark/utils/tests/SingleWriterConcurrentVectorTests.cpp diff --git a/src/lib/utils/thread_manager.cpp b/src/lib_spark/spark/utils/thread_manager.cpp similarity index 95% rename from src/lib/utils/thread_manager.cpp rename to src/lib_spark/spark/utils/thread_manager.cpp index c053dfac8..5f96c060b 100644 --- a/src/lib/utils/thread_manager.cpp +++ b/src/lib_spark/spark/utils/thread_manager.cpp @@ -1,8 +1,8 @@ #include "thread_manager.h" -#include "lib/config/config.h" -#include "lib/config/protos/threads.pb.h" -#include "lib/logging/logging.h" -#include "lib/utils/bts_assert.h" +#include "spark/config/config.h" +#include "spark/config/protos/threads.pb.h" +#include "spark/logging/logging.h" +#include "spark/utils/bts_assert.h" #include #include diff --git a/src/lib/utils/thread_manager.h b/src/lib_spark/spark/utils/thread_manager.h similarity index 96% rename from src/lib/utils/thread_manager.h rename to src/lib_spark/spark/utils/thread_manager.h index a9fe98634..cc40985c2 100644 --- a/src/lib/utils/thread_manager.h +++ b/src/lib_spark/spark/utils/thread_manager.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/config/protos/threads.pb.h" +#include "spark/config/protos/threads.pb.h" #include #include #include diff --git a/src/lib/utils/type_name.h b/src/lib_spark/spark/utils/type_name.h similarity index 100% rename from src/lib/utils/type_name.h rename to src/lib_spark/spark/utils/type_name.h diff --git a/src/lib/utils/warn_ctrl.h b/src/lib_spark/spark/utils/warn_ctrl.h similarity index 100% rename from src/lib/utils/warn_ctrl.h rename to src/lib_spark/spark/utils/warn_ctrl.h diff --git a/src/lib/utils/windows_wrapper.h b/src/lib_spark/spark/utils/windows_wrapper.h similarity index 100% rename from src/lib/utils/windows_wrapper.h rename to src/lib_spark/spark/utils/windows_wrapper.h diff --git a/src/sdk/examples/client_sdk/client_sdk_example.cpp b/src/sdk/examples/client_sdk/client_sdk_example.cpp index cf1bdf0ec..f78892bd0 100644 --- a/src/sdk/examples/client_sdk/client_sdk_example.cpp +++ b/src/sdk/examples/client_sdk/client_sdk_example.cpp @@ -1,8 +1,8 @@ -#include "lib/api/public/ServiceContext.h" -#include "lib/api/services/AdminService.client.pb.h" -#include "lib/api/services/MarketDataService.client.pb.h" -#include "lib/api/services/PositionService.client.pb.h" -#include "spark/lib/domain_model/Security.h" +#include "spark/api/public/ServiceContext.h" +#include "spark/api/services/AdminService.client.pb.h" +#include "spark/api/services/MarketDataService.client.pb.h" +#include "spark/api/services/PositionService.client.pb.h" +#include "spark/domain_model/Security.h" #include #include diff --git a/src/server/sparkd/CMakeLists.txt b/src/server/sparkd/CMakeLists.txt deleted file mode 100644 index 5ef690e19..000000000 --- a/src/server/sparkd/CMakeLists.txt +++ /dev/null @@ -1,109 +0,0 @@ -cmake_minimum_required(VERSION 3.14) -project(sparkd) - -include(FetchContent) -include(${CMAKE_SOURCE_DIR}/cmake/safe_dep_glob.cmake) -include(${CMAKE_SOURCE_DIR}/cmake/Protobuf.cmake) - -# dependencies -file( - GLOB_RECURSE Protos - RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - *.proto) -file( - GLOB_RECURSE Sparkd_Sources - RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - *.cpp *.c) -update_deps_file("${Protos};${Sparkd_Sources}") - -protobuf_generate_cpp(Proto_Srcs PROTO_HDRS ${Protos}) -add_executable(sparkd ${Sparkd_Sources} ${Proto_Srcs}) - -# include paths -target_include_directories( - sparkd PUBLIC - ${CMAKE_SOURCE_DIR}/src/server/sparkd/cmds/spartan - ${CMAKE_SOURCE_DIR}/src - ${CMAKE_BINARY_DIR}/src/server/sparkd/cmds/spartan ${emumba-deribit-connector-library_INCLUDE_DIRS}) - -find_package(PkgConfig REQUIRED) -pkg_check_modules(emumba-deribit-connector-library REQUIRED emumba-deribit-connector) - -# This dir contains rapidjsonConfig.cmake -list(APPEND CMAKE_PREFIX_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake_modules) -find_package(rapidjson REQUIRED) -target_include_directories(${PROJECT_NAME} SYSTEM PUBLIC ${rapidjson_INCLUDE_DIR}) -add_dependencies(${PROJECT_NAME} rapidjson_project) - -# databento -FetchContent_Declare( - databento - GIT_REPOSITORY https://github.com/databento/databento-cpp - GIT_TAG v0.31.0 -) -FetchContent_MakeAvailable(databento) - -# deribit-demo log level -if(NOT DEFINED DERIBIT_DEMO_LOG_LEVEL) - add_definitions(-DSPDLOG_ACTIVE_LEVEL=0) - message("-- Building of DERIBIT_DEMO_LOG_LEVEL=TRACE") -elseif(DERIBIT_DEMO_LOG_LEVEL STREQUAL "TRACE") - add_definitions(-DSPDLOG_ACTIVE_LEVEL=0) - message("-- Building of DERIBIT_DEMO_LOG_LEVEL=TRACE") -elseif(DERIBIT_DEMO_LOG_LEVEL STREQUAL "DEBUG") - add_definitions(-DSPDLOG_ACTIVE_LEVEL=1) - message("-- Building of DERIBIT_DEMO_LOG_LEVEL=DEBUG") -elseif(DERIBIT_DEMO_LOG_LEVEL STREQUAL "INFO") - add_definitions(-DSPDLOG_ACTIVE_LEVEL=2) - message("-- Building of DERIBIT_DEMO_LOG_LEVEL=INFO") -elseif(DERIBIT_DEMO_LOG_LEVEL STREQUAL "WARN") - add_definitions(-DSPDLOG_ACTIVE_LEVEL=3) - message("-- Building of DERIBIT_DEMO_LOG_LEVEL=WARN") -elseif(DERIBIT_DEMO_LOG_LEVEL STREQUAL "ERROR") - add_definitions(-DSPDLOG_ACTIVE_LEVEL=4) - message("-- Building of DERIBIT_DEMO_LOG_LEVEL=ERROR") -elseif(DERIBIT_DEMO_LOG_LEVEL STREQUAL "CRITICAL") - add_definitions(-DSPDLOG_ACTIVE_LEVEL=5) - message("-- Building of DERIBIT_DEMO_LOG_LEVEL=CRITICAL") -elseif(DERIBIT_DEMO_LOG_LEVEL STREQUAL "OFF") - add_definitions(-DSPDLOG_ACTIVE_LEVEL=6) - message("-- Building of DERIBIT_DEMO_LOG_LEVEL=OFF") -else() - add_definitions(-DSPDLOG_ACTIVE_LEVEL=0) - message("-- Building of DERIBIT_DEMO_LOG_LEVEL=TRACE") -endif() - -# linking -target_link_libraries(sparkd PUBLIC - libspark - binance_execution - databento::databento - ${emumba-deribit-connector-library_LIBRARIES} - ssl - cryptopp - tbb - onixs-cmemdh-all-4.8.0 - OnixS.IceImpactMulticastPriceFeedHandlerCpp - ACE - quickfix - benchmark - Common++ - Packet++ - Pcap++ - lttng-ust - -lpcap - -static-libgcc - -static-libstdc++ - -pthread) - -add_custom_command( - TARGET sparkd - POST_BUILD - COMMAND ln -fs ${CMAKE_BINARY_DIR}/src/lib/libspark.so ${CMAKE_CURRENT_BINARY_DIR} - COMMAND ln ARGS -sf ${EXTERNALS_ROOT}/../src/emumba/sparkd.lic ${CMAKE_BINARY_DIR}/src/server/sparkd) - -install(TARGETS sparkd DESTINATION "${CMAKE_INSTALL_BINDIR}") - -# Catch2 -find_package(Catch2 CONFIG REQUIRED) -target_link_libraries(${PROJECT_NAME} PUBLIC Catch2::Catch2) diff --git a/src/server/sparkd/cmds/Run.cpp b/src/server/sparkd/cmds/Run.cpp deleted file mode 100644 index 4e3ff25c7..000000000 --- a/src/server/sparkd/cmds/Run.cpp +++ /dev/null @@ -1,219 +0,0 @@ -#include "Run.h" -#include "lib/api/public/ServiceContext.h" -#include "lib/api/services/OrderService.pb.h" -#include "lib/config/config.h" -#include "lib/config/protos/jetfix.pb.h" -#include "lib/config/protos/ports.pb.h" -#include "lib/config/protos/quickbus_cfg.pb.h" -#include "lib/config/protos/toggles.pb.h" -#include "lib/domain_model/Security.pb.h" -#include "lib/domain_model/common.h" -#include "lib/io/http/curl_session.h" -#include "lib/logging/logging.h" -#include "lib/md/MBOProcessor.h" -#include "lib/md/MBOServiceServer.h" -#include "lib/md/MDClient.h" -#include "lib/md/SyntheticSecurityService.h" -#include "lib/md/relay/QueryServer.h" -#include "lib/md/service/MarketDataServiceServer.h" -#include "lib/metrics/metrics.h" -#include "lib/metrics/system_metrics.h" -#include "lib/orderman/OrderServiceServer.h" -#include "lib/orderman/gateways/sim/SimExecutionGatewayFactory.h" -#include "lib/orderman/log_messages/execution_report_log.h" -#include "lib/orderman/order_factory/DynamicOrderRegistry.h" -#include "lib/orderman/orderman_utils/ExecutionReport.h" -#include "lib/orderman/orders/algo/algo_orders/ProRataAlgo.h" -#include "lib/orderman/orders/algo/algo_orders/ScratchAlgo.h" -#include "lib/os/os.h" -#include "lib/os/spark_data_directory.h" -#include "lib/persistence/PersistenceServiceServer.h" -#include "lib/plugin/SparkServices.h" -#include "lib/plugin/plugin.h" -#include "lib/quickbus/quickbus.h" -#include "lib/tracing/PerfLog.h" -#include "lib/utils/Dispatcher.h" -#include "lib/utils/thread_manager.h" -#include "lib/version.h" -#include "md/cmds/Run.h" -#include "server/sparkd/algo/AlgoDefinitionServiceServer.h" -#include "server/sparkd/analytics/AnalyticsServiceServer.h" -#include "server/sparkd/execution/execution_gateway_provider.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 -#include - -namespace bts::cmds { - -using bts::api::ServiceContext; -using bts::md::MDClient; -using bts::md::TradeSummarySignalDispatcher; -using bts::metrics::MetricsContainer; -using bts::orderman::DynamicOrderRegistry; -using bts::orderman::ExecutionGatewayProvider; -using bts::orderman::IExecutionGatewayProvider; -using bts::orderman::OrderServiceServer; -using bts::trace::PerfLog; -using std::unique_ptr; -using std::vector; - -static OrderServiceServer create_order_service_server( - ServiceContext &sc, - MDClient &mdclient, - DynamicOrderRegistry &dyn_order_registry, - MetricsContainer &stats, - PerfLog &perf_log, - TradeSummarySignalDispatcher &tss_dispatcher) { - vector> gw_pros; - gw_pros.push_back(std::make_unique( - &perf_log, mdclient.oracle(), config::get(), - [](const std::string &name) { - const spark::SparkDataDirectory data_dir; - return data_dir.load_config_json(name); - })); - return OrderServiceServer( - sc, mdclient, dyn_order_registry, std::move(gw_pros), stats, perf_log, - tss_dispatcher); -} - -static api::Security fake_binance_spot( - const std::string &sym, api::Security &sec) { - sec.mutable_binance()->set_security_desc(sym + "USDT"); - sec.mutable_spot(); - sec.set_symbol(sym); - sec.mutable_contract_spec()->set_low_tick(0.1); - sec.mutable_contract_spec()->set_high_tick(0.1); - return sec; -} - -static api::Security *fake_sec = nullptr; - -static void execute(bool test = true) { - using namespace bts; - LOG(Gen, Warn, - "------------------------------------ Sparkd " BTS_SPARK_VERSION_FULL - " launched " - "--------------------------------"); - if (test) { - std::shared_ptr er_p = - std::make_shared(); - bts::orderman::ExecutionReport &er = *er_p; - er.order_key.value() = 4; - auto &acc = er.account_name.value(); - acc[0] = 't'; - acc[1] = 'e'; - acc[2] = 's'; - acc[3] = 't'; - er.operator_id.value()[0] = 'b'; - er.operator_id.value()[1] = 't'; - er.operator_id.value()[2] = 's'; - if (fake_sec == nullptr) { - fake_sec = new api::Security(); - fake_binance_spot("BTC", *fake_sec); - } - er.security = fake_sec; - er.side = api::Side::SIDE_BUY; - er.time_in_force = api::orderman::TIME_IN_FORCE_GTC; - er.order_type = api::orderman::NATIVE_ORDER_TYPE_LIMIT; - er.exec_type = api::orderman::EXEC_TYPE_NEW; - er.order_status = api::orderman::NATIVE_ORDER_STATUS_PENDING_NEW; - er.manual_order_indicator = api::orderman::MANUAL_ORDER_INDICATOR_NO; - er.exchange_order_id = orderman::ExchangeOrderID64{7}; - er.price = bts::Price{87525.50}; - er.quantity = Quantity::create_new(1.2); - er.filled_quantity = Quantity{0}; - er.last_shares = Quantity{0}; - er.exchange = api::VENUE_BINANCE; - LOG_EXECUTION_REPORT(Info, er_p); - std::this_thread::sleep_for(std::chrono::milliseconds(100)); - return; - } - // Initializes curl for the application, and eventual cleanup in destructor - http::CurlSession global_curl_session; - auto qb_cfg = config::get().node(); - auto &ports = config::get(); - qb_cfg.set_my_port(ports.qbus_port()); - qbus::Quickbus quickbus(qb_cfg, qbus::QuickbusThreadOptions::DEFERRED_START); - api::ServiceContext sc(&quickbus); - - trace::PerfLog perf_log; - metrics::MetricsContainer stats; - metrics::publish_system_metrics(stats); - http::SparkWebServer webserver(sc, stats, perf_log, ports.config_port()); - - persistence::PersistenceServiceServer settings_saver(sc, "settings"); - user::AuthServiceServer login_server(sc); - - bts::md::MBOProcessor mbo_processor; - bts::md::TradeSummarySignalDispatcher tss_dispatcher; - md::cmds::Run::run(); - - api::synthetic::SyntheticSecurityService synthetic_service(sc); - bts::md::MDClient mdclient( - &utils::Dispatcher::background(), &synthetic_service, - &mbo_processor.reader()); - - bts::md::QueryServerPtr md_query_server( - bts::md::run_query_server(sc, mdclient, stats)); - - bts::md::MBOServiceServer mboserver( - sc, utils::Dispatcher::background(), mdclient); - bts::md::MarketDataService mdserver(mdclient, sc, stats); - - // initialize order plugins - orderman::DynamicOrderRegistry dyn_order_registry; - SparkServices plugin_services(dyn_order_registry); - plugin::init_plugins(plugin_services); - // finished initializing order plugins - - auto order_service_server = create_order_service_server( - sc, mdclient, dyn_order_registry, stats, perf_log, tss_dispatcher); - support::ErrorReportServer error_report_service(sc); - admin::AdminServiceServer admin_service(sc); - bts::md::auxiliary::MarketDataAuxiliaryServiceServer md_aux_server(sc); - bts::api::orderman::algo::AlgoDefinitionServiceServer algo_definition_server( - sc); - bts::analytics::AnalyticsServiceServer analytics_server(sc); - position::BasePositionServiceServer base_pos_server(sc); - position::MoneyFileServiceServer money_file_server(sc); - position::PositionServiceServer position_service(sc, mdclient); - position::MarginServiceServer margin_service(sc, mdclient); - metrics::ShellLatencyServer shell_latency_service( - sc, stats, utils::Dispatcher::background()); - bts::md::recording::MDRecorder::start_recording(mdclient); - - auto bg_health = - std::make_shared("spark_background_thread"); - utils::DispatcherTimer timer(utils::Dispatcher::background(), 5000, [=]() { - bg_health->increment(); - }); - timer.start(); - - utils::DispatcherTimer timer2(utils::Dispatcher::background(), 1000, [&]() { - perf_log.store_log_entries(); - }); - timer2.start(); - stats.publish(bg_health); - subprocess::run_all(); - - quickbus.run(); -} - -Run::Run() : CLI::App("Run default sparkd services", "run") { - callback([]() { execute(false); }); -} - -} // namespace bts::cmds diff --git a/src/server/sparkd/sparkd.vcxproj b/src/server/sparkd/sparkd.vcxproj deleted file mode 100644 index bd07ea4e6..000000000 --- a/src/server/sparkd/sparkd.vcxproj +++ /dev/null @@ -1,311 +0,0 @@ - - - - - Debug - x64 - - - Release - x64 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {bbbafd38-312d-4a8d-9af0-f2bdee72ce6f} - Linux - sparkd - 15.0 - Linux - 1.0 - Generic - {FC1A4D80-50E9-41DA-9192-61C0DBAA00D2} - - - - true - Makefile - /bts - - - false - Makefile - /bts/ - - - - - - - - $(ProjectDir)..\..\..\build\windows - $(ProjectDir)..\..\..\build\windows - $(RemoteRootDir)/src/server/$(ProjectName) - false - .;$(ProjectDir)..\..\..\build\gcc_debug\src;$(ProjectDir)..\..\..\src;$(ProjectDir)..\..\..\externals\linux\include - cd $(RemoteRootDir)/build/gcc_debug; make -j4 - cd $(RemoteRootDir)/build/gcc_debug; make -j4 --always-make - rm -rf $(RemoteRootDir)/build/windows; cd $(RemoteRootDir)/tools; ./setup_builds.sh - $(VS_LINUX_OUTPUT_PATH) - - - $(ProjectDir)..\..\..\build\windows - $(ProjectDir)..\..\..\build\windows - $(RemoteRootDir)/src/server/$(ProjectName) - false - .;$(ProjectDir)..\..\..\build\gcc_release\src;$(ProjectDir)..\..\..\src;$(ProjectDir)..\..\..\externals\linux\include - cd $(RemoteRootDir)/build/gcc_release; make -j4 - cd $(RemoteRootDir)/build/gcc_release; make -j4 --always-make - rm -rf $(RemoteRootDir)/build/windows; cd $(RemoteRootDir)/tools; ./setup_builds.sh - - - - - - $(IntDir)\..\$(MSBuildProjectName).log - - - - - $(IntDir)\..\$(MSBuildProjectName).log - - - - - \ No newline at end of file diff --git a/src/server/sparkd/sparkd.vcxproj.filters b/src/server/sparkd/sparkd.vcxproj.filters deleted file mode 100644 index ce11c08fc..000000000 --- a/src/server/sparkd/sparkd.vcxproj.filters +++ /dev/null @@ -1,801 +0,0 @@ - - - - - {f6f32940-c5ff-43b2-b5dc-6b9ef7e2c77e} - - - {1397b187-ab3c-473a-9cd2-091b5c88d09a} - - - {38c6fc02-5be7-4628-8c42-bceedf4f8749} - - - {1359608d-806d-49dd-9975-27063dc58214} - - - {0d3fb688-4c16-47c6-b9e4-ef5deb2b0d81} - - - {759c74db-e3f7-44a6-bd62-2365ec5d133c} - - - {007d16be-4d25-4aa9-9686-21273bd3fb07} - - - {8316c896-7c7a-476d-a5f1-962d7d3461a1} - - - {88c8730a-2a04-4d5f-9c67-dceae7b2435d} - - - {daeaaf78-c028-4983-b30a-1ac52e2554cc} - - - {8bfd5a57-c513-4b2a-87ef-6b22c9a6602b} - - - {06294411-3e3e-453b-8d1c-ac2b534a62da} - - - {f1c38d24-1ed7-4b5b-83f3-ce596696b47a} - - - {61f2964a-15d1-48c8-92be-cf17fa3d54e2} - - - {0ff412ed-2734-4d94-ab9b-847f9db1836f} - - - {27ecfe19-2370-4af6-bbae-7995e5fbe509} - - - {c17d3a8c-aaf6-403e-ac52-41b2bcf4b5ec} - - - {645ce6c2-6d87-4a01-acaf-4f1a1b405ac3} - - - {98a5b625-a8a9-4890-a9df-ec38ef5132d2} - - - {a8df66a9-ad70-460c-9a61-3ec9b30ed6ec} - - - {4e4b3d1d-a92f-45e0-a4fe-a337ba970375} - - - {93469cbf-4b49-4efe-96f4-5078a9c33ef5} - - - {c1df436f-5609-4627-8d44-25f660f2cf7d} - - - {0d1ec999-bb20-49b1-849a-ec4464ae38f7} - - - {c0f7866f-3289-4ca1-b4c2-d2d6837508c5} - - - {15d101c8-d0ee-44fd-a9e8-76866382a038} - - - {94683b4e-5a80-44d6-b19c-14308d00a4ec} - - - {61a9e6cf-a2e2-41a3-854d-63ace2026d50} - - - {643344f3-f3bc-405f-9657-3b84f77f5733} - - - {cf1a2666-118c-40f8-8d27-563cdc97e4cd} - - - {d17a6474-c0a5-44a0-8e1f-9992156d78c3} - - - {990ca1c7-67ca-4d58-a967-8c4a993c347f} - - - {223aefe5-f441-48e8-933e-c06d00d24d72} - - - {1abb48d1-8915-48c5-bac2-f2e5f6167b10} - - - {20c0d44d-5ab7-4e77-8624-d11ad6be2e6f} - - - {cd2a0ca7-5574-4143-9048-eb20920d5f85} - - - {468d3757-9d71-44dc-b7ab-f108e8ab73bb} - - - - - algo_man - - - fabric - - - fabric - - - fabric - - - fabric - - - fabric - - - fabric - - - fabric\tests - - - fabric\tests - - - jetfix\codec - - - jetfix\common - - - jetfix\connection - - - jetfix\connection - - - jetfix\connection - - - jetfix\gateway - - - jetfix\gateway - - - jetfix\gateway - - - jetfix\store - - - jetfix\store - - - jetfix\tests - - - jetfix\tests - - - jetfix\tests - - - jetfix\tests - - - jetfix\tests - - - jetfix\tests - - - orderman - - - orderman - - - orderman - - - orderman - - - orderman - - - orderman - - - orderman - - - orderman\spreader_orders - - - orderman\spreader_orders - - - orderman\components - - - orderman\components - - - orderman\components - - - orderman\components - - - orderman\components - - - orderman\events - - - orderman\events - - - orderman\events - - - orderman\native_orders - - - orderman\persistence - - - orderman\persistence - - - orderman\persistence - - - orderman\service - - - orderman\utils - - - orderman\utils - - - persistence - - - persistence - - - persistence - - - persistence\tests - - - risk_limits - - - risk_limits - - - risk_limits - - - risk_limits - - - risk_limits - - - risk_limits\tests - - - setup - - - setup - - - spreader - - - spreader - - - spreader - - - spreader - - - spreader - - - spreader - - - testing - - - user - - - md - - - md\platforms\mdp3_onixs - - - md\platforms\mdp3_onixs - - - md\platforms\mdp3_onixs - - - md\platforms\mdp3_onixs\tests - - - md\platforms\celoxica - - - md\platforms\celoxica - - - md\platforms\celoxica\tests - - - securities - - - cmds - - - cmds - - - cmds - - - cmds - - - cmds - - - cmds - - - - - algo_man - - - fabric - - - fabric - - - fabric - - - fabric - - - fabric - - - fabric - - - fabric - - - fabric - - - fabric - - - fabric - - - jetfix - - - jetfix\codec - - - jetfix\codec - - - jetfix\codec - - - jetfix\codec - - - jetfix\codec - - - jetfix\codec - - - jetfix\codec - - - jetfix\codec - - - jetfix\codec - - - jetfix\codec - - - jetfix\codec - - - jetfix\codec - - - jetfix\codec - - - jetfix\codec - - - jetfix\codec - - - jetfix\codec - - - jetfix\codec - - - jetfix\codec - - - jetfix\codec - - - jetfix\codec - - - jetfix\common - - - jetfix\common - - - jetfix\common - - - jetfix\common - - - jetfix\common - - - jetfix\connection - - - jetfix\connection - - - jetfix\connection - - - jetfix\connection - - - jetfix\gateway - - - jetfix\gateway - - - jetfix\gateway - - - jetfix\gateway - - - jetfix\gateway - - - jetfix\store - - - jetfix\store - - - jetfix\store - - - orderman - - - orderman - - - orderman - - - orderman - - - orderman - - - orderman - - - orderman - - - orderman - - - orderman - - - orderman - - - orderman\spreader_orders - - - orderman\spreader_orders - - - orderman\spreader_orders - - - orderman\spreader_orders - - - orderman\components - - - orderman\components - - - orderman\components - - - orderman\components - - - orderman\components - - - orderman\components - - - orderman\components - - - orderman\events - - - orderman\events - - - orderman\events - - - orderman\events - - - orderman\events - - - orderman\events - - - orderman\events - - - orderman\events - - - orderman\events - - - orderman\events - - - orderman\events - - - orderman\events - - - orderman\events - - - orderman\events - - - orderman\events - - - orderman\native_orders - - - orderman\native_orders - - - orderman\native_orders - - - orderman\native_orders - - - orderman\persistence - - - orderman\persistence - - - orderman\persistence - - - orderman\service - - - orderman\utils - - - orderman\md - - - persistence - - - persistence - - - persistence - - - risk_limits - - - risk_limits - - - risk_limits - - - risk_limits - - - risk_limits - - - risk_limits - - - setup - - - setup - - - spreader - - - spreader - - - spreader - - - spreader - - - spreader - - - spreader - - - spreader - - - spreader - - - spreader - - - spreader - - - spreader - - - testing - - - user - - - md - - - md\platforms\mdp3_onixs - - - md\platforms\mdp3_onixs - - - md\platforms\mdp3_onixs - - - md\platforms\mdp3_onixs - - - md\platforms\mdp3_onixs - - - md\platforms\celoxica - - - md\platforms\celoxica - - - md\platforms\celoxica - - - md\platforms\celoxica - - - securities - - - cmds - - - cmds - - - cmds - - - cmds - - - cmds - - - cmds - - - cmds - - - orderman\utils - - - - - jetfix\tests - - - orderman\doc - - - orderman\doc - - - md\platforms\mdp3_onixs\licenses - - - - \ No newline at end of file diff --git a/src/server/sparkd/sparkd.vcxproj.user b/src/server/sparkd/sparkd.vcxproj.user deleted file mode 100644 index 3141fab1e..000000000 --- a/src/server/sparkd/sparkd.vcxproj.user +++ /dev/null @@ -1,13 +0,0 @@ - - - - $(RemoteRootDir)/build/gcc_debug/src/server/sparkd/ - gdb - true - LinuxDebugger - test *.* - - - false - - \ No newline at end of file diff --git a/tools/sparkd.sh b/tools/sparkd.sh index 2757e8d33..3f77b4a29 100755 --- a/tools/sparkd.sh +++ b/tools/sparkd.sh @@ -93,7 +93,7 @@ if [ -z "$compiler" ]; then fi this_dir="$(readlink -f "$(dirname "${BASH_SOURCE[0]}")")" -sparkd_dir="$(realpath "$this_dir/../build/sparkd-${build_type}-${compiler}/server")" +sparkd_dir="$(realpath "$this_dir/../build/sparkd-${build_type}-${compiler}/src/app_sparkd")" roll_over_log echo "Running sparkd ${build_type} ${compiler}" echo "------------------------------------------------------------------------"