From 3f4a4fbac8d35cceb623d300acad374201ceae20 Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Sun, 17 Apr 2022 15:08:56 -0400 Subject: [PATCH] The 3 wrappers SpreaderOrderBuilder, SpreaderOrderServices and SpreaderPreActivationOrderServices do not call into the Spark infrastructure any more --- .../orders/spreader_orders/SpreaderOrder.cpp | 5 +- .../SpreaderOrderBuilder.cpp | 37 +++------- .../SpreaderOrderBuilder.h | 8 +-- .../SpreaderOrderServices.cpp | 38 ++-------- .../SpreaderOrderServices.h | 15 ---- .../external_interfacing/SpreaderWrapper.cpp | 14 ++-- .../external_interfacing/SpreaderWrapper.h | 3 +- .../SpreaderStartStateWorker.cpp | 72 ++++++++++--------- 8 files changed, 69 insertions(+), 123 deletions(-) diff --git a/src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp b/src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp index 183647c01..ec00ed79a 100644 --- a/src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp +++ b/src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp @@ -145,8 +145,9 @@ void SpreaderOrder::_on_time(const bts::mercury::TimerEvent &t_event) { void SpreaderOrder::_on_book_update(const BookUpdateEvent &book_event) { if (!_active) return; - auto scoped = _order_services->log_scope( - "SpreaderOrder::_on_book_update", key().value()); + // SPREADER_CHANGE, no need for this + // auto scoped = _order_services->log_scope( + // "SpreaderOrder::_on_book_update", key().value()); _state_worker->on_book(book_event.book); } void SpreaderOrder::_on_settlement_update( diff --git a/src/lib/orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderBuilder.cpp b/src/lib/orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderBuilder.cpp index 99db18b09..19b223018 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderBuilder.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderBuilder.cpp @@ -7,37 +7,18 @@ namespace bts { namespace orderman { SpreaderOrderBuilder::SpreaderOrderBuilder( - OrderKey parent_key, - const OrderDefinition &order_def, - const SpreaderPreActivationOrderServices &spreader_pao_services, - size_t reserve_sz) - : _is_live(spreader_pao_services.is_live()) { - if (_is_live) { - LOG(OrderMan, Info, - "SpreaderOrderBuilder.cons parent_key: {} sec_key: {}", parent_key, - order_def.security_key()); - _real_order_builder = OrderBuilder( - parent_key, order_def, spreader_pao_services.order_factory(), - reserve_sz); - } -} -SpreaderOrderBuilder::SpreaderOrderBuilder(SpreaderOrderBuilder &&) - : _is_live(true) { - // this cons should never be called. the reason we need this - // is because SpreaderOrderBuilder's are stored in a vector. - // however we know the length of the vector (n of legs), and - // hence can reserve it at construction + OrderKey, + const OrderDefinition &, + const SpreaderPreActivationOrderServices &, + size_t) {} + +SpreaderOrderBuilder::SpreaderOrderBuilder(SpreaderOrderBuilder &&) { bts_assert(false); } bts::orderman::ChildOrder SpreaderOrderBuilder::build() { - if (_is_live) - return _real_order_builder.build(); - else - return bts::orderman::ChildOrder(); -} -void SpreaderOrderBuilder::activate(SpreaderOrderServices &order_services) { - if (_is_live) - _real_order_builder.activate(order_services.order_services()); + // TODO: something will have to be done here to cater for QHO + return bts::orderman::ChildOrder(); } +void SpreaderOrderBuilder::activate(SpreaderOrderServices &) {} } // namespace orderman } // 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 ffd6a6218..ac9d6a9f3 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 @@ -22,8 +22,8 @@ class SpreaderPreActivationOrderServices; // (cons'ed and housed in SpreaderBookKeepingData) class SpreaderOrderBuilder { private: - const bool _is_live; - bts::orderman::OrderBuilder _real_order_builder; + // const bool _is_live; + // bts::orderman::OrderBuilder _real_order_builder; public: SpreaderOrderBuilder( @@ -32,9 +32,7 @@ class SpreaderOrderBuilder { const SpreaderPreActivationOrderServices &spreader_pao_services, size_t reserve_sz); SpreaderOrderBuilder() = delete; - SpreaderOrderBuilder(const SpreaderOrderBuilder &) : _is_live(true) { - bts_assert(false); - } + SpreaderOrderBuilder(const SpreaderOrderBuilder &) { bts_assert(false); } SpreaderOrderBuilder(SpreaderOrderBuilder &&other); SpreaderOrderBuilder &operator=(const SpreaderOrderBuilder) = delete; SpreaderOrderBuilder &operator=(SpreaderOrderBuilder &&other) = delete; diff --git a/src/lib/orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderServices.cpp b/src/lib/orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderServices.cpp index 0aa8c58fa..12437ce63 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderServices.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderServices.cpp @@ -5,40 +5,14 @@ using namespace bts::api::orderman; namespace bts { namespace orderman { -SpreaderOrderServices::SpreaderOrderServices(OrderServices *order_services) - : _is_live(order_services != nullptr), _order_services(order_services) {} +SpreaderOrderServices::SpreaderOrderServices(OrderServices *) {} -OrderServices &SpreaderOrderServices::order_services() { - bts_assert(_is_live); - return *_order_services; +void SpreaderOrderServices::report_state(const OrderState &) { + // TODO + // Route it to integration interface + // if (is_live()) + // _order_services->report_state(state); } -void SpreaderOrderServices::report_state(const OrderState &state) { - if (is_live()) - _order_services->report_state(state); -} - -trace::ScopedPerfLogEntry SpreaderOrderServices::log_scope( - const char *entry_kind, - uint64_t uint64_1, - const char *txt_1, - uint32_t uint32_1) { - if (_is_live) - return _order_services->log_scope(entry_kind, uint64_1, txt_1, uint32_1); - else - return trace::ScopedPerfLogEntry(); -} - -void SpreaderOrderServices::log( - const char *entry_kind, - uint64_t uint64_1, - const char *txt_1, - uint32_t uint32_1) { - if (_is_live) - _order_services->log(entry_kind, uint64_1, txt_1, uint32_1); -} - -bool SpreaderOrderServices::is_live() const { return _is_live; } - } // namespace orderman } // namespace bts 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 49d821e05..398d43df1 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 @@ -18,25 +18,10 @@ class IAlternateOrderGateway; // (OrderServices is used to report status, sub to // events etc) class SpreaderOrderServices { - private: - const bool _is_live; - bts::orderman::OrderServices *_order_services; public: SpreaderOrderServices(OrderServices *order_services); - OrderServices &order_services(); void report_state(const api::orderman::OrderState &state); - trace::ScopedPerfLogEntry log_scope( - const char *entry_kind, - uint64_t uint64_1 = 0, - const char *txt_1 = "", - uint32_t uint32_1 = 0); - void - log(const char *entry_kind, - uint64_t uint64_1 = 0, - const char *txt_1 = "", - uint32_t uint32_1 = 0); - bool is_live() const; }; } // namespace orderman 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 545032757..4a8eaa4aa 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,5 +1,7 @@ #include "SpreaderWrapper.h" +#include "lib/domain_model/Security.pb.h" #include "lib/orderman/orders/spreader_orders/SpreaderOrder.h" +#include "lib/orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderPreActivationOrderServices.h" #include namespace bts::integration { @@ -7,17 +9,19 @@ namespace bts::integration { using namespace bts::api; struct SpreaderWrapper::PImpl { - const SyntheticContract contract; + const Security synthetic_security; IOrderGateway &order_gateway; bts::orderman::SpreaderOrder spreader; + bts::orderman::SpreaderPreActivationOrderServices pre_activation_services; - PImpl(const SyntheticContract &contract, IOrderGateway &order_gateway) - : contract(contract), order_gateway(order_gateway), spreader(nullptr) {} + PImpl(const Security &synthetic_security, IOrderGateway &order_gateway) + : synthetic_security(synthetic_security), order_gateway(order_gateway), + spreader(nullptr), pre_activation_services(synthetic_security) {} }; SpreaderWrapper::SpreaderWrapper( - const bts::api::SyntheticContract &contract, IOrderGateway &order_gateway) - : me(std::make_unique(contract, order_gateway)) {} + const Security &synthetic_security, IOrderGateway &order_gateway) + : me(std::make_unique(synthetic_security, order_gateway)) {} void SpreaderWrapper::on_order_update(const OrderUpdate &u) { // TODO, pass it through the OrderServices 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 57dd0e2aa..570f0fad1 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 @@ -54,8 +54,9 @@ class SpreaderWrapper : public IOrderSync { public: SpreaderWrapper( - const bts::api::SyntheticContract &synthetic_contract, + const bts::api::Security &synthetic_security, IOrderGateway &order_gateway); + void run(); void on_order_update(const OrderUpdate &update) override; void update_book(const bts::orderman::Book &book); void update_spreader(Price price, Quantity qty); diff --git a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp index 4bd5225bf..1fdead274 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp @@ -97,41 +97,43 @@ void SpreaderStartStateWorker::on_activate( leg_data.order_update_message().re_init(child_order); } } - if (order_services.is_live()) { - // 4. sub to child orders order - // (could have hidden that inside SpreaderOrderServices by exposing - // events) - order_services.order_services().subscribe_to_child_updates( - [this](const bts::orderman::OrderStateUpdateEvent &os) { - _spreader->_on_child_order_update(os); - }); - // 5. sub to market data - for (size_t l_idx = 0; l_idx < _spreader->_bookkeeping_data().n_legs(); - l_idx++) { - const LegPropertyData &leg_prop = _spreader->_bookkeeping_data() - .get_leg_data(l_idx) - .leg_property_data(); - LOG(OrderMan, Info, - "SpreaderStartStateWorker::on_activate subbing to book sec_key: " - "{}", - leg_prop.security_key()); - order_services.order_services().subscribe_to_book( - leg_prop.leg_security_key(), - [this](const BookUpdateEvent &bk_event) { - _spreader->_on_book_update(bk_event); - }); - order_services.order_services().subscribe_to_settlements( - leg_prop.leg_security_key(), - [this](const SettlementUpdateEvent &s_event) { - _spreader->_on_settlement_update(s_event); - }); - } - // 6. sub to time - order_services.order_services().subscribe_to_time( - [this](const bts::mercury::TimerEvent &t_event) { - _spreader->_on_time(t_event); - }); - } + // SPREADER_CHANGE, we will get these through external calls + // if (order_services.is_live()) { + // // 4. sub to child orders order + // // (could have hidden that inside SpreaderOrderServices by exposing + // // events) + // order_services.order_services().subscribe_to_child_updates( + // [this](const bts::orderman::OrderStateUpdateEvent &os) { + // _spreader->_on_child_order_update(os); + // }); + // // 5. sub to market data + // for (size_t l_idx = 0; l_idx < _spreader->_bookkeeping_data().n_legs(); + // l_idx++) { + // const LegPropertyData &leg_prop = _spreader->_bookkeeping_data() + // .get_leg_data(l_idx) + // .leg_property_data(); + // LOG(OrderMan, Info, + // "SpreaderStartStateWorker::on_activate subbing to book sec_key: + // " + // "{}", + // leg_prop.security_key()); + // order_services.order_services().subscribe_to_book( + // leg_prop.leg_security_key(), + // [this](const BookUpdateEvent &bk_event) { + // _spreader->_on_book_update(bk_event); + // }); + // order_services.order_services().subscribe_to_settlements( + // leg_prop.leg_security_key(), + // [this](const SettlementUpdateEvent &s_event) { + // _spreader->_on_settlement_update(s_event); + // }); + // } + // // 6. sub to time + // order_services.order_services().subscribe_to_time( + // [this](const bts::mercury::TimerEvent &t_event) { + // _spreader->_on_time(t_event); + // }); + // } // quoters are init'ed in the next state _spreader->_transform_to_WAITING_FOR_INITIAL_DATA(); }