diff --git a/src/lib/orderman/actors/ilink3/IL3GW.h b/src/lib/orderman/actors/ilink3/IL3GW.h index f18b1871f..0c10e4884 100644 --- a/src/lib/orderman/actors/ilink3/IL3GW.h +++ b/src/lib/orderman/actors/ilink3/IL3GW.h @@ -1,22 +1,20 @@ #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/actors/ilink3/RawMsg.h" +#include "lib/orderman/gateways/IExecutionGateway.h" +#include "lib/orderman/orderman_utils/CancelReject.h" #include #include #include #include #include -#include "../IExecutionGateway.h" -#include "IL3Connection.h" -#include "IL3ConnectionHandler.h" -#include "TimeKeeper.h" - -#include "IL3GeneratedFwd.h" -#include "IL3Parser.h" -#include "generated/MessageHeader.h" -#include "lib/config/protos/jetfix.pb.h" -#include "lib/orderman/actors/ilink3/RawMsg.h" -#include "lib/orderman/orderman_utils/CancelReject.h" - #define MID_SESSION_REPLAY namespace bts { diff --git a/src/lib/orderman/actors/order_manager/OrderServicesData.h b/src/lib/orderman/actors/order_manager/OrderServicesData.h index 894bd63f9..436efc334 100644 --- a/src/lib/orderman/actors/order_manager/OrderServicesData.h +++ b/src/lib/orderman/actors/order_manager/OrderServicesData.h @@ -9,7 +9,7 @@ #include "lib/md/SecurityOracle.h" #include "lib/mercury/events/TimerEvent.h" -#include "lib/orderman/actors/IExecutionGateway.h" +#include "lib/orderman/Governor.h" #include "lib/orderman/actors/order_manager/PositionIndex.h" #include "lib/orderman/events/ActivateOrderEvent.h" #include "lib/orderman/events/BookUpdateEvent.h" @@ -32,7 +32,7 @@ #include "lib/orderman/events/TickerUpdateEvent.h" #include "lib/orderman/events/TradeSignalEvent.h" #include "lib/orderman/events/UpdateOrderEvent.h" -#include "lib/orderman/Governor.h" +#include "lib/orderman/gateways/IExecutionGateway.h" #include "lib/orderman/limiter/Limiter.h" #include "lib/orderman/order_router/OrderRouter.h" #include "lib/utils/Puid.h" diff --git a/src/lib/orderman/actors/GLBXExecutionGateway.cpp b/src/lib/orderman/gateways/GLBXExecutionGateway.cpp similarity index 100% rename from src/lib/orderman/actors/GLBXExecutionGateway.cpp rename to src/lib/orderman/gateways/GLBXExecutionGateway.cpp diff --git a/src/lib/orderman/actors/GLBXExecutionGateway.h b/src/lib/orderman/gateways/GLBXExecutionGateway.h similarity index 100% rename from src/lib/orderman/actors/GLBXExecutionGateway.h rename to src/lib/orderman/gateways/GLBXExecutionGateway.h diff --git a/src/lib/orderman/actors/GLBXiLink3ExecutionGateway.cpp b/src/lib/orderman/gateways/GLBXiLink3ExecutionGateway.cpp similarity index 98% rename from src/lib/orderman/actors/GLBXiLink3ExecutionGateway.cpp rename to src/lib/orderman/gateways/GLBXiLink3ExecutionGateway.cpp index fdf044ad1..bb7b11d1c 100644 --- a/src/lib/orderman/actors/GLBXiLink3ExecutionGateway.cpp +++ b/src/lib/orderman/gateways/GLBXiLink3ExecutionGateway.cpp @@ -1,16 +1,16 @@ -#include "lib/orderman/actors/GLBXiLink3ExecutionGateway.h" +#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/orderman/actors/GLBXExecutionGateway.h" #include "lib/orderman/actors/ilink3/IL3GW.h" #include "lib/orderman/actors/ilink3/IL3MessageFramer.h" #include "lib/orderman/actors/ilink3/IL3Reactor.h" #include "lib/orderman/actors/ilink3/IL3SecDB.h" #include "lib/orderman/actors/ilink3/SessionStore.h" #include "lib/orderman/events/NewSecuritiesEvent.h" +#include "lib/orderman/gateways/GLBXExecutionGateway.h" #include "lib/orderman/orderman_utils/fix_order_codec.h" namespace bts { diff --git a/src/lib/orderman/actors/GLBXiLink3ExecutionGateway.h b/src/lib/orderman/gateways/GLBXiLink3ExecutionGateway.h similarity index 100% rename from src/lib/orderman/actors/GLBXiLink3ExecutionGateway.h rename to src/lib/orderman/gateways/GLBXiLink3ExecutionGateway.h diff --git a/src/lib/orderman/actors/ICEExecutionGateway.cpp b/src/lib/orderman/gateways/ICEExecutionGateway.cpp similarity index 100% rename from src/lib/orderman/actors/ICEExecutionGateway.cpp rename to src/lib/orderman/gateways/ICEExecutionGateway.cpp diff --git a/src/lib/orderman/actors/ICEExecutionGateway.h b/src/lib/orderman/gateways/ICEExecutionGateway.h similarity index 100% rename from src/lib/orderman/actors/ICEExecutionGateway.h rename to src/lib/orderman/gateways/ICEExecutionGateway.h diff --git a/src/lib/orderman/actors/IExecutionGateway.cpp b/src/lib/orderman/gateways/IExecutionGateway.cpp similarity index 81% rename from src/lib/orderman/actors/IExecutionGateway.cpp rename to src/lib/orderman/gateways/IExecutionGateway.cpp index f03c728ef..0a0b6451c 100644 --- a/src/lib/orderman/actors/IExecutionGateway.cpp +++ b/src/lib/orderman/gateways/IExecutionGateway.cpp @@ -1,8 +1,8 @@ #include "IExecutionGateway.h" -#include "GLBXExecutionGateway.h" -#include "ICEExecutionGateway.h" -#include "lib/orderman/actors/GLBXiLink3ExecutionGateway.h" +#include "lib/orderman/gateways/GLBXExecutionGateway.h" +#include "lib/orderman/gateways/ICEExecutionGateway.h" +#include "lib/orderman/gateways/GLBXiLink3ExecutionGateway.h" #include "lib/utils/ValueWrapper.h" #include diff --git a/src/lib/orderman/actors/IExecutionGateway.h b/src/lib/orderman/gateways/IExecutionGateway.h similarity index 100% rename from src/lib/orderman/actors/IExecutionGateway.h rename to src/lib/orderman/gateways/IExecutionGateway.h diff --git a/src/lib/orderman/orders/glbx/iLink3OrderEncoder.cpp b/src/lib/orderman/orders/glbx/iLink3OrderEncoder.cpp index e6d58cdbe..c079d2040 100644 --- a/src/lib/orderman/orders/glbx/iLink3OrderEncoder.cpp +++ b/src/lib/orderman/orders/glbx/iLink3OrderEncoder.cpp @@ -2,7 +2,7 @@ #include "lib/api/services/OrderService.pb.h" #include "lib/domain_model/Security.h" -#include "lib/orderman/actors/IExecutionGateway.h" +#include "lib/orderman/gateways/IExecutionGateway.h" #include "lib/orderman/actors/order_manager/OrderServices.h" #include "lib/orderman/orderman_utils/fix_order_codec.h"