From e85cdcb4533cb85688fc5b30a6bcbafbc99f2fa9 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Mon, 2 Sep 2024 03:57:13 +0000 Subject: [PATCH] refactor: Move SecurityMarketDataStatistics to lib_domain --- src/app_sparkd/sparkd/md/MarketDataListener.h | 2 +- .../md/binance/BinanceMiniTickerUpdate.cpp | 2 +- .../sparkd/md/binance/BinanceMiniTickerUpdate.h | 2 +- .../sparkd/md/binance/BinancePriceStatistics.cpp | 2 +- .../md/binance/BinancePriceStatisticsAdaptor.cpp | 2 +- .../md/binance_us/BinanceUsPriceStatistics.cpp | 2 +- .../BinanceUsPriceStatisticsAdaptor.cpp | 2 +- .../BinanceUsdsFuturesPriceStatistics.cpp | 2 +- .../BinanceUsdsFuturesPriceStatisticsAdaptor.cpp | 2 +- .../md/coinbase/CoinbasePriceStatistics.cpp | 2 +- .../coinbase/CoinbasePriceStatisticsAdaptor.cpp | 2 +- .../sparkd/md/deribit/DeribitTickerAdaptor.cpp | 3 ++- .../sparkd/md/ftx/FTXHistoricalPriceAdaptor.cpp | 2 +- .../sparkd/md/ftx/FTXHistoricalPriceRecord.cpp | 2 +- .../sparkd/md/listeners/LiveLadderPrinter.h | 1 + .../sparkd/md/okx/OkxTickerAdaptor.cpp | 2 +- .../sparkd/md/recording/MDReplayer.cpp | 4 ++-- .../domain/security_market_data_statistics.h} | 16 +++------------- .../spark/domain/DomainSecurityUtils.cpp | 16 ++++++++++++++++ src/lib_spark/spark/domain/DomainSecurityUtils.h | 4 ++++ .../spark/md/GeneralMarketDataListener.cpp | 2 +- 21 files changed, 43 insertions(+), 31 deletions(-) rename src/{lib_spark/spark/domain/SecurityMarketDataStatistics.h => lib_domain/domain/security_market_data_statistics.h} (76%) diff --git a/src/app_sparkd/sparkd/md/MarketDataListener.h b/src/app_sparkd/sparkd/md/MarketDataListener.h index 38e7354c5..942c40e34 100644 --- a/src/app_sparkd/sparkd/md/MarketDataListener.h +++ b/src/app_sparkd/sparkd/md/MarketDataListener.h @@ -3,9 +3,9 @@ #include "domain/book.h" #include "domain/rfq.h" #include "domain/security.h" +#include "domain/security_market_data_statistics.h" #include "domain/security_state.h" #include "domain/trade_record.h" -#include "spark/domain/SecurityMarketDataStatistics.h" #include "spark/md/IMarketDataListener.h" #include "sparkd/md/MarketDataError.h" diff --git a/src/app_sparkd/sparkd/md/binance/BinanceMiniTickerUpdate.cpp b/src/app_sparkd/sparkd/md/binance/BinanceMiniTickerUpdate.cpp index 5dd77a9a8..30d1a6b98 100644 --- a/src/app_sparkd/sparkd/md/binance/BinanceMiniTickerUpdate.cpp +++ b/src/app_sparkd/sparkd/md/binance/BinanceMiniTickerUpdate.cpp @@ -2,7 +2,7 @@ #include "BinanceMiniTickerUpdate.h" #include "domain/price.h" #include "domain/quantity.h" -#include "spark/domain/SecurityMarketDataStatistics.h" +#include "domain/security_market_data_statistics.h" #include "sparkd/md/ccapi/CCApiReader.h" #include "system/json/json_dumper.h" #include "system/json/json_reader.h" diff --git a/src/app_sparkd/sparkd/md/binance/BinanceMiniTickerUpdate.h b/src/app_sparkd/sparkd/md/binance/BinanceMiniTickerUpdate.h index 987cc9825..3f8d031be 100644 --- a/src/app_sparkd/sparkd/md/binance/BinanceMiniTickerUpdate.h +++ b/src/app_sparkd/sparkd/md/binance/BinanceMiniTickerUpdate.h @@ -1,6 +1,6 @@ #pragma once -#include "spark/domain/SecurityMarketDataStatistics.h" +#include "domain/security_market_data_statistics.h" #include "sparkd/md/binance/BinanceMiniTickerEventType.h" #include "system/time_stamp.h" diff --git a/src/app_sparkd/sparkd/md/binance/BinancePriceStatistics.cpp b/src/app_sparkd/sparkd/md/binance/BinancePriceStatistics.cpp index 88b8a56ee..621292f38 100644 --- a/src/app_sparkd/sparkd/md/binance/BinancePriceStatistics.cpp +++ b/src/app_sparkd/sparkd/md/binance/BinancePriceStatistics.cpp @@ -1,7 +1,7 @@ #include "BinancePriceStatistics.h" #include "domain/price.h" #include "domain/quantity.h" -#include "spark/domain/SecurityMarketDataStatistics.h" +#include "domain/security_market_data_statistics.h" #include "sparkd/md/ccapi/CCApiReader.h" #include "system/json/json_dumper.h" #include "system/json/json_reader.h" diff --git a/src/app_sparkd/sparkd/md/binance/BinancePriceStatisticsAdaptor.cpp b/src/app_sparkd/sparkd/md/binance/BinancePriceStatisticsAdaptor.cpp index 6135689c0..4a02cb791 100644 --- a/src/app_sparkd/sparkd/md/binance/BinancePriceStatisticsAdaptor.cpp +++ b/src/app_sparkd/sparkd/md/binance/BinancePriceStatisticsAdaptor.cpp @@ -1,6 +1,6 @@ #include "BinancePriceStatisticsAdaptor.h" #include "domain/security_id.h" -#include "spark/domain/SecurityMarketDataStatistics.h" +#include "domain/security_market_data_statistics.h" #include "spark/md/IMarketDataListener.h" #include "spark/utils/bts_fatal.h" #include "sparkd/md/binance/BinancePriceStatistics.h" diff --git a/src/app_sparkd/sparkd/md/binance_us/BinanceUsPriceStatistics.cpp b/src/app_sparkd/sparkd/md/binance_us/BinanceUsPriceStatistics.cpp index d0ad63316..a6efc28d1 100644 --- a/src/app_sparkd/sparkd/md/binance_us/BinanceUsPriceStatistics.cpp +++ b/src/app_sparkd/sparkd/md/binance_us/BinanceUsPriceStatistics.cpp @@ -1,7 +1,7 @@ #include "BinanceUsPriceStatistics.h" #include "domain/price.h" #include "domain/quantity.h" -#include "spark/domain/SecurityMarketDataStatistics.h" +#include "domain/security_market_data_statistics.h" #include "sparkd/md/ccapi/CCApiReader.h" #include "system/json/json_dumper.h" #include "system/json/json_reader.h" diff --git a/src/app_sparkd/sparkd/md/binance_us/BinanceUsPriceStatisticsAdaptor.cpp b/src/app_sparkd/sparkd/md/binance_us/BinanceUsPriceStatisticsAdaptor.cpp index edc99628f..4552e6da0 100644 --- a/src/app_sparkd/sparkd/md/binance_us/BinanceUsPriceStatisticsAdaptor.cpp +++ b/src/app_sparkd/sparkd/md/binance_us/BinanceUsPriceStatisticsAdaptor.cpp @@ -1,6 +1,6 @@ #include "BinanceUsPriceStatisticsAdaptor.h" #include "domain/security_id.h" -#include "spark/domain/SecurityMarketDataStatistics.h" +#include "domain/security_market_data_statistics.h" #include "spark/md/IMarketDataListener.h" #include "spark/utils/bts_fatal.h" #include "sparkd/md/binance_us/BinanceUsPriceStatistics.h" diff --git a/src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuturesPriceStatistics.cpp b/src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuturesPriceStatistics.cpp index ef5e72946..b8a1dd840 100644 --- a/src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuturesPriceStatistics.cpp +++ b/src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuturesPriceStatistics.cpp @@ -1,7 +1,7 @@ #include "BinanceUsdsFuturesPriceStatistics.h" #include "domain/price.h" #include "domain/quantity.h" -#include "spark/domain/SecurityMarketDataStatistics.h" +#include "domain/security_market_data_statistics.h" #include "sparkd/md/ccapi/CCApiReader.h" #include "system/json/json_reader.h" diff --git a/src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuturesPriceStatisticsAdaptor.cpp b/src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuturesPriceStatisticsAdaptor.cpp index 99d7b5386..c64436118 100644 --- a/src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuturesPriceStatisticsAdaptor.cpp +++ b/src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuturesPriceStatisticsAdaptor.cpp @@ -1,6 +1,6 @@ #include "BinanceUsdsFuturesPriceStatisticsAdaptor.h" #include "domain/security_id.h" -#include "spark/domain/SecurityMarketDataStatistics.h" +#include "domain/security_market_data_statistics.h" #include "spark/md/IMarketDataListener.h" #include "spark/utils/bts_fatal.h" #include "sparkd/md/binance_usds_futures/BinanceUsdsFuturesPriceStatistics.h" diff --git a/src/app_sparkd/sparkd/md/coinbase/CoinbasePriceStatistics.cpp b/src/app_sparkd/sparkd/md/coinbase/CoinbasePriceStatistics.cpp index e3cbf7398..12155152b 100644 --- a/src/app_sparkd/sparkd/md/coinbase/CoinbasePriceStatistics.cpp +++ b/src/app_sparkd/sparkd/md/coinbase/CoinbasePriceStatistics.cpp @@ -1,7 +1,7 @@ #include "CoinbasePriceStatistics.h" #include "domain/price.h" #include "domain/quantity.h" -#include "spark/domain/SecurityMarketDataStatistics.h" +#include "domain/security_market_data_statistics.h" #include "sparkd/md/ccapi/CCApiReader.h" #include "system/json/json_dumper.h" #include "system/json/json_reader.h" diff --git a/src/app_sparkd/sparkd/md/coinbase/CoinbasePriceStatisticsAdaptor.cpp b/src/app_sparkd/sparkd/md/coinbase/CoinbasePriceStatisticsAdaptor.cpp index ceee18545..121ae706b 100644 --- a/src/app_sparkd/sparkd/md/coinbase/CoinbasePriceStatisticsAdaptor.cpp +++ b/src/app_sparkd/sparkd/md/coinbase/CoinbasePriceStatisticsAdaptor.cpp @@ -1,6 +1,6 @@ #include "CoinbasePriceStatisticsAdaptor.h" #include "domain/security_id.h" -#include "spark/domain/SecurityMarketDataStatistics.h" +#include "domain/security_market_data_statistics.h" #include "spark/md/IMarketDataListener.h" #include "sparkd/md/coinbase/CoinbasePriceStatistics.h" diff --git a/src/app_sparkd/sparkd/md/deribit/DeribitTickerAdaptor.cpp b/src/app_sparkd/sparkd/md/deribit/DeribitTickerAdaptor.cpp index 6b3b918a5..d8c6021eb 100644 --- a/src/app_sparkd/sparkd/md/deribit/DeribitTickerAdaptor.cpp +++ b/src/app_sparkd/sparkd/md/deribit/DeribitTickerAdaptor.cpp @@ -1,7 +1,8 @@ #include "DeribitTickerAdaptor.h" #include "domain/security_id.h" -#include "spark/domain/SecurityMarketDataStatistics.h" +#include "domain/security_market_data_statistics.h" #include "spark/md/IMarketDataListener.h" +#include "spark/utils/bts_assert.h" #include "system/json/json_reader.h" #include diff --git a/src/app_sparkd/sparkd/md/ftx/FTXHistoricalPriceAdaptor.cpp b/src/app_sparkd/sparkd/md/ftx/FTXHistoricalPriceAdaptor.cpp index dc8621e9f..d10c3c789 100644 --- a/src/app_sparkd/sparkd/md/ftx/FTXHistoricalPriceAdaptor.cpp +++ b/src/app_sparkd/sparkd/md/ftx/FTXHistoricalPriceAdaptor.cpp @@ -1,5 +1,5 @@ #include "FTXHistoricalPriceAdaptor.h" -#include "spark/domain/SecurityMarketDataStatistics.h" +#include "domain/security_market_data_statistics.h" #include "spark/md/IMarketDataListener.h" #include "sparkd/md/ftx/FTXHistoricalPriceRecord.h" diff --git a/src/app_sparkd/sparkd/md/ftx/FTXHistoricalPriceRecord.cpp b/src/app_sparkd/sparkd/md/ftx/FTXHistoricalPriceRecord.cpp index e38dd7768..969f7938b 100644 --- a/src/app_sparkd/sparkd/md/ftx/FTXHistoricalPriceRecord.cpp +++ b/src/app_sparkd/sparkd/md/ftx/FTXHistoricalPriceRecord.cpp @@ -1,6 +1,6 @@ #include "FTXHistoricalPriceRecord.h" #include "domain/price.h" -#include "spark/domain/SecurityMarketDataStatistics.h" +#include "domain/security_market_data_statistics.h" #include "sparkd/md/ccapi/CCApiReader.h" #include "system/json/json_reader.h" diff --git a/src/app_sparkd/sparkd/md/listeners/LiveLadderPrinter.h b/src/app_sparkd/sparkd/md/listeners/LiveLadderPrinter.h index 2a54938f6..e6ca07338 100644 --- a/src/app_sparkd/sparkd/md/listeners/LiveLadderPrinter.h +++ b/src/app_sparkd/sparkd/md/listeners/LiveLadderPrinter.h @@ -1,5 +1,6 @@ #pragma once +#include "spark/utils/bts_assert.h" #include "sparkd/md/MarketDataError.h" #include "sparkd/md/MarketDataListener.h" diff --git a/src/app_sparkd/sparkd/md/okx/OkxTickerAdaptor.cpp b/src/app_sparkd/sparkd/md/okx/OkxTickerAdaptor.cpp index a9783db94..e1267b29d 100644 --- a/src/app_sparkd/sparkd/md/okx/OkxTickerAdaptor.cpp +++ b/src/app_sparkd/sparkd/md/okx/OkxTickerAdaptor.cpp @@ -1,7 +1,7 @@ #include "OkxTickerAdaptor.h" #include "domain/price.h" #include "domain/security_id.h" -#include "spark/domain/SecurityMarketDataStatistics.h" +#include "domain/security_market_data_statistics.h" #include "spark/md/IMarketDataListener.h" #include "sparkd/md/ccapi/CCApiCorrelationID.h" #include "sparkd/md/okx/OkxTicker.h" diff --git a/src/app_sparkd/sparkd/md/recording/MDReplayer.cpp b/src/app_sparkd/sparkd/md/recording/MDReplayer.cpp index 623968bd2..d536a3105 100644 --- a/src/app_sparkd/sparkd/md/recording/MDReplayer.cpp +++ b/src/app_sparkd/sparkd/md/recording/MDReplayer.cpp @@ -5,10 +5,10 @@ #include "domain/security.h" #include "domain/security_common.h" #include "domain/security_id.h" +#include "domain/security_market_data_statistics.h" #include "domain/side.h" #include "domain/trade_record.h" #include "spark/domain/DomainSecurityUtils.h" -#include "spark/domain/SecurityMarketDataStatistics.h" #include "spark/domain_model/Security.pb.h" #include "spark/logging/logging.h" #include "spark/md/GeneralMarketDataListener.h" @@ -154,7 +154,7 @@ void MDReplayer::_replay_message(const bts::co2::RecordedMDMessage &m) { break; } case (co2::RecordedMDMessage::MDRecordCase::kMisc): { - bts::domain::SecurityMarketDataStatistics stats(m.sec_key(), m.misc()); + auto stats = domain::DomainSecurityUtils::convert(m.sec_key(), m.misc()); me->listener->on_security_statistics(stats); break; } diff --git a/src/lib_spark/spark/domain/SecurityMarketDataStatistics.h b/src/lib_domain/domain/security_market_data_statistics.h similarity index 76% rename from src/lib_spark/spark/domain/SecurityMarketDataStatistics.h rename to src/lib_domain/domain/security_market_data_statistics.h index f175c574a..e09620844 100644 --- a/src/lib_spark/spark/domain/SecurityMarketDataStatistics.h +++ b/src/lib_domain/domain/security_market_data_statistics.h @@ -2,9 +2,7 @@ #include "domain/price.h" #include "domain/quantity.h" -#include "domain/security.h" -#include "spark/md/IntPrice.h" -#include "spark/md/protos/co2.pb.h" +#include "domain/security_id.h" #include "system/FMT_IMPL.h" #include "system/json/json_reader.h" @@ -23,16 +21,6 @@ class SecurityMarketDataStatistics { Price settle; Quantity volume = Quantity(0); SecurityMarketDataStatistics() {} - SecurityMarketDataStatistics( - uint32_t sec_key, const bts::co2::MiscMessage &misc_msg) - : security_id(SecurityID(sec_key)), - low(Price::from_double(misc_msg.session_low())), - high(Price::from_double(misc_msg.session_high())), - open(Price::from_double(misc_msg.open_price())), - settle(Price::from_double(bts::md::IntPrice( - misc_msg.settlement().mantissa(), - misc_msg.settlement().exponent()) - .price())) {} }; void from_json(const nlohmann::json &j, SecurityMarketDataStatistics &s); @@ -57,9 +45,11 @@ inline void from_json( jr.read("volume", s.volume); // clang-format on if (!success) { +#ifdef LOG const auto j_str = j.dump(2); LOG(md, Error, "Failed to parse json to SecurityMarketDataStatistics:\n{}", j_str); +#endif } } diff --git a/src/lib_spark/spark/domain/DomainSecurityUtils.cpp b/src/lib_spark/spark/domain/DomainSecurityUtils.cpp index 761d4ed44..2befbabd9 100644 --- a/src/lib_spark/spark/domain/DomainSecurityUtils.cpp +++ b/src/lib_spark/spark/domain/DomainSecurityUtils.cpp @@ -4,6 +4,7 @@ #include "domain/price.h" #include "domain/protobufs/venue.pb.h" #include "domain/security.h" +#include "domain/security_market_data_statistics.h" #include "domain/spot_security.h" #include "domain/spread_security.h" #include "spark/domain_model/Security.pb.h" @@ -16,6 +17,8 @@ namespace bts::domain { #define DOMAIN_VENUE(x) bts::domain::protobufs::VENUE_##x #define DOMAIN_SEC_TYPE(x) bts::domain::protobufs::SECURITY_TYPE_##x +using std::uint32_t; + domain::TradeRecord DomainSecurityUtils::convert( const co2::TradeMessage &trade) { domain::TradeRecord rv; @@ -277,4 +280,17 @@ domain::Security DomainSecurityUtils::convert(const bts::api::Security &sec) { return rv; } +domain::SecurityMarketDataStatistics DomainSecurityUtils::convert( + uint32_t sec_key, const co2::MiscMessage &misc_msg) { + domain::SecurityMarketDataStatistics rv; + *rv.security_id = sec_key; + rv.low = Price::from_double(misc_msg.session_low()); + rv.high = Price::from_double(misc_msg.session_high()); + rv.open = Price::from_double(misc_msg.open_price()); + rv.settle = Price::from_double( + bts::md::IntPrice( + misc_msg.settlement().mantissa(), misc_msg.settlement().exponent()) + .price()); + return rv; +} } // namespace bts::domain diff --git a/src/lib_spark/spark/domain/DomainSecurityUtils.h b/src/lib_spark/spark/domain/DomainSecurityUtils.h index 78fcaaac3..4d11b281d 100644 --- a/src/lib_spark/spark/domain/DomainSecurityUtils.h +++ b/src/lib_spark/spark/domain/DomainSecurityUtils.h @@ -12,6 +12,8 @@ namespace bts::domain { +class SecurityMarketDataStatistics; + class DomainSecurityUtils { public: static domain::Security convert(const bts::api::Security &sec); @@ -28,6 +30,8 @@ class DomainSecurityUtils { static bts::domain::SpreadSecurity convert( const bts::api::SpreadContract &spr); static domain::TradeRecord convert(const co2::TradeMessage &trade); + static domain::SecurityMarketDataStatistics convert( + std::uint32_t sec_key, const co2::MiscMessage &misc_msg); static bts::api::SecurityType get_type(const bts::api::Security &s); static std::string get_exchange_id(const bts::api::Security &s); diff --git a/src/lib_spark/spark/md/GeneralMarketDataListener.cpp b/src/lib_spark/spark/md/GeneralMarketDataListener.cpp index a327a800c..f34a52a9e 100644 --- a/src/lib_spark/spark/md/GeneralMarketDataListener.cpp +++ b/src/lib_spark/spark/md/GeneralMarketDataListener.cpp @@ -11,13 +11,13 @@ #include "domain/security.h" #include "domain/security_common.h" #include "domain/security_id.h" +#include "domain/security_market_data_statistics.h" #include "domain/security_state.h" #include "domain/side.h" #include "domain/spot_security.h" #include "domain/spread_security.h" #include "domain/trade_record.h" #include "spark/domain/DomainSecurityUtils.h" -#include "spark/domain/SecurityMarketDataStatistics.h" #include "spark/domain_model/Security.pb.h" #include "spark/logging/logging.h" #include "spark/md/IntPrice.h"