From f6e47aa4e2da811787dcfbdc150358547853b1bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20Wo=CC=81jcik?=
 <3044353+pwojcikdev@users.noreply.github.com>
Date: Mon, 23 Sep 2024 16:49:23 +0200
Subject: [PATCH] Move `network_filter` to lib folder

---
 nano/core_test/network_filter.cpp            | 2 +-
 nano/lib/CMakeLists.txt                      | 2 ++
 nano/{secure => lib}/network_filter.cpp      | 2 +-
 nano/{secure => lib}/network_filter.hpp      | 0
 nano/node/common.hpp                         | 2 +-
 nano/node/network.hpp                        | 2 +-
 nano/node/transport/message_deserializer.hpp | 4 +++-
 nano/secure/CMakeLists.txt                   | 2 --
 8 files changed, 9 insertions(+), 7 deletions(-)
 rename nano/{secure => lib}/network_filter.cpp (98%)
 rename nano/{secure => lib}/network_filter.hpp (100%)

diff --git a/nano/core_test/network_filter.cpp b/nano/core_test/network_filter.cpp
index a886ae956..b23345374 100644
--- a/nano/core_test/network_filter.cpp
+++ b/nano/core_test/network_filter.cpp
@@ -1,8 +1,8 @@
 #include <nano/lib/blocks.hpp>
+#include <nano/lib/network_filter.hpp>
 #include <nano/lib/stream.hpp>
 #include <nano/node/common.hpp>
 #include <nano/secure/common.hpp>
-#include <nano/secure/network_filter.hpp>
 #include <nano/test_common/testutil.hpp>
 
 #include <gtest/gtest.h>
diff --git a/nano/lib/CMakeLists.txt b/nano/lib/CMakeLists.txt
index 144e1adfd..25f6d0add 100644
--- a/nano/lib/CMakeLists.txt
+++ b/nano/lib/CMakeLists.txt
@@ -63,6 +63,8 @@ add_library(
   logging_enums.cpp
   memory.hpp
   memory.cpp
+  network_filter.hpp
+  network_filter.cpp
   numbers.hpp
   numbers.cpp
   object_stream.hpp
diff --git a/nano/secure/network_filter.cpp b/nano/lib/network_filter.cpp
similarity index 98%
rename from nano/secure/network_filter.cpp
rename to nano/lib/network_filter.cpp
index c60a11174..f89bff5d3 100644
--- a/nano/secure/network_filter.cpp
+++ b/nano/lib/network_filter.cpp
@@ -1,9 +1,9 @@
 #include <nano/crypto_lib/random_pool.hpp>
 #include <nano/lib/blocks.hpp>
 #include <nano/lib/locks.hpp>
+#include <nano/lib/network_filter.hpp>
 #include <nano/lib/stream.hpp>
 #include <nano/secure/common.hpp>
-#include <nano/secure/network_filter.hpp>
 
 nano::network_filter::network_filter (size_t size_a) :
 	items (size_a, nano::uint128_t{ 0 })
diff --git a/nano/secure/network_filter.hpp b/nano/lib/network_filter.hpp
similarity index 100%
rename from nano/secure/network_filter.hpp
rename to nano/lib/network_filter.hpp
diff --git a/nano/node/common.hpp b/nano/node/common.hpp
index 54c337ba1..5dd98516d 100644
--- a/nano/node/common.hpp
+++ b/nano/node/common.hpp
@@ -3,8 +3,8 @@
 #include <nano/boost/asio/ip/tcp.hpp>
 #include <nano/lib/jsonconfig.hpp>
 #include <nano/lib/memory.hpp>
+#include <nano/lib/network_filter.hpp>
 #include <nano/secure/common.hpp>
-#include <nano/secure/network_filter.hpp>
 
 #include <bitset>
 #include <optional>
diff --git a/nano/node/network.hpp b/nano/node/network.hpp
index 31ebeee2b..54f24e7c7 100644
--- a/nano/node/network.hpp
+++ b/nano/node/network.hpp
@@ -1,13 +1,13 @@
 #pragma once
 
 #include <nano/lib/logging.hpp>
+#include <nano/lib/network_filter.hpp>
 #include <nano/node/common.hpp>
 #include <nano/node/messages.hpp>
 #include <nano/node/peer_exclusion.hpp>
 #include <nano/node/transport/common.hpp>
 #include <nano/node/transport/fwd.hpp>
 #include <nano/node/transport/tcp_channels.hpp>
-#include <nano/secure/network_filter.hpp>
 
 #include <deque>
 #include <memory>
diff --git a/nano/node/transport/message_deserializer.hpp b/nano/node/transport/message_deserializer.hpp
index c5ac4346b..c6eabf705 100644
--- a/nano/node/transport/message_deserializer.hpp
+++ b/nano/node/transport/message_deserializer.hpp
@@ -1,5 +1,6 @@
 #pragma once
 
+#include <nano/lib/network_filter.hpp>
 #include <nano/node/common.hpp>
 #include <nano/node/messages.hpp>
 
@@ -43,7 +44,8 @@ namespace transport
 		parse_status status;
 
 		using read_query = std::function<void (std::shared_ptr<std::vector<uint8_t>> const &, size_t, std::function<void (boost::system::error_code const &, std::size_t)>)>;
-		message_deserializer (network_constants const &, network_filter &, block_uniquer &, vote_uniquer &, read_query read_op);
+
+		message_deserializer (nano::network_constants const &, nano::network_filter &, nano::block_uniquer &, nano::vote_uniquer &, read_query read_op);
 
 		/*
 		 * Asynchronously read next message from the channel_read_fn.
diff --git a/nano/secure/CMakeLists.txt b/nano/secure/CMakeLists.txt
index 7b97291e9..f11d6e85d 100644
--- a/nano/secure/CMakeLists.txt
+++ b/nano/secure/CMakeLists.txt
@@ -56,8 +56,6 @@ add_library(
   ledger_set_any.cpp
   ledger_set_confirmed.hpp
   ledger_set_confirmed.cpp
-  network_filter.hpp
-  network_filter.cpp
   pending_info.hpp
   pending_info.cpp
   receivable_iterator.cpp