From 002bdff9a39884ddef9142dcd0dae14ce5d0969f Mon Sep 17 00:00:00 2001 From: John Colvin Date: Fri, 3 Jan 2025 16:04:23 +0000 Subject: [PATCH] fix: Don't parse non-existent json files in SparkDataDirectory Bugs (fixed): * Sparkd assert crashes if binance_usds_futures_execution.json file doesn't exist --- src/lib/os/spark_data_directory.cpp | 2 +- src/lib/os/spark_data_directory.h | 19 ++++++++--- .../execution_gateway_provider.cpp | 32 +++++++++++++------ 3 files changed, 37 insertions(+), 16 deletions(-) diff --git a/src/lib/os/spark_data_directory.cpp b/src/lib/os/spark_data_directory.cpp index 5025c81c2..4c5dcc458 100644 --- a/src/lib/os/spark_data_directory.cpp +++ b/src/lib/os/spark_data_directory.cpp @@ -61,7 +61,7 @@ boost::filesystem::path SparkDataDirectory::database_file( return root_ / "databases" / dir_name / (db_name + ".sqlite"); } -nlohmann::json SparkDataDirectory::load_config_json( +std::optional SparkDataDirectory::load_config_json( const std::string &name) const { const auto json_file = config_json_file(name); std::cout << "LOAD config json " << name << " from file " diff --git a/src/lib/os/spark_data_directory.h b/src/lib/os/spark_data_directory.h index c68179bc0..6f573e267 100644 --- a/src/lib/os/spark_data_directory.h +++ b/src/lib/os/spark_data_directory.h @@ -2,6 +2,7 @@ #include #include +#include #include namespace bts::spark { @@ -24,10 +25,11 @@ class SparkDataDirectory { boost::filesystem::path database_file( const std::string &dir_name, const std::string &db_name) const; - nlohmann::json load_config_json(const std::string &name) const; + std::optional load_config_json( + const std::string &name) const; template - T load_config_json(const std::string &name) const; + std::optional load_config_json(const std::string &name) const; template bool load_config_json(const std::string &name, T &result) const; @@ -41,16 +43,23 @@ class SparkDataDirectory { ////////////////////////////////////////////////// template -T SparkDataDirectory::load_config_json(const std::string &name) const { +std::optional SparkDataDirectory::load_config_json( + const std::string &name) const { auto j = load_config_json(name); - return j.get(); + if (j) { + return j->get(); + } + return std::nullopt; } template bool SparkDataDirectory::load_config_json( const std::string &name, T &result) const { auto j = load_config_json(name); - j.get_to(result); + if (!j) { + return false; + } + j->get_to(result); return true; } diff --git a/src/lib_binance_execution/binance_execution/execution_gateway_provider.cpp b/src/lib_binance_execution/binance_execution/execution_gateway_provider.cpp index 2de20c5a5..bae9bbd65 100644 --- a/src/lib_binance_execution/binance_execution/execution_gateway_provider.cpp +++ b/src/lib_binance_execution/binance_execution/execution_gateway_provider.cpp @@ -1,5 +1,6 @@ #include "execution_gateway_provider.h" #include "binance_execution/usds_futures/execution_gateway.h" +#include "binance_execution/usds_futures/execution_gateway_config.h" #include "lib/domain_model/Security.pb.h" #include "lib/md/SecurityOracle.h" #include "lib/orderman/actors/order_manager/order_gateway_definition.h" @@ -8,11 +9,31 @@ namespace binance_execution { +using bts::orderman::OrderGatewayDefinition; +using bts::spark::SparkDataDirectory; +using std::vector; + struct ExecutionGatewayProvider::PImpl { PImpl(bts::md::SecurityOracle sec_oracle) : sec_oracle(std::move(sec_oracle)) {} bts::md::SecurityOracle sec_oracle; + + bool load_usds_futures(vector &dest) { + SparkDataDirectory data_dir; + auto cfg = + data_dir.load_config_json( + "binance_usds_futures_execution"); + if (!cfg) { + return false; + } + auto &gw = dest.emplace_back(); + *gw.connection.mutable_name() = "binance_usds_futures_1"; + gw.connection.set_venue(bts::api::VENUE_BINANCE_USDS_FUTURES); + gw.gateway = std::make_shared( + sec_oracle, std::move(*cfg), gw.connection.name()); + return true; + } }; ExecutionGatewayProvider::ExecutionGatewayProvider( @@ -24,16 +45,7 @@ ExecutionGatewayProvider::~ExecutionGatewayProvider() = default; std::vector ExecutionGatewayProvider::create() { std::vector gws; - bts::spark::SparkDataDirectory data_dir; - usds_futures::ExecutionGatewayConfig usds_futures_cfg; - if (data_dir.load_config_json( - "binance_usds_futures_execution", usds_futures_cfg)) { - auto &binance_gw = gws.emplace_back(); - *binance_gw.connection.mutable_name() = "binance_usds_futures_1"; - binance_gw.connection.set_venue(bts::api::VENUE_BINANCE_USDS_FUTURES); - binance_gw.gateway = std::make_shared( - me_->sec_oracle, usds_futures_cfg, binance_gw.connection.name()); - } + me_->load_usds_futures(gws); return gws; }