From cad65ee4366991a9a9c1335af2c28e345b3a893d Mon Sep 17 00:00:00 2001 From: clemahieu Date: Sun, 8 Aug 2021 15:48:12 +0100 Subject: [PATCH] Pulling nano::network_constants reference through ipc_config_tcp_socket rather than instantiating it statically. --- nano/node/ipc/ipc_config.hpp | 11 ++++++++--- nano/node/nodeconfig.cpp | 1 + 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/nano/node/ipc/ipc_config.hpp b/nano/node/ipc/ipc_config.hpp index ad7d4b4e..e8a8d6da 100644 --- a/nano/node/ipc/ipc_config.hpp +++ b/nano/node/ipc/ipc_config.hpp @@ -52,11 +52,12 @@ namespace ipc class ipc_config_tcp_socket : public ipc_config_transport { public: - ipc_config_tcp_socket () : - port (network_constants.default_ipc_port) + ipc_config_tcp_socket (nano::network_constants & network_constants) : + network_constants{ network_constants }, + port{ network_constants.default_ipc_port } { } - nano::network_constants network_constants; + nano::network_constants & network_constants; /** Listening port */ uint16_t port; }; @@ -65,6 +66,10 @@ namespace ipc class ipc_config { public: + ipc_config (nano::network_constants & network_constants) : + transport_tcp{ network_constants } + { + } nano::error deserialize_json (bool & upgraded_a, nano::jsonconfig & json_a); nano::error serialize_json (nano::jsonconfig & json) const; nano::error deserialize_toml (nano::tomlconfig & toml_a); diff --git a/nano/node/nodeconfig.cpp b/nano/node/nodeconfig.cpp index 26c78b0e..e5a3fc4b 100644 --- a/nano/node/nodeconfig.cpp +++ b/nano/node/nodeconfig.cpp @@ -30,6 +30,7 @@ nano::node_config::node_config (uint16_t peering_port_a, nano::logging const & l peering_port{ peering_port_a }, logging{ logging_a }, websocket_config{ network_params.network }, + ipc_config{ network_params.network }, external_address{ boost::asio::ip::address_v6{}.to_string () } { // The default constructor passes 0 to indicate we should use the default port,