From e2a3055046d8b837a5f9eca5d07f4c19de2ac579 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Thu, 3 May 2018 14:16:56 -0400 Subject: [PATCH] Added a const qualifyer to order::definition --- src/server/sparkd/orderman/events/StoredFillEvent.h | 2 +- src/server/sparkd/orderman/orders/IcebergOrder.cpp | 2 +- src/server/sparkd/orderman/orders/IcebergOrder.h | 2 +- src/server/sparkd/orderman/orders/NativeOrder.cpp | 6 ++++-- src/server/sparkd/orderman/orders/NativeOrder.h | 2 +- src/server/sparkd/orderman/orders/Order.h | 2 +- src/server/sparkd/orderman/orders/TimeBoxOrder.cpp | 2 +- src/server/sparkd/orderman/orders/TimeBoxOrder.h | 2 +- .../orderman/orders/spreader_orders/SpreaderOrder.cpp | 2 +- .../sparkd/orderman/orders/spreader_orders/SpreaderOrder.h | 4 ++-- .../spreader_orders/spreader/SpreaderBookkeepingData.h | 2 +- 11 files changed, 15 insertions(+), 13 deletions(-) diff --git a/src/server/sparkd/orderman/events/StoredFillEvent.h b/src/server/sparkd/orderman/events/StoredFillEvent.h index 6c9c6fe97..36232b285 100644 --- a/src/server/sparkd/orderman/events/StoredFillEvent.h +++ b/src/server/sparkd/orderman/events/StoredFillEvent.h @@ -20,7 +20,7 @@ public: security(&security) {} std::string const& key() const {return fill->fill_key();} - api::orderman::Fill *fill; + api::orderman::Fill const *fill; api::Security const *security; }; diff --git a/src/server/sparkd/orderman/orders/IcebergOrder.cpp b/src/server/sparkd/orderman/orders/IcebergOrder.cpp index e74e48133..cb6216006 100644 --- a/src/server/sparkd/orderman/orders/IcebergOrder.cpp +++ b/src/server/sparkd/orderman/orders/IcebergOrder.cpp @@ -31,7 +31,7 @@ IcebergOrder::IcebergOrder() : me(new PImpl()) {} IcebergOrder::~IcebergOrder() {} -api::orderman::OrderDefinition const &IcebergOrder::definition() { +api::orderman::OrderDefinition const &IcebergOrder::definition() const { return me->def; } diff --git a/src/server/sparkd/orderman/orders/IcebergOrder.h b/src/server/sparkd/orderman/orders/IcebergOrder.h index 8c939e848..8b7003332 100644 --- a/src/server/sparkd/orderman/orders/IcebergOrder.h +++ b/src/server/sparkd/orderman/orders/IcebergOrder.h @@ -14,7 +14,7 @@ class IcebergOrder : public Order public: IcebergOrder(); ~IcebergOrder(); - api::orderman::OrderDefinition const&definition() override; + api::orderman::OrderDefinition const&definition() const override; void on_init_new(api::orderman::OrderDefinition const&, const PreActivationOrderServices&) override; void on_init_recovered(api::orderman::OrderRecord const&, diff --git a/src/server/sparkd/orderman/orders/NativeOrder.cpp b/src/server/sparkd/orderman/orders/NativeOrder.cpp index 5a143fa27..575980121 100644 --- a/src/server/sparkd/orderman/orders/NativeOrder.cpp +++ b/src/server/sparkd/orderman/orders/NativeOrder.cpp @@ -56,7 +56,9 @@ struct NativeOrder::PImpl { NativeOrder::NativeOrder() : me(new PImpl()) {} -OrderDefinition const &NativeOrder::definition() { return me->definition; } +OrderDefinition const &NativeOrder::definition() const { + return me->definition; +} void NativeOrder::on_init_new(OrderDefinition const &def, const PreActivationOrderServices &serv) { @@ -571,7 +573,7 @@ void NativeOrder::on_exe_report(const NewExecutionReportEvent &er) { } state.set_filled_quantity(er.data->filled_quantity.value()); state.set_last_price(er.data->last_price.value()); - me->services->limiter().add_fill( + me->services->limiter().add_new_fill( *me->sec, AccountID(me->definition.account_id()), me->definition.side(), Quantity(state.filled_quantity())); } diff --git a/src/server/sparkd/orderman/orders/NativeOrder.h b/src/server/sparkd/orderman/orders/NativeOrder.h index f96022d50..cb961923e 100644 --- a/src/server/sparkd/orderman/orders/NativeOrder.h +++ b/src/server/sparkd/orderman/orders/NativeOrder.h @@ -18,7 +18,7 @@ public: NativeOrder(); ~NativeOrder() override; - api::orderman::OrderDefinition const&definition() override; + api::orderman::OrderDefinition const &definition() const override; void on_init_new(api::orderman::OrderDefinition const&, const PreActivationOrderServices&) override; void on_init_recovered(api::orderman::OrderRecord const&, diff --git a/src/server/sparkd/orderman/orders/Order.h b/src/server/sparkd/orderman/orders/Order.h index 2e3f9507a..f800ded80 100644 --- a/src/server/sparkd/orderman/orders/Order.h +++ b/src/server/sparkd/orderman/orders/Order.h @@ -28,7 +28,7 @@ public: OrderKey key() const {return _key;} OrderKey parent_key() const {return _parent_key;} - virtual api::orderman::OrderDefinition const&definition() = 0; + virtual api::orderman::OrderDefinition const&definition() const = 0; // construction - can be slow virtual void on_init_new(api::orderman::OrderDefinition const&, const PreActivationOrderServices&) = 0; diff --git a/src/server/sparkd/orderman/orders/TimeBoxOrder.cpp b/src/server/sparkd/orderman/orders/TimeBoxOrder.cpp index d507260c7..aae63c234 100644 --- a/src/server/sparkd/orderman/orders/TimeBoxOrder.cpp +++ b/src/server/sparkd/orderman/orders/TimeBoxOrder.cpp @@ -25,7 +25,7 @@ TimeBoxOrder::TimeBoxOrder() : me(new PImpl()) {} TimeBoxOrder::~TimeBoxOrder() {} -api::orderman::OrderDefinition const &TimeBoxOrder::definition() { +api::orderman::OrderDefinition const &TimeBoxOrder::definition() const { return me->def; } diff --git a/src/server/sparkd/orderman/orders/TimeBoxOrder.h b/src/server/sparkd/orderman/orders/TimeBoxOrder.h index ba6af7442..70b86641d 100644 --- a/src/server/sparkd/orderman/orders/TimeBoxOrder.h +++ b/src/server/sparkd/orderman/orders/TimeBoxOrder.h @@ -14,7 +14,7 @@ class TimeBoxOrder : public Order public: TimeBoxOrder(); ~TimeBoxOrder(); - api::orderman::OrderDefinition const&definition() override; + api::orderman::OrderDefinition const&definition() const override; void on_init_new(api::orderman::OrderDefinition const&, const PreActivationOrderServices&) override; void on_init_recovered(api::orderman::OrderRecord const&, diff --git a/src/server/sparkd/orderman/orders/spreader_orders/SpreaderOrder.cpp b/src/server/sparkd/orderman/orders/spreader_orders/SpreaderOrder.cpp index 313a00b26..69b39865d 100644 --- a/src/server/sparkd/orderman/orders/spreader_orders/SpreaderOrder.cpp +++ b/src/server/sparkd/orderman/orders/spreader_orders/SpreaderOrder.cpp @@ -27,7 +27,7 @@ SpreaderOrder::~SpreaderOrder () {} /***********************************************************************/ /******************************Order Derived****************************/ /***********************************************************************/ -const api::orderman::OrderDefinition& SpreaderOrder::definition() +const api::orderman::OrderDefinition& SpreaderOrder::definition() const { bts_assert(_inited()); return _bookkeeping_data().order_def(); diff --git a/src/server/sparkd/orderman/orders/spreader_orders/SpreaderOrder.h b/src/server/sparkd/orderman/orders/spreader_orders/SpreaderOrder.h index 6ed88d894..0901e6a43 100644 --- a/src/server/sparkd/orderman/orders/spreader_orders/SpreaderOrder.h +++ b/src/server/sparkd/orderman/orders/spreader_orders/SpreaderOrder.h @@ -73,7 +73,7 @@ public: public: // inherited function to return the OrderDefinition. asserts // if on_init_new has not been called yet - const api::orderman::OrderDefinition& definition() override; + const api::orderman::OrderDefinition& definition() const override; // this is the construction, can be slow void on_init_new(const bts::api::orderman::OrderDefinition& order_def, const bts::orderman::PreActivationOrderServices&) override; // called when the order is recovered from disk (not dealing with it now) @@ -110,7 +110,7 @@ private: // swtches to the state passed in the arg void _switch_state (ISpreaderStateWorker* new_state); /***************************Misc***************************/ - bool _inited () {return _bookkeeping_data_ptr != nullptr;} + bool _inited () const {return _bookkeeping_data_ptr != nullptr;} bool _activated () {return _order_services != nullptr;} void _on_init_new(const bts::api::orderman::OrderDefinition&, const SpreaderPreActivationOrderServices&); void _on_activate(Price, Quantity, SpreaderOrderServices&); diff --git a/src/server/sparkd/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.h b/src/server/sparkd/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.h index 9b1c8b0bd..48a324576 100644 --- a/src/server/sparkd/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.h +++ b/src/server/sparkd/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.h @@ -83,7 +83,7 @@ public: } size_t n_legs() const { return _n_legs; } bool all_legs_resolved() const {return n_legs() > 0;} - const api::orderman::OrderDefinition& order_def() {return _order_def;} + const api::orderman::OrderDefinition& order_def() const {return _order_def;} SpreaderLegData* find_leg_from_quoter_orderkey(bts::orderman::OrderKey order_key) { for (auto q_it = _leg_data.begin(); q_it != _leg_data.end(); q_it++)