From c2a783ce9691b75e6a3ecb03e2d8fd423c3cf484 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Wed, 13 Oct 2021 09:32:18 -0400 Subject: [PATCH] refactor: Use protos in new Security class --- src/lib/domain/Security.h | 20 ++++++++++++++------ src/lib/domain/SecurityCommon.h | 11 ++++++----- src/lib/domain/SecurityID.h | 2 +- 3 files changed, 21 insertions(+), 12 deletions(-) diff --git a/src/lib/domain/Security.h b/src/lib/domain/Security.h index 7557ca5c9..faf09f871 100644 --- a/src/lib/domain/Security.h +++ b/src/lib/domain/Security.h @@ -15,19 +15,27 @@ class Security { std::variant security; - SecurityType security_type() const; + api::domain::SecurityType security_type() const; }; ////////////////////////////////////////////////// // Definition ////////////////////////////////////////////////// -inline SecurityType Security::security_type() const { +inline api::domain::SecurityType Security::security_type() const { return std::visit( - overloaded{[](const IndexSecurity &) { return SecurityType::INDEX; }, - [](const FutureSecurity &) { return SecurityType::FUTURE; }, - [](const SpreadSecurity &) { return SecurityType::SPREAD; }, - [](const OptionSecurity &) { return SecurityType::OPTION; }}, + overloaded{[](const IndexSecurity &) { + return api::domain::SecurityType::INDEX; + }, + [](const FutureSecurity &) { + return api::domain::SecurityType::FUTURE; + }, + [](const SpreadSecurity &) { + return api::domain::SecurityType::SPREAD; + }, + [](const OptionSecurity &) { + return api::domain::SecurityType::OPTION; + }}, security); } diff --git a/src/lib/domain/SecurityCommon.h b/src/lib/domain/SecurityCommon.h index f1501ddc1..6d133d752 100644 --- a/src/lib/domain/SecurityCommon.h +++ b/src/lib/domain/SecurityCommon.h @@ -2,8 +2,9 @@ #include "Currency.h" #include "Price.h" #include "SecurityID.h" -#include "SecurityType.h" -#include "Venue.h" +#include "lib/api/domain/Currency.pb.h" +#include "lib/api/domain/SecurityType.pb.h" +#include "lib/api/domain/Venue.pb.h" #include namespace bts::domain { @@ -11,10 +12,10 @@ namespace bts::domain { // All the security common params, ie regardless of Future, Spot, Spread etc class SecurityCommon { public: - Venue venue; + api::domain::Venue venue; SecurityID security_id{}; - SecurityType security_type; - Currency currency; + api::domain::SecurityType security_type; + api::domain::Currency currency; double display_factor{}; double cash_per_point{}; std::string symbol; diff --git a/src/lib/domain/SecurityID.h b/src/lib/domain/SecurityID.h index cae1f47ea..da6ceaf9e 100644 --- a/src/lib/domain/SecurityID.h +++ b/src/lib/domain/SecurityID.h @@ -4,6 +4,6 @@ namespace bts::domain { -using SecurityID = utils::ValueWrapper; +using SecurityID = utils::ValueWrapper; } // namespace bts::domain