diff --git a/src/server/sparkd/spreader/SingleLegQuoter.cpp b/src/server/sparkd/spreader/SingleLegQuoter.cpp index b2330fd77..33588258b 100644 --- a/src/server/sparkd/spreader/SingleLegQuoter.cpp +++ b/src/server/sparkd/spreader/SingleLegQuoter.cpp @@ -172,7 +172,7 @@ void SingleLegQuoter::_transform_to_WORKING() void SingleLegQuoter::_transform_to_WAITING_FOR_CANCEL_ACK() { bts_assert (_worker->state() == QuoterState::WORKING || _worker->state() == QuoterState::WAITING_FOR_FIRST_ACK_CANCELLED); - _switch_state (&_waiting_for_cancel_ack_final_state_worker); + _switch_state (&_waiting_for_cancel_ack_state_worker); } void SingleLegQuoter::_transform_to_END() { diff --git a/src/server/sparkd/spreader/SingleLegQuoter.h b/src/server/sparkd/spreader/SingleLegQuoter.h index 462417589..fc93e78c0 100644 --- a/src/server/sparkd/spreader/SingleLegQuoter.h +++ b/src/server/sparkd/spreader/SingleLegQuoter.h @@ -13,7 +13,7 @@ #include "server/sparkd/spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.h" #include "server/sparkd/spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.h" #include "server/sparkd/spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.h" -#include "server/sparkd/spreader/quoter/quoter_states/QuoterWaitingForCancelAckFinalStateWorker.h" +#include "server/sparkd/spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.h" #include "server/sparkd/spreader/quoter/quoter_states/QuoterWorkingStateWorker.h" #include "server/sparkd/spreader/quoter/quoter_states/QuoterEndStateWorker.h" @@ -60,7 +60,7 @@ private: QuoterWaitingForSizeStateWorker _waiting_for_size_state_worker; QuoterWaitingForFirstAckWorker _waiting_for_first_ack_state_worker; QuoterWaitingForFirstAckCancelledWorker _waiting_for_first_ack_cancelled_state_worker; - QuoterWaitingForCancelAckFinalStateWorker _waiting_for_cancel_ack_final_state_worker; + QuoterWaitingForCancelAckStateWorker _waiting_for_cancel_ack_state_worker; QuoterWorkingStateWorker _working_state_worker; QuoterEndStateWorker _end_state_worker; public: @@ -113,7 +113,7 @@ public: friend QuoterWaitingForSizeStateWorker; friend QuoterWaitingForFirstAckWorker; friend QuoterWaitingForFirstAckCancelledWorker; - friend QuoterWaitingForCancelAckFinalStateWorker; + friend QuoterWaitingForCancelAckStateWorker; friend QuoterWorkingStateWorker; friend QuoterEndStateWorker; private: diff --git a/src/server/sparkd/spreader/quoter/quoter_states/QuoterWaitingForCancelAckFinalStateWorker.cpp b/src/server/sparkd/spreader/quoter/quoter_states/QuoterWaitingForCancelAckFinalStateWorker.cpp deleted file mode 100644 index 0f2cc14a2..000000000 --- a/src/server/sparkd/spreader/quoter/quoter_states/QuoterWaitingForCancelAckFinalStateWorker.cpp +++ /dev/null @@ -1,47 +0,0 @@ -#include "server/sparkd/spreader/SpreaderOrderUpdateMessage.h" -#include "server/sparkd/orderman/md/Book.h" -#include "server/sparkd/spreader/quoter/quoter_states/QuoterWaitingForCancelAckFinalStateWorker.h" -#include "server/sparkd/spreader/quoter/quoter_states/QuoterState.h" -#include "server/sparkd/spreader/SingleLegQuoter.h" -#include "server/sparkd/spreader/SpreaderOrderUpdateMessage.h" - -namespace bts{ -namespace orderman{ - -QuoterState QuoterWaitingForCancelAckFinalStateWorker::state () const {return QuoterState::WAITING_FOR_CANCEL_ACK;} -void QuoterWaitingForCancelAckFinalStateWorker::build_once (SingleLegQuoter* quoter) -{ - _quoter = quoter; -} -void QuoterWaitingForCancelAckFinalStateWorker::init () -{ - bts_assert_msg (false, "QuoterWaitingForCancelAckFinalStateWorker::init is an illegal operation"); -} -void QuoterWaitingForCancelAckFinalStateWorker::on_order_update (const SpreaderOrderUpdateMessage& u) -{ - bts_assert (u.acknowledged()); - _quoter->_price_quantity_state.add_filled_quantity (u.last_update_filled_quantity()); - if (u.terminal_status()) - _quoter->_transform_to_END (); -} -void QuoterWaitingForCancelAckFinalStateWorker::on_book (bts::orderman::TickToTradeCorID, size_t, const bts::orderman::Book&) -{} -void QuoterWaitingForCancelAckFinalStateWorker::cancel() -{} -void QuoterWaitingForCancelAckFinalStateWorker::terminate() -{ - _quoter->_transform_to_END (); -} -void QuoterWaitingForCancelAckFinalStateWorker::on_time(const TimeStamp&) -{ - // TODO check threshold -} -void QuoterWaitingForCancelAckFinalStateWorker::other_leg_quoter_fill (size_t leg_index, Quantity filled_quantity) -{ - _quoter->_incorporate_other_leg_fill (leg_index, filled_quantity); -} -void QuoterWaitingForCancelAckFinalStateWorker::update_spreader_order (Price price, Quantity quantity) -{ - _quoter->_price_quantity_state.update_target_price_quantity (price, quantity); -} -}} \ No newline at end of file diff --git a/src/server/sparkd/spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.cpp b/src/server/sparkd/spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.cpp new file mode 100644 index 000000000..43af269a7 --- /dev/null +++ b/src/server/sparkd/spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.cpp @@ -0,0 +1,47 @@ +#include "server/sparkd/spreader/SpreaderOrderUpdateMessage.h" +#include "server/sparkd/orderman/md/Book.h" +#include "server/sparkd/spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.h" +#include "server/sparkd/spreader/quoter/quoter_states/QuoterState.h" +#include "server/sparkd/spreader/SingleLegQuoter.h" +#include "server/sparkd/spreader/SpreaderOrderUpdateMessage.h" + +namespace bts{ +namespace orderman{ + +QuoterState QuoterWaitingForCancelAckStateWorker::state () const {return QuoterState::WAITING_FOR_CANCEL_ACK;} +void QuoterWaitingForCancelAckStateWorker::build_once (SingleLegQuoter* quoter) +{ + _quoter = quoter; +} +void QuoterWaitingForCancelAckStateWorker::init () +{ + bts_assert_msg (false, "QuoterWaitingForCancelAckStateWorker::init is an illegal operation"); +} +void QuoterWaitingForCancelAckStateWorker::on_order_update (const SpreaderOrderUpdateMessage& u) +{ + bts_assert (u.acknowledged()); + _quoter->_price_quantity_state.add_filled_quantity (u.last_update_filled_quantity()); + if (u.terminal_status()) + _quoter->_transform_to_END (); +} +void QuoterWaitingForCancelAckStateWorker::on_book (bts::orderman::TickToTradeCorID, size_t, const bts::orderman::Book&) +{} +void QuoterWaitingForCancelAckStateWorker::cancel() +{} +void QuoterWaitingForCancelAckStateWorker::terminate() +{ + _quoter->_transform_to_END (); +} +void QuoterWaitingForCancelAckStateWorker::on_time(const TimeStamp&) +{ + // TODO check threshold +} +void QuoterWaitingForCancelAckStateWorker::other_leg_quoter_fill (size_t leg_index, Quantity filled_quantity) +{ + _quoter->_incorporate_other_leg_fill (leg_index, filled_quantity); +} +void QuoterWaitingForCancelAckStateWorker::update_spreader_order (Price price, Quantity quantity) +{ + _quoter->_price_quantity_state.update_target_price_quantity (price, quantity); +} +}} \ No newline at end of file diff --git a/src/server/sparkd/spreader/quoter/quoter_states/QuoterWaitingForCancelAckFinalStateWorker.h b/src/server/sparkd/spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.h similarity index 87% rename from src/server/sparkd/spreader/quoter/quoter_states/QuoterWaitingForCancelAckFinalStateWorker.h rename to src/server/sparkd/spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.h index fa919e620..d19283f1f 100644 --- a/src/server/sparkd/spreader/quoter/quoter_states/QuoterWaitingForCancelAckFinalStateWorker.h +++ b/src/server/sparkd/spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.h @@ -12,13 +12,13 @@ class Book; class SingleLegQuoter; // this state is reached when the cancel has been sent // and it is waiting for the cancelled ack -class QuoterWaitingForCancelAckFinalStateWorker : public IQuoterStateWorker +class QuoterWaitingForCancelAckStateWorker : public IQuoterStateWorker { private: SingleLegQuoter* _quoter; const std::string _state_text; public: - QuoterWaitingForCancelAckFinalStateWorker () : _state_text ("WAITING_FOR_CANCEL_ACK") {} + QuoterWaitingForCancelAckStateWorker () : _state_text ("WAITING_FOR_CANCEL_ACK") {} public: QuoterState state () const override; const std::string& state_text () const override {return _state_text;}