diff --git a/.gitignore b/.gitignore index 7c976336d..cf4c7c358 100644 --- a/.gitignore +++ b/.gitignore @@ -32,3 +32,4 @@ trace_data/ /src/lib/orderman/perf_analysis/last_pretty_log.csv /src/lib/orderman/perf_analysis/log.csv /doc/user/public/* +.ionide/* diff --git a/doc/user/content/release_notes/_index.md b/doc/user/content/release_notes/_index.md index 0bf2094a9..0286a8dcf 100644 --- a/doc/user/content/release_notes/_index.md +++ b/doc/user/content/release_notes/_index.md @@ -10,6 +10,7 @@ insert_anchor_links = "right" - In the ladder, corrected display of volume tool tip - In the ladder, changed the consolidation of last trade to consider only the price ignoring aggressor changes - Added an option for the Top Algo to delete itself if within N ticks from top of book + - Address a rare issue that could lead to an error report on UI exit ### Internal Changes - Ensure that admin logins are always allowed to login, regardless of keycode status. @@ -407,7 +408,8 @@ insert_anchor_links = "right" - This is configurable from a ladder's settings as well ### Customized settings in all windows - All windows now contain a settings page where grid settings (font color, size, etc) are applied - - These settings can be saved on a per-window basis or as a Default for newly-launched windows + - These settings can be saved on a per-window basis or as a Default for newly-launched windows + ## 1.3.1 Through 1.3.4 diff --git a/src/lib/md/SecurityCache.cpp b/src/lib/md/SecurityCache.cpp index 160633145..63a181a5d 100644 --- a/src/lib/md/SecurityCache.cpp +++ b/src/lib/md/SecurityCache.cpp @@ -22,6 +22,7 @@ void SecurityCacheImpl::enqueue_update_db(const SecurityPtr& security) { } void SecurityCacheImpl::flush() { + #ifndef _WIN32 if (!update_queue.empty()) { std::vector work; SecurityPtr temp; @@ -33,6 +34,7 @@ void SecurityCacheImpl::flush() { } } } + #endif } ////////////////// diff --git a/src/lib/md/test/synthetic_book_merge_tests.cpp b/src/lib/md/test/synthetic_book_merge_tests.cpp index 25d97cfab..63d1914c9 100644 --- a/src/lib/md/test/synthetic_book_merge_tests.cpp +++ b/src/lib/md/test/synthetic_book_merge_tests.cpp @@ -111,7 +111,7 @@ tuple,vector> make_securities(c l->mutable_security()->mutable_contract_spec()->set_low_tick(tick_size); l->mutable_security()->mutable_contract_spec()->set_high_tick(tick_size); l->set_quantity(quantity); - l->set_price_multiplier(quantity * (side == api::SIDE_BUY ? 1.0 : -1)); + l->set_price_multiplier(mult); l->set_side(side); synthetic->legs.push_back(instr.consumer()); legs.push_back(instr); @@ -126,7 +126,8 @@ tuple,vector> make_securities(c double quantity, tick_size; api::Side side; std::tie(quantity, tick_size, side) = t; - legs.push_back({ quantity, quantity, tick_size, side }); + double mult = quantity * (side == api::SIDE_BUY ? 1.0 : -1); + legs.push_back({ quantity, mult, tick_size, side }); } return make_securities(legs); } @@ -457,6 +458,113 @@ TEST_CASE("Synthetic_net_change", "[md][synthetic]") { } } +TEST_CASE("HCL_SP_104", "[md][synthetic]") { + shared_ptr synthetic; + vector test_instr; + tie(synthetic, test_instr) = make_securities({ + // (quantity, multiplier, tick_size, side) + {1.0, 1.0, 0.01, api::SIDE_BUY}, + {1.0, 1.0, 0.01, api::SIDE_BUY}, + {1.0, -1.0, 0.01, api::SIDE_SELL}, + {1.0, -1.0, 0.01, api::SIDE_SELL } + }); + auto leg1 = test_instr[0]; // CLQ9-CLU9 + auto leg2 = test_instr[1]; // HCLQ9-CLQ9 + auto leg3 = test_instr[2]; // HCLQ9-HCLU9 + auto leg4 = test_instr[3]; // HCLU9-CLU9 + + setup_market(leg1.producer(), + { + { -0.10, 3299 }, + { -0.11, 2885 }, + { -0.12, 2558 }, + { -0.13, 2447 }, + { -0.14, 1540 }, + { -0.15, 2334 }, + { -0.16, 1396 }, + { -0.17, 1190 }, + { -0.18, 1221 }, + { -0.19, 812 } + }, + { + { -0.09, 1318 }, + { -0.08, 2174 }, + { -0.07, 3057 }, + { -0.06, 2331 }, + { -0.05, 2543 }, + { -0.04, 2638 }, + { -0.03, 2232 }, + { -0.02, 3221 }, + { -0.01, 2863 }, + { 0.00, 3327 } + }); + + setup_market(leg2.producer(), + { + { 4.06, 1 }, + { 4.05, 2 }, + { 4.04, 3 }, + { 4.03, 12 }, + { 4.02, 6 }, + { 4.01, 1 } + }, + { + { 4.07, 1 }, + { 4.08, 2 }, + { 4.10, 8 }, + { 4.11, 10 }, + { 4.12, 2 }, + { 4.14, 1 } + }); + + setup_market(leg3.producer(), + { + { 0.20, 2 }, + { 0.19, 6 }, + { 0.18, 5 }, + { 0.17, 18 }, + { 0.16, 2 }, + { 0.15, 3 }, + { 0.14, 2 } + }, + { + { 0.22, 2 }, + { 0.23, 4 }, + { 0.24, 9 }, + { 0.25, 17}, + { 0.26, 5 }, + { 0.27, 5 }, + { 0.28, 4 }, + { 0.29, 2 }, + { 0.30, 2 } + }); + + setup_market(leg4.producer(), + { + { 3.75, 1 }, + { 3.74, 3 }, + { 3.73, 4 }, + { 3.72, 12 }, + { 3.71, 1 }, + { 3.70, 3 } + }, + { + { 3.78, 1 }, + { 3.79, 2 }, + { 3.80, 6 }, + { 3.81, 1 }, + { 3.82, 10 }, + { 3.83, 1 } + }); + + MDConsumerHandle synthetic_handle(synthetic); + // dump_market(synthetic_handle); + expect_market(synthetic_handle, + { { -0.04,1 },{ -0.06,1 },{ -0.07,1 },{ -0.09,3 },{ -0.11,3 },{ -0.12,1 },{ -0.13,5 },{ -0.14,3 },{ -0.15,2 },{ -0.16,1 } }, + { { 0.03,1 },{ 0.05,1 },{ 0.06,1 },{ 0.08,1 },{ 0.09,4 },{ 0.11,3 },{ 0.12,2 },{ 0.13,7 },{ 0.14,1 },{ 0.16,2 } } + ); +} + // // Benchmarks diff --git a/src/lib/utils/tests/AuthTokenTests.cpp b/src/lib/utils/tests/AuthTokenTests.cpp index 51de507f7..6bcbe52d8 100644 --- a/src/lib/utils/tests/AuthTokenTests.cpp +++ b/src/lib/utils/tests/AuthTokenTests.cpp @@ -5,19 +5,34 @@ namespace bts { namespace test { TEST_CASE("AuthToken", "[security]") { - api::admin::BTSUser user; - user.set_id(42); - user.set_name("user1"); + api::admin::BTSUser admin_user; + admin_user.set_id(42); + admin_user.set_name("user1"); + + api::admin::BTSUser trader_user; + trader_user.set_id(43); + trader_user.set_name("trader1"); + trader_user.mutable_user_data()->mutable_exchange_user_data()->mutable_cme_data()->add_md_permissions()->set_enabled(true); - SECTION("round trip") { - auto token = api::auth::generate_token(user); + SECTION("round trip admin") { + auto token = api::auth::generate_token(admin_user); + // We use 1 byte for api header size + REQUIRE(token.ByteSize() <= 240); + api::user::TokenPayload payload; + REQUIRE(!api::auth::decode_token(token, &payload)); + REQUIRE(payload.id() == admin_user.id()); + REQUIRE(payload.wheel() == false); + } + + SECTION("round trip trader") { + auto token = api::auth::generate_token(trader_user); // We use 1 byte for api header size REQUIRE(token.ByteSize() <= 240); api::user::TokenPayload payload; REQUIRE(api::auth::decode_token(token, &payload)); - REQUIRE(payload.id() == user.id()); + REQUIRE(payload.id() == trader_user.id()); REQUIRE(payload.wheel() == false); - } + } SECTION("empty token") { api::user::TokenPayload payload; @@ -28,11 +43,11 @@ TEST_CASE("AuthToken", "[security]") { } SECTION("bts is the big wheel") { - user.set_name("bts"); - auto token = api::auth::generate_token(user); + admin_user.set_name("bts"); + auto token = api::auth::generate_token(admin_user); api::user::TokenPayload payload; REQUIRE(api::auth::decode_token(token, &payload)); - REQUIRE(payload.id() == user.id()); + REQUIRE(payload.id() == admin_user.id()); REQUIRE(payload.wheel()); } }