From 6e4ed3f3280ffa328c92ef38409fe01a6090bcb1 Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Thu, 15 Nov 2018 17:25:01 -0500 Subject: [PATCH] for the first time at start up, net pos is enforced --- src/lib/orderman/limiter/LimiterUtils.h | 4 ++-- src/server/sparkd/user/AdminServiceServer.cpp | 8 +++++++- src/server/sparkd/user/AdminServiceServer.h | 7 ++++++- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/src/lib/orderman/limiter/LimiterUtils.h b/src/lib/orderman/limiter/LimiterUtils.h index d6f6b7068..97bdc4fcc 100644 --- a/src/lib/orderman/limiter/LimiterUtils.h +++ b/src/lib/orderman/limiter/LimiterUtils.h @@ -91,7 +91,7 @@ public: if(short_pos + quantity.value() > short_pos_limit){ out_res.error_msg = fmt::format("Short Position (Abs) " "(Max {} Current {})", - long_pos_limit,long_pos); + short_pos_limit,short_pos); out_res.ok = false; } } @@ -119,7 +119,7 @@ public: if(short_pos + diff > short_pos_limit){ out_res.error_msg = fmt::format("Short Position (Abs) " "(Max {} Current {})", - long_pos_limit,long_pos); + short_pos_limit,short_pos); out_res.ok = false; } } diff --git a/src/server/sparkd/user/AdminServiceServer.cpp b/src/server/sparkd/user/AdminServiceServer.cpp index bb5c07fe1..b23803299 100644 --- a/src/server/sparkd/user/AdminServiceServer.cpp +++ b/src/server/sparkd/user/AdminServiceServer.cpp @@ -44,7 +44,7 @@ AdminServiceServer::AdminServiceServer(bts::api::ServiceContext& context) if (_state.ParseFromString(ser_data)) { data_found = true; - AdminServiceUtils::fill_connections_from_config(_state); + _check_data_on_start(); _update_and_publish(false); } } @@ -250,4 +250,10 @@ void AdminServiceServer::_publish_md_permissions(){ _md_perm_publisher.add_or_update(p); _md_perm_publisher.flush(); } +void AdminServiceServer::_check_data_on_start (){ + AdminServiceUtils::fill_connections_from_config(_state); + for(int i=0; i<_state.accounts().size(); i++) + if(!_state.mutable_accounts(i)->has_risk_limit_enforcement()) + _state.mutable_accounts(i)->mutable_risk_limit_enforcement()->set_product_limit_in_net_terms(true); +} }} diff --git a/src/server/sparkd/user/AdminServiceServer.h b/src/server/sparkd/user/AdminServiceServer.h index 32bbe126c..618a20a38 100644 --- a/src/server/sparkd/user/AdminServiceServer.h +++ b/src/server/sparkd/user/AdminServiceServer.h @@ -68,12 +68,17 @@ public: const api::Response& reply) override; private: + // this is mainly does 2 things : + // 1. some data is in partially in config, this copies + // that to here + // 2. for new data fields, it initializes them here + void _check_data_on_start(); void _update_and_publish (bool is_insert); void _publish_md_entitlements(); void _publish_md_permissions(); void _add_live_order(map>& agg, const OrderRecord& order); void _cancel_orders(const std::vector& accounts, - const std::vector& users); + const std::vector& users); }; }}