From a10a49cf4ff57050feca5f638fec6d26d19cdcd8 Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Mon, 5 Aug 2019 22:49:13 -0400 Subject: [PATCH] Cleanup, removing some decaying code which was making for bad readibility --- src/lib/orderman/limiter/LimitStore.cpp | 5 ++-- src/lib/orderman/limiter/LimitStore.h | 2 -- src/lib/orderman/limiter/ProductLimitNode.cpp | 1 - src/lib/orderman/limiter/ProductLimitNode.h | 1 - src/lib/orderman/limiter/ProductLimitTree.cpp | 26 ++++++++++--------- src/lib/orderman/limiter/ProductLimitTree.h | 1 + .../orderman/limiter/SecurityLimitTree.cpp | 3 +-- src/lib/orderman/limiter/SecurityLimitTree.h | 3 +-- 8 files changed, 20 insertions(+), 22 deletions(-) diff --git a/src/lib/orderman/limiter/LimitStore.cpp b/src/lib/orderman/limiter/LimitStore.cpp index 3f71be12b..65f57cebb 100644 --- a/src/lib/orderman/limiter/LimitStore.cpp +++ b/src/lib/orderman/limiter/LimitStore.cpp @@ -19,8 +19,9 @@ LimitStore::LimitStore(const bts::api::admin::AdminData &admin_data, ProductLimitTree *product_tree_ptr = _find_product_for_security(security); bts_assert(product_tree_ptr != nullptr); _sec_map.insert(std::pair( - security.id(), SecurityLimitTree(security, *product_tree_ptr, - _admin_data, _zero_security_limit))); + security.id(), SecurityLimitTree(security, + *product_tree_ptr, + _admin_data))); } _set_user_data(); } diff --git a/src/lib/orderman/limiter/LimitStore.h b/src/lib/orderman/limiter/LimitStore.h index 033f3ab1b..8e2b68f18 100644 --- a/src/lib/orderman/limiter/LimitStore.h +++ b/src/lib/orderman/limiter/LimitStore.h @@ -72,9 +72,7 @@ private: // this is passed over to the SecurityLimitTree // entried (above) std::vector _prod_map; - // these are kept here and references passes to each node const bts::api::admin::AccountProductPositionLimitUnit _zero_product_limit; - const bts::api::admin::AccountSecurityPositionLimitUnit _zero_security_limit; public: LimitStore(const bts::api::admin::AdminData& admin_data, const std::map& sec_map); diff --git a/src/lib/orderman/limiter/ProductLimitNode.cpp b/src/lib/orderman/limiter/ProductLimitNode.cpp index 7e1992946..e2bd9a2ba 100644 --- a/src/lib/orderman/limiter/ProductLimitNode.cpp +++ b/src/lib/orderman/limiter/ProductLimitNode.cpp @@ -5,7 +5,6 @@ namespace orderman { ProductLimitNode::ProductLimitNode( uint32_t account_id, - uint32_t, const bts::api::admin::AccountProductPositionLimitUnit &limit, bool enforce_net) : diff --git a/src/lib/orderman/limiter/ProductLimitNode.h b/src/lib/orderman/limiter/ProductLimitNode.h index a664165af..ce88b6497 100644 --- a/src/lib/orderman/limiter/ProductLimitNode.h +++ b/src/lib/orderman/limiter/ProductLimitNode.h @@ -29,7 +29,6 @@ private: public: ProductLimitNode( uint32_t account_id, - uint32_t parent_account_id, const bts::api::admin::AccountProductPositionLimitUnit& limit, bool enforce_net); // accessors /////////////////////////////////////////////////////////////// diff --git a/src/lib/orderman/limiter/ProductLimitTree.cpp b/src/lib/orderman/limiter/ProductLimitTree.cpp index 1df2aa4ea..7d0737747 100644 --- a/src/lib/orderman/limiter/ProductLimitTree.cpp +++ b/src/lib/orderman/limiter/ProductLimitTree.cpp @@ -1,26 +1,28 @@ #include "ProductLimitTree.h" +using namespace bts::api::admin; +using namespace bts::admin; + namespace bts { namespace orderman { ProductLimitTree::ProductLimitTree( - const api::Product &product, const bts::api::admin::AdminData &admin_data, - const bts::api::admin::AccountProductPositionLimitUnit &zero_limit) - : _product(product) { + const api::Product &product, + const AdminData &admin_data, + const AccountProductPositionLimitUnit &zero_limit) + : + _product(product) { for (const auto &account : admin_data.accounts()) { bool enforce_net = true; // default is net if (account.has_risk_limit_enforcement()) enforce_net = account.risk_limit_enforcement().product_limit_in_net_terms(); - const bts::api::admin::AccountProductPositionLimitUnit *limit = - bts::admin::AdminServiceUtils::find_account_product_position_limit( - account, _product); - _tree.emplace_back( - account.id(), - bts::admin::AdminServiceUtils::has_id(account.parent_account_id()) - ? account.parent_account_id() - : 0, - limit != nullptr ? *limit : zero_limit, enforce_net); + const AccountProductPositionLimitUnit *limit = + AdminServiceUtils::find_account_product_position_limit(account, + _product); + _tree.emplace_back(account.id(), + limit != nullptr ? *limit : zero_limit, + enforce_net); } } } // namespace orderman diff --git a/src/lib/orderman/limiter/ProductLimitTree.h b/src/lib/orderman/limiter/ProductLimitTree.h index 93f6ad5a6..2e2bb5c56 100644 --- a/src/lib/orderman/limiter/ProductLimitTree.h +++ b/src/lib/orderman/limiter/ProductLimitTree.h @@ -12,6 +12,7 @@ namespace bts{ namespace orderman{ +// Scope : // this keeps the state for all the accounts // for a single product, via a vector of // ProductLimitNode, which is the only state diff --git a/src/lib/orderman/limiter/SecurityLimitTree.cpp b/src/lib/orderman/limiter/SecurityLimitTree.cpp index b2b657f3c..5cbb680bc 100644 --- a/src/lib/orderman/limiter/SecurityLimitTree.cpp +++ b/src/lib/orderman/limiter/SecurityLimitTree.cpp @@ -9,8 +9,7 @@ namespace orderman { SecurityLimitTree::SecurityLimitTree( const api::Security &security, ProductLimitTree &product_tree, - const AdminData &admin_data, - const AccountSecurityPositionLimitUnit&) { + const AdminData &admin_data) { for (const auto &account : admin_data.accounts()) { ProductLimitNode *product_node_ptr = product_tree.find_account(account.id()); diff --git a/src/lib/orderman/limiter/SecurityLimitTree.h b/src/lib/orderman/limiter/SecurityLimitTree.h index 6a035c0d3..f02786689 100644 --- a/src/lib/orderman/limiter/SecurityLimitTree.h +++ b/src/lib/orderman/limiter/SecurityLimitTree.h @@ -24,8 +24,7 @@ public: SecurityLimitTree( const api::Security& security, ProductLimitTree& product_tree, - const bts::api::admin::AdminData& admin_data, - const bts::api::admin::AccountSecurityPositionLimitUnit& zero_limit); + const bts::api::admin::AdminData& admin_data); // position updates //////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////// void add_working_order(AccountID account_id,