diff --git a/src/lib/orderman/orders/spreader_orders/tests/spreader_tests.cpp b/src/lib/orderman/orders/spreader_orders/tests/spreader_tests.cpp index 592061d10..cbbea7155 100644 --- a/src/lib/orderman/orders/spreader_orders/tests/spreader_tests.cpp +++ b/src/lib/orderman/orders/spreader_orders/tests/spreader_tests.cpp @@ -6341,17 +6341,16 @@ TEST_CASE("4legs_hedging", "[spreader_perf]") { SpreaderManagerForTest spreader_manager( order_key, order_def, pao_services, leg_props, quoter_ord_defs, hedger_ord_defs); - SpreaderOrder spreader(spreader_manager.alt_order_gateway()); - REQUIRE(spreader.test_only_func_spreader_state() == SpreaderState::START); + integration::SpreaderWrapper spreader_w(order_def, nullptr); + REQUIRE(spreader_w.spreader_state() == SpreaderState::START); // on_init_new and activate - spreader.test_only_on_init_new(order_def, pao_services); + // spreader.test_only_on_init_new(order_def, pao_services); SpreaderOrderServices order_services(nullptr); - spreader.test_only_on_activate( - spreader_price, spreader_quantity, order_services); - SpreaderBookkeepingData &bookkeeping_data = - spreader.test_only_func_spreader_full_data(); + spreader_w.activate(spreader_price, spreader_quantity); + SpreaderBookkeepingData &bookkeeping_data = spreader_w.bookkeeping_data(); verify_basic_spreader_state( - spreader, SpreaderState::WORKING, spreader_price, spreader_quantity); + spreader_w.spreader(), SpreaderState::WORKING, spreader_price, + spreader_quantity); SpreaderLegData &qleg_data_4 = bookkeeping_data.get_leg_data(3); verify_complete_quoter_state( qleg_data_4.quoter(), QuoterState::WAITING_FOR_SIZE, false, @@ -6393,16 +6392,17 @@ TEST_CASE("4legs_hedging", "[spreader_perf]") { new uint16_t[5]{75, 25, 125, 100, 300}, new double[5]{19.890, 19.895, 19.900, 19.910, 19.915}, new uint16_t[5]{100, 50, 50, 125, 125}, true); - spreader.test_only_on_book_update(BookUpdateEvent(book_1, trace::CorID())); - spreader.test_only_on_book_update(BookUpdateEvent(book_2, trace::CorID())); - spreader.test_only_on_book_update(BookUpdateEvent(book_3, trace::CorID())); + spreader_w.update_book(book_1); + spreader_w.update_book(book_2); + spreader_w.update_book(book_3); verify_complete_quoter_state( qleg_data_4.quoter(), QuoterState::WAITING_FOR_FIRST_ACK, false, spreader_price, spreader_quantity, Quantity(0), Quantity(0), Price(20.045), spreader_quantity, spreader_quantity, false); - spreader.test_only_on_child_order_update( - qleg_data_4.order_key(), - api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity(0), Price(0)); + spreader_w.on_order_update( + {qleg_data_4.order_key(), + api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity(0), + Price(0)}); verify_complete_quoter_state( qleg_data_4.quoter(), QuoterState::WORKING, false, spreader_price, spreader_quantity, Quantity(0), Quantity(0), Price(20.045), @@ -6418,22 +6418,16 @@ TEST_CASE("4legs_hedging", "[spreader_perf]") { auto fire_book = [&](size_t n_upates) -> void { for (uint32_t b = 0; b < n_upates; b++) { - spreader.test_only_on_book_update( - BookUpdateEvent(book_1_alt, trace::CorID())); - spreader.test_only_on_book_update( - BookUpdateEvent(book_2_alt, trace::CorID())); - spreader.test_only_on_book_update( - BookUpdateEvent(book_3_alt, trace::CorID())); - spreader.test_only_on_book_update( - BookUpdateEvent(book_1, trace::CorID())); - spreader.test_only_on_book_update( - BookUpdateEvent(book_2, trace::CorID())); - spreader.test_only_on_book_update( - BookUpdateEvent(book_3, trace::CorID())); - spreader.test_only_on_child_order_update( - qleg_data_4.order_key(), - api::orderman::OrderStatus::ORDER_STATUS_WORKING, - Quantity(total_filled_qty), Price(20.045)); + spreader_w.update_book(book_1_alt); + spreader_w.update_book(book_2_alt); + spreader_w.update_book(book_3_alt); + spreader_w.update_book(book_1); + spreader_w.update_book(book_2); + spreader_w.update_book(book_3); + spreader_w.on_order_update( + {qleg_data_4.order_key(), + api::orderman::OrderStatus::ORDER_STATUS_WORKING, + Quantity(total_filled_qty), Price(20.045)}); } }; for (uint32_t i = 0; i < n_runs; i++) { @@ -6465,16 +6459,16 @@ TEST_CASE("4legs_hedging", "[spreader_perf]") { // 1* 25 // 30000* 25 test_sleep(30000, true); - spreader.test_only_keep_hedging_path_hot(); + // spreader_w.test_only_keep_hedging_path_hot(); for (uint32_t h = 0; h < n_hedges; h++) { auto t0 = utils::TimeStamp::now(); - spreader.test_only_on_child_order_update( - qleg_data_4.order_key(), - api::orderman::OrderStatus::ORDER_STATUS_WORKING, - Quantity(++total_filled_qty), Price(20.045)); + spreader_w.on_order_update( + {qleg_data_4.order_key(), + api::orderman::OrderStatus::ORDER_STATUS_WORKING, + Quantity(++total_filled_qty), Price(20.045)}); auto t1 = utils::TimeStamp::now(); hedge_perfs.push_back((t1 - t0).nanoseconds()); - fill_all_working_hedgers(spreader); + fill_all_working_hedgers(spreader_w.spreader()); test_sleep(100, true); } double min, max, mean, median;