diff --git a/src/server/sparkd/orderman/tests/spreader_order_tests.cpp b/src/server/sparkd/orderman/tests/spreader_order_tests.cpp index e9789839d..af39fb7a3 100644 --- a/src/server/sparkd/orderman/tests/spreader_order_tests.cpp +++ b/src/server/sparkd/orderman/tests/spreader_order_tests.cpp @@ -950,7 +950,7 @@ TEST_CASE ("quoter_WAITING_FOR_FIRT_ACK", "[spreader]") quoter.init (); double prices[] = {2000, 2001, 0, 0, 0}; uint16_t sizes[] = {60, 55, 0, 0, 0}; fire_book_update (prices, sizes, api::Side::SIDE_SELL, 0, sm, quoter); - test_complete_quoter_state (quoter, QuoterState::WAITING_FOR_FIRST_ACK, false, spreader_price, spreader_quantity, Quantity(0), Quantity(0), Price(2000.75), Quantity(100), Quantity (100), false); + test_complete_quoter_state (quoter, QuoterState::WAITING_FOR_FIRST_ACK, false, spreader_price, spreader_quantity, Quantity(0), Quantity(0), Price(2000.75), Quantity(100), Quantity (100), false); SECTION("2. update_order_status_non_terminal") { SpreaderOrderUpdateMessage u (bts::orderman::OrderKey(0)); @@ -1212,6 +1212,57 @@ TEST_CASE ("quoter_END", "[spreader]") LOG(OrderMan, Diag, "quoter_END.terminate_terminal_state"); } } +TEST_CASE ("quoter_WORKING", "[spreader]") +{ + Price spreader_price = Price (0.5); Quantity spreader_quantity (100); + SpreaderManagerForTest sm = create_spreader_manager_2_legs (bts::api::Venue::VENUE_GLBX, "ES", 2017, 12, 15, 1.0, 1.0, 1.0, api::Side::SIDE_BUY, 1.0, 0.25, + bts::api::Venue::VENUE_GLBX, "ES", 2017, 3, 15, 1.0, -1.0, 1.0, api::Side::SIDE_SELL, 1.0, 0.25); + SingleLegQuoter quoter (sm, sm.get_leg_data (1), 2, spreader_price, spreader_quantity, bts::orderman::SpreaderOrderBase::ChildOrder()); + quoter.init (); + double prices[] = {2000.0, 2000.25, 2000.5, 2000.75, 2001.0}; uint16_t sizes[] = {5, 10, 4, 6, 15}; + fire_book_update (prices, sizes, api::Side::SIDE_SELL, 0, sm, quoter); + SpreaderOrderUpdateMessage u (bts::orderman::OrderKey(0)); + u.update (api::orderman::OrderStatus::OS_NEW, Quantity (0), Price (0), nullptr); + quoter.update_order_status (u); + test_complete_quoter_state (quoter, QuoterState::WORKING, false, spreader_price, spreader_quantity, Quantity(0), Quantity(0), Price(2000.50), Quantity(40), Quantity (100), false); + SECTION("2. reduced_size_update_order_status_non_terminal") + { + // partial fills + u.update (api::orderman::OrderStatus::OS_PARTIALLY_FILLED, Quantity (15), Price (2000), nullptr); + quoter.update_order_status (u); + test_complete_quoter_state (quoter, QuoterState::WORKING, false, spreader_price, spreader_quantity, Quantity(15), Quantity(0), Price(2000.50), Quantity(55), Quantity (85), false); + LOG(OrderMan, Diag, "quoter_WORKING.reduced_size_update_order_status_non_terminal"); + } + SECTION("2. reduced_size_update_order_status_terminal") + { + // complete fill, should go to end, and then to waiting_for_size. + // a tick here would make it send an order + u.update (api::orderman::OrderStatus::OS_FILLED, Quantity (40), Price (2000), nullptr); + quoter.update_order_status (u); + test_complete_quoter_state (quoter, QuoterState::WAITING_FOR_SIZE, false, spreader_price, spreader_quantity, Quantity(40), Quantity(0), Price(0), Quantity(0), Quantity (60), false); + LOG(OrderMan, Diag, "quoter_WORKING.reduced_size_update_order_status_terminal"); + } + SECTION("2. full_size_update_order_status_non_terminal") + { + // change book to accomodate full size + double prices_full[] = {2000.0, 2000.25, 2000.5, 2000.75, 2001.0}; uint16_t sizes_full[] = {10, 30, 25, 15, 20}; + fire_book_update (prices_full, sizes_full, api::Side::SIDE_SELL, 0, sm, quoter); + test_complete_quoter_state (quoter, QuoterState::WORKING, false, spreader_price, spreader_quantity, Quantity(0), Quantity(0), Price(2000.50), Quantity(100), Quantity (100), false); + // send out a fill + u.update (api::orderman::OrderStatus::OS_PARTIALLY_FILLED, Quantity (20), Price (2000), nullptr); + quoter.update_order_status (u); + test_complete_quoter_state (quoter, QuoterState::WORKING, false, spreader_price, spreader_quantity, Quantity(20), Quantity(0), Price(2000.25), Quantity(100), Quantity (80), false); + LOG(OrderMan, Diag, "quoter_WORKING.full_size_update_order_status_non_terminal"); + } +// SECTION("2. full_size_update_order_status_terminal") +// { +// // change book to accomodate full size +// double prices_full[] = {2000.0, 2000.25, 2000.5, 2000.75, 2001.0}; uint16_t sizes_full[] = {10, 30, 25, 15, 20}; +// fire_book_update (prices_full, sizes_full, api::Side::SIDE_SELL, 0, sm, quoter); +// test_complete_quoter_state (quoter, QuoterState::WORKING, false, spreader_price, spreader_quantity, Quantity(0), Quantity(0), Price(2000.50), Quantity(100), Quantity (100), false); +// LOG(OrderMan, Diag, "quoter_WORKING.full_size_update_order_status_non_terminal"); +// } +} //TEST_CASE ("Spreader Order", "[spreader]") // void disabled_temp() // { diff --git a/src/server/sparkd/spreader/SingleLegQuoter.cpp b/src/server/sparkd/spreader/SingleLegQuoter.cpp index 33588258b..f0ff33970 100644 --- a/src/server/sparkd/spreader/SingleLegQuoter.cpp +++ b/src/server/sparkd/spreader/SingleLegQuoter.cpp @@ -96,9 +96,11 @@ void SingleLegQuoter::_compute_price_quantity(Price& price, Quantity& quantity) if (_two_legged) { size_t other_leg_index = _this_leg_data.leg_index() == 0 ? 1 : 0; - SpreaderUtils::compute_price_quantity_2_legs (_price_quantity_state.target_spread_price(), _price_quantity_state.target_leg_quantity(), + SpreaderUtils::compute_price_quantity_2_legs (_price_quantity_state.target_spread_price(), _price_quantity_state.remaining_to_fill(), _this_leg_data, _spreader.get_leg_data(other_leg_index), _spreader.get_book(other_leg_index), price, quantity); + // to adjust for what has already been filled + quantity = Quantity (quantity.value() + _price_quantity_state.aggregated_filled_quantity().value()); } else _compute_price_quantity_n_legs (price, quantity); } diff --git a/src/server/sparkd/spreader/quoter/quoter_states/QuoterWorkingStateWorker.cpp b/src/server/sparkd/spreader/quoter/quoter_states/QuoterWorkingStateWorker.cpp index 2f1f8f877..058c5d1d6 100644 --- a/src/server/sparkd/spreader/quoter/quoter_states/QuoterWorkingStateWorker.cpp +++ b/src/server/sparkd/spreader/quoter/quoter_states/QuoterWorkingStateWorker.cpp @@ -21,7 +21,10 @@ void QuoterWorkingStateWorker::on_order_update (const SpreaderOrderUpdateMessage bts_assert (u.acknowledged()); _quoter->_price_quantity_state.add_filled_quantity (u.last_update_filled_quantity()); if (u.terminal_status()) + { + _quoter->_price_quantity_state.clear_out_price_quantity (); _quoter->_transform_to_END (); + } else _longpath_analyze_and_act (bts::orderman::NullTickToTradeCorID); } @@ -51,7 +54,7 @@ void QuoterWorkingStateWorker::update_spreader_order (Price price, Quantity quan _quoter->_price_quantity_state.update_target_price_quantity (price, quantity); _longpath_analyze_and_act (bts::orderman::NullTickToTradeCorID); } -void QuoterWorkingStateWorker::_longpath_analyze_and_act (bts::orderman::TickToTradeCorID corid) +void QuoterWorkingStateWorker::_longpath_analyze_and_act (bts::orderman::TickToTradeCorID) { if (_quoter->_price_quantity_state.target_reached()) { @@ -66,8 +69,6 @@ void QuoterWorkingStateWorker::_longpath_analyze_and_act (bts::orderman::TickToT { Price new_price; Quantity new_quantity; _quoter->_compute_price_quantity (new_price, new_quantity); - //new_quantity = Quantity(new_quantity.value() + _quoter->_price_quantity_state.aggregated_filled_quantity().value()); - // TODO, some adjustment for fills needed if (new_quantity.value() == 0) { // no size could be computed, go to wait state @@ -81,7 +82,8 @@ void QuoterWorkingStateWorker::_longpath_analyze_and_act (bts::orderman::TickToT // this is a size change, size changes always go through regardless of the // quoting parameters _quoter->_price_quantity_state.update_out_price_quantity(new_price, new_quantity); - _quoter->_order.update(corid, new_price, new_quantity); + //TODO:temp disable for tests + //_quoter->_order.update(corid, new_price, new_quantity); } else { @@ -92,7 +94,8 @@ void QuoterWorkingStateWorker::_longpath_analyze_and_act (bts::orderman::TickToT if (reprice) { _quoter->_price_quantity_state.update_out_price_quantity(new_price, new_quantity); - _quoter->_order.update(corid, new_price, new_quantity); + //TODO:temp disable for tests + //_quoter->_order.update(corid, new_price, new_quantity); } } }