From a7b7c45657ca0356d054cacafa2be77f609aeefd Mon Sep 17 00:00:00 2001 From: John Colvin Date: Wed, 15 Sep 2021 16:11:33 -0400 Subject: [PATCH] refactor (flatten): Move ChildOrder to orderman dir --- src/lib/orderman/{actors/order_manager => }/ChildOrder.h | 0 src/lib/orderman/actors/order_manager/OrderBuilder.h | 3 +-- src/lib/orderman/actors/order_manager/OrderServices.cpp | 2 +- src/lib/orderman/orders/CompositeOrder.cpp | 3 +-- src/lib/orderman/orders/algo/AlgoWrapperOrder.cpp | 4 +--- src/lib/orderman/orders/book_algos/BookOrderBase.cpp | 2 +- .../orders/spreader_orders/spreader/ISpreaderManager.h | 2 +- .../orders/spreader_orders/spreader/SingleLegQuoter.h | 3 +-- .../spreader/external_interfacing/IAlternateOrderGateway.h | 2 +- .../spreader/external_interfacing/SpreaderOrderBuilder.h | 2 +- .../spreader/external_interfacing/SpreaderOrderServices.h | 2 +- .../spreader_orders/spreader/hedger/IHedgerStateWorker.h | 3 +-- 12 files changed, 11 insertions(+), 17 deletions(-) rename src/lib/orderman/{actors/order_manager => }/ChildOrder.h (100%) diff --git a/src/lib/orderman/actors/order_manager/ChildOrder.h b/src/lib/orderman/ChildOrder.h similarity index 100% rename from src/lib/orderman/actors/order_manager/ChildOrder.h rename to src/lib/orderman/ChildOrder.h diff --git a/src/lib/orderman/actors/order_manager/OrderBuilder.h b/src/lib/orderman/actors/order_manager/OrderBuilder.h index 5afa6f979..8e8b6727f 100644 --- a/src/lib/orderman/actors/order_manager/OrderBuilder.h +++ b/src/lib/orderman/actors/order_manager/OrderBuilder.h @@ -1,8 +1,7 @@ #pragma once - #include "lib/api/services/OrderService.pb.h" #include "lib/logging/logging.h" -#include "lib/orderman/actors/order_manager/ChildOrder.h" +#include "lib/orderman/ChildOrder.h" #include "lib/orderman/actors/order_manager/OrderServices.h" #include "lib/orderman/orderman_utils/orderman_common.h" #include diff --git a/src/lib/orderman/actors/order_manager/OrderServices.cpp b/src/lib/orderman/actors/order_manager/OrderServices.cpp index d608d3dec..34ccc7066 100644 --- a/src/lib/orderman/actors/order_manager/OrderServices.cpp +++ b/src/lib/orderman/actors/order_manager/OrderServices.cpp @@ -1,5 +1,5 @@ #include "OrderServices.h" -#include "lib/orderman/actors/order_manager/ChildOrder.h" +#include "lib/orderman/ChildOrder.h" namespace bts::orderman { diff --git a/src/lib/orderman/orders/CompositeOrder.cpp b/src/lib/orderman/orders/CompositeOrder.cpp index e249a2089..3845304a0 100644 --- a/src/lib/orderman/orders/CompositeOrder.cpp +++ b/src/lib/orderman/orders/CompositeOrder.cpp @@ -1,10 +1,9 @@ #include "lib/orderman/orders/CompositeOrder.h" #include "lib/api/services/OrderService.pb.h" -#include "lib/orderman/actors/order_manager/ChildOrder.h" +#include "lib/orderman/ChildOrder.h" #include "lib/orderman/actors/order_manager/OrderBuilder.h" #include "lib/orderman/orders/PreActivationOrderServices.h" #include "lib/utils/PBUtils.h" - #include "lib/utils/bts_assert.h" namespace bts { diff --git a/src/lib/orderman/orders/algo/AlgoWrapperOrder.cpp b/src/lib/orderman/orders/algo/AlgoWrapperOrder.cpp index 90c450117..7c14fbd24 100644 --- a/src/lib/orderman/orders/algo/AlgoWrapperOrder.cpp +++ b/src/lib/orderman/orders/algo/AlgoWrapperOrder.cpp @@ -1,6 +1,5 @@ #include "lib/orderman/orders/algo/AlgoWrapperOrder.h" - -#include "lib/orderman/actors/order_manager/ChildOrder.h" +#include "lib/orderman/ChildOrder.h" #include "lib/orderman/actors/order_manager/OrderBuilder.h" #include "lib/orderman/actors/order_manager/OrderServices.h" #include "lib/orderman/orderman_utils/orderman_utils.h" @@ -8,7 +7,6 @@ #include "lib/orderman/orders/algo/ChildTemplate.h" #include "lib/orderman/orders/algo/IAlgoOrder.h" #include "lib/utils/bts_assert.h" - #include #include diff --git a/src/lib/orderman/orders/book_algos/BookOrderBase.cpp b/src/lib/orderman/orders/book_algos/BookOrderBase.cpp index 2566c1f0f..d6fc9d5bc 100644 --- a/src/lib/orderman/orders/book_algos/BookOrderBase.cpp +++ b/src/lib/orderman/orders/book_algos/BookOrderBase.cpp @@ -1,6 +1,6 @@ #include "BookOrderBase.h" #include "lib/domain_model/Security.h" -#include "lib/orderman/actors/order_manager/ChildOrder.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" diff --git a/src/lib/orderman/orders/spreader_orders/spreader/ISpreaderManager.h b/src/lib/orderman/orders/spreader_orders/spreader/ISpreaderManager.h index ceba322ab..c058f29ae 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/ISpreaderManager.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/ISpreaderManager.h @@ -1,5 +1,5 @@ #pragma once -#include "lib/orderman/actors/order_manager/ChildOrder.h" +#include "lib/orderman/ChildOrder.h" #include "lib/orderman/orderman_utils/Book.h" namespace bts { diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SingleLegQuoter.h b/src/lib/orderman/orders/spreader_orders/spreader/SingleLegQuoter.h index c41b2a51b..4a6f9388c 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SingleLegQuoter.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/SingleLegQuoter.h @@ -1,9 +1,8 @@ #pragma once - #include "LegPropertyData.h" #include "QuoteLegPriceQuantityState.h" #include "lib/domain_model/Security.pb.h" -#include "lib/orderman/actors/order_manager/ChildOrder.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" diff --git a/src/lib/orderman/orders/spreader_orders/spreader/external_interfacing/IAlternateOrderGateway.h b/src/lib/orderman/orders/spreader_orders/spreader/external_interfacing/IAlternateOrderGateway.h index 22326ce5c..5c208895f 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/external_interfacing/IAlternateOrderGateway.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/external_interfacing/IAlternateOrderGateway.h @@ -1,5 +1,5 @@ #pragma once -#include "lib/orderman/actors/order_manager/ChildOrder.h" +#include "lib/orderman/ChildOrder.h" #include "lib/orderman/orderman_utils/Book.h" namespace bts { diff --git a/src/lib/orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderBuilder.h b/src/lib/orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderBuilder.h index 9271de7c4..05ae09f00 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderBuilder.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderBuilder.h @@ -2,7 +2,7 @@ #include "SpreaderOrderServices.h" #include "lib/api/services/OrderService.pb.h" #include "lib/domain_model/Security.pb.h" -#include "lib/orderman/actors/order_manager/ChildOrder.h" +#include "lib/orderman/ChildOrder.h" #include "lib/orderman/actors/order_manager/OrderBuilder.h" #include "lib/orderman/orders/PreActivationOrderServices.h" #include "lib/tracing/PerfLog.h" diff --git a/src/lib/orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderServices.h b/src/lib/orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderServices.h index c733aec37..985e9f277 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderServices.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderServices.h @@ -1,7 +1,7 @@ #pragma once #include "lib/api/services/OrderService.pb.h" #include "lib/domain_model/Security.pb.h" -#include "lib/orderman/actors/order_manager/ChildOrder.h" +#include "lib/orderman/ChildOrder.h" #include "lib/orderman/actors/order_manager/OrderBuilder.h" #include "lib/orderman/orders/PreActivationOrderServices.h" #include "lib/tracing/PerfLog.h" diff --git a/src/lib/orderman/orders/spreader_orders/spreader/hedger/IHedgerStateWorker.h b/src/lib/orderman/orders/spreader_orders/spreader/hedger/IHedgerStateWorker.h index a10b6a1e9..a8cea68cd 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/hedger/IHedgerStateWorker.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/hedger/IHedgerStateWorker.h @@ -1,6 +1,5 @@ #pragma once - -#include "lib/orderman/actors/order_manager/ChildOrder.h" +#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"