Fixed a few bugs in native order management.
This commit is contained in:
1 parent
7e5211ad59
commit
ff613f8d5c
2 files changed
+16
-10
No files matched your search
@@ -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,
|
||||
|
||||
@@ -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 &);
|
||||
};
|
||||
|
||||
|
||||
Reference in new issue
Block a user