diff --git a/src/server/sparkd/spreader/SingleLegQuoter.cpp b/src/server/sparkd/spreader/SingleLegQuoter.cpp index 64e3b4bd7..93bd4954e 100644 --- a/src/server/sparkd/spreader/SingleLegQuoter.cpp +++ b/src/server/sparkd/spreader/SingleLegQuoter.cpp @@ -45,6 +45,7 @@ void SingleLegQuoter::init() } void SingleLegQuoter::update_order_status(const SpreaderChildOrderState& u) { + bts_assert (u.order_key() == _order.order_key()); LOG(OrderMan, Diag, "SingleLegQuoter::update_order_status key: {} state: {} order status: {} fills: {}", _order.order_key().value(), _worker->state_text(), static_cast(u.status()), u.last_update_filled_quantity().value()); _worker->on_order_update (u); @@ -57,7 +58,7 @@ void SingleLegQuoter::update_other_leg_fills(size_t leg_index, Quantity filled_q { LOG(OrderMan, Diag, "SingleLegQuoter::update_other_leg_fills key: {} state: {} leg_index: {} filled_quantity: {}", _order.order_key().value(), _worker->state_text(), leg_index, filled_quantity.value()); - _worker->other_leg_quoter_fill (leg_index, filled_quantity); + _worker->on_other_leg_quoter_fill (leg_index, filled_quantity); } void SingleLegQuoter::update_order_price_quantity(Price price, Quantity quantity) { diff --git a/src/server/sparkd/spreader/SpreaderChildOrderState.h b/src/server/sparkd/spreader/SpreaderChildOrderState.h index 1dd76a2b7..95f2a77cd 100644 --- a/src/server/sparkd/spreader/SpreaderChildOrderState.h +++ b/src/server/sparkd/spreader/SpreaderChildOrderState.h @@ -6,8 +6,8 @@ namespace bts { namespace orderman { -// this represents the state of the child orders -// submitted by the spreader; this includes +// this represents the state of the child order +// submitted by the spreader (both quoter and hedger); this includes // i. order key // ii. filled price/qty // iii. last update filled price/qty diff --git a/src/server/sparkd/spreader/quoter/IQuoterStateWorker.h b/src/server/sparkd/spreader/quoter/IQuoterStateWorker.h index 472eedd4c..9d60c92db 100644 --- a/src/server/sparkd/spreader/quoter/IQuoterStateWorker.h +++ b/src/server/sparkd/spreader/quoter/IQuoterStateWorker.h @@ -31,7 +31,7 @@ public: // time update from the infrastructure virtual void on_time(const TimeStamp&) = 0; // on a quoting fill on one of the other legs - virtual void other_leg_quoter_fill (size_t leg_id, Quantity fill_quantity) = 0; + virtual void on_other_leg_quoter_fill (size_t leg_id, Quantity fill_quantity) = 0; // when a spreader order gets updated, it could be that the one of // the price or quantity does not change virtual void update_spreader_order (Price price, Quantity quantity) = 0; diff --git a/src/server/sparkd/spreader/quoter/quoter_states/QuoterEndStateWorker.cpp b/src/server/sparkd/spreader/quoter/quoter_states/QuoterEndStateWorker.cpp index 0b8e32108..6046f925d 100644 --- a/src/server/sparkd/spreader/quoter/quoter_states/QuoterEndStateWorker.cpp +++ b/src/server/sparkd/spreader/quoter/quoter_states/QuoterEndStateWorker.cpp @@ -35,7 +35,7 @@ void QuoterEndStateWorker::terminate() {} void QuoterEndStateWorker::on_time(const TimeStamp&) {} -void QuoterEndStateWorker::other_leg_quoter_fill (size_t, Quantity) +void QuoterEndStateWorker::on_other_leg_quoter_fill (size_t, Quantity) {} void QuoterEndStateWorker::update_spreader_order (Price, Quantity) {} diff --git a/src/server/sparkd/spreader/quoter/quoter_states/QuoterEndStateWorker.h b/src/server/sparkd/spreader/quoter/quoter_states/QuoterEndStateWorker.h index 3b0bf94db..6bc26e90d 100644 --- a/src/server/sparkd/spreader/quoter/quoter_states/QuoterEndStateWorker.h +++ b/src/server/sparkd/spreader/quoter/quoter_states/QuoterEndStateWorker.h @@ -28,7 +28,7 @@ public: void cancel() override; void terminate() override; void on_time(const TimeStamp& ts) override; - void other_leg_quoter_fill (size_t leg_id, Quantity fill_quantity) override; + void on_other_leg_quoter_fill (size_t leg_id, Quantity fill_quantity) override; void update_spreader_order (Price price, Quantity quantity) override; }; }} \ No newline at end of file diff --git a/src/server/sparkd/spreader/quoter/quoter_states/QuoterStartStateWorker.cpp b/src/server/sparkd/spreader/quoter/quoter_states/QuoterStartStateWorker.cpp index 0619cc882..a26e2777d 100644 --- a/src/server/sparkd/spreader/quoter/quoter_states/QuoterStartStateWorker.cpp +++ b/src/server/sparkd/spreader/quoter/quoter_states/QuoterStartStateWorker.cpp @@ -39,7 +39,7 @@ void QuoterStartStateWorker::terminate() } void QuoterStartStateWorker::on_time(const TimeStamp&) {} -void QuoterStartStateWorker::other_leg_quoter_fill (size_t leg_index, Quantity filled_quantity) +void QuoterStartStateWorker::on_other_leg_quoter_fill (size_t leg_index, Quantity filled_quantity) { // if the other leg has been filled the quoting size gets reduced. // it can potentially get reduced all the way to 0, and since an @@ -56,7 +56,7 @@ void QuoterStartStateWorker::_analyze_and_act () { if (_quoter->_price_quantity_state.target_reached()) { - LOG(OrderMan, Diag, "QuoterStartStateWorker::other_leg_quoter_fill key: {}, target reached, transforming to end", _quoter->_order.order_key().value()); + LOG(OrderMan, Diag, "QuoterStartStateWorker::on_other_leg_quoter_fill key: {}, target reached, transforming to end", _quoter->_order.order_key().value()); _quoter->_transform_to_END (); } } diff --git a/src/server/sparkd/spreader/quoter/quoter_states/QuoterStartStateWorker.h b/src/server/sparkd/spreader/quoter/quoter_states/QuoterStartStateWorker.h index e984417eb..38db4055f 100644 --- a/src/server/sparkd/spreader/quoter/quoter_states/QuoterStartStateWorker.h +++ b/src/server/sparkd/spreader/quoter/quoter_states/QuoterStartStateWorker.h @@ -28,7 +28,7 @@ public: void cancel() override; void terminate() override; void on_time(const TimeStamp& ts) override; - void other_leg_quoter_fill (size_t leg_id, Quantity fill_quantity) override; + void on_other_leg_quoter_fill (size_t leg_id, Quantity fill_quantity) override; void update_spreader_order (Price price, Quantity quantity) override; private: void _analyze_and_act (); diff --git a/src/server/sparkd/spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.cpp b/src/server/sparkd/spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.cpp index 46b107d25..87a2b27e1 100644 --- a/src/server/sparkd/spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.cpp +++ b/src/server/sparkd/spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.cpp @@ -39,7 +39,7 @@ void QuoterWaitingForCancelAckStateWorker::on_time(const TimeStamp&) { // TODO check threshold } -void QuoterWaitingForCancelAckStateWorker::other_leg_quoter_fill (size_t leg_index, Quantity filled_quantity) +void QuoterWaitingForCancelAckStateWorker::on_other_leg_quoter_fill (size_t leg_index, Quantity filled_quantity) { _quoter->_incorporate_other_leg_fill (leg_index, filled_quantity); } diff --git a/src/server/sparkd/spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.h b/src/server/sparkd/spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.h index e4e034911..ebcd6526c 100644 --- a/src/server/sparkd/spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.h +++ b/src/server/sparkd/spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.h @@ -29,7 +29,7 @@ public: void cancel() override; void terminate() override; void on_time(const TimeStamp& ts) override; - void other_leg_quoter_fill (size_t leg_id, Quantity fill_quantity) override; + void on_other_leg_quoter_fill (size_t leg_id, Quantity fill_quantity) override; void update_spreader_order (Price price, Quantity quantity) override; }; }} \ No newline at end of file diff --git a/src/server/sparkd/spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.cpp b/src/server/sparkd/spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.cpp index dea56b768..4757224e4 100644 --- a/src/server/sparkd/spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.cpp +++ b/src/server/sparkd/spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.cpp @@ -44,7 +44,7 @@ void QuoterWaitingForFirstAckCancelledWorker::terminate() } void QuoterWaitingForFirstAckCancelledWorker::on_time(const TimeStamp&) {} -void QuoterWaitingForFirstAckCancelledWorker::other_leg_quoter_fill (size_t leg_index, Quantity filled_quantity) +void QuoterWaitingForFirstAckCancelledWorker::on_other_leg_quoter_fill (size_t leg_index, Quantity filled_quantity) { _quoter->_incorporate_other_leg_fill (leg_index, filled_quantity); } diff --git a/src/server/sparkd/spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.h b/src/server/sparkd/spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.h index 23563833b..d0118d69b 100644 --- a/src/server/sparkd/spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.h +++ b/src/server/sparkd/spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.h @@ -30,7 +30,7 @@ public: void cancel() override; void terminate() override; void on_time(const TimeStamp& ts) override; - void other_leg_quoter_fill (size_t leg_id, Quantity fill_quantity) override; + void on_other_leg_quoter_fill (size_t leg_id, Quantity fill_quantity) override; void update_spreader_order (Price price, Quantity quantity) override; }; }} \ No newline at end of file diff --git a/src/server/sparkd/spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.cpp b/src/server/sparkd/spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.cpp index 84ed2e409..b0ac545de 100644 --- a/src/server/sparkd/spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.cpp +++ b/src/server/sparkd/spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.cpp @@ -41,7 +41,7 @@ void QuoterWaitingForFirstAckWorker::terminate() } void QuoterWaitingForFirstAckWorker::on_time(const TimeStamp&) {} -void QuoterWaitingForFirstAckWorker::other_leg_quoter_fill (size_t leg_index, Quantity filled_quantity) +void QuoterWaitingForFirstAckWorker::on_other_leg_quoter_fill (size_t leg_index, Quantity filled_quantity) { _quoter->_incorporate_other_leg_fill (leg_index, filled_quantity); _analyze_and_act (); diff --git a/src/server/sparkd/spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.h b/src/server/sparkd/spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.h index 3c946b326..300a3e8e6 100644 --- a/src/server/sparkd/spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.h +++ b/src/server/sparkd/spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.h @@ -29,7 +29,7 @@ public: void cancel() override; void terminate() override; void on_time(const TimeStamp& ts) override; - void other_leg_quoter_fill (size_t leg_id, Quantity fill_quantity) override; + void on_other_leg_quoter_fill (size_t leg_id, Quantity fill_quantity) override; void update_spreader_order (Price price, Quantity quantity) override; private: // checks if the target is reached, and cancels diff --git a/src/server/sparkd/spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.cpp b/src/server/sparkd/spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.cpp index d3bdd7b5d..d19ba63fb 100644 --- a/src/server/sparkd/spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.cpp +++ b/src/server/sparkd/spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.cpp @@ -39,7 +39,7 @@ void QuoterWaitingForSizeStateWorker::terminate() } void QuoterWaitingForSizeStateWorker::on_time(const TimeStamp&) {} -void QuoterWaitingForSizeStateWorker::other_leg_quoter_fill (size_t leg_index, Quantity filled_quantity) +void QuoterWaitingForSizeStateWorker::on_other_leg_quoter_fill (size_t leg_index, Quantity filled_quantity) { _quoter->_incorporate_other_leg_fill (leg_index, filled_quantity); _longpath_analyze_and_act (bts::orderman::NullTickToTradeCorID); diff --git a/src/server/sparkd/spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.h b/src/server/sparkd/spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.h index c5334e2d0..722361630 100644 --- a/src/server/sparkd/spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.h +++ b/src/server/sparkd/spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.h @@ -29,7 +29,7 @@ public: void cancel() override; void terminate() override; void on_time(const TimeStamp& ts) override; - void other_leg_quoter_fill (size_t leg_id, Quantity fill_quantity) override; + void on_other_leg_quoter_fill (size_t leg_id, Quantity fill_quantity) override; void update_spreader_order (Price price, Quantity quantity) override; private: // checks to see if target has reached and goes to end diff --git a/src/server/sparkd/spreader/quoter/quoter_states/QuoterWorkingStateWorker.cpp b/src/server/sparkd/spreader/quoter/quoter_states/QuoterWorkingStateWorker.cpp index 4f6964073..0923f74f2 100644 --- a/src/server/sparkd/spreader/quoter/quoter_states/QuoterWorkingStateWorker.cpp +++ b/src/server/sparkd/spreader/quoter/quoter_states/QuoterWorkingStateWorker.cpp @@ -45,7 +45,7 @@ void QuoterWorkingStateWorker::terminate() } void QuoterWorkingStateWorker::on_time(const TimeStamp&) {} -void QuoterWorkingStateWorker::other_leg_quoter_fill (size_t leg_index, Quantity filled_quantity) +void QuoterWorkingStateWorker::on_other_leg_quoter_fill (size_t leg_index, Quantity filled_quantity) { _quoter->_incorporate_other_leg_fill (leg_index, filled_quantity); _longpath_analyze_and_act (bts::orderman::NullTickToTradeCorID); diff --git a/src/server/sparkd/spreader/quoter/quoter_states/QuoterWorkingStateWorker.h b/src/server/sparkd/spreader/quoter/quoter_states/QuoterWorkingStateWorker.h index 831cfdd85..e88085855 100644 --- a/src/server/sparkd/spreader/quoter/quoter_states/QuoterWorkingStateWorker.h +++ b/src/server/sparkd/spreader/quoter/quoter_states/QuoterWorkingStateWorker.h @@ -28,7 +28,7 @@ public: void cancel() override; void terminate() override; void on_time(const TimeStamp& ts) override; - void other_leg_quoter_fill (size_t leg_id, Quantity fill_quantity) override; + void on_other_leg_quoter_fill (size_t leg_id, Quantity fill_quantity) override; void update_spreader_order (Price price, Quantity quantity) override; private: // this does the following in this order