From dbc7ba5598914143134bdfbc65b89a6e0e4e47dc Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Mon, 4 Dec 2017 12:36:53 -0500 Subject: [PATCH] Refactor. --- src/server/sparkd/CMakeDeps.cmake | 2 +- src/server/sparkd/cmds/Benchmark.cpp | 4 ++-- src/server/sparkd/{orderman2 => }/mercury/actors/Actor.cpp | 4 ++-- src/server/sparkd/{orderman2 => }/mercury/actors/Actor.h | 6 +++--- src/server/sparkd/{orderman2 => }/mercury/actors/ActorPtr.h | 0 src/server/sparkd/{orderman2 => }/mercury/actors/Poller.cpp | 0 src/server/sparkd/{orderman2 => }/mercury/actors/Poller.h | 2 +- .../{orderman2 => }/mercury/broker/AsyncEventBroker.cpp | 0 .../{orderman2 => }/mercury/broker/AsyncEventBroker.h | 4 ++-- .../{orderman2 => }/mercury/broker/CoreEventBroker.cpp | 4 ++-- .../sparkd/{orderman2 => }/mercury/broker/CoreEventBroker.h | 2 +- .../sparkd/{orderman2 => }/mercury/broker/IEventBroker.cpp | 0 .../sparkd/{orderman2 => }/mercury/broker/IEventBroker.h | 4 ++-- src/server/sparkd/{orderman2 => }/mercury/events/Event.h | 2 +- .../sparkd/{orderman2 => }/mercury/events/PollEvent.h | 2 +- src/server/sparkd/{orderman2 => }/mercury/events/Update.h | 2 +- .../{orderman2 => }/mercury/mercury_utils/Executor.cpp | 0 .../sparkd/{orderman2 => }/mercury/mercury_utils/Executor.h | 6 +++--- .../{orderman2 => }/mercury/mercury_utils/FatWrapper.h | 0 .../mercury/mercury_utils/mercury_common.cpp | 0 .../{orderman2 => }/mercury/mercury_utils/mercury_common.h | 2 +- .../sparkd/{orderman2 => }/mercury/synopsys/AppendVector.h | 4 ++-- .../sparkd/{orderman2 => }/mercury/synopsys/CacheLast.h | 4 ++-- .../{orderman2 => }/mercury/synopsys/ISynopsysBuilder.h | 2 +- .../sparkd/{orderman2 => }/mercury/synopsys/NoSynopsis.h | 4 ++-- .../{orderman2 => }/mercury/synopsys/SynopsisBuilder.cpp | 0 .../{orderman2 => }/mercury/synopsys/SynopsisBuilder.h | 2 +- src/server/sparkd/{orderman2 => }/mercury/topics/ITopic.cpp | 0 src/server/sparkd/{orderman2 => }/mercury/topics/ITopic.h | 2 +- src/server/sparkd/{orderman2 => }/mercury/topics/Topic.h | 0 src/server/sparkd/orderman2/actors/SecuritySrc.cpp | 2 +- src/server/sparkd/orderman2/actors/SecuritySrc.h | 2 +- src/server/sparkd/orderman2/events/NewSecuritiesEvent.h | 4 ++-- src/server/sparkd/orderman2/tests/fat_wrapper_tests.cpp | 2 +- 34 files changed, 37 insertions(+), 37 deletions(-) rename src/server/sparkd/{orderman2 => }/mercury/actors/Actor.cpp (88%) rename src/server/sparkd/{orderman2 => }/mercury/actors/Actor.h (96%) rename src/server/sparkd/{orderman2 => }/mercury/actors/ActorPtr.h (100%) rename src/server/sparkd/{orderman2 => }/mercury/actors/Poller.cpp (100%) rename src/server/sparkd/{orderman2 => }/mercury/actors/Poller.h (85%) rename src/server/sparkd/{orderman2 => }/mercury/broker/AsyncEventBroker.cpp (100%) rename src/server/sparkd/{orderman2 => }/mercury/broker/AsyncEventBroker.h (98%) rename src/server/sparkd/{orderman2 => }/mercury/broker/CoreEventBroker.cpp (99%) rename src/server/sparkd/{orderman2 => }/mercury/broker/CoreEventBroker.h (94%) rename src/server/sparkd/{orderman2 => }/mercury/broker/IEventBroker.cpp (100%) rename src/server/sparkd/{orderman2 => }/mercury/broker/IEventBroker.h (82%) rename src/server/sparkd/{orderman2 => }/mercury/events/Event.h (67%) rename src/server/sparkd/{orderman2 => }/mercury/events/PollEvent.h (70%) rename src/server/sparkd/{orderman2 => }/mercury/events/Update.h (71%) rename src/server/sparkd/{orderman2 => }/mercury/mercury_utils/Executor.cpp (100%) rename src/server/sparkd/{orderman2 => }/mercury/mercury_utils/Executor.h (83%) rename src/server/sparkd/{orderman2 => }/mercury/mercury_utils/FatWrapper.h (100%) rename src/server/sparkd/{orderman2 => }/mercury/mercury_utils/mercury_common.cpp (100%) rename src/server/sparkd/{orderman2 => }/mercury/mercury_utils/mercury_common.h (92%) rename src/server/sparkd/{orderman2 => }/mercury/synopsys/AppendVector.h (82%) rename src/server/sparkd/{orderman2 => }/mercury/synopsys/CacheLast.h (77%) rename src/server/sparkd/{orderman2 => }/mercury/synopsys/ISynopsysBuilder.h (79%) rename src/server/sparkd/{orderman2 => }/mercury/synopsys/NoSynopsis.h (62%) rename src/server/sparkd/{orderman2 => }/mercury/synopsys/SynopsisBuilder.cpp (100%) rename src/server/sparkd/{orderman2 => }/mercury/synopsys/SynopsisBuilder.h (72%) rename src/server/sparkd/{orderman2 => }/mercury/topics/ITopic.cpp (100%) rename src/server/sparkd/{orderman2 => }/mercury/topics/ITopic.h (81%) rename src/server/sparkd/{orderman2 => }/mercury/topics/Topic.h (100%) diff --git a/src/server/sparkd/CMakeDeps.cmake b/src/server/sparkd/CMakeDeps.cmake index 60ee2ffef..6b4d0f038 100644 --- a/src/server/sparkd/CMakeDeps.cmake +++ b/src/server/sparkd/CMakeDeps.cmake @@ -1 +1 @@ -set(sources ;cmds/Benchmark.cpp;cmds/CmdRegistry.cpp;cmds/ConfigCheck.cpp;cmds/Help.cpp;cmds/Md.cpp;cmds/Run.cpp;cmds/RunSim.cpp;cmds/Test.cpp;cmds/TestCeloxica.cpp;cmds/TestOrderman.cpp;event_grid/EventNode.cpp;exchange_sim/ExchangeSim.cpp;exchange_sim/ExchangeSimApplication.cpp;exchange_sim/Market.cpp;jetfix/codec/FIXArray.cpp;jetfix/common/OutFIX.cpp;jetfix/connection/AsyncReader.cpp;jetfix/connection/IConnection.cpp;jetfix/connection/SocketConnection.cpp;jetfix/gateway/CoreGateway.cpp;jetfix/gateway/JetFIXGateway.cpp;jetfix/gateway/Session.cpp;jetfix/store/FIXFileStore.cpp;jetfix/store/session_name.cpp;jetfix/tests/async_reader_tests.cpp;jetfix/tests/decoding_tests.cpp;jetfix/tests/fix_encoding_stream_tests.cpp;jetfix/tests/fix_fragment_tests.cpp;jetfix/tests/jetfix_performance_tests.cpp;jetfix/tests/store_tests.cpp;main.cpp;md/platforms/celoxica/CXListener.cpp;md/platforms/celoxica/CXMain.cpp;md/platforms/celoxica/tests/cx_tests.cpp;md/platforms/mdp3_onixs/MDP3Listener.cpp;md/platforms/mdp3_onixs/MDP3Main.cpp;md/platforms/mdp3_onixs/MDP3Utils.cpp;md/platforms/mdp3_onixs/tests/mdp3_tests.cpp;md/run_md.cpp;orderman/components/FillRecorder.cpp;orderman/components/Gateway.cpp;orderman/components/MDSource.cpp;orderman/components/NativeOrderMan.cpp;orderman/components/OrderRecorder.cpp;orderman/components/SpreaderOrderMan.cpp;orderman/events/ExecutionReport.cpp;orderman/events/NativeOrderStateChange.cpp;orderman/events/SpreaderOrderStateChange.cpp;orderman/events/TimeChange.cpp;orderman/native_orders/NativeOrder.cpp;orderman/native_orders/NativeOrderBuilder.cpp;orderman/native_orders/NativeOrderFactory.cpp;orderman/persistence/FillDB.cpp;orderman/persistence/OrderDB.cpp;orderman/persistence/gen_order_id.cpp;orderman/service/OrderServiceServer.cpp;orderman/spreader_orders/SpreaderOrder.cpp;orderman/spreader_orders/SpreaderOrderBase.cpp;orderman/spreader_orders/spreader_states/SpreaderEndStateWorker.cpp;orderman/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp;orderman/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.cpp;orderman/spreader_orders/spreader_states/SpreaderWaitingForFirstConnStateWorker.cpp;orderman/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp;orderman/tests/spreader_tests.cpp;orderman/utils/fix_order_codec.cpp;orderman/utils/orderman_utils.cpp;orderman2/actors/SecuritySrc.cpp;orderman2/factory/OrderBuilder.cpp;orderman2/factory/OrderFactory.cpp;orderman2/mercury/actors/Actor.cpp;orderman2/mercury/actors/Poller.cpp;orderman2/mercury/broker/AsyncEventBroker.cpp;orderman2/mercury/broker/CoreEventBroker.cpp;orderman2/mercury/broker/IEventBroker.cpp;orderman2/mercury/mercury_utils/Executor.cpp;orderman2/mercury/mercury_utils/mercury_common.cpp;orderman2/mercury/synopsys/SynopsisBuilder.cpp;orderman2/mercury/topics/ITopic.cpp;orderman2/orders/Order.cpp;orderman2/server/OrderServiceServer2.cpp;orderman2/tests/fat_wrapper_tests.cpp;persistence/IStore.cpp;persistence/PersistenceServiceServer.cpp;persistence/SqliteStore.cpp;persistence/tests/PersistenceServiceTests.cpp;position/IPositionObserver.cpp;position/MarginServiceCore.cpp;position/PositionServiceCore.cpp;risk_limits/AccountRiskLimiter.cpp;risk_limits/IRiskLimitObserver.cpp;risk_limits/OperatorRiskLimiter.cpp;risk_limits/RiskLimitManager.cpp;risk_limits/RiskLimiter.cpp;risk_limits/SymbolKey.cpp;risk_limits/tests/RiskLimitsTests.cpp;securities/SecurityDB.cpp;spreader/SingleFillHedger.cpp;spreader/SingleLegQuoter.cpp;spreader/hedger/hedger_states/HedgerEndStateWorker.cpp;spreader/hedger/hedger_states/HedgerStartStateWorker.cpp;spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.cpp;spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelledStateWorker.cpp;spreader/hedger/hedger_states/HedgerWaitingForFirstAckStateWorker.cpp;spreader/hedger/hedger_states/HedgerWorkingStateWorker.cpp;spreader/quoter/quoter_states/QuoterEndStateWorker.cpp;spreader/quoter/quoter_states/QuoterStartStateWorker.cpp;spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.cpp;spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.cpp;spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.cpp;spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.cpp;spreader/quoter/quoter_states/QuoterWorkingStateWorker.cpp;testing/catch_test_runner.cpp;user/AccountServiceServer.cpp;user/UserServiceServer.cpp;user/tests/UserAndAccountTests.cpp) \ No newline at end of file +set(sources ;cmds/Benchmark.cpp;cmds/CmdRegistry.cpp;cmds/ConfigCheck.cpp;cmds/Help.cpp;cmds/Md.cpp;cmds/Run.cpp;cmds/RunSim.cpp;cmds/Test.cpp;cmds/TestCeloxica.cpp;cmds/TestOrderman.cpp;event_grid/EventNode.cpp;exchange_sim/ExchangeSim.cpp;exchange_sim/ExchangeSimApplication.cpp;exchange_sim/Market.cpp;jetfix/codec/FIXArray.cpp;jetfix/common/OutFIX.cpp;jetfix/connection/AsyncReader.cpp;jetfix/connection/IConnection.cpp;jetfix/connection/SocketConnection.cpp;jetfix/gateway/CoreGateway.cpp;jetfix/gateway/JetFIXGateway.cpp;jetfix/gateway/Session.cpp;jetfix/store/FIXFileStore.cpp;jetfix/store/session_name.cpp;jetfix/tests/async_reader_tests.cpp;jetfix/tests/decoding_tests.cpp;jetfix/tests/fix_encoding_stream_tests.cpp;jetfix/tests/fix_fragment_tests.cpp;jetfix/tests/jetfix_performance_tests.cpp;jetfix/tests/store_tests.cpp;main.cpp;md/platforms/celoxica/CXListener.cpp;md/platforms/celoxica/CXMain.cpp;md/platforms/celoxica/tests/cx_tests.cpp;md/platforms/mdp3_onixs/MDP3Listener.cpp;md/platforms/mdp3_onixs/MDP3Main.cpp;md/platforms/mdp3_onixs/MDP3Utils.cpp;md/platforms/mdp3_onixs/tests/mdp3_tests.cpp;md/run_md.cpp;mercury/actors/Actor.cpp;mercury/actors/Poller.cpp;mercury/broker/AsyncEventBroker.cpp;mercury/broker/CoreEventBroker.cpp;mercury/broker/IEventBroker.cpp;mercury/mercury_utils/Executor.cpp;mercury/mercury_utils/mercury_common.cpp;mercury/synopsys/SynopsisBuilder.cpp;mercury/topics/ITopic.cpp;orderman/components/FillRecorder.cpp;orderman/components/Gateway.cpp;orderman/components/MDSource.cpp;orderman/components/NativeOrderMan.cpp;orderman/components/OrderRecorder.cpp;orderman/components/SpreaderOrderMan.cpp;orderman/events/ExecutionReport.cpp;orderman/events/NativeOrderStateChange.cpp;orderman/events/SpreaderOrderStateChange.cpp;orderman/events/TimeChange.cpp;orderman/native_orders/NativeOrder.cpp;orderman/native_orders/NativeOrderBuilder.cpp;orderman/native_orders/NativeOrderFactory.cpp;orderman/persistence/FillDB.cpp;orderman/persistence/OrderDB.cpp;orderman/persistence/gen_order_id.cpp;orderman/service/OrderServiceServer.cpp;orderman/spreader_orders/SpreaderOrder.cpp;orderman/spreader_orders/SpreaderOrderBase.cpp;orderman/spreader_orders/spreader_states/SpreaderEndStateWorker.cpp;orderman/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp;orderman/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.cpp;orderman/spreader_orders/spreader_states/SpreaderWaitingForFirstConnStateWorker.cpp;orderman/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp;orderman/tests/spreader_tests.cpp;orderman/utils/fix_order_codec.cpp;orderman/utils/orderman_utils.cpp;orderman2/actors/SecuritySrc.cpp;orderman2/factory/OrderBuilder.cpp;orderman2/factory/OrderFactory.cpp;orderman2/orders/Order.cpp;orderman2/server/OrderServiceServer2.cpp;orderman2/tests/fat_wrapper_tests.cpp;persistence/IStore.cpp;persistence/PersistenceServiceServer.cpp;persistence/SqliteStore.cpp;persistence/tests/PersistenceServiceTests.cpp;position/IPositionObserver.cpp;position/MarginServiceCore.cpp;position/PositionServiceCore.cpp;risk_limits/AccountRiskLimiter.cpp;risk_limits/IRiskLimitObserver.cpp;risk_limits/OperatorRiskLimiter.cpp;risk_limits/RiskLimitManager.cpp;risk_limits/RiskLimiter.cpp;risk_limits/SymbolKey.cpp;risk_limits/tests/RiskLimitsTests.cpp;securities/SecurityDB.cpp;spreader/SingleFillHedger.cpp;spreader/SingleLegQuoter.cpp;spreader/hedger/hedger_states/HedgerEndStateWorker.cpp;spreader/hedger/hedger_states/HedgerStartStateWorker.cpp;spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.cpp;spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelledStateWorker.cpp;spreader/hedger/hedger_states/HedgerWaitingForFirstAckStateWorker.cpp;spreader/hedger/hedger_states/HedgerWorkingStateWorker.cpp;spreader/quoter/quoter_states/QuoterEndStateWorker.cpp;spreader/quoter/quoter_states/QuoterStartStateWorker.cpp;spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.cpp;spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.cpp;spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.cpp;spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.cpp;spreader/quoter/quoter_states/QuoterWorkingStateWorker.cpp;testing/catch_test_runner.cpp;user/AccountServiceServer.cpp;user/UserServiceServer.cpp;user/tests/UserAndAccountTests.cpp) \ No newline at end of file diff --git a/src/server/sparkd/cmds/Benchmark.cpp b/src/server/sparkd/cmds/Benchmark.cpp index 33cae9dbd..2c389e8b1 100644 --- a/src/server/sparkd/cmds/Benchmark.cpp +++ b/src/server/sparkd/cmds/Benchmark.cpp @@ -6,8 +6,8 @@ #include "server/sparkd/orderman/persistence/gen_order_id.h" #include "lib/api/services/OrderService.pb.h" #include "lib/utils/Uuid.h" -#include "server/sparkd/orderman2/mercury/mercury_utils/FatWrapper.h" -#include "server/sparkd/orderman2/mercury/broker/CoreEventBroker.h" +#include "server/sparkd/mercury/mercury_utils/FatWrapper.h" +#include "server/sparkd/mercury/broker/CoreEventBroker.h" #include #include diff --git a/src/server/sparkd/orderman2/mercury/actors/Actor.cpp b/src/server/sparkd/mercury/actors/Actor.cpp similarity index 88% rename from src/server/sparkd/orderman2/mercury/actors/Actor.cpp rename to src/server/sparkd/mercury/actors/Actor.cpp index 6c49d4029..ee1f3ab35 100644 --- a/src/server/sparkd/orderman2/mercury/actors/Actor.cpp +++ b/src/server/sparkd/mercury/actors/Actor.cpp @@ -1,8 +1,8 @@ #include "Actor.h" #include "server/sparkd/orderman/md/Book.h" #include "lib/domain_model/common.h" -#include "server/sparkd/orderman2/mercury/synopsys/CacheLast.h" -#include "server/sparkd/orderman2/mercury/events/Event.h" +#include "server/sparkd/mercury/synopsys/CacheLast.h" +#include "server/sparkd/mercury/events/Event.h" namespace bts { namespace mercury { diff --git a/src/server/sparkd/orderman2/mercury/actors/Actor.h b/src/server/sparkd/mercury/actors/Actor.h similarity index 96% rename from src/server/sparkd/orderman2/mercury/actors/Actor.h rename to src/server/sparkd/mercury/actors/Actor.h index 4bc0276cf..f8be58a7f 100644 --- a/src/server/sparkd/orderman2/mercury/actors/Actor.h +++ b/src/server/sparkd/mercury/actors/Actor.h @@ -5,9 +5,9 @@ #include "lib/utils/bts_assert.h" #include "lib/utils/warn_ctrl.h" -#include "server/sparkd/orderman2/mercury/broker/AsyncEventBroker.h" -#include "server/sparkd/orderman2/mercury/topics/Topic.h" -#include "server/sparkd/orderman2/mercury/events/Update.h" +#include "server/sparkd/mercury/broker/AsyncEventBroker.h" +#include "server/sparkd/mercury/topics/Topic.h" +#include "server/sparkd/mercury/events/Update.h" namespace bts { namespace mercury { diff --git a/src/server/sparkd/orderman2/mercury/actors/ActorPtr.h b/src/server/sparkd/mercury/actors/ActorPtr.h similarity index 100% rename from src/server/sparkd/orderman2/mercury/actors/ActorPtr.h rename to src/server/sparkd/mercury/actors/ActorPtr.h diff --git a/src/server/sparkd/orderman2/mercury/actors/Poller.cpp b/src/server/sparkd/mercury/actors/Poller.cpp similarity index 100% rename from src/server/sparkd/orderman2/mercury/actors/Poller.cpp rename to src/server/sparkd/mercury/actors/Poller.cpp diff --git a/src/server/sparkd/orderman2/mercury/actors/Poller.h b/src/server/sparkd/mercury/actors/Poller.h similarity index 85% rename from src/server/sparkd/orderman2/mercury/actors/Poller.h rename to src/server/sparkd/mercury/actors/Poller.h index 5bfd248f8..228b2b1ba 100644 --- a/src/server/sparkd/orderman2/mercury/actors/Poller.h +++ b/src/server/sparkd/mercury/actors/Poller.h @@ -1,7 +1,7 @@ #pragma once #include -#include "server/sparkd/orderman2/mercury/events/PollEvent.h" +#include "server/sparkd/mercury/events/PollEvent.h" #include "Actor.h" namespace bts { diff --git a/src/server/sparkd/orderman2/mercury/broker/AsyncEventBroker.cpp b/src/server/sparkd/mercury/broker/AsyncEventBroker.cpp similarity index 100% rename from src/server/sparkd/orderman2/mercury/broker/AsyncEventBroker.cpp rename to src/server/sparkd/mercury/broker/AsyncEventBroker.cpp diff --git a/src/server/sparkd/orderman2/mercury/broker/AsyncEventBroker.h b/src/server/sparkd/mercury/broker/AsyncEventBroker.h similarity index 98% rename from src/server/sparkd/orderman2/mercury/broker/AsyncEventBroker.h rename to src/server/sparkd/mercury/broker/AsyncEventBroker.h index 439441072..8b92e3f58 100644 --- a/src/server/sparkd/orderman2/mercury/broker/AsyncEventBroker.h +++ b/src/server/sparkd/mercury/broker/AsyncEventBroker.h @@ -7,8 +7,8 @@ #include #include -#include "server/sparkd/orderman2/mercury/mercury_utils/FatWrapper.h" -#include "server/sparkd/orderman2/mercury/broker/CoreEventBroker.h" +#include "server/sparkd/mercury/mercury_utils/FatWrapper.h" +#include "server/sparkd/mercury/broker/CoreEventBroker.h" namespace bts { namespace mercury { diff --git a/src/server/sparkd/orderman2/mercury/broker/CoreEventBroker.cpp b/src/server/sparkd/mercury/broker/CoreEventBroker.cpp similarity index 99% rename from src/server/sparkd/orderman2/mercury/broker/CoreEventBroker.cpp rename to src/server/sparkd/mercury/broker/CoreEventBroker.cpp index fed6a12e7..3016fd00f 100644 --- a/src/server/sparkd/orderman2/mercury/broker/CoreEventBroker.cpp +++ b/src/server/sparkd/mercury/broker/CoreEventBroker.cpp @@ -2,8 +2,8 @@ #include "lib/utils/Puid.h" #include "lib/utils/bts_assert.h" -#include "server/sparkd/orderman2/mercury/synopsys/ISynopsysBuilder.h" -#include "server/sparkd/orderman2/mercury/topics/ITopic.h" +#include "server/sparkd/mercury/synopsys/ISynopsysBuilder.h" +#include "server/sparkd/mercury/topics/ITopic.h" #include #include diff --git a/src/server/sparkd/orderman2/mercury/broker/CoreEventBroker.h b/src/server/sparkd/mercury/broker/CoreEventBroker.h similarity index 94% rename from src/server/sparkd/orderman2/mercury/broker/CoreEventBroker.h rename to src/server/sparkd/mercury/broker/CoreEventBroker.h index 9732deda2..67247c132 100644 --- a/src/server/sparkd/orderman2/mercury/broker/CoreEventBroker.h +++ b/src/server/sparkd/mercury/broker/CoreEventBroker.h @@ -1,7 +1,7 @@ #pragma once #include -#include "server/sparkd/orderman2/mercury/broker/IEventBroker.h" +#include "server/sparkd/mercury/broker/IEventBroker.h" namespace bts { namespace mercury { diff --git a/src/server/sparkd/orderman2/mercury/broker/IEventBroker.cpp b/src/server/sparkd/mercury/broker/IEventBroker.cpp similarity index 100% rename from src/server/sparkd/orderman2/mercury/broker/IEventBroker.cpp rename to src/server/sparkd/mercury/broker/IEventBroker.cpp diff --git a/src/server/sparkd/orderman2/mercury/broker/IEventBroker.h b/src/server/sparkd/mercury/broker/IEventBroker.h similarity index 82% rename from src/server/sparkd/orderman2/mercury/broker/IEventBroker.h rename to src/server/sparkd/mercury/broker/IEventBroker.h index c2a498a0b..34dadaf05 100644 --- a/src/server/sparkd/orderman2/mercury/broker/IEventBroker.h +++ b/src/server/sparkd/mercury/broker/IEventBroker.h @@ -1,8 +1,8 @@ #pragma once #include -#include "server/sparkd/orderman2/mercury/mercury_utils/mercury_common.h" -#include "server/sparkd/orderman2/mercury/topics/ITopic.h" +#include "server/sparkd/mercury/mercury_utils/mercury_common.h" +#include "server/sparkd/mercury/topics/ITopic.h" namespace bts { namespace mercury { diff --git a/src/server/sparkd/orderman2/mercury/events/Event.h b/src/server/sparkd/mercury/events/Event.h similarity index 67% rename from src/server/sparkd/orderman2/mercury/events/Event.h rename to src/server/sparkd/mercury/events/Event.h index 8b6790a3b..42cefc162 100644 --- a/src/server/sparkd/orderman2/mercury/events/Event.h +++ b/src/server/sparkd/mercury/events/Event.h @@ -1,7 +1,7 @@ #pragma once #include -#include "server/sparkd/orderman2/mercury/synopsys/NoSynopsis.h" +#include "server/sparkd/mercury/synopsys/NoSynopsis.h" namespace bts { namespace mercury { diff --git a/src/server/sparkd/orderman2/mercury/events/PollEvent.h b/src/server/sparkd/mercury/events/PollEvent.h similarity index 70% rename from src/server/sparkd/orderman2/mercury/events/PollEvent.h rename to src/server/sparkd/mercury/events/PollEvent.h index 2c68703fa..6c337c54f 100644 --- a/src/server/sparkd/orderman2/mercury/events/PollEvent.h +++ b/src/server/sparkd/mercury/events/PollEvent.h @@ -1,7 +1,7 @@ #pragma once #include -#include "server/sparkd/orderman2/mercury/events/Event.h" +#include "server/sparkd/mercury/events/Event.h" namespace bts { namespace mercury { diff --git a/src/server/sparkd/orderman2/mercury/events/Update.h b/src/server/sparkd/mercury/events/Update.h similarity index 71% rename from src/server/sparkd/orderman2/mercury/events/Update.h rename to src/server/sparkd/mercury/events/Update.h index bd8d5b8ba..d6be5f158 100644 --- a/src/server/sparkd/orderman2/mercury/events/Update.h +++ b/src/server/sparkd/mercury/events/Update.h @@ -1,7 +1,7 @@ #pragma once #include -#include "server/sparkd/orderman2/mercury/mercury_utils/mercury_common.h" +#include "server/sparkd/mercury/mercury_utils/mercury_common.h" namespace bts { namespace mercury { diff --git a/src/server/sparkd/orderman2/mercury/mercury_utils/Executor.cpp b/src/server/sparkd/mercury/mercury_utils/Executor.cpp similarity index 100% rename from src/server/sparkd/orderman2/mercury/mercury_utils/Executor.cpp rename to src/server/sparkd/mercury/mercury_utils/Executor.cpp diff --git a/src/server/sparkd/orderman2/mercury/mercury_utils/Executor.h b/src/server/sparkd/mercury/mercury_utils/Executor.h similarity index 83% rename from src/server/sparkd/orderman2/mercury/mercury_utils/Executor.h rename to src/server/sparkd/mercury/mercury_utils/Executor.h index 315ad4828..1f009f15f 100644 --- a/src/server/sparkd/orderman2/mercury/mercury_utils/Executor.h +++ b/src/server/sparkd/mercury/mercury_utils/Executor.h @@ -3,9 +3,9 @@ #include #include -#include "server/sparkd/orderman2/mercury/broker/AsyncEventBroker.h" -#include "server/sparkd/orderman2/mercury/actors/ActorPtr.h" -#include "server/sparkd/orderman2/mercury/actors/Actor.h" +#include "server/sparkd/mercury/broker/AsyncEventBroker.h" +#include "server/sparkd/mercury/actors/ActorPtr.h" +#include "server/sparkd/mercury/actors/Actor.h" namespace bts { namespace mercury { diff --git a/src/server/sparkd/orderman2/mercury/mercury_utils/FatWrapper.h b/src/server/sparkd/mercury/mercury_utils/FatWrapper.h similarity index 100% rename from src/server/sparkd/orderman2/mercury/mercury_utils/FatWrapper.h rename to src/server/sparkd/mercury/mercury_utils/FatWrapper.h diff --git a/src/server/sparkd/orderman2/mercury/mercury_utils/mercury_common.cpp b/src/server/sparkd/mercury/mercury_utils/mercury_common.cpp similarity index 100% rename from src/server/sparkd/orderman2/mercury/mercury_utils/mercury_common.cpp rename to src/server/sparkd/mercury/mercury_utils/mercury_common.cpp diff --git a/src/server/sparkd/orderman2/mercury/mercury_utils/mercury_common.h b/src/server/sparkd/mercury/mercury_utils/mercury_common.h similarity index 92% rename from src/server/sparkd/orderman2/mercury/mercury_utils/mercury_common.h rename to src/server/sparkd/mercury/mercury_utils/mercury_common.h index 15ec6c56b..a789705e5 100644 --- a/src/server/sparkd/orderman2/mercury/mercury_utils/mercury_common.h +++ b/src/server/sparkd/mercury/mercury_utils/mercury_common.h @@ -3,7 +3,7 @@ #include #include #include -#include "server/sparkd/orderman2/mercury/mercury_utils/FatWrapper.h" +#include "server/sparkd/mercury/mercury_utils/FatWrapper.h" #include "lib/utils/ValueWrapper.h" namespace bts { diff --git a/src/server/sparkd/orderman2/mercury/synopsys/AppendVector.h b/src/server/sparkd/mercury/synopsys/AppendVector.h similarity index 82% rename from src/server/sparkd/orderman2/mercury/synopsys/AppendVector.h rename to src/server/sparkd/mercury/synopsys/AppendVector.h index b94e9038f..9e9d64210 100644 --- a/src/server/sparkd/orderman2/mercury/synopsys/AppendVector.h +++ b/src/server/sparkd/mercury/synopsys/AppendVector.h @@ -1,8 +1,8 @@ #pragma once #include -#include "server/sparkd/orderman2/mercury/synopsys/ISynopsysBuilder.h" -#include "server/sparkd/orderman2/mercury/mercury_utils/mercury_common.h" +#include "server/sparkd/mercury/synopsys/ISynopsysBuilder.h" +#include "server/sparkd/mercury/mercury_utils/mercury_common.h" namespace bts { namespace mercury { diff --git a/src/server/sparkd/orderman2/mercury/synopsys/CacheLast.h b/src/server/sparkd/mercury/synopsys/CacheLast.h similarity index 77% rename from src/server/sparkd/orderman2/mercury/synopsys/CacheLast.h rename to src/server/sparkd/mercury/synopsys/CacheLast.h index a0db9e2c1..26b17caf3 100644 --- a/src/server/sparkd/orderman2/mercury/synopsys/CacheLast.h +++ b/src/server/sparkd/mercury/synopsys/CacheLast.h @@ -1,8 +1,8 @@ #pragma once #include -#include "server/sparkd/orderman2/mercury/synopsys/ISynopsysBuilder.h" -#include "server/sparkd/orderman2/mercury/mercury_utils/mercury_common.h" +#include "server/sparkd/mercury/synopsys/ISynopsysBuilder.h" +#include "server/sparkd/mercury/mercury_utils/mercury_common.h" namespace bts { namespace mercury { diff --git a/src/server/sparkd/orderman2/mercury/synopsys/ISynopsysBuilder.h b/src/server/sparkd/mercury/synopsys/ISynopsysBuilder.h similarity index 79% rename from src/server/sparkd/orderman2/mercury/synopsys/ISynopsysBuilder.h rename to src/server/sparkd/mercury/synopsys/ISynopsysBuilder.h index 35b0d8ba7..a7869142f 100644 --- a/src/server/sparkd/orderman2/mercury/synopsys/ISynopsysBuilder.h +++ b/src/server/sparkd/mercury/synopsys/ISynopsysBuilder.h @@ -1,7 +1,7 @@ #pragma once #include -#include "server/sparkd/orderman2/mercury/mercury_utils/mercury_common.h" +#include "server/sparkd/mercury/mercury_utils/mercury_common.h" namespace bts { namespace mercury { diff --git a/src/server/sparkd/orderman2/mercury/synopsys/NoSynopsis.h b/src/server/sparkd/mercury/synopsys/NoSynopsis.h similarity index 62% rename from src/server/sparkd/orderman2/mercury/synopsys/NoSynopsis.h rename to src/server/sparkd/mercury/synopsys/NoSynopsis.h index a0bff728f..5eb4ea0de 100644 --- a/src/server/sparkd/orderman2/mercury/synopsys/NoSynopsis.h +++ b/src/server/sparkd/mercury/synopsys/NoSynopsis.h @@ -1,8 +1,8 @@ #pragma once #include -#include "server/sparkd/orderman2/mercury/synopsys/ISynopsysBuilder.h" -#include "server/sparkd/orderman2/mercury/mercury_utils/mercury_common.h" +#include "server/sparkd/mercury/synopsys/ISynopsysBuilder.h" +#include "server/sparkd/mercury/mercury_utils/mercury_common.h" namespace bts { namespace mercury { diff --git a/src/server/sparkd/orderman2/mercury/synopsys/SynopsisBuilder.cpp b/src/server/sparkd/mercury/synopsys/SynopsisBuilder.cpp similarity index 100% rename from src/server/sparkd/orderman2/mercury/synopsys/SynopsisBuilder.cpp rename to src/server/sparkd/mercury/synopsys/SynopsisBuilder.cpp diff --git a/src/server/sparkd/orderman2/mercury/synopsys/SynopsisBuilder.h b/src/server/sparkd/mercury/synopsys/SynopsisBuilder.h similarity index 72% rename from src/server/sparkd/orderman2/mercury/synopsys/SynopsisBuilder.h rename to src/server/sparkd/mercury/synopsys/SynopsisBuilder.h index b75428ab0..ca94eef11 100644 --- a/src/server/sparkd/orderman2/mercury/synopsys/SynopsisBuilder.h +++ b/src/server/sparkd/mercury/synopsys/SynopsisBuilder.h @@ -1,7 +1,7 @@ #pragma once #include -#include "server/sparkd/orderman2/mercury/mercury_utils/mercury_common.h" +#include "server/sparkd/mercury/mercury_utils/mercury_common.h" namespace bts { namespace mercury { diff --git a/src/server/sparkd/orderman2/mercury/topics/ITopic.cpp b/src/server/sparkd/mercury/topics/ITopic.cpp similarity index 100% rename from src/server/sparkd/orderman2/mercury/topics/ITopic.cpp rename to src/server/sparkd/mercury/topics/ITopic.cpp diff --git a/src/server/sparkd/orderman2/mercury/topics/ITopic.h b/src/server/sparkd/mercury/topics/ITopic.h similarity index 81% rename from src/server/sparkd/orderman2/mercury/topics/ITopic.h rename to src/server/sparkd/mercury/topics/ITopic.h index e70ec197a..4f70ffbdc 100644 --- a/src/server/sparkd/orderman2/mercury/topics/ITopic.h +++ b/src/server/sparkd/mercury/topics/ITopic.h @@ -1,7 +1,7 @@ #pragma once #include -#include "server/sparkd/orderman2/mercury/synopsys/ISynopsysBuilder.h" +#include "server/sparkd/mercury/synopsys/ISynopsysBuilder.h" namespace bts { namespace mercury { diff --git a/src/server/sparkd/orderman2/mercury/topics/Topic.h b/src/server/sparkd/mercury/topics/Topic.h similarity index 100% rename from src/server/sparkd/orderman2/mercury/topics/Topic.h rename to src/server/sparkd/mercury/topics/Topic.h diff --git a/src/server/sparkd/orderman2/actors/SecuritySrc.cpp b/src/server/sparkd/orderman2/actors/SecuritySrc.cpp index 3d545809b..f12a7da59 100644 --- a/src/server/sparkd/orderman2/actors/SecuritySrc.cpp +++ b/src/server/sparkd/orderman2/actors/SecuritySrc.cpp @@ -1,6 +1,6 @@ #include "SecuritySrc.h" #include "server/sparkd/orderman2/events/NewSecuritiesEvent.h" -#include "server/sparkd/orderman2/mercury/events/PollEvent.h" +#include "server/sparkd/mercury/events/PollEvent.h" #include "server/sparkd/persistence/SqliteStore.h" #include "lib/md/MDRecoverableConsumer.h" #include "lib/utils/bts_chrono.h" diff --git a/src/server/sparkd/orderman2/actors/SecuritySrc.h b/src/server/sparkd/orderman2/actors/SecuritySrc.h index 99df04d9c..3f28d8462 100644 --- a/src/server/sparkd/orderman2/actors/SecuritySrc.h +++ b/src/server/sparkd/orderman2/actors/SecuritySrc.h @@ -1,7 +1,7 @@ #pragma once #include -#include "server/sparkd/orderman2/mercury/actors/Actor.h" +#include "server/sparkd/mercury/actors/Actor.h" namespace bts { namespace api { class Security;} diff --git a/src/server/sparkd/orderman2/events/NewSecuritiesEvent.h b/src/server/sparkd/orderman2/events/NewSecuritiesEvent.h index 5da7e696d..907495745 100644 --- a/src/server/sparkd/orderman2/events/NewSecuritiesEvent.h +++ b/src/server/sparkd/orderman2/events/NewSecuritiesEvent.h @@ -1,9 +1,9 @@ #pragma once #include -#include "server/sparkd/orderman2/mercury/events/Event.h" +#include "server/sparkd/mercury/events/Event.h" #include "lib/domain_model/Security.h" -#include "server/sparkd/orderman2/mercury/synopsys/AppendVector.h" +#include "server/sparkd/mercury/synopsys/AppendVector.h" namespace bts { namespace orderman2 { diff --git a/src/server/sparkd/orderman2/tests/fat_wrapper_tests.cpp b/src/server/sparkd/orderman2/tests/fat_wrapper_tests.cpp index 1baa9866f..effad2b46 100644 --- a/src/server/sparkd/orderman2/tests/fat_wrapper_tests.cpp +++ b/src/server/sparkd/orderman2/tests/fat_wrapper_tests.cpp @@ -1,4 +1,4 @@ -#include "server/sparkd/orderman2/mercury/mercury_utils/FatWrapper.h" +#include "server/sparkd/mercury/mercury_utils/FatWrapper.h" #include namespace bts {