diff --git a/src/server/sparkd/exchange_sim/ExchangeSim.cpp b/src/server/sparkd/exchange_sim/ExchangeSim.cpp index 0b752dd53..e660f5b47 100644 --- a/src/server/sparkd/exchange_sim/ExchangeSim.cpp +++ b/src/server/sparkd/exchange_sim/ExchangeSim.cpp @@ -14,6 +14,7 @@ #include "lib/config/config.h" #include +#include "lib/utils/bts_chrono.h" namespace bts { namespace sim { @@ -54,7 +55,7 @@ int start_exchange_sim() FIX::SocketAcceptor acceptor( application, storeFactory, settings, logFactory ); acceptor.start(); - while ( true ) ; + while ( true ) std::this_thread::sleep_for(10ms); acceptor.stop(); return 0; } diff --git a/src/server/sparkd/orderman/tests/spreader_tests.cpp b/src/server/sparkd/orderman/tests/spreader_tests.cpp index 35cbe671a..68ebd83cc 100644 --- a/src/server/sparkd/orderman/tests/spreader_tests.cpp +++ b/src/server/sparkd/orderman/tests/spreader_tests.cpp @@ -1848,10 +1848,43 @@ TEST_CASE ("spreader_WORKING", "[spreader]") } SECTION("14. on_check_termination") { - // get active orders working, send a terminal - // status on each order and verify that the - // spreader reached a terminal state - LOG(OrderMan, Diag, "spreader_WORKING.on_quoter_order_error"); + // the only way to do a termination and transit + // to END is if the orders get filled. If we cancel + // it leaves this state; if we send terminal status + // on the quoters, and its not fully filled, the quoters + // resubmit and continue + // leg has 30 hedge deduction, and 55 filled, another 15 will fill it completely + spreader.on_child_update (leg_data_2.order_key(), api::orderman::OrderStatus::OS_FILLED, Quantity (70), Price (2001), nullptr); + bts_assert (leg_data_1.n_hedgers () == 4); + bts_assert (leg_data_2.n_hedgers () == 2); + verify_complete_quoter_state (*leg_data_1.quoter(), QuoterState::WAITING_FOR_CANCEL_ACK, false, spreader_price, Quantity (100), Quantity (30), Quantity(70), Price(2003), Quantity(45), Quantity(0), true); + verify_complete_quoter_state (*leg_data_2.quoter(), QuoterState::END, false, spreader_price, Quantity (100), Quantity (0), Quantity(30), Price(0), Quantity(0), Quantity(0), true); + verify_complete_hedger_state (leg_data_1.get_hedger (0).hedger(), HedgerState::WORKING, Price (2002), Quantity(15), Quantity (0), Price(2002), Quantity (15), Quantity (15)); + verify_complete_hedger_state (leg_data_1.get_hedger (1).hedger(), HedgerState::WORKING, Price (2002), Quantity(30), Quantity (0), Price(2002), Quantity (30), Quantity (30)); + verify_complete_hedger_state (leg_data_1.get_hedger (2).hedger(), HedgerState::WORKING, Price (2002), Quantity(10), Quantity (0), Price(2002), Quantity (10), Quantity (10)); + verify_complete_hedger_state (leg_data_1.get_hedger (3).hedger(), HedgerState::WAITING_FOR_FIRST_ACK, Price (2002), Quantity(15), Quantity (0), Price(2002), Quantity (15), Quantity (15));//new hedger + verify_complete_hedger_state (leg_data_2.get_hedger (0).hedger(), HedgerState::WORKING, Price (1999), Quantity(20), Quantity (0), Price(1999), Quantity (20), Quantity (20)); + verify_complete_hedger_state (leg_data_2.get_hedger (1).hedger(), HedgerState::WORKING, Price (1999), Quantity(10), Quantity (0), Price(1999), Quantity (10), Quantity (10)); + // now bring the quoter and hedgers to their end states + // when all of them are at the end state, the spreader + // should also go to end + spreader.on_child_update (leg_data_1.order_key(), api::orderman::OrderStatus::OS_CANCELED, Quantity (70), Price (2001), nullptr); + verify_complete_quoter_state (*leg_data_1.quoter(), QuoterState::END, false, spreader_price, Quantity (100), Quantity (0), Quantity(70), Price(0), Quantity(0), Quantity(0), true); + verify_basic_spreader_state (spreader, SpreaderState::WORKING, spreader_price, spreader_quantity); + // all the quoters are done now + spreader.on_child_update (leg_data_1.get_hedger (0).order_update_message().order_key, api::orderman::OrderStatus::OS_FILLED, Quantity (15), Price (2002), nullptr); + verify_basic_spreader_state (spreader, SpreaderState::WORKING, spreader_price, spreader_quantity); + spreader.on_child_update (leg_data_1.get_hedger (1).order_update_message().order_key, api::orderman::OrderStatus::OS_FILLED, Quantity (30), Price (2002), nullptr); + verify_basic_spreader_state (spreader, SpreaderState::WORKING, spreader_price, spreader_quantity); + spreader.on_child_update (leg_data_1.get_hedger (2).order_update_message().order_key, api::orderman::OrderStatus::OS_FILLED, Quantity (10), Price (2002), nullptr); + verify_basic_spreader_state (spreader, SpreaderState::WORKING, spreader_price, spreader_quantity); + spreader.on_child_update (leg_data_1.get_hedger (3).order_update_message().order_key, api::orderman::OrderStatus::OS_FILLED, Quantity (15), Price (2002), nullptr); + verify_basic_spreader_state (spreader, SpreaderState::WORKING, spreader_price, spreader_quantity); + spreader.on_child_update (leg_data_2.get_hedger (0).order_update_message().order_key, api::orderman::OrderStatus::OS_FILLED, Quantity (20), Price (1999), nullptr); + verify_basic_spreader_state (spreader, SpreaderState::WORKING, spreader_price, spreader_quantity); + spreader.on_child_update (leg_data_2.get_hedger (1).order_update_message().order_key, api::orderman::OrderStatus::OS_FILLED, Quantity (10), Price (1999), nullptr); + verify_basic_spreader_state (spreader, SpreaderState::END, spreader_price, spreader_quantity); + LOG(OrderMan, Diag, "spreader_WORKING.on_quoter_order_fill"); } } TEST_CASE ("spreader_WAITING_FOR_CANCEL_ACK", "[spreader]")