SPARK-1408 Limiter dupe value crash

This commit is contained in:
Taha Afzal committed 2018-06-20 14:22:11 -04:00
1 parent a2b8d53ebb
commit 4dad98a8b2
3 files changed
+110 -9

No files matched your search

@@ -820,19 +820,49 @@ void AdminServiceUtils::delete_user (bts::api::admin::AdminData& admin_data,
////////////////////////////////////////////
bool AdminServiceUtils::_sort_security_scopes (const bts::api::admin::SecurityScope& a,
const bts::api::admin::SecurityScope& b){
if (has_id(a.security_id()))
return true;
// for both the sec and product scope sorting, the more
// qualified arg is sent to the top (vs wildcard). the
// order of qualification is sec_id, symbol, type, exchange.
// if both a and b are equally qualified, it is a
// a dont-care case (in terms of sec/prod res) and
// ascending orderring is used
if (has_id(a.security_id())){
if (has_id(b.security_id()))
return a.security_id() < b.security_id();
else
return true;
}
if (has_id(b.security_id()))
return false;
if (a.security_symbol() != "*")
return true;
return false;
// symbol
if (is_symbol_set(a.security_symbol())){
if (is_symbol_set(b.security_symbol()))
return a.security_symbol() < b.security_symbol();
else
return true;
}
if (is_symbol_set(b.security_symbol()))
return false;
// sec type
if (a.security_type() != b.security_type())
return a.security_type() < b.security_type();
return a.exchange() < b.exchange();
}
bool AdminServiceUtils::_sort_product_scopes (const bts::api::admin::ProductScope& a,
const bts::api::admin::ProductScope&){
if (a.security_symbol() != "*")
return true;
return false;
const bts::api::admin::ProductScope& b){
// symbol
if (is_symbol_set(a.security_symbol())){
if (is_symbol_set(b.security_symbol()))
return a.security_symbol() < b.security_symbol();
else
return true;
}
if (is_symbol_set(b.security_symbol()))
return false;
// sec type
if (a.security_type() != b.security_type())
return a.security_type() < b.security_type();
return a.exchange() < b.exchange();
}
void AdminServiceUtils::sort_limits (bts::api::admin::BTSAccount& account){
std::sort (account.mutable_security_position_limits()->begin(),
@@ -1025,4 +1055,7 @@ void AdminServiceUtils::bootstrap_data (bts::api::admin::AdminData& data){
acct_a1_clip_size->set_clip_size(100);
}
bool AdminServiceUtils::has_id (uint32_t id){return id>0;}
bool AdminServiceUtils::is_symbol_set (const std::string& symbol){
return symbol !="*";
}
}}
@@ -240,6 +240,7 @@ public:
// misc//////// ////////////////////////////
////////////////////////////////////////////
static bool has_id (uint32_t id);
static bool is_symbol_set (const std::string& symbol);
static void bootstrap_data (bts::api::admin::AdminData& data);
};
}}
@@ -268,4 +268,71 @@ TEST_CASE ("Bootstrapping", "[admin_service]")
REQUIRE(account.connections().exchange_connection_names_size()==2);
}
}
TEST_CASE("Sorting Limit","[admin_service]"){
bts::api::admin::AdminData admin_data;
bts::api::admin::AdminServiceCreateAccountResult account_result;
auto account = AdminServiceUtils::create_account(admin_data,
0,
std::string("A"),
std::string("description"),
true,
account_result);
auto l1 = account->mutable_security_clip_limits()->add_limit();
l1->mutable_security()->set_exchange(api::Venue::VENUE_GLBX);
l1->mutable_security()->set_security_type(api::SecurityType::SECURITYTYPE_FUTURE);
l1->mutable_security()->set_security_symbol("*");
l1->mutable_security()->set_security_id(0);
l1->set_clip_size(100);
auto l2 = account->mutable_security_clip_limits()->add_limit();
l2->mutable_security()->set_exchange(api::Venue::VENUE_GLBX);
l2->mutable_security()->set_security_type(api::SecurityType::SECURITYTYPE_FUTURE);
l2->mutable_security()->set_security_symbol("SI");
l2->mutable_security()->set_security_id(0);
l2->set_clip_size(101);
auto l3 = account->mutable_security_clip_limits()->add_limit();
l3->mutable_security()->set_exchange(api::Venue::VENUE_GLBX);
l3->mutable_security()->set_security_type(api::SecurityType::SECURITYTYPE_FUTURE);
l3->mutable_security()->set_security_symbol("CL");
l3->mutable_security()->set_security_id(0);
l3->set_clip_size(102);
auto l4 = account->mutable_security_clip_limits()->add_limit();
l4->mutable_security()->set_exchange(api::Venue::VENUE_GLBX);
l4->mutable_security()->set_security_type(api::SecurityType::SECURITYTYPE_FUTURE);
l4->mutable_security()->set_security_symbol("ZC");
l4->mutable_security()->set_security_id(10);
l4->set_clip_size(103);
auto l5 = account->mutable_security_clip_limits()->add_limit();
l5->mutable_security()->set_exchange(api::Venue::VENUE_GLBX);
l5->mutable_security()->set_security_type(api::SecurityType::SECURITYTYPE_FUTURE);
l5->mutable_security()->set_security_symbol("ZN");
l5->mutable_security()->set_security_id(5);
l5->set_clip_size(104);
auto l6 = account->mutable_security_clip_limits()->add_limit();
l6->mutable_security()->set_exchange(api::Venue::VENUE_GLBX);
l6->mutable_security()->set_security_type(api::SecurityType::SECURITYTYPE_SPREAD);
l6->mutable_security()->set_security_symbol("SI");
l6->mutable_security()->set_security_id(0);
l6->set_clip_size(105);
// tests
auto sorted_admin_data = AdminServiceUtils::sort_limits(admin_data);
const auto& r_account = sorted_admin_data.accounts(0);
const auto& r_l1 = r_account.security_clip_limits().limit(0);
REQUIRE(r_l1.security().security_id()==5);
REQUIRE(r_l1.clip_size()==104);
const auto& r_l2 = r_account.security_clip_limits().limit(1);
REQUIRE(r_l2.security().security_id()==10);
REQUIRE(r_l2.clip_size()==103);
const auto& r_l3 = r_account.security_clip_limits().limit(2);
REQUIRE(r_l3.security().security_symbol()=="CL");
REQUIRE(r_l3.clip_size()==102);
const auto& r_l4 = r_account.security_clip_limits().limit(3);
REQUIRE(r_l4.security().security_symbol()=="SI");
REQUIRE(r_l4.clip_size()==101);
const auto& r_l5 = r_account.security_clip_limits().limit(4);
REQUIRE(r_l5.security().security_symbol()=="SI");
REQUIRE(r_l5.clip_size()==105);
const auto& r_l6 = r_account.security_clip_limits().limit(5);
REQUIRE(r_l6.security().security_symbol()=="*");
REQUIRE(r_l6.clip_size()==100);
}
}}