Move parse_status and auxiliary functions to more appropriate names…

…pace

nano/core_test/message_deserializer.cpp

@@ -51,7 +51,7 @@ auto message_deserializer_success_checker (message_type & message_original) -> v
 		ASSERT_EQ (*deserialized_bytes, *original_bytes);
 	});
 	// This is a sanity test, to ensure the successful deserialization case passes.
-	ASSERT_EQ (message_deserializer->status, nano::transport::message_deserializer::parse_status::success);
+	ASSERT_EQ (message_deserializer->status, nano::transport::parse_status::success);
 }
 
 TEST (message_deserializer, exact_confirm_ack)

nano/node/transport/message_deserializer.cpp

@@ -382,14 +382,14 @@ std::unique_ptr<nano::asc_pull_ack> nano::transport::message_deserializer::deser
 	return {};
 }
 
-nano::stat::detail nano::to_stat_detail (nano::transport::message_deserializer::parse_status status)
+nano::stat::detail nano::transport::to_stat_detail (nano::transport::parse_status status)
 {
 	auto value = magic_enum::enum_cast<nano::stat::detail> (magic_enum::enum_name (status));
 	debug_assert (value);
 	return value.value_or (nano::stat::detail{});
 }
 
-std::string_view nano::to_string (nano::transport::message_deserializer::parse_status status)
+std::string_view nano::transport::to_string (nano::transport::parse_status status)
 {
 	return magic_enum::enum_name (status);
 }

nano/node/transport/message_deserializer.hpp

@@ -10,34 +10,34 @@ namespace nano
 {
 namespace transport
 {
+	enum class parse_status
+	{
+		none,
+		success,
+		insufficient_work,
+		invalid_header,
+		invalid_message_type,
+		invalid_keepalive_message,
+		invalid_publish_message,
+		invalid_confirm_req_message,
+		invalid_confirm_ack_message,
+		invalid_node_id_handshake_message,
+		invalid_telemetry_req_message,
+		invalid_telemetry_ack_message,
+		invalid_bulk_pull_message,
+		invalid_bulk_pull_account_message,
+		invalid_frontier_req_message,
+		invalid_asc_pull_req_message,
+		invalid_asc_pull_ack_message,
+		invalid_network,
+		outdated_version,
+		duplicate_publish_message,
+		message_size_too_big,
+	};
+
 	class message_deserializer : public std::enable_shared_from_this<nano::transport::message_deserializer>
 	{
 	public:
-		enum class parse_status
-		{
-			none,
-			success,
-			insufficient_work,
-			invalid_header,
-			invalid_message_type,
-			invalid_keepalive_message,
-			invalid_publish_message,
-			invalid_confirm_req_message,
-			invalid_confirm_ack_message,
-			invalid_node_id_handshake_message,
-			invalid_telemetry_req_message,
-			invalid_telemetry_ack_message,
-			invalid_bulk_pull_message,
-			invalid_bulk_pull_account_message,
-			invalid_frontier_req_message,
-			invalid_asc_pull_req_message,
-			invalid_asc_pull_ack_message,
-			invalid_network,
-			outdated_version,
-			duplicate_publish_message,
-			message_size_too_big,
-		};
-
 		using callback_type = std::function<void (boost::system::error_code, std::unique_ptr<nano::message>)>;
 
 		parse_status status;
@@ -90,8 +90,8 @@ namespace transport
 		nano::vote_uniquer & vote_uniquer_m;
 		read_query read_op;
 	};
-}
 
-nano::stat::detail to_stat_detail (nano::transport::message_deserializer::parse_status);
-std::string_view to_string (nano::transport::message_deserializer::parse_status);
+	nano::stat::detail to_stat_detail (parse_status);
+	std::string_view to_string (parse_status);
+}
 }

nano/node/transport/tcp_server.cpp

@@ -372,10 +372,10 @@ void nano::transport::tcp_server::receive_message ()
 		if (ec)
 		{
 			// IO error or critical error when deserializing message
-			node->stats.inc (nano::stat::type::error, nano::to_stat_detail (this_l->message_deserializer->status));
+			node->stats.inc (nano::stat::type::error, to_stat_detail (this_l->message_deserializer->status));
 			node->logger.debug (nano::log::type::tcp_server, "Error reading message: {}, status: {} ({})",
 			ec.message (),
-			nano::to_string (this_l->message_deserializer->status),
+			to_string (this_l->message_deserializer->status),
 			nano::util::to_str (this_l->remote_endpoint));
 
 			this_l->stop ();
@@ -402,18 +402,18 @@ void nano::transport::tcp_server::received_message (std::unique_ptr<nano::messag
 	else
 	{
 		// Error while deserializing message
-		debug_assert (message_deserializer->status != transport::message_deserializer::parse_status::success);
+		debug_assert (message_deserializer->status != transport::parse_status::success);
 
-		node->stats.inc (nano::stat::type::error, nano::to_stat_detail (message_deserializer->status));
-		if (message_deserializer->status == transport::message_deserializer::parse_status::duplicate_publish_message)
+		node->stats.inc (nano::stat::type::error, to_stat_detail (message_deserializer->status));
+		if (message_deserializer->status == transport::parse_status::duplicate_publish_message)
 		{
 			node->stats.inc (nano::stat::type::filter, nano::stat::detail::duplicate_publish_message);
 		}
 		else
 		{
 			// Avoid too much noise about `duplicate_publish_message` errors
 			node->logger.debug (nano::log::type::tcp_server, "Error deserializing message: {} ({})",
-			nano::to_string (message_deserializer->status),
+			to_string (message_deserializer->status),
 			nano::util::to_str (remote_endpoint));
 		}
 	}