From 8e93378b4e8b6079e9211f641228bf70fd3b775d Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Wed, 28 Aug 2019 12:27:36 -0400 Subject: [PATCH] Some error handling (originating the algo from the wrong top spread) --- .../orders/algo/algo_orders/PyramidAlgo.cpp | 24 +++++++++++++++++-- .../orders/algo/algo_orders/PyramidAlgo.h | 6 +++++ 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/src/lib/orderman/orders/algo/algo_orders/PyramidAlgo.cpp b/src/lib/orderman/orders/algo/algo_orders/PyramidAlgo.cpp index c643debb5..769cd22d9 100644 --- a/src/lib/orderman/orders/algo/algo_orders/PyramidAlgo.cpp +++ b/src/lib/orderman/orders/algo/algo_orders/PyramidAlgo.cpp @@ -77,7 +77,7 @@ IAlgoServices& PyramidAlgo::_algo() const { return *me->algo_services; } OrderOpResult PyramidAlgo::do_before_launch(IBeforeLaunchAlgoServices& serv) { auto& def = serv.definition(); if (def.has_custom_def() && def.custom_def().has_dynamic()){ - auto conv_res = _convert_params(def.custom_def()); + auto conv_res = _get_creation_params(def.custom_def(), serv); if (std::get<1>(conv_res)){ // params are good me->params = std::get<0>(conv_res); @@ -121,7 +121,7 @@ void PyramidAlgo::do_update(const api::orderman::Update& update) { _algo().terminate_error("Invalid update"); return; } - auto conv_res = _convert_params(update.custom()); + auto conv_res = _get_update_params(update, me->params); if (!std::get<1>(conv_res)){ _algo().terminate_error("Invalid update"); return; @@ -222,6 +222,26 @@ PyramidAlgo::_convert_params (const CustomOrderDefinition& cod){ return std::make_tuple(rv,true,std::string("")); } +std::tuple +PyramidAlgo::_get_creation_params(const CustomOrderDefinition& cod, + IBeforeLaunchAlgoServices& serv){ + auto rv = _convert_params(cod); + if (std::get<1>(rv)){ + const auto& p = std::get<0>(rv); + if(p.sec_keys[0].value() != serv.security().id()){ + std::get<2>(rv) = "Algo can only be launched from the Top Spread"; + std::get<1>(rv) = false; + } + } + return rv; +} + +std::tuple +PyramidAlgo::_get_update_params(const Update&, + const PyramidAlgoParams& curr_params){ + return std::make_tuple(curr_params,true,std::string("")); +} + ChildTemplate* PyramidAlgo::_create_order_template ( IBeforeLaunchAlgoServices& serv, SecurityKey key, diff --git a/src/lib/orderman/orders/algo/algo_orders/PyramidAlgo.h b/src/lib/orderman/orders/algo/algo_orders/PyramidAlgo.h index bcc8e5947..585a5403c 100644 --- a/src/lib/orderman/orders/algo/algo_orders/PyramidAlgo.h +++ b/src/lib/orderman/orders/algo/algo_orders/PyramidAlgo.h @@ -36,6 +36,12 @@ private: IAlgoServices& _algo() const ; static std::tuple _convert_params ( const bts::api::orderman::CustomOrderDefinition&); + static std::tuple _get_creation_params( + const bts::api::orderman::CustomOrderDefinition&, + IBeforeLaunchAlgoServices&); + static std::tuple _get_update_params( + const api::orderman::Update&, + const PyramidAlgoParams& curr_params); ChildTemplate* _create_order_template (IBeforeLaunchAlgoServices&, SecurityKey, api::Side) const;