From 4f18683ce3da5980db9f7f93140d45f3bf416cdf Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Fri, 13 Oct 2017 12:45:09 -0400 Subject: [PATCH] handling the unack'ed status update in the quoter --- src/server/sparkd/spreader/SingleLegQuoter.cpp | 4 +++- .../spreader/SpreaderOrderUpdateMessage.h | 2 ++ src/server/sparkd/spreader/SpreaderUtils.h | 17 +++++++++++++---- 3 files changed, 18 insertions(+), 5 deletions(-) diff --git a/src/server/sparkd/spreader/SingleLegQuoter.cpp b/src/server/sparkd/spreader/SingleLegQuoter.cpp index 43335bf49..8615f1be9 100644 --- a/src/server/sparkd/spreader/SingleLegQuoter.cpp +++ b/src/server/sparkd/spreader/SingleLegQuoter.cpp @@ -170,8 +170,10 @@ void SingleLegQuoter::_handle_events_in_WAITING_FOR_FIRST_ACK(const EventData& e if (order_udpate_message.terminal_status()) _transform_to_END(); else if (order_udpate_message.has_error()) + // TODO, spreader is already checking for this + // and cancelling orders _transform_to_WAITING_FOR_CANCEL_ACK(); - else + else if (order_udpate_message.acknowledged()) { if (_price_quantity_state.remaining_to_fill().value() == 0) _transform_to_WAITING_FOR_CANCEL_ACK(); diff --git a/src/server/sparkd/spreader/SpreaderOrderUpdateMessage.h b/src/server/sparkd/spreader/SpreaderOrderUpdateMessage.h index 1ee02f071..abb2e484c 100644 --- a/src/server/sparkd/spreader/SpreaderOrderUpdateMessage.h +++ b/src/server/sparkd/spreader/SpreaderOrderUpdateMessage.h @@ -43,6 +43,8 @@ public: { } bool terminal_status() const { return SpreaderUtils::order_in_terminal_state(status); } + bool acknowledged () const {return SpreaderUtils::order_acknowledged (status);} + bool has_error() const { return key.value() == 0; }// return error_msg != NULL; bool has_fills() const diff --git a/src/server/sparkd/spreader/SpreaderUtils.h b/src/server/sparkd/spreader/SpreaderUtils.h index e43f1fb9a..99e12ede3 100644 --- a/src/server/sparkd/spreader/SpreaderUtils.h +++ b/src/server/sparkd/spreader/SpreaderUtils.h @@ -78,14 +78,23 @@ public: } bts_assert(false); } + + static bool order_acknowledged (api::orderman::OrderStatus order_status) + { + // any state but that means order is ack'ed + return order_status!=api::orderman::OrderStatus::OS_UNACKNOWLEDGED; + } + + static bool order_in_terminal_state(api::orderman::OrderStatus order_status) { - return order_status == api::orderman::OrderStatus::OS_CANCELED || - order_status == api::orderman::OrderStatus::OS_DONE || - order_status == api::orderman::OrderStatus::OS_EXPIRED || + return order_status == api::orderman::OrderStatus::OS_REJECTED_BY_SPARK || order_status == api::orderman::OrderStatus::OS_FILLED || + order_status == api::orderman::OrderStatus::OS_DONE || + order_status == api::orderman::OrderStatus::OS_CANCELED || + order_status == api::orderman::OrderStatus::OS_STOPPED || order_status == api::orderman::OrderStatus::OS_REJECTED || - order_status == api::orderman::OrderStatus::OS_STOPPED; + order_status == api::orderman::OrderStatus::OS_EXPIRED; } // CRITICAL PATH // this traverses the depth of the book, accumulating the quantity,