From b123e90f05eff33e6b6d48010ce612b588732b34 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20Wo=CC=81jcik?=
 <3044353+pwojcikdev@users.noreply.github.com>
Date: Sat, 3 Aug 2024 13:45:38 +0200
Subject: [PATCH] Use unique ptr

---
 nano/core_test/node.cpp | 1 +
 nano/node/network.cpp   | 6 ++----
 nano/node/node.cpp      | 4 +++-
 nano/node/node.hpp      | 5 +++--
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/nano/core_test/node.cpp b/nano/core_test/node.cpp
index bc579fa10..34af749f6 100644
--- a/nano/core_test/node.cpp
+++ b/nano/core_test/node.cpp
@@ -7,6 +7,7 @@
 #include <nano/node/inactive_node.hpp>
 #include <nano/node/local_vote_history.hpp>
 #include <nano/node/make_store.hpp>
+#include <nano/node/portmapping.hpp>
 #include <nano/node/scheduler/component.hpp>
 #include <nano/node/scheduler/manual.hpp>
 #include <nano/node/scheduler/priority.hpp>
diff --git a/nano/node/network.cpp b/nano/node/network.cpp
index 92443870d..3d15149c3 100644
--- a/nano/node/network.cpp
+++ b/nano/node/network.cpp
@@ -1,16 +1,14 @@
-#include "message_processor.hpp"
-
 #include <nano/crypto_lib/random_pool_shuffle.hpp>
 #include <nano/lib/blocks.hpp>
 #include <nano/lib/threading.hpp>
 #include <nano/lib/utility.hpp>
 #include <nano/node/bootstrap_ascending/service.hpp>
+#include <nano/node/message_processor.hpp>
 #include <nano/node/network.hpp>
 #include <nano/node/node.hpp>
+#include <nano/node/portmapping.hpp>
 #include <nano/node/telemetry.hpp>
 
-#include <boost/format.hpp>
-
 using namespace std::chrono_literals;
 
 // TODO: Return to static const and remove "disable_large_votes" when rolled out
diff --git a/nano/node/node.cpp b/nano/node/node.cpp
index f296ae5cc..0561143ed 100644
--- a/nano/node/node.cpp
+++ b/nano/node/node.cpp
@@ -16,6 +16,7 @@
 #include <nano/node/monitor.hpp>
 #include <nano/node/node.hpp>
 #include <nano/node/peer_history.hpp>
+#include <nano/node/portmapping.hpp>
 #include <nano/node/request_aggregator.hpp>
 #include <nano/node/scheduler/component.hpp>
 #include <nano/node/scheduler/hinted.hpp>
@@ -187,7 +188,8 @@ nano::node::node (std::shared_ptr<boost::asio::io_context> io_ctx_a, std::filesy
 	tcp_listener_impl{ std::make_unique<nano::transport::tcp_listener> (network.port, config.tcp, *this) },
 	tcp_listener{ *tcp_listener_impl },
 	application_path (application_path_a),
-	port_mapping (*this),
+	port_mapping_impl{ std::make_unique<nano::port_mapping> (*this) },
+	port_mapping{ *port_mapping_impl },
 	block_processor (*this),
 	confirming_set_impl{ std::make_unique<nano::confirming_set> (config.confirming_set, ledger, stats) },
 	confirming_set{ *confirming_set_impl },
diff --git a/nano/node/node.hpp b/nano/node/node.hpp
index 020910bf1..c24ca6a29 100644
--- a/nano/node/node.hpp
+++ b/nano/node/node.hpp
@@ -19,7 +19,6 @@
 #include <nano/node/node_observers.hpp>
 #include <nano/node/nodeconfig.hpp>
 #include <nano/node/online_reps.hpp>
-#include <nano/node/portmapping.hpp>
 #include <nano/node/process_live_dispatcher.hpp>
 #include <nano/node/rep_tiers.hpp>
 #include <nano/node/repcrawler.hpp>
@@ -51,6 +50,7 @@ class vote_cache_processor;
 class vote_router;
 class work_pool;
 class peer_history;
+class port_mapping;
 class thread_runner;
 
 namespace scheduler
@@ -181,7 +181,8 @@ public:
 	nano::transport::tcp_listener & tcp_listener;
 	std::filesystem::path application_path;
 	nano::node_observers observers;
-	nano::port_mapping port_mapping;
+	std::unique_ptr<nano::port_mapping> port_mapping_impl;
+	nano::port_mapping & port_mapping;
 	nano::block_processor block_processor;
 	std::unique_ptr<nano::confirming_set> confirming_set_impl;
 	nano::confirming_set & confirming_set;