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 ab5b98f24..2d59c2bf5 100644 --- a/src/lib/orderman/orders/spreader_orders/tests/spreader_tests.cpp +++ b/src/lib/orderman/orders/spreader_orders/tests/spreader_tests.cpp @@ -4214,7 +4214,8 @@ TEST_CASE ("sim_spreader", "[spreader]"){ {104,5}, {105,5} }; - auto md_udpate_leg_1 = get_book_update(bids,asks,leg_1.security().id()); + auto md_udpate_leg_1 = get_book_update(bids,asks,leg_1.security().id()); + // send leg_1 book update => leg_2 should quote sim_spreader.on_notification( { bts::spartan::mdp3::MDP3TimeStamp{}, @@ -4222,14 +4223,7 @@ TEST_CASE ("sim_spreader", "[spreader]"){ md_udpate_leg_1 } ); - // auto md_udpate_leg_2 = get_book_update(bids,asks,leg_2.security().id()); - // sim_spreader.on_notification( - // { - // bts::spartan::mdp3::MDP3TimeStamp{}, - // bts::spartan::mdp3::MDP3TimeStamp{}, - // md_udpate_leg_2 - // } - // ); + sim_spreader.on_time(bts::spartan::mdp3::MDP3TimeStamp()); REQUIRE(sim_services.n_updates==1); } } diff --git a/src/server/sparkd/cmds/spartan/md/mdp3/back_testing/simulator/algos/SimOrderGateway.cpp b/src/server/sparkd/cmds/spartan/md/mdp3/back_testing/simulator/algos/SimOrderGateway.cpp index ef1493b4e..4ea3b14d5 100644 --- a/src/server/sparkd/cmds/spartan/md/mdp3/back_testing/simulator/algos/SimOrderGateway.cpp +++ b/src/server/sparkd/cmds/spartan/md/mdp3/back_testing/simulator/algos/SimOrderGateway.cpp @@ -15,6 +15,7 @@ struct OrderTuple{ OrderChange ochange; uint32_t total_fills = 0; double avg_filled_price = 0; + bool order_send_acked = false; OrderTuple (OrderKey key, OrderChange ochange) : @@ -55,7 +56,7 @@ OrderTuple* find_ord(MDP3OrderKey key, struct SimOrderGateway::PImpl { ISimServices* sim_services = nullptr; SpreaderOrder* spreader = nullptr; - std::vector orders; + std::vector orders; }; SimOrderGateway::SimOrderGateway() @@ -75,34 +76,23 @@ void SimOrderGateway:: place_order(SecurityKey skey, Price p, Quantity q){ bts_assert(me->sim_services!=nullptr); - auto& t = - me->orders.emplace_back( - okey, - OrderChange{ - MDP3Order(), - MDP3Order{ - me->sim_services->generate_order_key(), - MDP3SecurityID{static_cast(skey.value())}, - side, - MDP3OrderPriority{}, - md::IntPrice_from_double<7>(p.value()), - MDP3Quantity{static_cast(q.value())}, - MDP3Quantity(0) - }, - OrderChange::added - }); - const auto& ochange = t.ochange; - me->sim_services->send(ochange); - // since there is no working order ack, fake one - route_update_to_spreader( - OrderUpdate{ - t.ochange.order.key, - OrderUpdate::Status::PARTIALLY_FILLED, - t.ochange.order.security, - t.ochange.order.side, - MDP3Quantity{}, - md::IntPrice() - }); + const auto& t = + me->orders.emplace_back( + okey, + OrderChange{ + MDP3Order(), + MDP3Order{ + me->sim_services->generate_order_key(), + MDP3SecurityID{static_cast(skey.value())}, + side, + MDP3OrderPriority{}, + md::IntPrice_from_double<7>(p.value()), + MDP3Quantity{static_cast(q.value())}, + MDP3Quantity(0) + }, + OrderChange::added + }); + me->sim_services->send(t.ochange); } void SimOrderGateway::modify_order(OrderKey okey, @@ -111,6 +101,7 @@ void SimOrderGateway::modify_order(OrderKey okey, bts_assert(me->sim_services!=nullptr); OrderTuple* t = find_ord(okey,me->orders); bts_assert(t != nullptr); + bts_assert(t->order_send_acked); auto& ochange = t->ochange; ochange.previous_order = ochange.order; ochange.order.price = md::IntPrice_from_double<7>(p.value()); @@ -120,19 +111,38 @@ void SimOrderGateway::modify_order(OrderKey okey, } void SimOrderGateway::cancel_order(OrderKey okey){ - bts_assert(me->sim_services!=nullptr); + bts_assert(me->sim_services!=nullptr); OrderTuple* t = find_ord(okey,me->orders); bts_assert(t != nullptr); + bts_assert(t->order_send_acked); auto& ochange = t->ochange; ochange.change = OrderChange::removed; me->sim_services->send(ochange); } OrderKey SimOrderGateway::generate_key(){ - auto rv = static_cast(bts::Timer::now().time_since_epoch().count()); + auto rv = + static_cast(bts::Timer::now().time_since_epoch().count()); return OrderKey(rv); } +void SimOrderGateway::poll(){ + for(auto& t : me->orders){ + if(!t.order_send_acked){ + t.order_send_acked=true; + route_update_to_spreader( + OrderUpdate{ + t.ochange.order.key, + OrderUpdate::Status::PARTIALLY_FILLED, + t.ochange.order.security, + t.ochange.order.side, + MDP3Quantity{}, + md::IntPrice() + }); + } + } +} + void SimOrderGateway::route_update_to_spreader(const OrderUpdate& u){ OrderTuple* t = find_ord(u.key,me->orders); bts_assert(t!=nullptr); @@ -153,5 +163,4 @@ void SimOrderGateway::route_update_to_spreader(const OrderUpdate& u){ Price(t->avg_filled_price) ); } - } \ No newline at end of file diff --git a/src/server/sparkd/cmds/spartan/md/mdp3/back_testing/simulator/algos/SimOrderGateway.h b/src/server/sparkd/cmds/spartan/md/mdp3/back_testing/simulator/algos/SimOrderGateway.h index 1351dbe37..681b5c580 100644 --- a/src/server/sparkd/cmds/spartan/md/mdp3/back_testing/simulator/algos/SimOrderGateway.h +++ b/src/server/sparkd/cmds/spartan/md/mdp3/back_testing/simulator/algos/SimOrderGateway.h @@ -32,6 +32,7 @@ public: void cancel_order(bts::orderman::OrderKey) override; bts::orderman::OrderKey generate_key() override; // Sends ISimServices's updates to spreader + void poll(); void route_update_to_spreader(const OrderUpdate&); }; diff --git a/src/server/sparkd/cmds/spartan/md/mdp3/back_testing/simulator/algos/SimSpreader.cpp b/src/server/sparkd/cmds/spartan/md/mdp3/back_testing/simulator/algos/SimSpreader.cpp index a9b7360d8..a679860ea 100644 --- a/src/server/sparkd/cmds/spartan/md/mdp3/back_testing/simulator/algos/SimSpreader.cpp +++ b/src/server/sparkd/cmds/spartan/md/mdp3/back_testing/simulator/algos/SimSpreader.cpp @@ -85,7 +85,9 @@ void SimSpreader::init(ISimServices& sim_services){ me->quantity, me->so_services); } - +void SimSpreader::on_time(MDP3TimeStamp){ + me->sim_order_gateway.poll(); +} void SimSpreader::on_notification(AlgoNotification const& ev) { if(std::holds_alternative(ev.event)){ // book update diff --git a/src/server/sparkd/cmds/spartan/md/mdp3/back_testing/simulator/algos/SimSpreader.h b/src/server/sparkd/cmds/spartan/md/mdp3/back_testing/simulator/algos/SimSpreader.h index d7dbbf5d6..afde8c95c 100644 --- a/src/server/sparkd/cmds/spartan/md/mdp3/back_testing/simulator/algos/SimSpreader.h +++ b/src/server/sparkd/cmds/spartan/md/mdp3/back_testing/simulator/algos/SimSpreader.h @@ -22,8 +22,9 @@ public: const bts::api::Security&, Price, Quantity); void init(ISimServices&) override; - void on_notification(AlgoNotification const&) override; + void on_time(MDP3TimeStamp) override; + void on_notification(AlgoNotification const&) override; ~SimSpreader(){} }; -} +} \ No newline at end of file