From 420d8d5359c0b06a87aa17c08e6f73b8d61842d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20Wo=CC=81jcik?=
 <3044353+pwojcikdev@users.noreply.github.com>
Date: Wed, 30 Oct 2024 20:18:06 +0100
Subject: [PATCH] Modify `socket_connected` event

---
 nano/core_test/network.cpp           |  8 ++++----
 nano/node/node_observers.hpp         |  2 +-
 nano/node/transport/tcp_listener.cpp |  2 +-
 nano/node/transport/tcp_listener.hpp | 10 +++++-----
 nano/node/transport/tcp_socket.cpp   |  1 -
 5 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/nano/core_test/network.cpp b/nano/core_test/network.cpp
index bedc3aaf..b626bb65 100644
--- a/nano/core_test/network.cpp
+++ b/nano/core_test/network.cpp
@@ -1068,8 +1068,8 @@ TEST (network, purge_dead_channel)
 
 	auto & node1 = *system.add_node (flags);
 
-	node1.observers.socket_connected.add ([&] (nano::transport::tcp_socket & sock) {
-		system.logger.debug (nano::log::type::test, "Connected: {}", sock);
+	node1.observers.socket_connected.add ([&] (auto const & socket) {
+		system.logger.debug (nano::log::type::test, "Connected socket: {}", nano::streamed (socket));
 	});
 
 	auto & node2 = *system.add_node (flags);
@@ -1119,8 +1119,8 @@ TEST (network, purge_dead_channel_remote)
 	auto & node1 = *system.add_node (flags);
 	auto & node2 = *system.add_node (flags);
 
-	node2.observers.socket_connected.add ([&] (nano::transport::tcp_socket & sock) {
-		system.logger.debug (nano::log::type::test, "Connected: {}", sock);
+	node2.observers.socket_connected.add ([&] (auto const & socket) {
+		system.logger.debug (nano::log::type::test, "Connected socket: {}", nano::streamed (socket));
 	});
 
 	ASSERT_EQ (node1.network.size (), 1);
diff --git a/nano/node/node_observers.hpp b/nano/node/node_observers.hpp
index dd5b2d79..df43bbc2 100644
--- a/nano/node/node_observers.hpp
+++ b/nano/node/node_observers.hpp
@@ -32,7 +32,7 @@ public:
 	nano::observer_set<> disconnect;
 	nano::observer_set<nano::root const &> work_cancel;
 	nano::observer_set<nano::telemetry_data const &, std::shared_ptr<nano::transport::channel> const &> telemetry;
-	nano::observer_set<nano::transport::tcp_socket &> socket_connected;
+	nano::observer_set<std::shared_ptr<nano::transport::tcp_socket>> socket_connected;
 	nano::observer_set<std::shared_ptr<nano::transport::channel>> channel_connected;
 
 	nano::container_info container_info () const;
diff --git a/nano/node/transport/tcp_listener.cpp b/nano/node/transport/tcp_listener.cpp
index bf973048..0c905bfe 100644
--- a/nano/node/transport/tcp_listener.cpp
+++ b/nano/node/transport/tcp_listener.cpp
@@ -27,7 +27,7 @@ nano::transport::tcp_listener::tcp_listener (uint16_t port_a, tcp_config const &
 	task{ strand }
 {
 	connection_accepted.add ([this] (auto const & socket, auto const & server) {
-		node.observers.socket_connected.notify (*socket);
+		node.observers.socket_connected.notify (socket);
 	});
 }
 
diff --git a/nano/node/transport/tcp_listener.hpp b/nano/node/transport/tcp_listener.hpp
index dd9a279e..694e1bb5 100644
--- a/nano/node/transport/tcp_listener.hpp
+++ b/nano/node/transport/tcp_listener.hpp
@@ -80,13 +80,13 @@ public:
 	size_t realtime_count () const;
 	size_t bootstrap_count () const;
 
-	std::vector<std::shared_ptr<nano::transport::tcp_socket>> sockets () const;
-	std::vector<std::shared_ptr<nano::transport::tcp_server>> servers () const;
+	std::vector<std::shared_ptr<tcp_socket>> sockets () const;
+	std::vector<std::shared_ptr<tcp_server>> servers () const;
 
 	nano::container_info container_info () const;
 
 public: // Events
-	using connection_accepted_event_t = nano::observer_set<std::shared_ptr<nano::transport::tcp_socket>, std::shared_ptr<nano::transport::tcp_server>>;
+	using connection_accepted_event_t = nano::observer_set<std::shared_ptr<tcp_socket>, std::shared_ptr<tcp_server>>;
 	connection_accepted_event_t connection_accepted;
 
 private: // Dependencies
@@ -135,8 +135,8 @@ private:
 	{
 		connection_type type;
 		asio::ip::tcp::endpoint endpoint;
-		std::weak_ptr<nano::transport::tcp_socket> socket;
-		std::weak_ptr<nano::transport::tcp_server> server;
+		std::weak_ptr<tcp_socket> socket;
+		std::weak_ptr<tcp_server> server;
 
 		asio::ip::address address () const
 		{
diff --git a/nano/node/transport/tcp_socket.cpp b/nano/node/transport/tcp_socket.cpp
index af8a9ed4..0e8e8bf7 100644
--- a/nano/node/transport/tcp_socket.cpp
+++ b/nano/node/transport/tcp_socket.cpp
@@ -85,7 +85,6 @@ void nano::transport::tcp_socket::async_connect (nano::tcp_endpoint const & endp
 					boost::system::error_code ec;
 					this_l->local = this_l->raw_socket.local_endpoint (ec);
 				}
-				node_l->observers.socket_connected.notify (*this_l);
 			}
 			callback (ec);
 		}));