From 9f1bb177b8d9de1985a9bd2d230ab0c77e2350e7 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Sat, 12 Jan 2019 15:56:01 -0500 Subject: [PATCH] Fixed build. --- .../spreader_orders/tests/spreader_tests.cpp | 89 ++++++++----------- src/sdk/examples/order_plugin_example.cpp | 15 ++-- 2 files changed, 41 insertions(+), 63 deletions(-) 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 553641440..352aa7c1b 100644 --- a/src/lib/orderman/orders/spreader_orders/tests/spreader_tests.cpp +++ b/src/lib/orderman/orders/spreader_orders/tests/spreader_tests.cpp @@ -47,9 +47,8 @@ TEST_CASE ("quoter price quantity state", "[spreader]") REQUIRE (s.out_price() == Price (0.0)); REQUIRE (s.out_quantity() == Quantity (0)); // set out price and quantity - trace::CorID dont_care; bts::TimeStamp ts; - order.place_order(Price (-0.35), Quantity (123),ts,dont_care); + order.place_order(Price (-0.35), Quantity (123),ts); REQUIRE (s.target_spread_price() == Price (-1.0)); REQUIRE (s.target_leg_quantity() == Quantity (200)); REQUIRE (s.aggregated_filled_quantity() == Quantity (25)); @@ -102,9 +101,8 @@ TEST_CASE ("quoter price quantity state", "[spreader]") s.add_hedged_reduction (Quantity(5)); s.add_hedged_reduction (Quantity(15)); // set out values - trace::CorID dont_care; bts::TimeStamp ts; - order_2.place_order (Price(1), Quantity (50),ts,dont_care); + order_2.place_order (Price(1), Quantity (50),ts); REQUIRE (s.target_spread_price() == Price (-1.0)); REQUIRE (s.target_leg_quantity() == Quantity (200)); REQUIRE (s.aggregated_filled_quantity() == Quantity (40)); @@ -125,7 +123,7 @@ TEST_CASE ("quoter price quantity state", "[spreader]") on_order_update (order_2, api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity (10), Price (2000)); s.add_hedged_reduction (Quantity(3)); s.add_hedged_reduction (Quantity(7)); - order_2.place_order (Price(0.75), Quantity (50),ts,dont_care); + order_2.place_order (Price(0.75), Quantity (50),ts); REQUIRE (s.target_spread_price() == Price (-1.0)); REQUIRE (s.target_leg_quantity() == Quantity (200)); REQUIRE (s.aggregated_filled_quantity() == Quantity (10)); @@ -1250,8 +1248,7 @@ TEST_CASE ("hedger_START_state", "[spreader]") 1, hedger_price, hedger_quantity, - nullptr, - trace::CorID()); + nullptr); verify_complete_hedger_state (hedger, HedgerState::START, hedger_price, hedger_quantity, Quantity (0), Price (0), Quantity (0), hedger_quantity); SECTION("0. transition_to_start") @@ -1301,8 +1298,7 @@ TEST_CASE ("hedger_WAITING_FOR_FIRST_ACK_state", "[spreader]") 1, hedger_price, hedger_quantity, - nullptr, - trace::CorID()); + nullptr); verify_complete_hedger_state (hedger, HedgerState::START, hedger_price, hedger_quantity, Quantity (0), Price (0), Quantity (0), hedger_quantity); hedger.init (); @@ -1361,8 +1357,7 @@ TEST_CASE ("hedger_WAITING_FOR_FIRST_ACK_CANCELLED_state", "[spreader]") 1, hedger_price, hedger_quantity, - nullptr, - trace::CorID()); + nullptr); verify_complete_hedger_state (hedger, HedgerState::START, hedger_price, hedger_quantity, Quantity (0), Price (0), Quantity (0), hedger_quantity); hedger.init (); @@ -1423,8 +1418,7 @@ TEST_CASE ("hedger_WAITING_FOR_CANCEL_ACK_state", "[spreader]") 1, hedger_price, hedger_quantity, - nullptr, - trace::CorID()); + nullptr); verify_complete_hedger_state (hedger, HedgerState::START, hedger_price, hedger_quantity, Quantity (0), Price (0), Quantity (0), hedger_quantity); hedger.init (); @@ -1496,8 +1490,7 @@ TEST_CASE ("hedger_END_state", "[spreader]") 1, hedger_price, hedger_quantity, - nullptr, - trace::CorID()); + nullptr); verify_complete_hedger_state (hedger, HedgerState::START, hedger_price, hedger_quantity, Quantity (0), Price (0), Quantity (0), hedger_quantity); hedger.init (); @@ -1554,8 +1547,7 @@ TEST_CASE ("hedger_WORKING", "[spreader]") 1, hedger_price, hedger_quantity, - nullptr, - trace::CorID()); + nullptr); verify_complete_hedger_state (hedger, HedgerState::START, hedger_price, hedger_quantity, Quantity (0), Price (0), Quantity (0), hedger_quantity); SpreaderChildOrderState& u = hedger.order_state(); @@ -1657,7 +1649,7 @@ TEST_CASE ("spreader_START", "[spreader]") } SECTION("5. on_cancel") { - spreader.on_cancel(trace::CorID()); + spreader.on_cancel(); REQUIRE(spreader.test_only_func_spreader_state() == SpreaderState::END); LOG(OrderMan, Diag, "spreader_START.on_cancel"); } @@ -1769,7 +1761,7 @@ TEST_CASE ("spreader_WORKING", "[spreader]") // be as is spreader_price = Price (0); spreader_quantity = Quantity (200); - spreader.on_update (spreader_price, spreader_quantity,trace::CorID()); + spreader.on_update (spreader_price, spreader_quantity); verify_basic_spreader_state (spreader, SpreaderState::WORKING, spreader_price, spreader_quantity); verify_complete_quoter_state (leg_data_1.quoter(), QuoterState::WORKING, false, spreader_price, spreader_quantity, Quantity (30), Quantity(55), Price(1998), Quantity(130), Quantity(115), false); verify_complete_quoter_state (leg_data_2.quoter(), QuoterState::WORKING, false, spreader_price, spreader_quantity, Quantity (55), Quantity(30), Price(2004), Quantity(165), Quantity(115), false); @@ -1779,7 +1771,7 @@ TEST_CASE ("spreader_WORKING", "[spreader]") } SECTION("5. on_cancel") { - spreader.on_cancel(trace::CorID()); + spreader.on_cancel(); verify_basic_spreader_state (spreader, SpreaderState::WAITING_FOR_CANCEL_ALL, spreader_price, spreader_quantity); generic_validate_quoters (QuoterState::WAITING_FOR_CANCEL_ACK, true); generic_validate_hedgers (HedgerState::WAITING_FOR_CANCEL_ACK); @@ -1800,7 +1792,7 @@ TEST_CASE ("spreader_WORKING", "[spreader]") new double[5] {2005, 2006, 2007, 2008, 2009}, new uint16_t[5] {0, 0, 0, 0, 0}, true); - spreader.test_only_on_book_update (modified_book, trace::CorID()); + spreader.test_only_on_book_update (modified_book); verify_basic_spreader_state (spreader, SpreaderState::WORKING, spreader_price, spreader_quantity); generic_validate_quoters (QuoterState::WORKING, false); generic_validate_hedgers (HedgerState::WORKING); @@ -1814,8 +1806,8 @@ TEST_CASE ("spreader_WORKING", "[spreader]") new double[5] {2003, 2004, 2005, 2006, 2007}, new uint16_t[5] {25, 25, 20, 20, 10}, true); - //spreader.on_book (bts::orderman::trace::CorID(), modified_book); - spreader.test_only_on_book_update (modified_book,trace::CorID()); + //spreader.on_book (modified_book); + spreader.test_only_on_book_update (modified_book); verify_basic_spreader_state (spreader, SpreaderState::WORKING, spreader_price, spreader_quantity); verify_complete_quoter_state (leg_data_1.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (30), Quantity(55), Price(1999), Quantity(45), Quantity(15), false); verify_complete_quoter_state (leg_data_2.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (55), Quantity(30), Price(2000), Quantity(70), Quantity(15), false); @@ -1830,8 +1822,8 @@ TEST_CASE ("spreader_WORKING", "[spreader]") new double[5] {2003, 2004, 2005, 2006, 2007}, new uint16_t[5] {25, 25, 20, 20, 10}, true); - //spreader.on_book (bts::orderman::trace::CorID(), modified_book); - spreader.test_only_on_book_update (modified_book,trace::CorID()); + //spreader.on_book (modified_book); + spreader.test_only_on_book_update (modified_book); verify_basic_spreader_state (spreader, SpreaderState::WORKING, spreader_price, spreader_quantity); verify_complete_quoter_state (leg_data_1.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (30), Quantity(55), Price(2000), Quantity(34), Quantity(15), false); verify_complete_quoter_state (leg_data_2.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (55), Quantity(30), Price(2000), Quantity(70), Quantity(15), false); @@ -1844,8 +1836,8 @@ TEST_CASE ("spreader_WORKING", "[spreader]") new double[5] {2003, 2004, 2005, 2006, 2007}, new uint16_t[5] {25, 25, 20, 20, 10}, true); - //spreader.on_book (bts::orderman::trace::CorID(), modified_book); - spreader.test_only_on_book_update (modified_book, trace::CorID()); + //spreader.on_book (modified_book); + spreader.test_only_on_book_update (modified_book); verify_basic_spreader_state (spreader, SpreaderState::WORKING, spreader_price, spreader_quantity); verify_complete_quoter_state (leg_data_1.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (30), Quantity(55), Price(2001), Quantity(45), Quantity(15), false); verify_complete_quoter_state (leg_data_2.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (55), Quantity(30), Price(2000), Quantity(70), Quantity(15), false); @@ -1859,8 +1851,8 @@ TEST_CASE ("spreader_WORKING", "[spreader]") new double[5] {2003, 2004, 2005, 2006, 2007}, new uint16_t[5] {25, 25, 20, 20, 10}, true); - //spreader.on_book (bts::orderman::trace::CorID(), modified_book); - spreader.test_only_on_book_update (modified_book, trace::CorID()); + //spreader.on_book (modified_book); + spreader.test_only_on_book_update (modified_book); verify_basic_spreader_state (spreader, SpreaderState::WORKING, spreader_price, spreader_quantity); verify_complete_quoter_state (leg_data_1.quoter(), QuoterState::WAITING_FOR_CANCEL_ACK, false, spreader_price, Quantity (100), Quantity (30), Quantity(55), Price(2001), Quantity(45), Quantity(15), false); verify_complete_quoter_state (leg_data_2.quoter(), QuoterState::WORKING, false, spreader_price, Quantity (100), Quantity (55), Quantity(30), Price(2000), Quantity(70), Quantity(15), false); @@ -2074,7 +2066,7 @@ TEST_CASE ("spreader_WAITING_FOR_CANCEL_ACK", "[spreader]") // now cancel the spreader bts::TimeStamp cancel_timestamp = std::chrono::system_clock::now(); spreader.test_only_on_time (cancel_timestamp); - spreader.on_cancel (trace::CorID()); + spreader.on_cancel (); auto validate_state = [&]() -> void { verify_basic_spreader_state (spreader, SpreaderState::WAITING_FOR_CANCEL_ALL, spreader_price, spreader_quantity); @@ -2097,7 +2089,7 @@ TEST_CASE ("spreader_WAITING_FOR_CANCEL_ACK", "[spreader]") } SECTION("4. on_update") { - spreader.on_update (Price(-0.05), Quantity(200),trace::CorID()); + spreader.on_update (Price(-0.05), Quantity(200)); validate_state(); // order changes dont go through validate_state(); @@ -2105,7 +2097,7 @@ TEST_CASE ("spreader_WAITING_FOR_CANCEL_ACK", "[spreader]") } SECTION("5. on_cancel") { - spreader.on_cancel(trace::CorID()); + spreader.on_cancel(); // already in cancel state, no change validate_state(); LOG(OrderMan, Diag, "spreader_WAITING_FOR_CANCEL_ACK.on_cancel"); @@ -2673,11 +2665,9 @@ TEST_CASE ("spreader_perf_2legs", "[spreader]") bts::TimeStamp t0=bts::Timer::now(); for (uint32_t i=0; i(us_diff (t1,t0))/n_iters; @@ -2823,12 +2813,9 @@ TEST_CASE ("spreader_perf_4legs", "[spreader]") 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.test_only_on_book_update (BookUpdateEvent(book_1)); + spreader.test_only_on_book_update (BookUpdateEvent(book_2)); + spreader.test_only_on_book_update (BookUpdateEvent(book_3)); verify_complete_quoter_state (qleg_data_4.quoter(), QuoterState::WAITING_FOR_FIRST_ACK, false, @@ -2907,18 +2894,12 @@ TEST_CASE ("spreader_perf_4legs", "[spreader]") hedge_perfs.reserve(n_hedges); auto t0=utils::TimeStamp::now(); for (uint32_t b=0; bservices); me->services = &services; me->child_builder.activate(services); @@ -163,8 +161,7 @@ OrderOpResult DynamicIcebergOrder::on_activate(Price p, Quantity q, return OrderOpResult(); } -OrderOpResult DynamicIcebergOrder::on_update(Price p, Quantity q, - trace::CorID const &) { +OrderOpResult DynamicIcebergOrder::on_update(Price p, Quantity q) { switch (me->state.status()) { case ORDER_STATUS_WORKING: case ORDER_STATUS_PENDING_WORKING: @@ -192,7 +189,7 @@ OrderOpResult DynamicIcebergOrder::on_update(Price p, Quantity q, return OrderOpResult(); } -OrderOpResult DynamicIcebergOrder::on_cancel(trace::CorID const &) { +OrderOpResult DynamicIcebergOrder::on_cancel() { switch (me->state.status()) { case ORDER_STATUS_WORKING: LOG(Plugin, Info, "Canceling DynamicIceberg Order {}", key().value());