From b64a8ba2145aae8a75b281567f12655dba44bc07 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Mon, 26 Aug 2024 15:12:05 +0000 Subject: [PATCH] cleanup: Remove unnecessary code Trim includes as well --- src/app_sparkd/sparkd/cmds/Web.cpp | 14 +- .../sparkd/md/MarketDataListenerID.h | 4 +- .../sparkd/md/ccapi/CCApiTradeRecord.h | 7 +- src/app_sparkd/sparkd/md/ftx/FTXFuture.cpp | 2 - src/app_sparkd/sparkd/md/ftx/FTXMarket.cpp | 11 +- .../cmake/GetWindowsClientSources.cmake | 1 - src/lib_spark/spark/config/ConfigQuerier.cpp | 1 - .../spark/config/ConfigurationState.cpp | 1 - src/lib_spark/spark/config/config.cpp | 1 - src/lib_spark/spark/core/AllSameType.h | 10 -- src/lib_spark/spark/core/NaN.h | 24 ---- src/lib_spark/spark/core/StringContains.h | 70 --------- src/lib_spark/spark/core/StringFiller.h | 24 ---- src/lib_spark/spark/core/ValueWrapper.h | 9 -- src/lib_spark/spark/core/VectorAdapter.h | 56 -------- src/lib_spark/spark/domain/FTXSecurity.h | 0 src/lib_spark/spark/domain/NewBookSide.h | 20 --- src/lib_spark/spark/domain/NewOrder.cpp | 10 -- src/lib_spark/spark/domain/NewOrder.h | 18 --- src/lib_spark/spark/domain/SideReq.h | 136 ------------------ src/lib_spark/spark/md/relay/RelayClient.cpp | 1 - src/lib_spark/spark/os/os.cpp | 2 - src/lib_spark/spark/os/tests/os_tests.cpp | 36 ----- 23 files changed, 13 insertions(+), 445 deletions(-) delete mode 100644 src/lib_spark/spark/core/AllSameType.h delete mode 100644 src/lib_spark/spark/core/NaN.h delete mode 100644 src/lib_spark/spark/core/StringContains.h delete mode 100644 src/lib_spark/spark/core/StringFiller.h delete mode 100644 src/lib_spark/spark/core/ValueWrapper.h delete mode 100644 src/lib_spark/spark/core/VectorAdapter.h delete mode 100644 src/lib_spark/spark/domain/FTXSecurity.h delete mode 100644 src/lib_spark/spark/domain/NewBookSide.h delete mode 100644 src/lib_spark/spark/domain/NewOrder.cpp delete mode 100644 src/lib_spark/spark/domain/NewOrder.h delete mode 100644 src/lib_spark/spark/domain/SideReq.h delete mode 100644 src/lib_spark/spark/os/tests/os_tests.cpp diff --git a/src/app_sparkd/sparkd/cmds/Web.cpp b/src/app_sparkd/sparkd/cmds/Web.cpp index 14add1290..595be4d8f 100644 --- a/src/app_sparkd/sparkd/cmds/Web.cpp +++ b/src/app_sparkd/sparkd/cmds/Web.cpp @@ -1,30 +1,22 @@ #include "Web.h" +#include "md/cmds/Run.h" #include "spark/api/public/ServiceContext.h" -#include "spark/api/services/MarketDataService.pb.h" -#include "spark/api/services/SyntheticSecurityService.pb.h" #include "spark/config/config.h" -#include "spark/config/protos/market_data.pb.h" #include "spark/config/protos/ports.pb.h" #include "spark/config/protos/quickbus_cfg.pb.h" -#include "spark/md/MBOProcessor.h" #include "spark/md/MDClient.h" #include "spark/md/SyntheticSecurityService.h" #include "spark/md/relay/QueryServer.h" #include "spark/metrics/metrics.h" #include "spark/metrics/system_metrics.h" -#include "spark/quickbus/quickbus.h" +#include "spark/quickbus/core/Quickbus.h" #include "spark/tracing/PerfLog.h" #include "spark/utils/Dispatcher.h" -#include "spark/utils/thread_manager.h" -#include "md/cmds/Cleanup.h" -#include "md/cmds/Run.h" -#include "sparkd/exchange_sim/ExchangeSim.h" #include "sparkd/http/WebServer.h" #include "sparkd/user/AdminServiceServer.h" #include "sparkd/user/AuthServiceServer.h" -#include + #include -#include namespace bts::cmds { diff --git a/src/app_sparkd/sparkd/md/MarketDataListenerID.h b/src/app_sparkd/sparkd/md/MarketDataListenerID.h index 809957535..9645b486f 100644 --- a/src/app_sparkd/sparkd/md/MarketDataListenerID.h +++ b/src/app_sparkd/sparkd/md/MarketDataListenerID.h @@ -2,12 +2,12 @@ #ifndef _WIN32 #include "spark/core/FMT_IMPL.h" -#include "spark/core/ValueWrapper.h" +#include "spark/utils/ValueWrapper.h" namespace bts::md { using MarketDataListenerID = - core::ValueWrapper; + utils::ValueWrapper; } // namespace bts::md diff --git a/src/app_sparkd/sparkd/md/ccapi/CCApiTradeRecord.h b/src/app_sparkd/sparkd/md/ccapi/CCApiTradeRecord.h index abbb02696..ac278ba51 100644 --- a/src/app_sparkd/sparkd/md/ccapi/CCApiTradeRecord.h +++ b/src/app_sparkd/sparkd/md/ccapi/CCApiTradeRecord.h @@ -1,8 +1,7 @@ #pragma once -#include "spark/core/NaN.h" - #include +#include #include #include @@ -24,8 +23,8 @@ namespace bts::md { class CCApiTradeRecord { public: bool is_buyer_maker = false; - double last_price = core::NaN::value(); - double last_size = core::NaN::value(); + double last_price = std::numeric_limits::quiet_NaN(); + double last_size = std::numeric_limits::quiet_NaN(); std::uint64_t trade_id = 0; static std::vector parse(const ccapi::Message &source); diff --git a/src/app_sparkd/sparkd/md/ftx/FTXFuture.cpp b/src/app_sparkd/sparkd/md/ftx/FTXFuture.cpp index a6372c451..db68a5476 100644 --- a/src/app_sparkd/sparkd/md/ftx/FTXFuture.cpp +++ b/src/app_sparkd/sparkd/md/ftx/FTXFuture.cpp @@ -1,5 +1,4 @@ #include "FTXFuture.h" -#include "spark/api/domain/Currency.pb.h" #include "spark/api/domain/Venue.pb.h" #include "spark/core/TableFormatter.h" #include "spark/domain/FutureSecurity.h" @@ -15,7 +14,6 @@ namespace bts::md::ftx { -using bts::api::domain::Currency; using bts::core::TableFormatter; using bts::domain::FutureSecurity; using bts::domain::Security; diff --git a/src/app_sparkd/sparkd/md/ftx/FTXMarket.cpp b/src/app_sparkd/sparkd/md/ftx/FTXMarket.cpp index 48ec4374b..b718d2987 100644 --- a/src/app_sparkd/sparkd/md/ftx/FTXMarket.cpp +++ b/src/app_sparkd/sparkd/md/ftx/FTXMarket.cpp @@ -1,6 +1,5 @@ #include "FTXMarket.h" #include "spark/api/domain/Venue.pb.h" -#include "spark/core/NaN.h" #include "spark/core/TableFormatter.h" #include "spark/domain/Security.h" #include "spark/io/JsonReader.h" @@ -11,6 +10,7 @@ #include #include #include +#include #include #include @@ -19,7 +19,6 @@ namespace bts::md::ftx { #define SEC_TYPE(x) bts::api::domain::SECURITY_TYPE_##x using bts::api::domain::Venue; -using bts::core::NaN; using bts::core::TableFormatter; using bts::domain::Security; using bts::io::JsonReader; @@ -133,11 +132,11 @@ void from_json(const nlohmann::json &j, FTXMarket &mkt) { jr.read("minProvideSize", mkt.min_provide_size); jr.read("enabled", mkt.enabled); - jr.read_or("ask", mkt.ask, NaN::value()); - jr.read_or("bid", mkt.bid, NaN::value()); - jr.read_or("last", mkt.last, NaN::value()); + jr.read_or("ask", mkt.ask, std::numeric_limits::quiet_NaN()); + jr.read_or("bid", mkt.bid, std::numeric_limits::quiet_NaN()); + jr.read_or("last", mkt.last, std::numeric_limits::quiet_NaN()); jr.read("postOnly", mkt.post_only); - jr.read_or("price", mkt.price, NaN::value()); + jr.read_or("price", mkt.price, std::numeric_limits::quiet_NaN()); jr.read("priceIncrement", mkt.price_increment); jr.read("sizeIncrement", mkt.size_increment); jr.read("restricted", mkt.restricted); diff --git a/src/lib_spark/cmake/GetWindowsClientSources.cmake b/src/lib_spark/cmake/GetWindowsClientSources.cmake index 8ec530b65..4b606f273 100644 --- a/src/lib_spark/cmake/GetWindowsClientSources.cmake +++ b/src/lib_spark/cmake/GetWindowsClientSources.cmake @@ -101,7 +101,6 @@ function(get_cpp_sources dest) ${PROJECT_NAME}/md/test/md_test_utils.cpp ${PROJECT_NAME}/md/test/synthetic_book_merge_tests.cpp ${PROJECT_NAME}/os/os.cpp - ${PROJECT_NAME}/os/tests/os_tests.cpp ${PROJECT_NAME}/quickbus/core/LocalNode.cpp ${PROJECT_NAME}/quickbus/core/Quickbus.cpp ${PROJECT_NAME}/quickbus/core/SubscriptionID.cpp diff --git a/src/lib_spark/spark/config/ConfigQuerier.cpp b/src/lib_spark/spark/config/ConfigQuerier.cpp index 90d846c32..524454a1c 100644 --- a/src/lib_spark/spark/config/ConfigQuerier.cpp +++ b/src/lib_spark/spark/config/ConfigQuerier.cpp @@ -1,6 +1,5 @@ #include "ConfigQuerier.h" #include "config.h" -#include "spark/collections/Contains.h" #include "spark/config/ConfigQueryErrors.h" #include "spark/config/text_format/text_format.h" #include "spark/core/EnumMacros.h" diff --git a/src/lib_spark/spark/config/ConfigurationState.cpp b/src/lib_spark/spark/config/ConfigurationState.cpp index b96a92f27..d42bc6dff 100644 --- a/src/lib_spark/spark/config/ConfigurationState.cpp +++ b/src/lib_spark/spark/config/ConfigurationState.cpp @@ -6,7 +6,6 @@ #include "ConfigurationException.h" #include "PreprocessInputStream.h" #include "config.h" -#include "spark/collections/Contains.h" #include "spark/core/FMT.h" #include "spark/io/ProtoPrinter.h" #include "spark/os/os.h" diff --git a/src/lib_spark/spark/config/config.cpp b/src/lib_spark/spark/config/config.cpp index b03e5fde7..b596de3f1 100644 --- a/src/lib_spark/spark/config/config.cpp +++ b/src/lib_spark/spark/config/config.cpp @@ -4,7 +4,6 @@ #include "config.h" #include "../os/os.h" #include "ConfigurationState.h" -#include "spark/collections/Contains.h" #include #include diff --git a/src/lib_spark/spark/core/AllSameType.h b/src/lib_spark/spark/core/AllSameType.h deleted file mode 100644 index 46bc52269..000000000 --- a/src/lib_spark/spark/core/AllSameType.h +++ /dev/null @@ -1,10 +0,0 @@ -#pragma once -#include - -namespace bts::core { - -template -using AllSameType = - std::enable_if_t...>>; - -} // namespace bts::core diff --git a/src/lib_spark/spark/core/NaN.h b/src/lib_spark/spark/core/NaN.h deleted file mode 100644 index e9a46102e..000000000 --- a/src/lib_spark/spark/core/NaN.h +++ /dev/null @@ -1,24 +0,0 @@ -#pragma once -#include - -namespace bts::core { - -class NaN { - public: - static constexpr double value(); - static constexpr float valuef(); -}; - -////////////////////////////////////////////////// -// Definition -////////////////////////////////////////////////// - -constexpr double NaN::value() { - return std::numeric_limits::quiet_NaN(); -} - -constexpr float NaN::valuef() { - return std::numeric_limits::quiet_NaN(); -} - -} // namespace bts::core diff --git a/src/lib_spark/spark/core/StringContains.h b/src/lib_spark/spark/core/StringContains.h deleted file mode 100644 index 30fae9f7e..000000000 --- a/src/lib_spark/spark/core/StringContains.h +++ /dev/null @@ -1,70 +0,0 @@ -#pragma once -#include -#include -#include - -namespace bts::core { - -class StringContains { - public: - template - using AllSame = std::enable_if_t...>>; - - template - using AllString = AllSame; - - constexpr bool contains(const std::string &str, const std::string &substr); - constexpr bool contains(const std::string &str, const char *substr); - constexpr bool contains(const char *str, const char *substr); - - template - constexpr bool contains( - const std::string &str, const std::string &substr, Ts... substrs); -}; - -////////////////////////////////////////////////// -// Definition -////////////////////////////////////////////////// - -constexpr bool StringContains::contains( - const std::string &str, const std::string &substr) { - return str.find(substr) != std::string::npos; -} - -constexpr bool StringContains::contains( - const std::string &str, const char *substr) { - return str.find(substr) != std::string::npos; -} - -constexpr bool StringContains::contains(const char *str, const char *substr) { - if (str[0] == '\0') { - return false; - } - if (substr[0] == '\0') { - return false; - } - - for (std::size_t i = 0; str[i] != '\0'; i++) { - bool is_match = true; - for (std::size_t j = 0; substr[j] < '\0'; j++) { - if (str[i + j] != substr[j]) { - is_match = false; - break; - } - } - if (is_match) { - return true; - } - } - return false; -} - -template -constexpr bool StringContains::contains( - const std::string &str, const std::string &substr, Ts... substrs) { - return contains(str, substr) || contains(str, substrs...); -} - -#define STRING_CONTAINS(x, ...) (bts::StringContains(x, __VA_ARGS__)) - -} // namespace bts::core diff --git a/src/lib_spark/spark/core/StringFiller.h b/src/lib_spark/spark/core/StringFiller.h deleted file mode 100644 index 58f0c17e0..000000000 --- a/src/lib_spark/spark/core/StringFiller.h +++ /dev/null @@ -1,24 +0,0 @@ -#pragma once -#include - -namespace bts::core { - -class StringFiller { - public: - static bool fill_if_empty(std::string &target, const std::string &fill); -}; - -////////////////////////////////////////////////// -// Definition -////////////////////////////////////////////////// - -inline bool StringFiller::fill_if_empty( - std::string &target, const std::string &fill) { - if (!target.empty()) { - return false; - } - target = fill; - return true; -} - -} // namespace bts::core diff --git a/src/lib_spark/spark/core/ValueWrapper.h b/src/lib_spark/spark/core/ValueWrapper.h deleted file mode 100644 index 243f17e5e..000000000 --- a/src/lib_spark/spark/core/ValueWrapper.h +++ /dev/null @@ -1,9 +0,0 @@ -#pragma once -#include "spark/utils/ValueWrapper.h" - -namespace bts::core { - -template -using ValueWrapper = utils::ValueWrapper; - -} // namespace bts::core diff --git a/src/lib_spark/spark/core/VectorAdapter.h b/src/lib_spark/spark/core/VectorAdapter.h deleted file mode 100644 index 481eb4cb3..000000000 --- a/src/lib_spark/spark/core/VectorAdapter.h +++ /dev/null @@ -1,56 +0,0 @@ -#pragma once -#include -#include - -namespace bts::core { - -class VectorAdapter { - public: - template - static std::vector to(const std::vector &source, Op op); - - template - static std::vector to_const_pointers( - const std::vector &source); - - template - static std::vector copy_values(const std::unordered_map &source); -}; - -////////////////////////////////////////////////// -// Definition -////////////////////////////////////////////////// - -template -std::vector VectorAdapter::to(const std::vector &source, Op op) { - std::vector result; - result.reserve(source.size()); - for (const auto &value : source) { - result.push_back(op(value)); - } - return result; -} - -template -std::vector VectorAdapter::to_const_pointers( - const std::vector &source) { - std::vector ptrs; - ptrs.reserve(source.size()); - for (const auto &value : source) { - ptrs.push_back(&value); - } - return ptrs; -} - -template -std::vector VectorAdapter::copy_values( - const std::unordered_map &source) { - std::vector values; - values.reserve(source.size()); - for (const auto &p : source) { - values.push_back(p.second); - } - return values; -} - -} // namespace bts::core diff --git a/src/lib_spark/spark/domain/FTXSecurity.h b/src/lib_spark/spark/domain/FTXSecurity.h deleted file mode 100644 index e69de29bb..000000000 diff --git a/src/lib_spark/spark/domain/NewBookSide.h b/src/lib_spark/spark/domain/NewBookSide.h deleted file mode 100644 index aaea8858d..000000000 --- a/src/lib_spark/spark/domain/NewBookSide.h +++ /dev/null @@ -1,20 +0,0 @@ -#pragma once -#include "BookLevel.h" -#include - -namespace bts::domain { - -class BookSide { - public: - // compile time size for speed - using Container = std::array; - - std::uint32_t num_populated_levels() const noexcept; - bool is_empty() const noexcept; - - private: - // compile time size for speed - Container levels_; -}; - -} // namespace bts::domain diff --git a/src/lib_spark/spark/domain/NewOrder.cpp b/src/lib_spark/spark/domain/NewOrder.cpp deleted file mode 100644 index acf434ce4..000000000 --- a/src/lib_spark/spark/domain/NewOrder.cpp +++ /dev/null @@ -1,10 +0,0 @@ -#include "NewOrder.h" - -namespace bts::domain { - -std::ostream &operator<<(std::ostream &out, const NewOrder &no) noexcept { - out << "price: " << no.price << "; qty: " << no.qty << "; " << no.order_def; - return out; -} - -} // namespace bts::domain diff --git a/src/lib_spark/spark/domain/NewOrder.h b/src/lib_spark/spark/domain/NewOrder.h deleted file mode 100644 index e487b3cb5..000000000 --- a/src/lib_spark/spark/domain/NewOrder.h +++ /dev/null @@ -1,18 +0,0 @@ -#pragma once -#include "OrderDefinition.h" -#include "Price.h" -#include "Quantity.h" - -namespace bts::domain { - -// Sent once per order, when the order is first launched (launching an order, -// placing, firing, sending all mean the same) -struct NewOrder { - OrderDefinition order_def; - domain::Price price; - domain::Quantity qty; -}; - -std::ostream &operator<<(std::ostream &out, const NewOrder &no) noexcept; - -} // namespace bts::domain diff --git a/src/lib_spark/spark/domain/SideReq.h b/src/lib_spark/spark/domain/SideReq.h deleted file mode 100644 index c52792aa1..000000000 --- a/src/lib_spark/spark/domain/SideReq.h +++ /dev/null @@ -1,136 +0,0 @@ -/* Generated SBE (Simple Binary Encoding) message codec */ -#ifndef _IL3_SIDEREQ_H_ -#define _IL3_SIDEREQ_H_ - -#if defined(SBE_HAVE_CMATH) -/* cmath needed for std::numeric_limits::quiet_NaN() */ -# include -# define SBE_FLOAT_NAN std::numeric_limits::quiet_NaN() -# define SBE_DOUBLE_NAN std::numeric_limits::quiet_NaN() -#else -/* math.h needed for NAN */ -# include -# define SBE_FLOAT_NAN NAN -# define SBE_DOUBLE_NAN NAN -#endif - -#if __cplusplus >= 201103L -# define SBE_CONSTEXPR constexpr -# define SBE_NOEXCEPT noexcept -#else -# define SBE_CONSTEXPR -# define SBE_NOEXCEPT -#endif - -#if __cplusplus >= 201703L -# include -# define SBE_NODISCARD [[nodiscard]] -#else -# define SBE_NODISCARD -#endif - -#if !defined(__STDC_LIMIT_MACROS) -# define __STDC_LIMIT_MACROS 1 -#endif - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#if defined(WIN32) || defined(_WIN32) -# define SBE_BIG_ENDIAN_ENCODE_16(v) _byteswap_ushort(v) -# define SBE_BIG_ENDIAN_ENCODE_32(v) _byteswap_ulong(v) -# define SBE_BIG_ENDIAN_ENCODE_64(v) _byteswap_uint64(v) -# define SBE_LITTLE_ENDIAN_ENCODE_16(v) (v) -# define SBE_LITTLE_ENDIAN_ENCODE_32(v) (v) -# define SBE_LITTLE_ENDIAN_ENCODE_64(v) (v) -#elif __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__ -# define SBE_BIG_ENDIAN_ENCODE_16(v) __builtin_bswap16(v) -# define SBE_BIG_ENDIAN_ENCODE_32(v) __builtin_bswap32(v) -# define SBE_BIG_ENDIAN_ENCODE_64(v) __builtin_bswap64(v) -# define SBE_LITTLE_ENDIAN_ENCODE_16(v) (v) -# define SBE_LITTLE_ENDIAN_ENCODE_32(v) (v) -# define SBE_LITTLE_ENDIAN_ENCODE_64(v) (v) -#elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__ -# define SBE_LITTLE_ENDIAN_ENCODE_16(v) __builtin_bswap16(v) -# define SBE_LITTLE_ENDIAN_ENCODE_32(v) __builtin_bswap32(v) -# define SBE_LITTLE_ENDIAN_ENCODE_64(v) __builtin_bswap64(v) -# define SBE_BIG_ENDIAN_ENCODE_16(v) (v) -# define SBE_BIG_ENDIAN_ENCODE_32(v) (v) -# define SBE_BIG_ENDIAN_ENCODE_64(v) (v) -#else -# error "Byte Ordering of platform not determined. Set __BYTE_ORDER__ manually before including this file." -#endif - -#if defined(SBE_NO_BOUNDS_CHECK) -# define SBE_BOUNDS_CHECK_EXPECT(exp,c) (false) -#elif defined(_MSC_VER) -# define SBE_BOUNDS_CHECK_EXPECT(exp,c) (exp) -#else -# define SBE_BOUNDS_CHECK_EXPECT(exp,c) (__builtin_expect(exp,c)) -#endif - -#define SBE_NULLVALUE_INT8 (std::numeric_limits::min)() -#define SBE_NULLVALUE_INT16 (std::numeric_limits::min)() -#define SBE_NULLVALUE_INT32 (std::numeric_limits::min)() -#define SBE_NULLVALUE_INT64 (std::numeric_limits::min)() -#define SBE_NULLVALUE_UINT8 (std::numeric_limits::max)() -#define SBE_NULLVALUE_UINT16 (std::numeric_limits::max)() -#define SBE_NULLVALUE_UINT32 (std::numeric_limits::max)() -#define SBE_NULLVALUE_UINT64 (std::numeric_limits::max)() - - -namespace il3 { - -class SideReq -{ -public: - enum Value - { - Buy = static_cast(1), - Sell = static_cast(2), - NULL_VALUE = static_cast(255) - }; - - static SideReq::Value get(const std::uint8_t value) - { - switch (value) - { - case static_cast(1): return Buy; - case static_cast(2): return Sell; - case static_cast(255): return NULL_VALUE; - } - - throw std::runtime_error("unknown value for enum SideReq [E103]"); - } - - static const char *c_str(const SideReq::Value value) - { - switch (value) - { - case Buy: return "Buy"; - case Sell: return "Sell"; - case NULL_VALUE: return "NULL_VALUE"; - } - - throw std::runtime_error("unknown value for enum SideReq [E103]:"); - } - - template - friend std::basic_ostream& operator << ( - std::basic_ostream& os, SideReq::Value m) - { - return os << SideReq::c_str(m); - } -}; - -} - -#endif diff --git a/src/lib_spark/spark/md/relay/RelayClient.cpp b/src/lib_spark/spark/md/relay/RelayClient.cpp index 7a657ccd8..3f824d4a0 100644 --- a/src/lib_spark/spark/md/relay/RelayClient.cpp +++ b/src/lib_spark/spark/md/relay/RelayClient.cpp @@ -3,7 +3,6 @@ #include "RelayRecorder.h" #include "../MDProducer.h" -#include "spark/collections/Remove.h" #include "spark/config/config.h" #include "spark/logging/logging.h" #include "spark/md/SymbolLoader.h" diff --git a/src/lib_spark/spark/os/os.cpp b/src/lib_spark/spark/os/os.cpp index fda41b0da..800288ca0 100644 --- a/src/lib_spark/spark/os/os.cpp +++ b/src/lib_spark/spark/os/os.cpp @@ -1,6 +1,4 @@ #include "os.h" -#include "spark/config/config.h" -#include "spark/config/protos/system_config.pb.h" #include "spark/os/app_data_dir.h" #include "spark/utils/bts_array_size.h" #include "spark/utils/bts_assert.h" diff --git a/src/lib_spark/spark/os/tests/os_tests.cpp b/src/lib_spark/spark/os/tests/os_tests.cpp deleted file mode 100644 index 337750999..000000000 --- a/src/lib_spark/spark/os/tests/os_tests.cpp +++ /dev/null @@ -1,36 +0,0 @@ -// #include "core/bts_core/utest/utest.h" -// #include "core/bts_core/utest/TempFile.h" - -// #include "../os.h" - -// namespace bts { -// namespace os { - -// class FileNameSanitization : public TestSuite -// { -// public: -// void empty_file_name_works () -// { -// test_equal (sanitize_file_name (""),""); -// } - -// void legal_file_name_passes_through () -// { -// test_equal (sanitize_file_name ("bts_shell"),"bts_shell"); -// } - -// void bad_file_name_is_fixed () -// { -// test_equal (sanitize_file_name ("bts_shell -configserver -// http://edge-qa/config/"), -// "bts_shell -configserver -// http___edge-qa_config_"); -// } -// }; - -// BEGIN_TEST_SUITE(FileNameSanitization) -// ADD_TEST (bad_file_name_is_fixed) -// ADD_TEST (legal_file_name_passes_through) -// ADD_TEST (bad_file_name_is_fixed) -// END_TEST_SUITE -// }}