From 431964cd265b82e067569eb32374fba4b1491a0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20Wo=CC=81jcik?= <3044353+pwojcikdev@users.noreply.github.com> Date: Mon, 9 Sep 2024 22:43:13 +0200 Subject: [PATCH] Use unique ptr for `telemetry` --- nano/core_test/websocket.cpp | 1 + nano/node/message_processor.cpp | 1 + nano/node/node.cpp | 3 ++- nano/node/node.hpp | 5 +++-- nano/rpc_test/rpc.cpp | 1 + nano/slow_test/node.cpp | 1 + 6 files changed, 9 insertions(+), 3 deletions(-) diff --git a/nano/core_test/websocket.cpp b/nano/core_test/websocket.cpp index f62c2e968..883d92c71 100644 --- a/nano/core_test/websocket.cpp +++ b/nano/core_test/websocket.cpp @@ -1,6 +1,7 @@ #include #include #include +#include #include #include #include diff --git a/nano/node/message_processor.cpp b/nano/node/message_processor.cpp index 4e82a23ee..f48542c30 100644 --- a/nano/node/message_processor.cpp +++ b/nano/node/message_processor.cpp @@ -2,6 +2,7 @@ #include #include #include +#include nano::message_processor::message_processor (message_processor_config const & config_a, nano::node & node_a) : config{ config_a }, diff --git a/nano/node/node.cpp b/nano/node/node.cpp index 89cd4f321..3bcaa939f 100644 --- a/nano/node/node.cpp +++ b/nano/node/node.cpp @@ -155,7 +155,8 @@ nano::node::node (std::shared_ptr io_ctx_a, std::filesy // otherwise, any value is considered, with `0` having the special meaning of 'let the OS pick a port instead' // network (*this, config.peering_port.has_value () ? *config.peering_port : 0), - telemetry{ flags, *this, network, observers, network_params, stats }, + telemetry_impl{ std::make_unique (flags, *this, network, observers, network_params, stats) }, + telemetry{ *telemetry_impl }, bootstrap_initiator (*this), bootstrap_server{ config.bootstrap_server, store, ledger, network_params.network, stats }, // BEWARE: `bootstrap` takes `network.port` instead of `config.peering_port` because when the user doesn't specify diff --git a/nano/node/node.hpp b/nano/node/node.hpp index 4cfb7db7d..d51137d5c 100644 --- a/nano/node/node.hpp +++ b/nano/node/node.hpp @@ -20,7 +20,6 @@ #include #include #include -#include #include #include #include @@ -45,6 +44,7 @@ class confirming_set; class message_processor; class monitor; class node; +class telemetry; class vote_processor; class vote_cache_processor; class vote_router; @@ -171,7 +171,8 @@ public: std::unique_ptr message_processor_impl; nano::message_processor & message_processor; nano::network network; - nano::telemetry telemetry; + std::unique_ptr telemetry_impl; + nano::telemetry & telemetry; nano::bootstrap_initiator bootstrap_initiator; nano::bootstrap_server bootstrap_server; std::unique_ptr tcp_listener_impl; diff --git a/nano/rpc_test/rpc.cpp b/nano/rpc_test/rpc.cpp index 1f3747375..daecb52a9 100644 --- a/nano/rpc_test/rpc.cpp +++ b/nano/rpc_test/rpc.cpp @@ -13,6 +13,7 @@ #include #include #include +#include #include #include #include diff --git a/nano/slow_test/node.cpp b/nano/slow_test/node.cpp index 9efbd3b4b..09c2f22fb 100644 --- a/nano/slow_test/node.cpp +++ b/nano/slow_test/node.cpp @@ -9,6 +9,7 @@ #include #include #include +#include #include #include #include