From 788c767a5fa1031ee5df84dec9396659a67223c8 Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Mon, 30 Oct 2017 19:57:02 -0400 Subject: [PATCH] changing the namespace from bts::spreader to bts::orderman --- .../orderman/spreader_orders/ISpreaderStateWorker.h | 6 +++--- .../sparkd/orderman/spreader_orders/SpreaderOrder.h | 1 - .../spreader_states/SpreaderEndStateWorker.cpp | 6 +++--- .../spreader_states/SpreaderEndStateWorker.h | 6 +++--- .../spreader_states/SpreaderStartStateWorker.cpp | 6 +++--- .../spreader_states/SpreaderStartStateWorker.h | 6 +++--- .../SpreaderWaitingForCancelAllStateWorker.cpp | 6 +++--- .../SpreaderWaitingForCancelAllStateWorker.h | 6 +++--- .../SpreaderWaitingForFirstConnStateWorker.cpp | 6 +++--- .../SpreaderWaitingForFirstConnStateWorker.h | 6 +++--- .../spreader_states/SpreaderWorkingStateWorker.cpp | 8 ++++---- .../spreader_states/SpreaderWorkingStateWorker.h | 6 +++--- src/server/sparkd/orderman/tests/spreader_order_tests.cpp | 2 +- src/server/sparkd/spreader/ISpreaderManager.h | 2 +- src/server/sparkd/spreader/LegPropertyData.h | 2 +- src/server/sparkd/spreader/QuoteLegPriceQuantityState.cpp | 2 +- src/server/sparkd/spreader/QuoteLegPriceQuantityState.h | 2 +- src/server/sparkd/spreader/SingleFillHedger.cpp | 2 +- src/server/sparkd/spreader/SingleFillHedger.h | 2 +- src/server/sparkd/spreader/SingleLegQuoter.cpp | 2 +- src/server/sparkd/spreader/SingleLegQuoter.h | 2 +- src/server/sparkd/spreader/SpreaderBookkeepingData.h | 2 +- src/server/sparkd/spreader/SpreaderHedgerData.h | 2 +- src/server/sparkd/spreader/SpreaderLegData.h | 2 +- src/server/sparkd/spreader/SpreaderOrderUpdateMessage.h | 2 +- src/server/sparkd/spreader/SpreaderUtils.h | 2 +- src/server/sparkd/spreader/hedger/IHedgerStateWorker.h | 2 +- .../hedger/hedger_states/HedgerEndStateWorker.cpp | 2 +- .../spreader/hedger/hedger_states/HedgerEndStateWorker.h | 2 +- .../hedger/hedger_states/HedgerStartStateWorker.cpp | 2 +- .../hedger/hedger_states/HedgerStartStateWorker.h | 2 +- .../HedgerWaitingForCancelAckStateWorker.cpp | 2 +- .../hedger_states/HedgerWaitingForCancelAckStateWorker.h | 2 +- .../hedger/hedger_states/HedgerWaitingForFirstAck.cpp | 2 +- .../hedger/hedger_states/HedgerWaitingForFirstAck.h | 2 +- .../hedger_states/HedgerWaitingForFirstAckCancelled.cpp | 2 +- .../hedger_states/HedgerWaitingForFirstAckCancelled.h | 2 +- .../hedger/hedger_states/HedgerWorkingStateWorker.cpp | 2 +- .../hedger/hedger_states/HedgerWorkingStateWorker.h | 2 +- 39 files changed, 61 insertions(+), 62 deletions(-) diff --git a/src/server/sparkd/orderman/spreader_orders/ISpreaderStateWorker.h b/src/server/sparkd/orderman/spreader_orders/ISpreaderStateWorker.h index 10a4e4d11..54aefdf17 100644 --- a/src/server/sparkd/orderman/spreader_orders/ISpreaderStateWorker.h +++ b/src/server/sparkd/orderman/spreader_orders/ISpreaderStateWorker.h @@ -36,11 +36,11 @@ public: virtual void on_book(TickToTradeCorID corid, const Book&) = 0; virtual void on_time(const TimeStamp&) = 0; // when a quoter order ack from the exchange has an error - virtual void on_quoter_order_error(bts::spreader::SpreaderLegData& leg_data, api::orderman::OrderStatus, Quantity filled_quantity, Price average_price, std::string const *reject) = 0; + virtual void on_quoter_order_error(bts::orderman::SpreaderLegData& leg_data, api::orderman::OrderStatus, Quantity filled_quantity, Price average_price, std::string const *reject) = 0; // on a quoter order fill - virtual void on_quoter_order_fill(bts::spreader::SpreaderLegData& leg_data, api::orderman::OrderStatus, Quantity filled_quantity, Price average_price) = 0; + virtual void on_quoter_order_fill(bts::orderman::SpreaderLegData& leg_data, api::orderman::OrderStatus, Quantity filled_quantity, Price average_price) = 0; // on a quoter status update without a fill - virtual void on_quoter_order_status_update(bts::spreader::SpreaderLegData& leg_data, api::orderman::OrderStatus) = 0; + virtual void on_quoter_order_status_update(bts::orderman::SpreaderLegData& leg_data, api::orderman::OrderStatus) = 0; // when a hedger order ack from the exchange has an error virtual void on_hedger_order_error(OrderKey child_k, api::orderman::OrderStatus, Quantity filled_quantity, Price average_price, std::string const *reject) = 0; // on a hedgerorder udpate (this may or may not have a fill) diff --git a/src/server/sparkd/orderman/spreader_orders/SpreaderOrder.h b/src/server/sparkd/orderman/spreader_orders/SpreaderOrder.h index 8e51025e5..75676424c 100644 --- a/src/server/sparkd/orderman/spreader_orders/SpreaderOrder.h +++ b/src/server/sparkd/orderman/spreader_orders/SpreaderOrder.h @@ -12,7 +12,6 @@ namespace api {namespace orderman {class OrderState; class CreateSpreaderOrder;} namespace securities {class SecurityDB;} namespace orderman { -using namespace bts::spreader; class Book; class NativeOrderFactory; diff --git a/src/server/sparkd/orderman/spreader_orders/spreader_states/SpreaderEndStateWorker.cpp b/src/server/sparkd/orderman/spreader_orders/spreader_states/SpreaderEndStateWorker.cpp index a065485c8..17f3c04b7 100644 --- a/src/server/sparkd/orderman/spreader_orders/spreader_states/SpreaderEndStateWorker.cpp +++ b/src/server/sparkd/orderman/spreader_orders/spreader_states/SpreaderEndStateWorker.cpp @@ -32,11 +32,11 @@ void SpreaderEndStateWorker::on_book(TickToTradeCorID, Book const&) {} void SpreaderEndStateWorker::on_time(const TimeStamp&) {} -void SpreaderEndStateWorker::on_quoter_order_error(bts::spreader::SpreaderLegData&, api::orderman::OrderStatus, Quantity, Price, std::string const*) +void SpreaderEndStateWorker::on_quoter_order_error(bts::orderman::SpreaderLegData&, api::orderman::OrderStatus, Quantity, Price, std::string const*) {} -void SpreaderEndStateWorker::on_quoter_order_fill(bts::spreader::SpreaderLegData&, api::orderman::OrderStatus, Quantity, Price) +void SpreaderEndStateWorker::on_quoter_order_fill(bts::orderman::SpreaderLegData&, api::orderman::OrderStatus, Quantity, Price) {} -void SpreaderEndStateWorker::on_quoter_order_status_update(bts::spreader::SpreaderLegData&, api::orderman::OrderStatus) +void SpreaderEndStateWorker::on_quoter_order_status_update(bts::orderman::SpreaderLegData&, api::orderman::OrderStatus) {} void SpreaderEndStateWorker::on_hedger_order_error(OrderKey, api::orderman::OrderStatus, Quantity, Price, std::string const*) {} diff --git a/src/server/sparkd/orderman/spreader_orders/spreader_states/SpreaderEndStateWorker.h b/src/server/sparkd/orderman/spreader_orders/spreader_states/SpreaderEndStateWorker.h index cf9b41861..9b167956d 100644 --- a/src/server/sparkd/orderman/spreader_orders/spreader_states/SpreaderEndStateWorker.h +++ b/src/server/sparkd/orderman/spreader_orders/spreader_states/SpreaderEndStateWorker.h @@ -21,9 +21,9 @@ public: void on_cancel(api::orderman::CancelSpreaderOrder const&) override; void on_book(TickToTradeCorID corid, Book const&) override; void on_time(const TimeStamp&) override; - void on_quoter_order_error(bts::spreader::SpreaderLegData& leg_data, api::orderman::OrderStatus, Quantity filled_quantity, Price average_price, std::string const *reject) override; - void on_quoter_order_fill(bts::spreader::SpreaderLegData& leg_data, api::orderman::OrderStatus, Quantity filled_quantity, Price average_price) override; - void on_quoter_order_status_update(bts::spreader::SpreaderLegData& leg_data, api::orderman::OrderStatus) override; + void on_quoter_order_error(bts::orderman::SpreaderLegData& leg_data, api::orderman::OrderStatus, Quantity filled_quantity, Price average_price, std::string const *reject) override; + void on_quoter_order_fill(bts::orderman::SpreaderLegData& leg_data, api::orderman::OrderStatus, Quantity filled_quantity, Price average_price) override; + void on_quoter_order_status_update(bts::orderman::SpreaderLegData& leg_data, api::orderman::OrderStatus) override; void on_hedger_order_error(OrderKey child_k, api::orderman::OrderStatus, Quantity filled_quantity, Price average_price, std::string const *reject) override; void on_hedger_order_update(OrderKey child_k, api::orderman::OrderStatus, Quantity filled_quantity, Price average_price) override; void on_external_error(std::string const&) override; diff --git a/src/server/sparkd/orderman/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp b/src/server/sparkd/orderman/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp index 7f5d91082..4d6d65953 100644 --- a/src/server/sparkd/orderman/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp +++ b/src/server/sparkd/orderman/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp @@ -42,15 +42,15 @@ void SpreaderStartStateWorker::on_book(TickToTradeCorID, Book const&) void SpreaderStartStateWorker::on_time(const TimeStamp&) { } -void SpreaderStartStateWorker::on_quoter_order_error(bts::spreader::SpreaderLegData&, api::orderman::OrderStatus, Quantity, Price, std::string const*) +void SpreaderStartStateWorker::on_quoter_order_error(bts::orderman::SpreaderLegData&, api::orderman::OrderStatus, Quantity, Price, std::string const*) { bts_assert_msg (false, "Illegal Spreader operation {START,on_quoter_order_error}"); } -void SpreaderStartStateWorker::on_quoter_order_fill(bts::spreader::SpreaderLegData&, api::orderman::OrderStatus, Quantity, Price) +void SpreaderStartStateWorker::on_quoter_order_fill(bts::orderman::SpreaderLegData&, api::orderman::OrderStatus, Quantity, Price) { bts_assert_msg (false, "Illegal Spreader operation {START,on_quoter_order_fill}"); } -void SpreaderStartStateWorker::on_quoter_order_status_update(bts::spreader::SpreaderLegData&, api::orderman::OrderStatus) +void SpreaderStartStateWorker::on_quoter_order_status_update(bts::orderman::SpreaderLegData&, api::orderman::OrderStatus) { bts_assert_msg (false, "Illegal Spreader operation {START,on_quoter_order_status_update}"); } diff --git a/src/server/sparkd/orderman/spreader_orders/spreader_states/SpreaderStartStateWorker.h b/src/server/sparkd/orderman/spreader_orders/spreader_states/SpreaderStartStateWorker.h index 81623d10a..816fc7118 100644 --- a/src/server/sparkd/orderman/spreader_orders/spreader_states/SpreaderStartStateWorker.h +++ b/src/server/sparkd/orderman/spreader_orders/spreader_states/SpreaderStartStateWorker.h @@ -21,9 +21,9 @@ public: void on_cancel(api::orderman::CancelSpreaderOrder const&) override; void on_book(TickToTradeCorID corid, Book const&) override; void on_time(const TimeStamp&) override; - void on_quoter_order_error(bts::spreader::SpreaderLegData& leg_data, api::orderman::OrderStatus, Quantity filled_quantity, Price average_price, std::string const *reject) override; - void on_quoter_order_fill(bts::spreader::SpreaderLegData& leg_data, api::orderman::OrderStatus, Quantity filled_quantity, Price average_price) override; - void on_quoter_order_status_update(bts::spreader::SpreaderLegData& leg_data, api::orderman::OrderStatus) override; + void on_quoter_order_error(bts::orderman::SpreaderLegData& leg_data, api::orderman::OrderStatus, Quantity filled_quantity, Price average_price, std::string const *reject) override; + void on_quoter_order_fill(bts::orderman::SpreaderLegData& leg_data, api::orderman::OrderStatus, Quantity filled_quantity, Price average_price) override; + void on_quoter_order_status_update(bts::orderman::SpreaderLegData& leg_data, api::orderman::OrderStatus) override; void on_hedger_order_error(OrderKey child_k, api::orderman::OrderStatus, Quantity filled_quantity, Price average_price, std::string const *reject) override; void on_hedger_order_update(OrderKey child_k, api::orderman::OrderStatus, Quantity filled_quantity, Price average_price) override; void on_external_error(std::string const&) override; diff --git a/src/server/sparkd/orderman/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.cpp b/src/server/sparkd/orderman/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.cpp index 6ad7e6389..0633b4930 100644 --- a/src/server/sparkd/orderman/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.cpp +++ b/src/server/sparkd/orderman/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.cpp @@ -40,17 +40,17 @@ void SpreaderWaitingForCancelAllStateWorker::on_time(const TimeStamp&) { // TODO, if enough time has elapsed then tranform to end } -void SpreaderWaitingForCancelAllStateWorker::on_quoter_order_error(bts::spreader::SpreaderLegData&, api::orderman::OrderStatus, Quantity, Price, std::string const*) +void SpreaderWaitingForCancelAllStateWorker::on_quoter_order_error(bts::orderman::SpreaderLegData&, api::orderman::OrderStatus, Quantity, Price, std::string const*) { // on_error results in cancelling, however this is already waiting for cancel here } -void SpreaderWaitingForCancelAllStateWorker::on_quoter_order_fill(bts::spreader::SpreaderLegData& leg_data, api::orderman::OrderStatus status, +void SpreaderWaitingForCancelAllStateWorker::on_quoter_order_fill(bts::orderman::SpreaderLegData& leg_data, api::orderman::OrderStatus status, Quantity filled_quantity, Price average_price) { leg_data.order_update_message().update (status, filled_quantity, average_price, nullptr); leg_data.quoter().update_order_status (leg_data.order_update_message()); } -void SpreaderWaitingForCancelAllStateWorker::on_quoter_order_status_update(bts::spreader::SpreaderLegData& leg_data, api::orderman::OrderStatus status) +void SpreaderWaitingForCancelAllStateWorker::on_quoter_order_status_update(bts::orderman::SpreaderLegData& leg_data, api::orderman::OrderStatus status) { leg_data.order_update_message().update (status); } diff --git a/src/server/sparkd/orderman/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.h b/src/server/sparkd/orderman/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.h index e14fbe511..cb900fe6f 100644 --- a/src/server/sparkd/orderman/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.h +++ b/src/server/sparkd/orderman/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.h @@ -21,9 +21,9 @@ public: void on_cancel(api::orderman::CancelSpreaderOrder const&) override; void on_book(TickToTradeCorID corid, Book const&) override; void on_time(const TimeStamp&) override; - void on_quoter_order_error(bts::spreader::SpreaderLegData&, api::orderman::OrderStatus, Quantity filled_quantity, Price average_price, std::string const *reject) override; - void on_quoter_order_fill(bts::spreader::SpreaderLegData&, api::orderman::OrderStatus, Quantity filled_quantity, Price average_price) override; - void on_quoter_order_status_update(bts::spreader::SpreaderLegData&, api::orderman::OrderStatus) override; + void on_quoter_order_error(bts::orderman::SpreaderLegData&, api::orderman::OrderStatus, Quantity filled_quantity, Price average_price, std::string const *reject) override; + void on_quoter_order_fill(bts::orderman::SpreaderLegData&, api::orderman::OrderStatus, Quantity filled_quantity, Price average_price) override; + void on_quoter_order_status_update(bts::orderman::SpreaderLegData&, api::orderman::OrderStatus) override; void on_hedger_order_error(OrderKey child_k, api::orderman::OrderStatus, Quantity filled_quantity, Price average_price, std::string const *reject) override; void on_hedger_order_update(OrderKey child_k, api::orderman::OrderStatus, Quantity filled_quantity, Price average_price) override; void on_external_error(std::string const&) override; diff --git a/src/server/sparkd/orderman/spreader_orders/spreader_states/SpreaderWaitingForFirstConnStateWorker.cpp b/src/server/sparkd/orderman/spreader_orders/spreader_states/SpreaderWaitingForFirstConnStateWorker.cpp index 5a6197ee3..58d76750a 100644 --- a/src/server/sparkd/orderman/spreader_orders/spreader_states/SpreaderWaitingForFirstConnStateWorker.cpp +++ b/src/server/sparkd/orderman/spreader_orders/spreader_states/SpreaderWaitingForFirstConnStateWorker.cpp @@ -53,15 +53,15 @@ void SpreaderWaitingForFirstConnStateWorker::on_book(TickToTradeCorID, Book cons void SpreaderWaitingForFirstConnStateWorker::on_time(const TimeStamp&) { } -void SpreaderWaitingForFirstConnStateWorker::on_quoter_order_error(bts::spreader::SpreaderLegData&, api::orderman::OrderStatus, Quantity, Price, std::string const*) +void SpreaderWaitingForFirstConnStateWorker::on_quoter_order_error(bts::orderman::SpreaderLegData&, api::orderman::OrderStatus, Quantity, Price, std::string const*) { bts_assert_msg (false, "Illegal Spreader operation {WAITING_FOR_FIRST_CONNECT,on_quoter_order_error}"); } -void SpreaderWaitingForFirstConnStateWorker::on_quoter_order_fill(bts::spreader::SpreaderLegData&, api::orderman::OrderStatus, Quantity, Price) +void SpreaderWaitingForFirstConnStateWorker::on_quoter_order_fill(bts::orderman::SpreaderLegData&, api::orderman::OrderStatus, Quantity, Price) { bts_assert_msg (false, "Illegal Spreader operation {WAITING_FOR_FIRST_CONNECT,on_quoter_order_fill}"); } -void SpreaderWaitingForFirstConnStateWorker::on_quoter_order_status_update(bts::spreader::SpreaderLegData&, api::orderman::OrderStatus) +void SpreaderWaitingForFirstConnStateWorker::on_quoter_order_status_update(bts::orderman::SpreaderLegData&, api::orderman::OrderStatus) { bts_assert_msg (false, "Illegal Spreader operation {WAITING_FOR_FIRST_CONNECT,on_quoter_order_status_update}"); } diff --git a/src/server/sparkd/orderman/spreader_orders/spreader_states/SpreaderWaitingForFirstConnStateWorker.h b/src/server/sparkd/orderman/spreader_orders/spreader_states/SpreaderWaitingForFirstConnStateWorker.h index feae5eb15..b41c6a50f 100644 --- a/src/server/sparkd/orderman/spreader_orders/spreader_states/SpreaderWaitingForFirstConnStateWorker.h +++ b/src/server/sparkd/orderman/spreader_orders/spreader_states/SpreaderWaitingForFirstConnStateWorker.h @@ -21,9 +21,9 @@ public: void on_cancel(api::orderman::CancelSpreaderOrder const&) override; void on_book(TickToTradeCorID corid, Book const&) override; void on_time(const TimeStamp&) override; - void on_quoter_order_error(bts::spreader::SpreaderLegData&, api::orderman::OrderStatus, Quantity filled_quantity, Price average_price, std::string const *reject) override; - void on_quoter_order_fill(bts::spreader::SpreaderLegData&, api::orderman::OrderStatus, Quantity filled_quantity, Price average_price) override; - void on_quoter_order_status_update(bts::spreader::SpreaderLegData&, api::orderman::OrderStatus) override; + void on_quoter_order_error(bts::orderman::SpreaderLegData&, api::orderman::OrderStatus, Quantity filled_quantity, Price average_price, std::string const *reject) override; + void on_quoter_order_fill(bts::orderman::SpreaderLegData&, api::orderman::OrderStatus, Quantity filled_quantity, Price average_price) override; + void on_quoter_order_status_update(bts::orderman::SpreaderLegData&, api::orderman::OrderStatus) override; void on_hedger_order_error(OrderKey child_k, api::orderman::OrderStatus, Quantity filled_quantity, Price average_price, std::string const *reject) override; void on_hedger_order_update(OrderKey child_k, api::orderman::OrderStatus, Quantity filled_quantity, Price average_price) override; void on_external_error(std::string const&) override; diff --git a/src/server/sparkd/orderman/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp b/src/server/sparkd/orderman/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp index b97f53c56..971bf0468 100644 --- a/src/server/sparkd/orderman/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp +++ b/src/server/sparkd/orderman/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp @@ -89,7 +89,7 @@ void SpreaderWorkingStateWorker::on_time(const TimeStamp&) } } } -void SpreaderWorkingStateWorker::on_quoter_order_error(bts::spreader::SpreaderLegData& leg_data, api::orderman::OrderStatus status, Quantity filled_quantity, Price average_price, std::string const* err_msg) +void SpreaderWorkingStateWorker::on_quoter_order_error(bts::orderman::SpreaderLegData& leg_data, api::orderman::OrderStatus status, Quantity filled_quantity, Price average_price, std::string const* err_msg) { leg_data.order_update_message().update(status, filled_quantity, average_price, err_msg); // this is because the error message could also have status changes @@ -98,7 +98,7 @@ void SpreaderWorkingStateWorker::on_quoter_order_error(bts::spreader::SpreaderLe _spreader->report_state (api::orderman::OrderStatus::OS_PENDING_CANCEL); _spreader->_transform_to_WAITING_FOR_CANCEL_ALL (); } -void SpreaderWorkingStateWorker::on_quoter_order_fill(bts::spreader::SpreaderLegData& leg_data, api::orderman::OrderStatus status, Quantity filled_quantity, Price average_price) +void SpreaderWorkingStateWorker::on_quoter_order_fill(bts::orderman::SpreaderLegData& leg_data, api::orderman::OrderStatus status, Quantity filled_quantity, Price average_price) { // this is the most complex part of the spreader. the following needs to be done // 1. update the order state @@ -111,7 +111,7 @@ void SpreaderWorkingStateWorker::on_quoter_order_fill(bts::spreader::SpreaderLeg SpreaderBookkeepingData& bookkeeping_data = _spreader->bookkeeping_data (); for (size_t q_idx = 0; q_idx < bookkeeping_data.count(); q_idx++) { - bts::spreader::SpreaderLegData other_leg_data = bookkeeping_data.get_leg_data (q_idx); + bts::orderman::SpreaderLegData other_leg_data = bookkeeping_data.get_leg_data (q_idx); if (q_idx != leg_data.leg_property_data.leg_index) { // if it is an actively quoting leg, inform the quoter about it @@ -123,7 +123,7 @@ void SpreaderWorkingStateWorker::on_quoter_order_fill(bts::spreader::SpreaderLeg } } } -void SpreaderWorkingStateWorker::on_quoter_order_status_update(bts::spreader::SpreaderLegData& leg_data, api::orderman::OrderStatus status) +void SpreaderWorkingStateWorker::on_quoter_order_status_update(bts::orderman::SpreaderLegData& leg_data, api::orderman::OrderStatus status) { leg_data.order_update_message().update (status); leg_data.quoter().update_order_status (leg_data.order_update_message()); diff --git a/src/server/sparkd/orderman/spreader_orders/spreader_states/SpreaderWorkingStateWorker.h b/src/server/sparkd/orderman/spreader_orders/spreader_states/SpreaderWorkingStateWorker.h index 92451b7bd..0e989f15b 100644 --- a/src/server/sparkd/orderman/spreader_orders/spreader_states/SpreaderWorkingStateWorker.h +++ b/src/server/sparkd/orderman/spreader_orders/spreader_states/SpreaderWorkingStateWorker.h @@ -21,9 +21,9 @@ public: void on_cancel(api::orderman::CancelSpreaderOrder const&) override; void on_book(TickToTradeCorID corid, Book const&) override; void on_time(const TimeStamp&) override; - void on_quoter_order_error(bts::spreader::SpreaderLegData&, api::orderman::OrderStatus, Quantity filled_quantity, Price average_price, std::string const *reject) override; - void on_quoter_order_fill(bts::spreader::SpreaderLegData&, api::orderman::OrderStatus, Quantity filled_quantity, Price average_price) override; - void on_quoter_order_status_update(bts::spreader::SpreaderLegData&, api::orderman::OrderStatus) override; + void on_quoter_order_error(bts::orderman::SpreaderLegData&, api::orderman::OrderStatus, Quantity filled_quantity, Price average_price, std::string const *reject) override; + void on_quoter_order_fill(bts::orderman::SpreaderLegData&, api::orderman::OrderStatus, Quantity filled_quantity, Price average_price) override; + void on_quoter_order_status_update(bts::orderman::SpreaderLegData&, api::orderman::OrderStatus) override; void on_hedger_order_error(OrderKey child_k, api::orderman::OrderStatus, Quantity filled_quantity, Price average_price, std::string const *reject) override; void on_hedger_order_update(OrderKey child_k, api::orderman::OrderStatus, Quantity filled_quantity, Price average_price) override; void on_external_error(std::string const&) override; diff --git a/src/server/sparkd/orderman/tests/spreader_order_tests.cpp b/src/server/sparkd/orderman/tests/spreader_order_tests.cpp index 3a912175c..a62d37507 100644 --- a/src/server/sparkd/orderman/tests/spreader_order_tests.cpp +++ b/src/server/sparkd/orderman/tests/spreader_order_tests.cpp @@ -240,7 +240,7 @@ void disabled_temp() /*********************First on_connect*********************/ order.on_connect (); bts_assert (order.test_only_func_state() == SpreaderOrder::State::WORKING); - bts::spreader::SpreaderLegData& leg_data = order.test_only_func_leg_data (1); + bts::orderman::SpreaderLegData& leg_data = order.test_only_func_leg_data (1); bts_assert (leg_data.quoter().test_only_func_state() == SingleLegQuoter::QuoterState::WAITING_FOR_MARKET); const QuoteLegPriceQuantityState& qp_state = leg_data.quoter().test_only_func_price_quantity_state (); _test_quoter_price_quantity (qp_state, Price (0), Quantity(100), Quantity(0), Quantity(0), Price (0), Quantity (0)); diff --git a/src/server/sparkd/spreader/ISpreaderManager.h b/src/server/sparkd/spreader/ISpreaderManager.h index a9f889c10..61bbc206c 100644 --- a/src/server/sparkd/spreader/ISpreaderManager.h +++ b/src/server/sparkd/spreader/ISpreaderManager.h @@ -2,7 +2,7 @@ #include "server/sparkd/orderman/md/Book.h" namespace bts { -namespace spreader { +namespace orderman { class LegPropertyData; // spreader, spawns a bunch of SingleLegQuoters (to quote each active diff --git a/src/server/sparkd/spreader/LegPropertyData.h b/src/server/sparkd/spreader/LegPropertyData.h index fd0e60ae9..dd1c5c816 100644 --- a/src/server/sparkd/spreader/LegPropertyData.h +++ b/src/server/sparkd/spreader/LegPropertyData.h @@ -4,7 +4,7 @@ #include "lib/sparkproto/SparkProtos.pb.h" namespace bts { -namespace spreader { +namespace orderman { // collection of immutable leg data properties, shared // between the Spreader, SingleLegQuoter and SingleFillHedger class LegPropertyData diff --git a/src/server/sparkd/spreader/QuoteLegPriceQuantityState.cpp b/src/server/sparkd/spreader/QuoteLegPriceQuantityState.cpp index cb309f465..4f9963a32 100644 --- a/src/server/sparkd/spreader/QuoteLegPriceQuantityState.cpp +++ b/src/server/sparkd/spreader/QuoteLegPriceQuantityState.cpp @@ -1,7 +1,7 @@ #include "QuoteLegPriceQuantityState.h" namespace bts { -namespace spreader { +namespace orderman { QuoteLegPriceQuantityState::QuoteLegPriceQuantityState(Price target_spread_price, Quantity target_leg_quantity) : diff --git a/src/server/sparkd/spreader/QuoteLegPriceQuantityState.h b/src/server/sparkd/spreader/QuoteLegPriceQuantityState.h index e8584c5bf..81894cb8c 100644 --- a/src/server/sparkd/spreader/QuoteLegPriceQuantityState.h +++ b/src/server/sparkd/spreader/QuoteLegPriceQuantityState.h @@ -4,7 +4,7 @@ namespace bts { -namespace spreader { +namespace orderman { // this class is used to mantain the price and quantity // state of the leg quoter class QuoteLegPriceQuantityState diff --git a/src/server/sparkd/spreader/SingleFillHedger.cpp b/src/server/sparkd/spreader/SingleFillHedger.cpp index 119704795..d43930ae1 100644 --- a/src/server/sparkd/spreader/SingleFillHedger.cpp +++ b/src/server/sparkd/spreader/SingleFillHedger.cpp @@ -5,7 +5,7 @@ #include "SpreaderOrderUpdateMessage.h" namespace bts { -namespace spreader { +namespace orderman { SingleFillHedger::SingleFillHedger(ISpreaderManager&, //spreader_manager, size_t, //leg_index, diff --git a/src/server/sparkd/spreader/SingleFillHedger.h b/src/server/sparkd/spreader/SingleFillHedger.h index 91d8a6d1e..522c4ff7c 100644 --- a/src/server/sparkd/spreader/SingleFillHedger.h +++ b/src/server/sparkd/spreader/SingleFillHedger.h @@ -7,7 +7,7 @@ #include "server/sparkd/orderman/utils/orderman_utils.h" namespace bts { -namespace spreader { +namespace orderman { class ISpreaderManager; class LegPropertyData; class SpreaderOrderUpdateMessage; diff --git a/src/server/sparkd/spreader/SingleLegQuoter.cpp b/src/server/sparkd/spreader/SingleLegQuoter.cpp index 41fc85d08..69676471e 100644 --- a/src/server/sparkd/spreader/SingleLegQuoter.cpp +++ b/src/server/sparkd/spreader/SingleLegQuoter.cpp @@ -7,7 +7,7 @@ #include "server/sparkd/orderman/utils/orderman_utils.h" namespace bts { -namespace spreader { +namespace orderman { SingleLegQuoter::SingleLegQuoter(ISpreaderManager& order_bridge, LegPropertyData this_leg_property, diff --git a/src/server/sparkd/spreader/SingleLegQuoter.h b/src/server/sparkd/spreader/SingleLegQuoter.h index 111a40452..434482a83 100644 --- a/src/server/sparkd/spreader/SingleLegQuoter.h +++ b/src/server/sparkd/spreader/SingleLegQuoter.h @@ -12,7 +12,7 @@ namespace bts { -namespace spreader { +namespace orderman { class ISpreaderManager; class SpreaderOrderUpdateMessage; diff --git a/src/server/sparkd/spreader/SpreaderBookkeepingData.h b/src/server/sparkd/spreader/SpreaderBookkeepingData.h index ab0223018..3436d549c 100644 --- a/src/server/sparkd/spreader/SpreaderBookkeepingData.h +++ b/src/server/sparkd/spreader/SpreaderBookkeepingData.h @@ -4,7 +4,7 @@ #include "SpreaderLegData.h" namespace bts{ -namespace spreader { +namespace orderman { class SpreaderHedgerData; // encapsulates, organizes and provides easy access and lookups // for data needed by the spreader diff --git a/src/server/sparkd/spreader/SpreaderHedgerData.h b/src/server/sparkd/spreader/SpreaderHedgerData.h index 6ea6879f1..2b9e4cf77 100644 --- a/src/server/sparkd/spreader/SpreaderHedgerData.h +++ b/src/server/sparkd/spreader/SpreaderHedgerData.h @@ -3,7 +3,7 @@ #include "SpreaderOrderUpdateMessage.h" namespace bts{ -namespace spreader{ +namespace orderman{ class SpreaderHedgerData { diff --git a/src/server/sparkd/spreader/SpreaderLegData.h b/src/server/sparkd/spreader/SpreaderLegData.h index c9a9ddaa4..14bee4b18 100644 --- a/src/server/sparkd/spreader/SpreaderLegData.h +++ b/src/server/sparkd/spreader/SpreaderLegData.h @@ -6,7 +6,7 @@ #include "SpreaderOrderUpdateMessage.h" namespace bts{ -namespace spreader{ +namespace orderman{ // all the data for a leg : // 1. leg property data // 2. quoter diff --git a/src/server/sparkd/spreader/SpreaderOrderUpdateMessage.h b/src/server/sparkd/spreader/SpreaderOrderUpdateMessage.h index d6f4e89a6..5b184eb28 100644 --- a/src/server/sparkd/spreader/SpreaderOrderUpdateMessage.h +++ b/src/server/sparkd/spreader/SpreaderOrderUpdateMessage.h @@ -5,7 +5,7 @@ #include "SpreaderUtils.h" namespace bts { -namespace spreader { +namespace orderman { // this represents the last update message (and some derived data) // for an order. its part of the quoter and hedger data class SpreaderOrderUpdateMessage diff --git a/src/server/sparkd/spreader/SpreaderUtils.h b/src/server/sparkd/spreader/SpreaderUtils.h index 5508421a5..89fec5641 100644 --- a/src/server/sparkd/spreader/SpreaderUtils.h +++ b/src/server/sparkd/spreader/SpreaderUtils.h @@ -6,7 +6,7 @@ #include "server/sparkd/orderman/md/Book.h" namespace bts { -namespace spreader { +namespace orderman { // collection of helper functions used by the quoter, hedger // and the spreader glue diff --git a/src/server/sparkd/spreader/hedger/IHedgerStateWorker.h b/src/server/sparkd/spreader/hedger/IHedgerStateWorker.h index 0cd9f2aea..6996fd2ea 100644 --- a/src/server/sparkd/spreader/hedger/IHedgerStateWorker.h +++ b/src/server/sparkd/spreader/hedger/IHedgerStateWorker.h @@ -4,7 +4,7 @@ #include "server/sparkd/spreader/SpreaderLegData.h" // fix this (not needed) namespace bts { -namespace spreader { +namespace orderman { class SpreaderOrder; class TimeStamp; class Book; diff --git a/src/server/sparkd/spreader/hedger/hedger_states/HedgerEndStateWorker.cpp b/src/server/sparkd/spreader/hedger/hedger_states/HedgerEndStateWorker.cpp index c0b873659..efbb44fae 100644 --- a/src/server/sparkd/spreader/hedger/hedger_states/HedgerEndStateWorker.cpp +++ b/src/server/sparkd/spreader/hedger/hedger_states/HedgerEndStateWorker.cpp @@ -1,7 +1,7 @@ #include "server/sparkd/spreader/hedger/hedger_states/HedgerEndStateWorker.h" namespace bts{ -namespace spreader{ +namespace orderman{ void HedgerEndStateWorker::init() {} diff --git a/src/server/sparkd/spreader/hedger/hedger_states/HedgerEndStateWorker.h b/src/server/sparkd/spreader/hedger/hedger_states/HedgerEndStateWorker.h index 6a1ede3a0..709d4798e 100644 --- a/src/server/sparkd/spreader/hedger/hedger_states/HedgerEndStateWorker.h +++ b/src/server/sparkd/spreader/hedger/hedger_states/HedgerEndStateWorker.h @@ -3,7 +3,7 @@ #include "server/sparkd/spreader/hedger/IHedgerStateWorker.h" namespace bts{ -namespace spreader{ +namespace orderman{ class HedgerEndStateWorker : public IHedgerStateWorker { diff --git a/src/server/sparkd/spreader/hedger/hedger_states/HedgerStartStateWorker.cpp b/src/server/sparkd/spreader/hedger/hedger_states/HedgerStartStateWorker.cpp index 6e0eda2e0..8a55608fa 100644 --- a/src/server/sparkd/spreader/hedger/hedger_states/HedgerStartStateWorker.cpp +++ b/src/server/sparkd/spreader/hedger/hedger_states/HedgerStartStateWorker.cpp @@ -1,7 +1,7 @@ #include "server/sparkd/spreader/hedger/hedger_states/HedgerStartStateWorker.h" namespace bts{ -namespace spreader{ +namespace orderman{ void HedgerStartStateWorker::init() {} diff --git a/src/server/sparkd/spreader/hedger/hedger_states/HedgerStartStateWorker.h b/src/server/sparkd/spreader/hedger/hedger_states/HedgerStartStateWorker.h index 945038272..f19afb9ed 100644 --- a/src/server/sparkd/spreader/hedger/hedger_states/HedgerStartStateWorker.h +++ b/src/server/sparkd/spreader/hedger/hedger_states/HedgerStartStateWorker.h @@ -3,7 +3,7 @@ #include "server/sparkd/spreader/hedger/IHedgerStateWorker.h" namespace bts{ -namespace spreader{ +namespace orderman{ class HedgerStartStateWorker : public IHedgerStateWorker { diff --git a/src/server/sparkd/spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.cpp b/src/server/sparkd/spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.cpp index 84602b50a..910f3afbd 100644 --- a/src/server/sparkd/spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.cpp +++ b/src/server/sparkd/spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.cpp @@ -1,7 +1,7 @@ #include "server/sparkd/spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.h" namespace bts{ -namespace spreader{ +namespace orderman{ void HedgerWaitingForCancelAckStateWorker::init() {} diff --git a/src/server/sparkd/spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.h b/src/server/sparkd/spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.h index e74f80ba8..01828633d 100644 --- a/src/server/sparkd/spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.h +++ b/src/server/sparkd/spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.h @@ -3,7 +3,7 @@ #include "server/sparkd/spreader/hedger/IHedgerStateWorker.h" namespace bts{ -namespace spreader{ +namespace orderman{ class HedgerWaitingForCancelAckStateWorker : public IHedgerStateWorker { diff --git a/src/server/sparkd/spreader/hedger/hedger_states/HedgerWaitingForFirstAck.cpp b/src/server/sparkd/spreader/hedger/hedger_states/HedgerWaitingForFirstAck.cpp index 9dc488f6d..cc7124c6f 100644 --- a/src/server/sparkd/spreader/hedger/hedger_states/HedgerWaitingForFirstAck.cpp +++ b/src/server/sparkd/spreader/hedger/hedger_states/HedgerWaitingForFirstAck.cpp @@ -1,7 +1,7 @@ #include "server/sparkd/spreader/hedger/hedger_states/HedgerWaitingForFirstAck.h" namespace bts{ -namespace spreader{ +namespace orderman{ void HedgerWaitingForFirstAck::init() {} diff --git a/src/server/sparkd/spreader/hedger/hedger_states/HedgerWaitingForFirstAck.h b/src/server/sparkd/spreader/hedger/hedger_states/HedgerWaitingForFirstAck.h index e148242fa..d9a95eb73 100644 --- a/src/server/sparkd/spreader/hedger/hedger_states/HedgerWaitingForFirstAck.h +++ b/src/server/sparkd/spreader/hedger/hedger_states/HedgerWaitingForFirstAck.h @@ -3,7 +3,7 @@ #include "server/sparkd/spreader/hedger/IHedgerStateWorker.h" namespace bts{ -namespace spreader{ +namespace orderman{ class HedgerWaitingForFirstAck : public IHedgerStateWorker { diff --git a/src/server/sparkd/spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelled.cpp b/src/server/sparkd/spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelled.cpp index 1b61eb55d..d8b86df28 100644 --- a/src/server/sparkd/spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelled.cpp +++ b/src/server/sparkd/spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelled.cpp @@ -1,7 +1,7 @@ #include "server/sparkd/spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelled.h" namespace bts{ -namespace spreader{ +namespace orderman{ void HedgerWaitingForFirstAckCancelled::init() {} diff --git a/src/server/sparkd/spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelled.h b/src/server/sparkd/spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelled.h index 0892240b0..be2d2cc3f 100644 --- a/src/server/sparkd/spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelled.h +++ b/src/server/sparkd/spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelled.h @@ -3,7 +3,7 @@ #include "server/sparkd/spreader/hedger/IHedgerStateWorker.h" namespace bts{ -namespace spreader{ +namespace orderman{ class HedgerWaitingForFirstAckCancelled : public IHedgerStateWorker { diff --git a/src/server/sparkd/spreader/hedger/hedger_states/HedgerWorkingStateWorker.cpp b/src/server/sparkd/spreader/hedger/hedger_states/HedgerWorkingStateWorker.cpp index f8fb051c8..baa32d24a 100644 --- a/src/server/sparkd/spreader/hedger/hedger_states/HedgerWorkingStateWorker.cpp +++ b/src/server/sparkd/spreader/hedger/hedger_states/HedgerWorkingStateWorker.cpp @@ -1,7 +1,7 @@ #include "server/sparkd/spreader/hedger/hedger_states/HedgerWorkingStateWorker.h" namespace bts{ -namespace spreader{ +namespace orderman{ void HedgerWorkingStateWorker::init() {} diff --git a/src/server/sparkd/spreader/hedger/hedger_states/HedgerWorkingStateWorker.h b/src/server/sparkd/spreader/hedger/hedger_states/HedgerWorkingStateWorker.h index dcc737cb9..7a3f659ee 100644 --- a/src/server/sparkd/spreader/hedger/hedger_states/HedgerWorkingStateWorker.h +++ b/src/server/sparkd/spreader/hedger/hedger_states/HedgerWorkingStateWorker.h @@ -3,7 +3,7 @@ #include "server/sparkd/spreader/hedger/IHedgerStateWorker.h" namespace bts{ -namespace spreader{ +namespace orderman{ class HedgerWorkingStateWorker : public IHedgerStateWorker {