diff --git a/src/server/sparkd/cmds/Spartan.cpp b/src/server/sparkd/cmds/Spartan.cpp index f64b3f932..dbffa0cb9 100644 --- a/src/server/sparkd/cmds/Spartan.cpp +++ b/src/server/sparkd/cmds/Spartan.cpp @@ -74,7 +74,7 @@ std::map const &)>> } auto current_orders = s->orders(); add_iceberg_annotation(current_orders); - if (!matcher.has_same_orders(current_orders)) { + if (matcher.has_same_orders(current_orders).has_value()) { std::cout << "Failing on event:\n " << ev.event_id << std::endl; std::cout << "Old Orders:\n " << std::endl diff --git a/src/server/sparkd/cmds/spartan/md/mdp3/back_testing/FifoSecurityMatcher.cpp b/src/server/sparkd/cmds/spartan/md/mdp3/back_testing/FifoSecurityMatcher.cpp index dc6c1c81e..1d2eca2fe 100644 --- a/src/server/sparkd/cmds/spartan/md/mdp3/back_testing/FifoSecurityMatcher.cpp +++ b/src/server/sparkd/cmds/spartan/md/mdp3/back_testing/FifoSecurityMatcher.cpp @@ -239,10 +239,9 @@ void FifoSecurityMatcher::on_order_remove(MDP3OrderKey key){ _remove_empty_price_levels(); } -bool FifoSecurityMatcher::has_same_orders(const Orders& ord_map){ - auto i=0; +std::optional FifoSecurityMatcher::has_same_orders( + const Orders& ord_map){ for (const auto& kv : ord_map){ - i++; const auto& exp_ord = kv.second; auto[plevel,ord] = _find_order(exp_ord.key); auto match = plevel != nullptr && ord != nullptr && @@ -250,15 +249,27 @@ bool FifoSecurityMatcher::has_same_orders(const Orders& ord_map){ plevel->side()==exp_ord.side && ord->quantity == exp_ord.quantity; if(!match){ - auto pl = _find_price_level(exp_ord.side,exp_ord.price); - (void) pl; - // debug_break(); - // bts_assert(false); - // bts_assert(pl != nullptr); - return false; + std::ostringstream buff; + if(ord == nullptr) + buff<<"Order with Key:"<price()<quantity<side()<ib.is_ib? + ord->ib.total_qty.value():0; + buff<<"Expected IB state:"<{buff.str()}; } } - return true; + LOG(OrderMan, Info, "FifoSecurityMatcher::has_same_orders passed"); + return std::nullopt; } } diff --git a/src/server/sparkd/cmds/spartan/md/mdp3/back_testing/FifoSecurityMatcher.h b/src/server/sparkd/cmds/spartan/md/mdp3/back_testing/FifoSecurityMatcher.h index db3e3a8de..a53e02d2b 100644 --- a/src/server/sparkd/cmds/spartan/md/mdp3/back_testing/FifoSecurityMatcher.h +++ b/src/server/sparkd/cmds/spartan/md/mdp3/back_testing/FifoSecurityMatcher.h @@ -56,6 +56,6 @@ public: void on_order_update(const MDP3Order&); void on_order_remove(MDP3OrderKey); // For testing - bool has_same_orders(Orders const&); + std::optional has_same_orders(Orders const&); }; } // namespace bts::spartan::mdp3