From f90e41ea6522b57facdbc8ac66e66eaa3c1dd786 Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Wed, 20 Apr 2022 23:58:05 -0400 Subject: [PATCH] Moved the new interface, types into their own files --- .../external_interfacing/IOrderGateway.h | 22 ++++++++++++++ .../external_interfacing/OrderUpdate.h | 14 +++++++++ .../external_interfacing/SpreaderWrapper.cpp | 10 +++++-- .../external_interfacing/SpreaderWrapper.h | 30 +++---------------- .../spreader_orders/tests/spreader_tests.cpp | 14 +++++---- 5 files changed, 57 insertions(+), 33 deletions(-) create mode 100644 src/lib/orderman/orders/spreader_orders/spreader/external_interfacing/IOrderGateway.h create mode 100644 src/lib/orderman/orders/spreader_orders/spreader/external_interfacing/OrderUpdate.h diff --git a/src/lib/orderman/orders/spreader_orders/spreader/external_interfacing/IOrderGateway.h b/src/lib/orderman/orders/spreader_orders/spreader/external_interfacing/IOrderGateway.h new file mode 100644 index 000000000..2d2e5dee9 --- /dev/null +++ b/src/lib/orderman/orders/spreader_orders/spreader/external_interfacing/IOrderGateway.h @@ -0,0 +1,22 @@ +#pragma once +#include "lib/orderman/ChildOrder.h" +#include "lib/orderman/orderman_utils/Book.h" +#include "lib/orderman/orderman_utils/orderman_common.h" + +namespace bts::integration { + +// needs to be implemented by 3rd party +class IOrderGateway { + // OrderDefinition allows for a QHO to be sent (or do it some other way? not + // sure) + virtual bts::orderman::OrderKey send_order( + orderman::OrderKey order_key, + const bts::api::orderman::OrderDefinition &order_def, + Price price, + Quantity qty) = 0; + virtual void modify_order(bts::orderman::OrderKey, Price, Quantity) = 0; + virtual void cancel_order(bts::orderman::OrderKey) = 0; + virtual void report_spreader_state( + const bts::api::orderman::OrderState &order_state); +}; +} // namespace bts::integration diff --git a/src/lib/orderman/orders/spreader_orders/spreader/external_interfacing/OrderUpdate.h b/src/lib/orderman/orders/spreader_orders/spreader/external_interfacing/OrderUpdate.h new file mode 100644 index 000000000..db3af00c1 --- /dev/null +++ b/src/lib/orderman/orders/spreader_orders/spreader/external_interfacing/OrderUpdate.h @@ -0,0 +1,14 @@ +#pragma once + +#include "lib/orderman/orderman_utils/orderman_common.h" + +namespace bts::integration { + +struct OrderUpdate { + bts::orderman::OrderKey key; + api::orderman::OrderStatus status; + Quantity filled_quantity; + Price avg_price; +}; + +} // namespace bts::integration diff --git a/src/lib/orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderWrapper.cpp b/src/lib/orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderWrapper.cpp index 597b250eb..47917bf30 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderWrapper.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderWrapper.cpp @@ -1,7 +1,10 @@ #include "SpreaderWrapper.h" #include "lib/api/services/OrderService.pb.h" #include "lib/domain_model/Security.pb.h" +#include "lib/orderman/orderman_utils/orderman_common.h" #include "lib/orderman/orders/spreader_orders/SpreaderOrder.h" +#include "lib/orderman/orders/spreader_orders/spreader/external_interfacing/IOrderGateway.h" +#include "lib/orderman/orders/spreader_orders/spreader/external_interfacing/OrderUpdate.h" #include "lib/orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderServices.h" #include "lib/orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderPreActivationOrderServices.h" #include @@ -25,6 +28,7 @@ class AltOrderGatewayTemp : public IAlternateOrderGateway { }; struct SpreaderWrapper::PImpl { + bts::orderman::OrderKey id; const bts::api::orderman::OrderDefinition order_def; AltOrderGatewayTemp temp = {}; IOrderGateway *order_gateway; @@ -33,18 +37,20 @@ struct SpreaderWrapper::PImpl { bts::orderman::SpreaderOrderServices order_services; PImpl( + bts::orderman::OrderKey id, const api::orderman::OrderDefinition &order_def, IOrderGateway *order_gateway) - : order_def(order_def), order_gateway(order_gateway), + : id(id), order_def(order_def), order_gateway(order_gateway), spreader((IAlternateOrderGateway *)&temp), pre_activation_services(order_def.custom_def().spreader().security()), order_services(nullptr) {} }; SpreaderWrapper::SpreaderWrapper( + bts::orderman::OrderKey id, const api::orderman::OrderDefinition &order_def, IOrderGateway *order_gateway) - : me(new PImpl(order_def, order_gateway)) { + : me(new PImpl(id, order_def, order_gateway)) { me->spreader.test_only_on_init_new(order_def, me->pre_activation_services); } diff --git a/src/lib/orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderWrapper.h b/src/lib/orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderWrapper.h index 25cbb5cc3..bc464a3da 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderWrapper.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderWrapper.h @@ -13,6 +13,7 @@ #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/external_interfacing/IOrderGateway.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" @@ -30,33 +31,9 @@ class SpreaderOrder; namespace bts::integration { -// needs to be implemented by 3rd party -class IOrderGateway { - // OrderDefinition allows for a QHO to be sent (or do it some other way? not - // sure) - virtual bts::orderman::OrderKey send_order( - const bts::api::orderman::OrderDefinition &order_def, - Price price, - Quantity qty) = 0; - virtual void modify_order(bts::orderman::OrderKey, Price, Quantity) = 0; - virtual void cancel_order(bts::orderman::OrderKey) = 0; - virtual void report_spreader_state( - const bts::api::orderman::OrderState &order_state); -}; - struct OrderUpdate; -class IOrderSync { - virtual void on_order_update(const OrderUpdate &update) = 0; -}; -struct OrderUpdate { - bts::orderman::OrderKey key; - api::orderman::OrderStatus status; - Quantity filled_quantity; - Price avg_price; -}; - -class SpreaderWrapper : public IOrderSync { +class SpreaderWrapper { private: struct PImpl; // std::unique_ptr me; @@ -64,10 +41,11 @@ class SpreaderWrapper : public IOrderSync { public: SpreaderWrapper( + orderman::OrderKey order_key, const api::orderman::OrderDefinition &order_def, IOrderGateway *order_gateway); void activate(Price price, Quantity qty); - void on_order_update(const OrderUpdate &update) override; + void on_order_update(const OrderUpdate &update); void update_book(const bts::orderman::Book &book); void update_spreader(Price price, Quantity qty); void cancel(); diff --git a/src/lib/orderman/orders/spreader_orders/tests/spreader_tests.cpp b/src/lib/orderman/orders/spreader_orders/tests/spreader_tests.cpp index cbbea7155..597d7a17d 100644 --- a/src/lib/orderman/orders/spreader_orders/tests/spreader_tests.cpp +++ b/src/lib/orderman/orders/spreader_orders/tests/spreader_tests.cpp @@ -1,5 +1,8 @@ #include "lib/io/websocket/WebsocketClient.h" #include "lib/md/IMarketDataListener.h" +#include "lib/orderman/orderman_utils/orderman_common.h" +#include "lib/orderman/orders/spreader_orders/spreader/external_interfacing/IOrderGateway.h" +#include "lib/orderman/orders/spreader_orders/spreader/external_interfacing/OrderUpdate.h" #include "lib/orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderWrapper.h" #include "lib/orderman/orders/spreader_orders/tests/tests_common.h" #include @@ -2442,7 +2445,8 @@ TEST_CASE("spreader_standalone_START", "[spreader]") { // putting it together in SpreaderBookkeepingData SpreaderPreActivationOrderServices pao_services(synthetic_security); AltOrderGatewayForTest alt_order_gateway; - bts::integration::SpreaderWrapper spreader_w(order_def, nullptr); + bts::integration::SpreaderWrapper spreader_w( + OrderKey(10), order_def, nullptr); REQUIRE(spreader_w.spreader_state() == SpreaderState::START); SECTION("1. on_init_new.resolved") { @@ -3135,7 +3139,7 @@ TEST_CASE("spreader_standalone_WORKING", "[spreader]") { order_key, order_def, pao_services, leg_props, quoter_ord_defs, hedger_ord_defs); // SpreaderOrder spreader(spreader_manager.alt_order_gateway()); - integration::SpreaderWrapper spreader_w(order_def, nullptr); + integration::SpreaderWrapper spreader_w(OrderKey(10), order_def, nullptr); REQUIRE(spreader_w.spreader_state() == SpreaderState::START); // on_init_new and activate // spreader_w.test_only_on_init_new(order_def, pao_services); @@ -4257,7 +4261,7 @@ TEST_CASE("spreader_standlone_WAITING_FOR_CANCEL_ACK", "[spreader]") { SpreaderManagerForTest spreader_manager( order_key, order_def, pao_services, leg_props, quoter_ord_defs, hedger_ord_defs); - integration::SpreaderWrapper spreader_w(order_def, nullptr); + integration::SpreaderWrapper spreader_w(OrderKey(10), order_def, nullptr); REQUIRE(spreader_w.spreader_state() == SpreaderState::START); // on_init_new and activate SpreaderOrderServices order_services(nullptr); @@ -5797,7 +5801,7 @@ TEST_CASE("spreader_standalone_perf_4legs", "[spreader]") { order_key, order_def, pao_services, leg_props, quoter_ord_defs, hedger_ord_defs); // SpreaderOrder spreader(spreader_manager.alt_order_gateway()); - integration::SpreaderWrapper spreader_w(order_def, nullptr); + integration::SpreaderWrapper spreader_w(OrderKey(10), order_def, nullptr); REQUIRE(spreader_w.spreader_state() == SpreaderState::START); // on_init_new and activate // spreader.test_only_on_init_new(order_def, pao_services); @@ -6341,7 +6345,7 @@ TEST_CASE("4legs_hedging", "[spreader_perf]") { SpreaderManagerForTest spreader_manager( order_key, order_def, pao_services, leg_props, quoter_ord_defs, hedger_ord_defs); - integration::SpreaderWrapper spreader_w(order_def, nullptr); + integration::SpreaderWrapper spreader_w(OrderKey(10), order_def, nullptr); REQUIRE(spreader_w.spreader_state() == SpreaderState::START); // on_init_new and activate // spreader.test_only_on_init_new(order_def, pao_services);