From ff613f8d5c2ffa86d98ee978bce345cdf2e57696 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Fri, 5 Jan 2018 11:52:04 -0500 Subject: [PATCH] Fixed a few bugs in native order management. --- .../sparkd/orderman2/orders/NativeOrder.cpp | 24 ++++++++++++------- .../sparkd/orderman2/orders/NativeOrder.h | 2 +- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/src/server/sparkd/orderman2/orders/NativeOrder.cpp b/src/server/sparkd/orderman2/orders/NativeOrder.cpp index bdbda9843..b99fea27e 100644 --- a/src/server/sparkd/orderman2/orders/NativeOrder.cpp +++ b/src/server/sparkd/orderman2/orders/NativeOrder.cpp @@ -60,16 +60,16 @@ void NativeOrder::on_init_new(OrderDefinition const &def, switch (def.custom_case()) { case OrderDefinition::kMarket: - me->state.market(); + me->state.mutable_market(); break; case OrderDefinition::kLimit: - me->state.limit(); + me->state.mutable_limit(); break; case OrderDefinition::kStop: - me->state.stop(); + me->state.mutable_stop(); break; case OrderDefinition::kStopLimit: - me->state.stop_limit(); + me->state.mutable_stop_limit(); break; case OrderDefinition::kIceberg: case OrderDefinition::kSpreader: @@ -81,9 +81,11 @@ void NativeOrder::on_init_new(OrderDefinition const &def, me->sec = serv.sec_db.resolve(SecurityKey(def.security_key())); - if (!me->sec) - transition(ORDER_STATUS_REJECTED_BY_SPARK, - fmt::format("Unknown security: {}", def.security_key())); + if (!me->sec) { + auto msg = fmt::format("Unknown security: {}", def.security_key()); + me->state.set_last_msg(msg); + transition(ORDER_STATUS_REJECTED_BY_SPARK,msg); + } else { transition(ORDER_STATUS_INACTIVE); init_fix(); @@ -178,18 +180,22 @@ void NativeOrder::on_init_from_exe_report( switch (er.order_type) { case NATIVE_ORDER_TYPE_MARKET: def.mutable_market(); + state.mutable_market(); break; case NATIVE_ORDER_TYPE_LIMIT: def.mutable_limit(); + state.mutable_market(); break; case NATIVE_ORDER_TYPE_STOP: { auto &stop_def = *def.mutable_stop(); stop_def.set_stop_price(er.stop_price.value()); + state.mutable_stop(); break; } case NATIVE_ORDER_TYPE_STOP_LIMIT: { auto &stop_limit_def = *def.mutable_stop_limit(); stop_limit_def.set_stop_price(er.stop_price.value()); + state.mutable_stop_limit(); break; } case NATIVE_ORDER_TYPE_MARKET_LIMIT: @@ -666,8 +672,8 @@ OrderStatus map_external_status(NativeOrderStatus status) { return ORDER_STATUS_ERROR; } -bool NativeOrder::has_exchange_order_id() const { - return me->state.limit().native_state().exchange_order_id().size(); +bool NativeOrder::has_exchange_order_id() { + return get_native_state(me->state).exchange_order_id().size(); } void NativeOrder::transition(api::orderman2::OrderStatus new_status, diff --git a/src/server/sparkd/orderman2/orders/NativeOrder.h b/src/server/sparkd/orderman2/orders/NativeOrder.h index 8c42d71f8..c04aeae0a 100644 --- a/src/server/sparkd/orderman2/orders/NativeOrder.h +++ b/src/server/sparkd/orderman2/orders/NativeOrder.h @@ -44,7 +44,7 @@ private: void transition_to_error(api::orderman2::NativeOrderState::SubError sub_error, std::string const&msg); - bool has_exchange_order_id() const; + bool has_exchange_order_id() ; api::orderman2::NativeOrderState& get_native_state(api::orderman2::OrderState &); };