diff --git a/src/server/sparkd/orderman/spreader_orders/SpreaderOrder.cpp b/src/server/sparkd/orderman/spreader_orders/SpreaderOrder.cpp index 6199cadc7..d93031266 100644 --- a/src/server/sparkd/orderman/spreader_orders/SpreaderOrder.cpp +++ b/src/server/sparkd/orderman/spreader_orders/SpreaderOrder.cpp @@ -120,6 +120,7 @@ void SpreaderOrder::on_child_update(OrderKey order_key, else bts_assert_msg (false, "This order was not initiated in this spreader"); } + _state_worker->on_check_termination (); } void SpreaderOrder::on_external_error(const std::string& reason) { diff --git a/src/server/sparkd/orderman/tests/spreader_tests.cpp b/src/server/sparkd/orderman/tests/spreader_tests.cpp index 120d7f32a..9f211445b 100644 --- a/src/server/sparkd/orderman/tests/spreader_tests.cpp +++ b/src/server/sparkd/orderman/tests/spreader_tests.cpp @@ -1824,19 +1824,26 @@ TEST_CASE ("spreader_WORKING", "[spreader]") 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_basic_spreader_state (spreader, SpreaderState::WORKING, spreader_price, spreader_quantity); // 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"); - - + spreader.on_child_update (leg_data_1.order_key(), api::orderman::OrderStatus::OS_FILLED, Quantity (100), Price (1999), nullptr); + // leg1's quoter should be in end state + verify_complete_quoter_state (*leg_data_1.quoter(), QuoterState::END, false, spreader_price, Quantity (100), Quantity (0), Quantity(0), Price(0), Quantity(0), Quantity(0), true); + // leg 2 should cancel its order now + verify_complete_quoter_state (*leg_data_2.quoter(), QuoterState::WAITING_FOR_CANCEL_ACK, false, spreader_price, Quantity (100), Quantity (0), Quantity(100), Price(2002), Quantity(100), Quantity(0), true); + spreader.on_child_update (leg_data_2.order_key(), api::orderman::OrderStatus::OS_CANCELED, Quantity (0), Price (0), nullptr); + verify_complete_quoter_state (*leg_data_2.quoter(), QuoterState::END, false, spreader_price, Quantity (100), Quantity (0), Quantity(100), Price(0), Quantity(0), Quantity(0), true); + bts_assert (leg_data_2.get_hedgers().size() == 1); + SpreaderHedgerData leg_2_hedger_data = leg_data_2.get_hedgers()[0]; + verify_complete_hedger_state (leg_2_hedger_data.hedger(), HedgerState::WAITING_FOR_FIRST_ACK, Price(1998), Quantity(100), Quantity(0), Price (1998), Quantity(100), Quantity (100)); + verify_basic_spreader_state (spreader, SpreaderState::WORKING, spreader_price, spreader_quantity); + // send a fill, this should make the spreader go to end + spreader.on_child_update (leg_2_hedger_data.order_update_message().order_key, api::orderman::OrderStatus::OS_FILLED, Quantity (100), Price (1998), nullptr); + verify_complete_hedger_state (leg_2_hedger_data.hedger(), HedgerState::END, Price(1998), Quantity(100), Quantity(100), Price (0), Quantity(0), Quantity (0)); + verify_basic_spreader_state (spreader, SpreaderState::END, spreader_price, spreader_quantity); + LOG(OrderMan, Diag, "spreader_WORKING.on_quoter_order_error"); } } class Temp diff --git a/src/server/sparkd/spreader/SingleFillHedger.cpp b/src/server/sparkd/spreader/SingleFillHedger.cpp index 476cf5b56..9e56ef2ac 100644 --- a/src/server/sparkd/spreader/SingleFillHedger.cpp +++ b/src/server/sparkd/spreader/SingleFillHedger.cpp @@ -31,10 +31,7 @@ bool SingleFillHedger::is_active_order() const _worker->state() == HedgerState::END; return !is_not_active; } -bool SingleFillHedger::is_terminal_state () const -{ - return _worker->state() != HedgerState::END; -} +bool SingleFillHedger::is_terminal_state () const {return _worker->state() == HedgerState::END;} bool SingleFillHedger::accepting_price_change() const { return _worker->state() == HedgerState::WORKING; } Quantity SingleFillHedger::remaining_to_fill() const { return _price_quantity_state.remaining_to_fill(); } void SingleFillHedger::init()