From 5bb0ac41b528b4759cc56404b9f21cddb379f9a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20Wo=CC=81jcik?=
 <3044353+pwojcikdev@users.noreply.github.com>
Date: Thu, 21 Nov 2024 13:02:22 +0100
Subject: [PATCH] Renaming

# Conflicts:
#	nano/core_test/socket.cpp
---
 nano/core_test/network.cpp           | 4 ++--
 nano/core_test/tcp_listener.cpp      | 8 ++++----
 nano/node/transport/tcp_listener.cpp | 4 ++--
 nano/node/transport/tcp_listener.hpp | 4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/nano/core_test/network.cpp b/nano/core_test/network.cpp
index 7c5dc568..2307207b 100644
--- a/nano/core_test/network.cpp
+++ b/nano/core_test/network.cpp
@@ -1083,7 +1083,7 @@ TEST (network, purge_dead_channel)
 	auto channel = channels.front ();
 	ASSERT_TRUE (channel);
 
-	auto sockets = node1.tcp_listener.sockets ();
+	auto sockets = node1.tcp_listener.all_sockets ();
 	ASSERT_EQ (sockets.size (), 1);
 	auto socket = sockets.front ();
 	ASSERT_TRUE (socket);
@@ -1133,7 +1133,7 @@ TEST (network, purge_dead_channel_remote)
 	auto channel = channels.front ();
 	ASSERT_TRUE (channel);
 
-	auto sockets = node1.tcp_listener.sockets ();
+	auto sockets = node1.tcp_listener.all_sockets ();
 	ASSERT_EQ (sockets.size (), 1);
 	auto socket = sockets.front ();
 	ASSERT_TRUE (socket);
diff --git a/nano/core_test/tcp_listener.cpp b/nano/core_test/tcp_listener.cpp
index 787066f6..dc2d4e92 100644
--- a/nano/core_test/tcp_listener.cpp
+++ b/nano/core_test/tcp_listener.cpp
@@ -48,11 +48,11 @@ TEST (tcp_listener, max_connections)
 
 	// create space for one socket and fill the connections table again
 	{
-		auto sockets1 = node->tcp_listener.sockets ();
+		auto sockets1 = node->tcp_listener.all_sockets ();
 		ASSERT_EQ (sockets1.size (), 2);
 		sockets1[0]->close ();
 	}
-	ASSERT_TIMELY_EQ (10s, node->tcp_listener.sockets ().size (), 1);
+	ASSERT_TIMELY_EQ (10s, node->tcp_listener.all_sockets ().size (), 1);
 
 	auto client4 = std::make_shared<nano::transport::tcp_socket> (*node);
 	client4->async_connect (node->network.endpoint (), connect_handler);
@@ -66,12 +66,12 @@ TEST (tcp_listener, max_connections)
 
 	// close all existing sockets and fill the connections table again
 	{
-		auto sockets2 = node->tcp_listener.sockets ();
+		auto sockets2 = node->tcp_listener.all_sockets ();
 		ASSERT_EQ (sockets2.size (), 2);
 		sockets2[0]->close ();
 		sockets2[1]->close ();
 	}
-	ASSERT_TIMELY_EQ (10s, node->tcp_listener.sockets ().size (), 0);
+	ASSERT_TIMELY_EQ (10s, node->tcp_listener.all_sockets ().size (), 0);
 
 	auto client6 = std::make_shared<nano::transport::tcp_socket> (*node);
 	client6->async_connect (node->network.endpoint (), connect_handler);
diff --git a/nano/node/transport/tcp_listener.cpp b/nano/node/transport/tcp_listener.cpp
index 19ef706d..6e2baa65 100644
--- a/nano/node/transport/tcp_listener.cpp
+++ b/nano/node/transport/tcp_listener.cpp
@@ -585,7 +585,7 @@ asio::ip::tcp::endpoint nano::transport::tcp_listener::endpoint () const
 	return { asio::ip::address_v6::loopback (), local.port () };
 }
 
-auto nano::transport::tcp_listener::sockets () const -> std::vector<std::shared_ptr<tcp_socket>>
+auto nano::transport::tcp_listener::all_sockets () const -> std::deque<std::shared_ptr<tcp_socket>>
 {
 	nano::lock_guard<nano::mutex> lock{ mutex };
 	auto r = connections
@@ -594,7 +594,7 @@ auto nano::transport::tcp_listener::sockets () const -> std::vector<std::shared_
 	return { r.begin (), r.end () };
 }
 
-auto nano::transport::tcp_listener::servers () const -> std::vector<std::shared_ptr<tcp_server>>
+auto nano::transport::tcp_listener::all_servers () const -> std::deque<std::shared_ptr<tcp_server>>
 {
 	nano::lock_guard<nano::mutex> lock{ mutex };
 	auto r = connections
diff --git a/nano/node/transport/tcp_listener.hpp b/nano/node/transport/tcp_listener.hpp
index ee485b5e..4a835c45 100644
--- a/nano/node/transport/tcp_listener.hpp
+++ b/nano/node/transport/tcp_listener.hpp
@@ -71,8 +71,8 @@ public:
 	size_t realtime_count () const;
 	size_t bootstrap_count () const;
 
-	std::vector<std::shared_ptr<tcp_socket>> sockets () const;
-	std::vector<std::shared_ptr<tcp_server>> servers () const;
+	std::deque<std::shared_ptr<tcp_socket>> all_sockets () const;
+	std::deque<std::shared_ptr<tcp_server>> all_servers () const;
 
 	nano::container_info container_info () const;