Something here breaks

This commit is contained in:
Pedro Pinto committed 2020-07-02 19:04:49 -04:00
1 parent ac956a5c02
commit 5ea6dccdd4
9 files changed
+96 -51

No files matched your search

+9 -17
View File
@@ -45,7 +45,6 @@ struct NativeOrder::PImpl {
: services(nullptr), session_services(), sec(nullptr),
previous_working_position(0), definition(), state(),
price_encoding_precision(7), exchange_order_id() {
exchange_order_id.reserve(100);
}
OrderServices *services;
@@ -59,7 +58,7 @@ struct NativeOrder::PImpl {
OrderDefinition definition;
OrderState state;
int price_encoding_precision;
std::string exchange_order_id;
std::optional<ExchangeOrderIDVar> exchange_order_id;
OrderServices::ExeReportSubID exe_report_sid;
OrderServices::CancelRejectSubID cancel_reject_sid;
@@ -195,8 +194,8 @@ void NativeOrder::on_init_recovered(OrderRecord const &rec,
init_encodings();
if (me->state.status() != ORDER_STATUS_PENDING_WORKING) {
me->exchange_order_id = native_state.exchange_order_id();
me->encoder->update_exchange_order_id(me->exchange_order_id);
me->exchange_order_id = get_exchange_order_id(native_state);
me->encoder->update_exchange_order_id(me->exchange_order_id.value());
}
return;
}
@@ -710,7 +709,7 @@ void NativeOrder::on_attached(
*native_state.mutable_routing_record() = rq.routing_record;
init_encodings();
if (has_exchange_order_id())
me->encoder->update_exchange_order_id(me->exchange_order_id);
me->encoder->update_exchange_order_id(me->exchange_order_id.value());
// Update user, account and manual order indicator based on new parent
me->definition.set_manual_order_indicator(
@@ -846,13 +845,7 @@ void NativeOrder::on_exe_report(const NewExecutionReportEvent &er) {
}
native_state.set_last_msg_seq_num(er.data->msg_seq_num);
orderman::ExchangeTimeStampStr ts_str;
ExchangeTimeStamp64 ts_64;
er.data->get_ts(&ts_str,&ts_64);
native_state.set_last_transact_time_unix_ns(ts_64.value());
native_state.set_last_transact_time(to_str(ts_str));
set_last_transact_time(er.data->transact_time,&native_state);
auto external_status = map_external_status(er.data->order_status);
// filled quantity is reset back to 0 when the order is canceled
@@ -894,10 +887,9 @@ void NativeOrder::on_exe_report(const NewExecutionReportEvent &er) {
bool got_first_exchange_order_id = !has_exchange_order_id();
if (got_first_exchange_order_id) {
me->exchange_order_id =
to_trim_str(std::get<ExchangeOrderID>(er.data->exchange_order_id));
native_state.set_exchange_order_id(me->exchange_order_id);
me->encoder->update_exchange_order_id(me->exchange_order_id);
me->exchange_order_id = er.data->exchange_order_id;
set_exchange_order_id(me->exchange_order_id.value(),&native_state);
me->encoder->update_exchange_order_id(me->exchange_order_id.value());
}
if (!terminal_state(me->state.status())) {
@@ -1138,7 +1130,7 @@ OrderStatus map_external_status(NativeOrderStatus status) {
}
bool NativeOrder::has_exchange_order_id() {
return me->exchange_order_id.size();
return me->exchange_order_id.has_value();
}
void NativeOrder::transition(api::orderman::OrderStatus new_status,