From 0c4e22537dc1c900fc250d1711c5510ddecc26a5 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Wed, 9 Jan 2019 15:19:37 -0500 Subject: [PATCH] Upgraded SDK example to support op result of order.activate() --- src/sdk/examples/order_plugin_example.cpp | 48 +++++++++++------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/src/sdk/examples/order_plugin_example.cpp b/src/sdk/examples/order_plugin_example.cpp index 65fc7dba0..cfe922a8f 100644 --- a/src/sdk/examples/order_plugin_example.cpp +++ b/src/sdk/examples/order_plugin_example.cpp @@ -1,12 +1,11 @@ +#include "lib/config/config.h" +#include "lib/config/protos/system.pb.h" #include "spark/lib/logging/logging.h" -#include "spark/lib/orderman/orders/DynamicOrder.h" -#include "spark/lib/plugin/SparkServices.h" #include "spark/lib/orderman/actors/order_manager/ChildOrder.h" #include "spark/lib/orderman/actors/order_manager/OrderBuilder.h" #include "spark/lib/orderman/orders/DynamicOrder.h" +#include "spark/lib/plugin/SparkServices.h" #include "spark/lib/utils/PBUtils.h" -#include "lib/config/protos/system.pb.h" -#include "lib/config/config.h" using namespace bts::api::orderman; using namespace bts::orderman; @@ -18,16 +17,15 @@ class DynamicIcebergOrder : public DynamicOrder { public: DynamicIcebergOrder(); ~DynamicIcebergOrder(); - OrderDefinition const &definition() const; + OrderDefinition const &definition() const; void on_init_new(OrderDefinition const &, const PreActivationOrderServices &) override; void on_init_recovered(OrderRecord const &, const PreActivationOrderServices &) override; - void on_activate(Price, Quantity, OrderServices &, - trace::CorID const&) override; - void on_update(Price, Quantity, trace::CorID const&) override; - void on_crack(trace::CorID const &) override; - void on_cancel(trace::CorID const &) override; + OrderOpResult on_activate(Price, Quantity, OrderServices &, + trace::CorID const &) override; + OrderOpResult on_update(Price, Quantity, trace::CorID const &) override; + OrderOpResult on_cancel(trace::CorID const &) override; private: void report_state(); @@ -125,9 +123,9 @@ void DynamicIcebergOrder::on_init_recovered( } } -void DynamicIcebergOrder::on_activate(Price p, Quantity q, - OrderServices &services, - trace::CorID const &) { +OrderOpResult DynamicIcebergOrder::on_activate(Price p, Quantity q, + OrderServices &services, + trace::CorID const &) { bts_assert(!me->services); me->services = &services; me->child_builder.activate(services); @@ -162,9 +160,11 @@ void DynamicIcebergOrder::on_activate(Price p, Quantity q, break; } report_state(); + return OrderOpResult(); } -void DynamicIcebergOrder::on_update(Price p, Quantity q, trace::CorID const &) { +OrderOpResult DynamicIcebergOrder::on_update(Price p, Quantity q, + trace::CorID const &) { switch (me->state.status()) { case ORDER_STATUS_WORKING: case ORDER_STATUS_PENDING_WORKING: @@ -189,11 +189,10 @@ void DynamicIcebergOrder::on_update(Price p, Quantity q, trace::CorID const &) { break; } report_state(); + return OrderOpResult(); } -void DynamicIcebergOrder::on_crack(trace::CorID const &) {} - -void DynamicIcebergOrder::on_cancel(trace::CorID const &) { +OrderOpResult DynamicIcebergOrder::on_cancel(trace::CorID const &) { switch (me->state.status()) { case ORDER_STATUS_WORKING: LOG(Plugin, Info, "Canceling DynamicIceberg Order {}", key().value()); @@ -216,6 +215,7 @@ void DynamicIcebergOrder::on_cancel(trace::CorID const &) { break; } report_state(); + return OrderOpResult(); } void DynamicIcebergOrder::report_state() { @@ -354,12 +354,10 @@ void DynamicIcebergOrder::transition(api::orderman::OrderStatus new_status) { me->state.set_status(new_status); } - } // namespace order_example } // namespace bts -DynamicOrderDescriptor get_dynamic_iceberg_order_desc() -{ +DynamicOrderDescriptor get_dynamic_iceberg_order_desc() { DynamicOrderDescriptor desc; // order type name @@ -373,7 +371,8 @@ DynamicOrderDescriptor get_dynamic_iceberg_order_desc() // child order param = desc.add_param_desc(); param->set_param_name("child"); - param->mutable_param_type()->set_primitive(DYNAMIC_ORDER_PRIMITIVE_ORDER_DEF); + param->mutable_param_type()->set_primitive( + DYNAMIC_ORDER_PRIMITIVE_ORDER_DEF); return desc; } @@ -382,8 +381,9 @@ extern "C" void init_spark_plugin(bts::SparkServices &serv) { using namespace bts; if (config::get().type() == "dev") { - serv.register_dynamic_order(get_dynamic_iceberg_order_desc(), - []() { return std::make_unique(); }); - LOG(Plugin,Info, "Initialized order_plugin_example.so"); + serv.register_dynamic_order(get_dynamic_iceberg_order_desc(), []() { + return std::make_unique(); + }); + LOG(Plugin, Info, "Initialized order_plugin_example.so"); } }