From da5bca53497abd04ea340e5328f4c77edddd55d4 Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Mon, 11 Dec 2017 11:29:53 -0500 Subject: [PATCH] SPARK-287 (going on and on) --- .../spreader_orders/SpreaderOrder.cpp | 18 ++-- .../orderman/spreader_orders/SpreaderOrder.h | 5 +- ...SpreaderWaitingForFirstConnStateWorker.cpp | 2 +- .../sparkd/orderman/tests/spreader_tests.cpp | 96 +++++++++++-------- .../sparkd/orderman/tests/tests_common.h | 8 +- src/server/sparkd/spreader/ISpreaderManager.h | 3 + src/server/sparkd/spreader/SingleLegQuoter.h | 6 +- .../quoter_states/QuoterEndStateWorker.cpp | 6 ++ 8 files changed, 88 insertions(+), 56 deletions(-) diff --git a/src/server/sparkd/orderman/spreader_orders/SpreaderOrder.cpp b/src/server/sparkd/orderman/spreader_orders/SpreaderOrder.cpp index e0049a5fe..6199cadc7 100644 --- a/src/server/sparkd/orderman/spreader_orders/SpreaderOrder.cpp +++ b/src/server/sparkd/orderman/spreader_orders/SpreaderOrder.cpp @@ -135,6 +135,14 @@ const LegPropertyData& SpreaderOrder::get_leg_data(size_t leg_index) const { return _bookkeeping_data.get_leg_data(leg_index).leg_property_data(); } +bts::orderman::SpreaderOrderBase::ChildOrder SpreaderOrder::get_new_order (const LegPropertyData& leg_property_data, bool is_quote_order) +{ + bts::SecurityKey sec_key = bts::SecurityKey (leg_property_data.security_key()); + api::Security const* db_sec = _db().resolve (sec_key); + api::orderman::ChildOrderKind order_type = is_quote_order ? api::orderman::ChildOrderKind::COK_SPREADER_QUOTING : api::orderman::ChildOrderKind::COK_SPREADER_HEDGING; + bts::orderman::SpreaderOrderBase::ChildFactory child_factory = get_child_factory(*db_sec, leg_property_data.trading_side(), order_type); + return child_factory(); +} void SpreaderOrder::_transform_to_START() { bts_assert (_state_worker == nullptr); @@ -248,7 +256,7 @@ void SpreaderOrder::_send_hedge(size_t filled_leg_index, Price filled_price, Qua SpreaderLegData& leg_data = _bookkeeping_data.get_leg_data (hedge_leg_index); _compute_hedge_price_quantity (filled_leg_index, filled_price, filled_quantity, hedge_leg_index, hedge_price, hedge_quantity); - bts::orderman::SpreaderOrderBase::ChildOrder new_hedge_order = _get_new_order (leg_data.leg_property_data(), false); + bts::orderman::SpreaderOrderBase::ChildOrder new_hedge_order = get_new_order (leg_data.leg_property_data(), false); SpreaderHedgerData& hedger_data = leg_data.add_new_hedger (*this, new_hedge_order, hedge_price, hedge_quantity,leg_data.leg_property_data().trading_side()); hedger_data.hedger().init (); } @@ -283,14 +291,6 @@ void SpreaderOrder::_switch_state (ISpreaderStateWorker* new_state) _state_worker = new_state; _state_worker->build_once (this); } -bts::orderman::SpreaderOrderBase::ChildOrder SpreaderOrder::_get_new_order (const LegPropertyData& leg_property_data, bool is_quote_order) -{ - bts::SecurityKey sec_key = bts::SecurityKey (leg_property_data.security_key()); - api::Security const* db_sec = _db().resolve (sec_key); - api::orderman::ChildOrderKind order_type = is_quote_order ? api::orderman::ChildOrderKind::COK_SPREADER_QUOTING : api::orderman::ChildOrderKind::COK_SPREADER_HEDGING; - bts::orderman::SpreaderOrderBase::ChildFactory child_factory = get_child_factory(*db_sec, leg_property_data.trading_side(), order_type); - return child_factory(); -} /*******************************************************************************/ /***************************Functions to Help Testing****************************/ SpreaderState SpreaderOrder::test_only_func_spreader_state() {return _state_worker->state();} diff --git a/src/server/sparkd/orderman/spreader_orders/SpreaderOrder.h b/src/server/sparkd/orderman/spreader_orders/SpreaderOrder.h index b8385592a..210868f91 100644 --- a/src/server/sparkd/orderman/spreader_orders/SpreaderOrder.h +++ b/src/server/sparkd/orderman/spreader_orders/SpreaderOrder.h @@ -17,7 +17,6 @@ namespace bts { namespace api {namespace orderman {class OrderState; class CreateSpreaderOrder;}} -//namespace securities {class SecurityDB;} namespace orderman { class Book; @@ -69,6 +68,7 @@ public: // ISpreaderManager members const orderman::Book& get_book(size_t leg_index) const override; const LegPropertyData& get_leg_data(size_t leg_index) const override; + bts::orderman::SpreaderOrderBase::ChildOrder get_new_order (const LegPropertyData& leg_property_data, bool is_quote_order) override; public: // this is exposed for testing reasons only SpreaderState test_only_func_spreader_state (); @@ -108,8 +108,7 @@ private: size_t hedged_leg_index, Price& hedge_price, Quantity& hedge_quantity); void _report_state (api::orderman::OrderStatus order_status, std::string* message = nullptr); - void _switch_state (ISpreaderStateWorker* new_state); - bts::orderman::SpreaderOrderBase::ChildOrder _get_new_order (const LegPropertyData& leg_property_data, bool is_quote_order); + void _switch_state (ISpreaderStateWorker* new_state); private: const bool _active; std::string _msg; 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 dac54a5c2..1aa6c8f67 100644 --- a/src/server/sparkd/orderman/spreader_orders/spreader_states/SpreaderWaitingForFirstConnStateWorker.cpp +++ b/src/server/sparkd/orderman/spreader_orders/spreader_states/SpreaderWaitingForFirstConnStateWorker.cpp @@ -149,7 +149,7 @@ void SpreaderWaitingForFirstConnStateWorker::_construct_bookkeeping_data_and_quo api::Side leg_order_side = SpreaderUtils::get_leg_side(cor.side(), leg); LegPropertyData leg_property_data(leg_idx, leg, leg_exec_strategy_it->second, leg_order_side); // ii. setting up the order for this leg - bts::orderman::SpreaderOrderBase::ChildOrder child_order = _spreader->_get_new_order (leg_property_data, api::orderman::ChildOrderKind::COK_SPREADER_QUOTING); + bts::orderman::SpreaderOrderBase::ChildOrder child_order = _spreader->get_new_order (leg_property_data, api::orderman::ChildOrderKind::COK_SPREADER_QUOTING); LOG(OrderMan, Diag, "Initiazing quoting order {} owned by spreader order {}", child_order.order_key().value(), _spreader->key().value()); // iii. setting up the quoter (which needs the quoter and property from i and ii) SingleLegQuoter* leg_quoter = new SingleLegQuoter(me_ref, leg_property_data, sec.synthetic().legs().size(), Price(cor.price()), Quantity(cor.quantity()), child_order); diff --git a/src/server/sparkd/orderman/tests/spreader_tests.cpp b/src/server/sparkd/orderman/tests/spreader_tests.cpp index 1d0e80937..120d7f32a 100644 --- a/src/server/sparkd/orderman/tests/spreader_tests.cpp +++ b/src/server/sparkd/orderman/tests/spreader_tests.cpp @@ -1739,33 +1739,27 @@ TEST_CASE ("spreader_WORKING", "[spreader]") } SECTION("11. on_hedger_order_error") { - //create the same scenario is 9, so there is a hedge order out there + //create the same scenario as 9, but send an error on the hedger order + set_spreader_orders (spreader, new double[5] {1995, 1996, 1997, 1998, 1999}, new uint16_t[5] {10, 10, 10, 10, 10}, + new double[5] {2000, 2001, 2002, 2003, 2004}, new uint16_t[5] {10, 15, 25, 50, 10}, + new double[5] {2002, 2001, 2000, 1999, 1998}, new uint16_t[5] {20, 20, 20, 20, 20}, + new double[5] {2003, 2004, 2005, 2006, 2007}, new uint16_t[5] {10, 10, 10, 10, 10}); + // verify working orders SpreaderBookkeepingData& bookkeeping_data = spreader.test_only_func_spreader_full_data (); - SpreaderLegData& leg_data_1 = bookkeeping_data.get_leg_data (0); - SpreaderLegData& leg_data_2 = bookkeeping_data.get_leg_data (1); - Book book_leg_1 = get_book (SecurityKey (leg_1.security().id()), 5, - new double[5] {1995, 1996, 1997, 1998, 1999}, new uint16_t[5] {10, 10, 10, 10, 10}, - new double[5] {2000, 2001, 2002, 2003, 2004}, new uint16_t[5] {10, 15, 25, 50, 10}, true); - spreader.on_book (bts::orderman::NullTickToTradeCorID, book_leg_1); - Book book_leg_2 = get_book (SecurityKey (leg_2.security().id()), 5, - new double[5] {2002, 2001, 2000, 1999, 1998}, new uint16_t[5] {20, 20, 20, 20, 20}, - new double[5] {2003, 2004, 2005, 2006, 2007}, new uint16_t[5] {10, 10, 10, 10, 10}, true); - spreader.on_book (bts::orderman::NullTickToTradeCorID, book_leg_2); - spreader.on_child_update (leg_data_1.order_key(), api::orderman::OrderStatus::OS_NEW, Quantity (0), Price (0), nullptr); - spreader.on_child_update (leg_data_2.order_key(), api::orderman::OrderStatus::OS_NEW, Quantity (0), Price (0), nullptr); + SpreaderLegData& leg_data_1 = bookkeeping_data.get_leg_data (0); SpreaderLegData& leg_data_2 = bookkeeping_data.get_leg_data (1); verify_complete_quoter_state (*leg_data_1.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (0), Quantity(0), Price(1999), Quantity(100), Quantity(100), false); verify_complete_quoter_state (*leg_data_2.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (0), Quantity(0), Price(2002), Quantity(100), Quantity(100), false); spreader.on_child_update (leg_data_1.order_key(), api::orderman::OrderStatus::OS_PARTIALLY_FILLED, Quantity (20), Price (2000), nullptr); verify_complete_quoter_state (*leg_data_1.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (20), Quantity(0), Price(2000), Quantity(100), Quantity(80), false); - verify_complete_quoter_state (*leg_data_2.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (0), Quantity(20), Price(2002), Quantity(80), Quantity(80), false); + verify_complete_quoter_state (*leg_data_2.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (0), Quantity(20), Price(2002), Quantity(80), Quantity(80), false); std::vector& hedgers_leg_2 = leg_data_2.get_hedgers(); - SingleFillHedger& hedger = hedgers_leg_2[0].hedger(); - verify_complete_hedger_state (hedger, HedgerState::WAITING_FOR_FIRST_ACK, Price(1999), Quantity(20), Quantity(0), Price (1999), Quantity(20), Quantity (20)); - // send error on the hedger order + bts_assert (hedgers_leg_2.size() == 1); + SingleFillHedger& hedger = hedgers_leg_2[0].hedger(); + verify_complete_hedger_state (hedger, HedgerState::WAITING_FOR_FIRST_ACK, Price(1999), Quantity(20), Quantity(0), Price (1999), Quantity(20), Quantity (20)); bts::orderman::OrderKey hedger_order_key = hedgers_leg_2[0].order_update_message().order_key; - std::string err_msg = "error"; spreader.on_child_update (hedger_order_key, api::orderman::OrderStatus::OS_NEW, Quantity (0), Price (0), nullptr); verify_complete_hedger_state (hedger, HedgerState::WORKING, Price(1999), Quantity(20), Quantity(0), Price (1999), Quantity(20), Quantity (20)); + std::string err_msg = "error"; spreader.on_child_update (hedger_order_key, api::orderman::OrderStatus::OS_NEW, Quantity (0), Price (0), &err_msg); verify_basic_spreader_state (spreader, SpreaderState::WAITING_FOR_CANCEL_ALL, spreader_price, spreader_quantity); verify_complete_quoter_state (*leg_data_1.quoter(), QuoterState::WAITING_FOR_CANCEL_ACK, true, spreader_price, Quantity (100), Quantity (20), Quantity(0), Price(2000), Quantity(100), Quantity(80), false); @@ -1776,49 +1770,73 @@ TEST_CASE ("spreader_WORKING", "[spreader]") } SECTION("12. on_hedger_order_update") { - // hedger fills + //create the same scenario as 9, but send an error on the hedger order + set_spreader_orders (spreader, new double[5] {1995, 1996, 1997, 1998, 1999}, new uint16_t[5] {10, 10, 10, 10, 10}, + new double[5] {2000, 2001, 2002, 2003, 2004}, new uint16_t[5] {10, 15, 25, 50, 10}, + new double[5] {2002, 2001, 2000, 1999, 1998}, new uint16_t[5] {20, 20, 20, 20, 20}, + new double[5] {2003, 2004, 2005, 2006, 2007}, new uint16_t[5] {10, 10, 10, 10, 10}); + // verify working orders SpreaderBookkeepingData& bookkeeping_data = spreader.test_only_func_spreader_full_data (); - SpreaderLegData& leg_data_1 = bookkeeping_data.get_leg_data (0); - SpreaderLegData& leg_data_2 = bookkeeping_data.get_leg_data (1); - Book book_leg_1 = get_book (SecurityKey (leg_1.security().id()), 5, - new double[5] {1995, 1996, 1997, 1998, 1999}, new uint16_t[5] {10, 10, 10, 10, 10}, - new double[5] {2000, 2001, 2002, 2003, 2004}, new uint16_t[5] {10, 15, 25, 50, 10}, true); - spreader.on_book (bts::orderman::NullTickToTradeCorID, book_leg_1); - Book book_leg_2 = get_book (SecurityKey (leg_2.security().id()), 5, - new double[5] {2002, 2001, 2000, 1999, 1998}, new uint16_t[5] {20, 20, 20, 20, 20}, - new double[5] {2003, 2004, 2005, 2006, 2007}, new uint16_t[5] {10, 10, 10, 10, 10}, true); - spreader.on_book (bts::orderman::NullTickToTradeCorID, book_leg_2); - spreader.on_child_update (leg_data_1.order_key(), api::orderman::OrderStatus::OS_NEW, Quantity (0), Price (0), nullptr); - spreader.on_child_update (leg_data_2.order_key(), api::orderman::OrderStatus::OS_NEW, Quantity (0), Price (0), nullptr); + SpreaderLegData& leg_data_1 = bookkeeping_data.get_leg_data (0); SpreaderLegData& leg_data_2 = bookkeeping_data.get_leg_data (1); verify_complete_quoter_state (*leg_data_1.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (0), Quantity(0), Price(1999), Quantity(100), Quantity(100), false); verify_complete_quoter_state (*leg_data_2.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (0), Quantity(0), Price(2002), Quantity(100), Quantity(100), false); spreader.on_child_update (leg_data_1.order_key(), api::orderman::OrderStatus::OS_PARTIALLY_FILLED, Quantity (20), Price (2000), nullptr); verify_complete_quoter_state (*leg_data_1.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (20), Quantity(0), Price(2000), Quantity(100), Quantity(80), false); - verify_complete_quoter_state (*leg_data_2.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (0), Quantity(20), Price(2002), Quantity(80), Quantity(80), false); + verify_complete_quoter_state (*leg_data_2.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (0), Quantity(20), Price(2002), Quantity(80), Quantity(80), false); std::vector& hedgers_leg_2 = leg_data_2.get_hedgers(); - SingleFillHedger& hedger = hedgers_leg_2[0].hedger(); + bts_assert (hedgers_leg_2.size() == 1); + SingleFillHedger& hedger = hedgers_leg_2[0].hedger(); verify_complete_hedger_state (hedger, HedgerState::WAITING_FOR_FIRST_ACK, Price(1999), Quantity(20), Quantity(0), Price (1999), Quantity(20), Quantity (20)); // send fill on the hedger order bts::orderman::OrderKey hedger_order_key = hedgers_leg_2[0].order_update_message().order_key; spreader.on_child_update (hedger_order_key, api::orderman::OrderStatus::OS_NEW, Quantity (5), Price (2000), nullptr); verify_complete_hedger_state (hedger, HedgerState::WORKING, Price(1999), Quantity(20), Quantity(5), Price (1999), Quantity(20), Quantity (15)); - // verify that all quoter and hedgers should LOG(OrderMan, Diag, "spreader_WORKING.on_hedger_order_update"); } SECTION("13. on_external_error") { + SpreaderBookkeepingData& bookkeeping_data = spreader.test_only_func_spreader_full_data (); + SpreaderLegData& leg_data_1 = bookkeeping_data.get_leg_data (0); SpreaderLegData& leg_data_2 = bookkeeping_data.get_leg_data (1); + set_spreader_orders (spreader, new double[5] {1995, 1996, 1997, 1998, 1999}, new uint16_t[5] {10, 10, 10, 10, 10}, + new double[5] {2000, 2001, 2002, 2003, 2004}, new uint16_t[5] {10, 15, 25, 50, 10}, + new double[5] {2002, 2001, 2000, 1999, 1998}, new uint16_t[5] {20, 20, 20, 20, 20}, + new double[5] {2003, 2004, 2005, 2006, 2007}, new uint16_t[5] {10, 10, 10, 10, 10}); + spreader.on_child_update (leg_data_1.order_key(), api::orderman::OrderStatus::OS_PARTIALLY_FILLED, Quantity (20), Price (2000), nullptr); + SpreaderHedgerData& hedger_data = leg_data_2.get_hedgers()[0]; + spreader.on_child_update (hedger_data.order_update_message().order_key, api::orderman::OrderStatus::OS_NEW, Quantity (0), Price (0), nullptr); std::string err_msg = "external error"; - spreader.on_external_error (err_msg); + spreader.on_external_error (err_msg); verify_basic_spreader_state (spreader, SpreaderState::WAITING_FOR_CANCEL_ALL, spreader_price, spreader_quantity); + verify_complete_quoter_state (*leg_data_1.quoter(), QuoterState::WAITING_FOR_CANCEL_ACK, true, spreader_price, Quantity (100), Quantity (20), Quantity(0), Price(2000), Quantity(100), Quantity(80), false); + verify_complete_quoter_state (*leg_data_2.quoter(), QuoterState::WAITING_FOR_CANCEL_ACK, true, spreader_price, Quantity (100), Quantity (0), Quantity(20), Price(2002), Quantity(80), Quantity(80), false); + verify_complete_hedger_state (hedger_data.hedger(), HedgerState::WAITING_FOR_CANCEL_ACK, Price(1999), Quantity(20), Quantity(0), Price (1999), Quantity(20), Quantity (20)); LOG(OrderMan, Diag, "spreader_WORKING.on_external_error"); } SECTION("14. on_check_termination") { - // get active orders working, and cancel them - // call on_check_termination and verify that - // it should take them to the end state - // when the quoters and hedgers are done + // get active orders working, send a terminal + // status on each order and verify that the + // spreader reached a terminal state + SpreaderBookkeepingData& bookkeeping_data = spreader.test_only_func_spreader_full_data (); + SpreaderLegData& leg_data_1 = bookkeeping_data.get_leg_data (0); SpreaderLegData& leg_data_2 = bookkeeping_data.get_leg_data (1); + set_spreader_orders (spreader, new double[5] {1995, 1996, 1997, 1998, 1999}, new uint16_t[5] {10, 10, 10, 10, 10}, + new double[5] {2000, 2001, 2002, 2003, 2004}, new uint16_t[5] {10, 15, 25, 50, 10}, + new double[5] {2002, 2001, 2000, 1999, 1998}, new uint16_t[5] {20, 20, 20, 20, 20}, + new double[5] {2003, 2004, 2005, 2006, 2007}, new uint16_t[5] {10, 10, 10, 10, 10}); + // completely fill leg 1, this should cxl the leg 2 quoting order and send a hedge + // fill the hedge completely + // this should cause on_check_termination to return true + // spreader.on_child_update (leg_data_1.order_key(), api::orderman::OrderStatus::OS_FILLED, Quantity (20), Price (2000), nullptr); + // verify_complete_quoter_state (*leg_data_1.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (20), Quantity(0), Price(2000), Quantity(100), Quantity(80), false); + // verify_complete_quoter_state (*leg_data_2.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (0), Quantity(20), Price(2002), Quantity(80), Quantity(80), false); + // std::vector& hedgers_leg_2 = leg_data_2.get_hedgers(); + // bts_assert (hedgers_leg_2.size() == 1); + // SingleFillHedger& hedger = hedgers_leg_2[0].hedger(); + // verify_complete_hedger_state (hedger, HedgerState::WAITING_FOR_FIRST_ACK, Price(1999), Quantity(20), Quantity(0), Price (1999), Quantity(20), Quantity (20)); + // LOG(OrderMan, Diag, "spreader_WORKING.on_quoter_order_error"); + + } } class Temp diff --git a/src/server/sparkd/orderman/tests/tests_common.h b/src/server/sparkd/orderman/tests/tests_common.h index 238f01ac0..887907afc 100644 --- a/src/server/sparkd/orderman/tests/tests_common.h +++ b/src/server/sparkd/orderman/tests/tests_common.h @@ -68,6 +68,12 @@ public: { return _legs[leg_index]; } + bts::orderman::SpreaderOrderBase::ChildOrder get_new_order (const LegPropertyData&, bool) override + { + bts::orderman::SpreaderOrderBase::ChildOrder rv; + return rv; + } + }; /**********************************************************************/ /***************************order creation*****************************/ @@ -394,7 +400,7 @@ void set_spreader_orders (SpreaderOrder& spreader, double* leg_1_bid_prices, uin leg_2_ask_prices, leg_2_ask_sizes, true); spreader.on_book (bts::orderman::NullTickToTradeCorID, book_leg_2); spreader.on_child_update (leg_data_1.order_key(), api::orderman::OrderStatus::OS_NEW, Quantity (0), Price (0), nullptr); - spreader.on_child_update (leg_data_2.order_key(), api::orderman::OrderStatus::OS_NEW, Quantity (0), Price (0), nullptr); + spreader.on_child_update (leg_data_2.order_key(), api::orderman::OrderStatus::OS_NEW, Quantity (0), Price (0), nullptr); } /**********************************************************************/ /******************************misc************************************/ diff --git a/src/server/sparkd/spreader/ISpreaderManager.h b/src/server/sparkd/spreader/ISpreaderManager.h index 61bbc206c..250d4feb9 100644 --- a/src/server/sparkd/spreader/ISpreaderManager.h +++ b/src/server/sparkd/spreader/ISpreaderManager.h @@ -1,5 +1,6 @@ #pragma once #include "server/sparkd/orderman/md/Book.h" +#include "server/sparkd/orderman/spreader_orders/SpreaderOrderBase.h" namespace bts { namespace orderman { @@ -18,5 +19,7 @@ public: // data in the returned type is all const, so nothing will change // beneath it virtual const LegPropertyData& get_leg_data(size_t leg_index) const = 0; + // to request a new child order + virtual bts::orderman::SpreaderOrderBase::ChildOrder get_new_order (const LegPropertyData& leg_property_data, bool is_quote_order) = 0; }; }} \ No newline at end of file diff --git a/src/server/sparkd/spreader/SingleLegQuoter.h b/src/server/sparkd/spreader/SingleLegQuoter.h index fbed9b958..1204aa985 100644 --- a/src/server/sparkd/spreader/SingleLegQuoter.h +++ b/src/server/sparkd/spreader/SingleLegQuoter.h @@ -46,7 +46,7 @@ private: }; private: const bool _two_legged; - const ISpreaderManager& _spreader; + ISpreaderManager& _spreader; const LegPropertyData _this_leg_data; const size_t _n_spreader_legs; bts::orderman::SpreaderOrderBase::ChildOrder _order; @@ -64,7 +64,7 @@ private: QuoterWorkingStateWorker _working_state_worker; QuoterEndStateWorker _end_state_worker; public: - SingleLegQuoter(ISpreaderManager& order_bridge, + SingleLegQuoter(ISpreaderManager& spreader, LegPropertyData this_leg_property, size_t n_spreader_legs, bts::Price spread_order_price, @@ -127,7 +127,7 @@ private: // the lean ratio and the quoting parameters to come up with // the outgoing price and size. there is an n_leg case and an // optimized 2 leg case - void _compute_price_quantity(Price& price, Quantity& quantity); + void _compute_price_quantity(Price& price, Quantity& quantity); void _compute_price_quantity_n_legs(Price& price, Quantity& quantity); // this is a helper function for the above. Price _compute_leg_price_n_legs(const std::vector& leg_values); diff --git a/src/server/sparkd/spreader/quoter/quoter_states/QuoterEndStateWorker.cpp b/src/server/sparkd/spreader/quoter/quoter_states/QuoterEndStateWorker.cpp index 1cd694cce..1300007c3 100644 --- a/src/server/sparkd/spreader/quoter/quoter_states/QuoterEndStateWorker.cpp +++ b/src/server/sparkd/spreader/quoter/quoter_states/QuoterEndStateWorker.cpp @@ -3,6 +3,7 @@ #include "server/sparkd/spreader/quoter/quoter_states/QuoterEndStateWorker.h" #include "server/sparkd/spreader/quoter/quoter_states/QuoterState.h" #include "server/sparkd/spreader/SingleLegQuoter.h" +#include "server/sparkd/spreader/ISpreaderManager.h" namespace bts{ namespace orderman{ @@ -12,8 +13,13 @@ void QuoterEndStateWorker::build_once (SingleLegQuoter* quoter) { bool is_final = quoter->_is_permenantly_cancelled || quoter->_price_quantity_state.target_reached (); if (!is_final) + { + quoter->_price_quantity_state.cycle_back (); + quoter->_order = quoter->_spreader.get_new_order (quoter->_this_leg_data, true); + // get the new order // zeroing out any working state quoter->_transform_to_WAITING_FOR_SIZE (); + } } void QuoterEndStateWorker::init () {