diff --git a/src/lib/orderman/order_router/OrderRouter.cpp b/src/lib/orderman/OrderRouter.cpp similarity index 100% rename from src/lib/orderman/order_router/OrderRouter.cpp rename to src/lib/orderman/OrderRouter.cpp diff --git a/src/lib/orderman/order_router/OrderRouter.h b/src/lib/orderman/OrderRouter.h similarity index 100% rename from src/lib/orderman/order_router/OrderRouter.h rename to src/lib/orderman/OrderRouter.h diff --git a/src/lib/orderman/actors/AsyncFactory.cpp b/src/lib/orderman/actors/AsyncFactory.cpp index fc4d3ec66..5f66dae41 100644 --- a/src/lib/orderman/actors/AsyncFactory.cpp +++ b/src/lib/orderman/actors/AsyncFactory.cpp @@ -1,14 +1,13 @@ #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/order_router/OrderRouter.h" #include "lib/orderman/securities/MapSecurityDB.h" namespace bts { diff --git a/src/lib/orderman/actors/ServiceBridge.cpp b/src/lib/orderman/actors/ServiceBridge.cpp index 167ae1a13..be74c1dfa 100644 --- a/src/lib/orderman/actors/ServiceBridge.cpp +++ b/src/lib/orderman/actors/ServiceBridge.cpp @@ -1,10 +1,10 @@ #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/mercury/broker/BrokerProxy.h" +#include "lib/orderman/OrderRouter.h" #include "lib/orderman/events/AccountPnLUpdateEvent.h" #include "lib/orderman/events/ActivateOrderEvent.h" #include "lib/orderman/events/CancelOrderEvent.h" @@ -18,7 +18,6 @@ #include "lib/orderman/events/StoredOrderEvent.h" #include "lib/orderman/events/UpdateOrderEvent.h" #include "lib/orderman/order_factory/OrderFactory.h" -#include "lib/orderman/order_router/OrderRouter.h" #include "lib/orderman/orderman_utils/orderman_common.h" #include "lib/orderman/orders/Order.h" #include "lib/orderman/securities/MapSecurityDB.h" diff --git a/src/lib/orderman/actors/order_manager/OrderServicesData.h b/src/lib/orderman/actors/order_manager/OrderServicesData.h index 436efc334..fafb8e7dc 100644 --- a/src/lib/orderman/actors/order_manager/OrderServicesData.h +++ b/src/lib/orderman/actors/order_manager/OrderServicesData.h @@ -34,7 +34,7 @@ #include "lib/orderman/events/UpdateOrderEvent.h" #include "lib/orderman/gateways/IExecutionGateway.h" #include "lib/orderman/limiter/Limiter.h" -#include "lib/orderman/order_router/OrderRouter.h" +#include "lib/orderman/OrderRouter.h" #include "lib/utils/Puid.h" #include "lib/utils/datetime.h" diff --git a/src/lib/orderman/orders/GLBXNativeOrder.cpp b/src/lib/orderman/orders/GLBXNativeOrder.cpp index bb0abf99b..c5c232725 100644 --- a/src/lib/orderman/orders/GLBXNativeOrder.cpp +++ b/src/lib/orderman/orders/GLBXNativeOrder.cpp @@ -1,5 +1,4 @@ #include "GLBXNativeOrder.h" - #include "lib/api/services/OrderService.pb.h" #include "lib/config/config.h" #include "lib/config/protos/orderman_cfg.pb.h" @@ -8,8 +7,9 @@ #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/actors/order_manager/OrderServices.h" #include "lib/orderman/order_factory/IOrderFactory.h" -#include "lib/orderman/order_router/OrderRouter.h" #include "lib/orderman/orderman_utils/ExecutionReport.h" #include "lib/orderman/orderman_utils/fix_order_codec.h" #include "lib/orderman/orders/PreActivationOrderServices.h" @@ -19,9 +19,6 @@ #include "lib/orderman/securities/ISecurityDB.h" #include "lib/utils/PBUtils.h" #include "lib/utils/bts_chrono.h" - -#include "lib/orderman/actors/order_manager/OrderServices.h" - #include #include diff --git a/src/lib/orderman/orders/ICENativeOrder.cpp b/src/lib/orderman/orders/ICENativeOrder.cpp index b1189404d..f756b0903 100644 --- a/src/lib/orderman/orders/ICENativeOrder.cpp +++ b/src/lib/orderman/orders/ICENativeOrder.cpp @@ -1,13 +1,13 @@ #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/actors/order_manager/OrderServices.h" #include "lib/orderman/order_factory/IOrderFactory.h" -#include "lib/orderman/order_router/OrderRouter.h" #include "lib/orderman/orderman_utils/ExecutionReport.h" #include "lib/orderman/orderman_utils/fix_order_codec.h" #include "lib/orderman/orders/PreActivationOrderServices.h" @@ -15,9 +15,6 @@ #include "lib/utils/PBUtils.h" #include "lib/utils/Puid.h" #include "lib/utils/bts_chrono.h" - -#include "lib/orderman/actors/order_manager/OrderServices.h" - #include #include #include