Reduce messages.hpp includes with explicit dependencies

pwojcikdev · pwojcikdev · commit 1819528dc637 · 2026-04-10T15:52:33.000+02:00
diff --git a/nano/core_test/bootstrap_server.cpp b/nano/core_test/bootstrap_server.cpp
@@ -1,4 +1,5 @@
 #include <nano/lib/blocks.hpp>
+#include <nano/messages/asc_pull.hpp>
 #include <nano/node/bootstrap/bootstrap_server.hpp>
 #include <nano/node/transport/fake.hpp>
 #include <nano/test_common/chains.hpp>
diff --git a/nano/core_test/message.cpp b/nano/core_test/message.cpp
@@ -3,6 +3,7 @@
 #include <nano/lib/blocks.hpp>
 #include <nano/lib/stream.hpp>
 #include <nano/lib/vote.hpp>
+#include <nano/messages/messages.hpp>
 #include <nano/node/endpoint.hpp>
 #include <nano/node/network.hpp>
 #include <nano/secure/network_params.hpp>
diff --git a/nano/core_test/message_deserializer.cpp b/nano/core_test/message_deserializer.cpp
@@ -2,6 +2,7 @@
 #include <nano/lib/blocks.hpp>
 #include <nano/lib/numbers_templ.hpp>
 #include <nano/lib/vote.hpp>
+#include <nano/messages/messages.hpp>
 #include <nano/node/transport/message_deserializer.hpp>
 #include <nano/test_common/random.hpp>
 #include <nano/test_common/system.hpp>
diff --git a/nano/core_test/network.cpp b/nano/core_test/network.cpp
@@ -2,6 +2,7 @@
 #include <nano/lib/blocks.hpp>
 #include <nano/lib/files.hpp>
 #include <nano/lib/logging.hpp>
+#include <nano/messages/messages.hpp>
 #include <nano/node/block_processor.hpp>
 #include <nano/node/bootstrap/bootstrap_service.hpp>
 #include <nano/node/election.hpp>
diff --git a/nano/core_test/node.cpp b/nano/core_test/node.cpp
@@ -4,6 +4,7 @@
 #include <nano/lib/files.hpp>
 #include <nano/lib/vote.hpp>
 #include <nano/lib/work_version.hpp>
+#include <nano/messages/messages.hpp>
 #include <nano/node/active_elections.hpp>
 #include <nano/node/backlog_scan.hpp>
 #include <nano/node/block_processor.hpp>
diff --git a/nano/core_test/peer_container.cpp b/nano/core_test/peer_container.cpp
@@ -1,3 +1,4 @@
+#include <nano/messages/keepalive.hpp>
 #include <nano/node/network.hpp>
 #include <nano/node/nodeconfig.hpp>
 #include <nano/node/transport/tcp_server.hpp>
diff --git a/nano/core_test/rep_crawler.cpp b/nano/core_test/rep_crawler.cpp
@@ -4,6 +4,7 @@
 #include <nano/lib/files.hpp>
 #include <nano/lib/logging.hpp>
 #include <nano/lib/vote.hpp>
+#include <nano/messages/confirm.hpp>
 #include <nano/node/active_elections.hpp>
 #include <nano/node/network.hpp>
 #include <nano/node/nodeconfig.hpp>
diff --git a/nano/core_test/system.cpp b/nano/core_test/system.cpp
@@ -2,6 +2,7 @@
 #include <nano/lib/blocks.hpp>
 #include <nano/lib/thread_runner.hpp>
 #include <nano/lib/work_version.hpp>
+#include <nano/messages/keepalive.hpp>
 #include <nano/node/nodeconfig.hpp>
 #include <nano/node/transport/inproc.hpp>
 #include <nano/node/wallet.hpp>
diff --git a/nano/core_test/tcp_listener.cpp b/nano/core_test/tcp_listener.cpp
@@ -1,6 +1,9 @@
 #include <nano/boost/asio/ip/address_v6.hpp>
 #include <nano/boost/asio/ip/network_v6.hpp>
 #include <nano/lib/thread_runner.hpp>
+#include <nano/messages/keepalive.hpp>
+#include <nano/messages/message_type.hpp>
+#include <nano/messages/node_id_handshake.hpp>
 #include <nano/node/network.hpp>
 #include <nano/node/nodeconfig.hpp>
 #include <nano/node/transport/tcp_listener.hpp>
diff --git a/nano/core_test/tcp_server.cpp b/nano/core_test/tcp_server.cpp
@@ -1,6 +1,8 @@
 #include <nano/crypto_lib/random_pool.hpp>
 #include <nano/lib/blocks.hpp>
 #include <nano/lib/node_capabilities.hpp>
+#include <nano/messages/message_visitor.hpp>
+#include <nano/messages/node_id_handshake.hpp>
 #include <nano/node/network.hpp>
 #include <nano/node/node.hpp>
 #include <nano/node/nodeconfig.hpp>
diff --git a/nano/core_test/telemetry.cpp b/nano/core_test/telemetry.cpp
@@ -1,4 +1,5 @@
 #include <nano/lib/stream.hpp>
+#include <nano/messages/telemetry.hpp>
 #include <nano/node/network.hpp>
 #include <nano/node/nodeconfig.hpp>
 #include <nano/node/telemetry.hpp>
diff --git a/nano/core_test/websocket.cpp b/nano/core_test/websocket.cpp
@@ -3,6 +3,7 @@
 #include <nano/lib/blocks.hpp>
 #include <nano/lib/jsonconfig.hpp>
 #include <nano/lib/work_version.hpp>
+#include <nano/messages/messages.hpp>
 #include <nano/node/active_elections.hpp>
 #include <nano/node/network.hpp>
 #include <nano/node/nodeconfig.hpp>
diff --git a/nano/fuzzer_test/fuzz_buffer.cpp b/nano/fuzzer_test/fuzz_buffer.cpp
@@ -1,3 +1,4 @@
+#include <nano/messages/messages.hpp>
 #include <nano/node/common.hpp>
 #include <nano/node/testing.hpp>
 
diff --git a/nano/node/bootstrap/bootstrap_server.cpp b/nano/node/bootstrap/bootstrap_server.cpp
@@ -1,6 +1,7 @@
 #include <nano/lib/blocks.hpp>
 #include <nano/lib/thread_roles.hpp>
 #include <nano/lib/utility.hpp>
+#include <nano/messages/asc_pull.hpp>
 #include <nano/node/bootstrap/bootstrap_server.hpp>
 #include <nano/node/transport/channel.hpp>
 #include <nano/node/transport/transport.hpp>
diff --git a/nano/node/bootstrap/bootstrap_server.hpp b/nano/node/bootstrap/bootstrap_server.hpp
@@ -3,7 +3,7 @@
 #include <nano/lib/locks.hpp>
 #include <nano/lib/observer_set.hpp>
 #include <nano/lib/rate_limiting.hpp>
-#include <nano/messages/messages.hpp>
+#include <nano/messages/asc_pull.hpp>
 #include <nano/node/fair_queue_traits.hpp>
 #include <nano/node/fwd.hpp>
 
diff --git a/nano/node/bootstrap/bootstrap_service.cpp b/nano/node/bootstrap/bootstrap_service.cpp
@@ -1,3 +1,4 @@
+#include <nano/messages/asc_pull.hpp>
 #include <nano/node/bootstrap/bootstrap_context.hpp>
 #include <nano/node/bootstrap/bootstrap_service.hpp>
 
diff --git a/nano/node/bootstrap/dependency_strategy.cpp b/nano/node/bootstrap/dependency_strategy.cpp
@@ -1,6 +1,7 @@
 #include <nano/lib/logging.hpp>
 #include <nano/lib/stats_enums.hpp>
 #include <nano/lib/thread_roles.hpp>
+#include <nano/messages/asc_pull.hpp>
 #include <nano/node/bootstrap/dependency_strategy.hpp>
 #include <nano/node/nodeconfig.hpp>
 #include <nano/node/transport/formatting.hpp>
diff --git a/nano/node/bootstrap/frontier_strategy.cpp b/nano/node/bootstrap/frontier_strategy.cpp
@@ -1,6 +1,7 @@
 #include <nano/lib/logging.hpp>
 #include <nano/lib/stats_enums.hpp>
 #include <nano/lib/thread_roles.hpp>
+#include <nano/messages/asc_pull.hpp>
 #include <nano/node/bootstrap/frontier_strategy.hpp>
 #include <nano/node/network.hpp>
 #include <nano/node/nodeconfig.hpp>
diff --git a/nano/node/confirmation_solicitor.cpp b/nano/node/confirmation_solicitor.cpp
@@ -1,4 +1,6 @@
 #include <nano/lib/blocks.hpp>
+#include <nano/messages/confirm.hpp>
+#include <nano/messages/publish.hpp>
 #include <nano/node/confirmation_solicitor.hpp>
 #include <nano/node/election.hpp>
 #include <nano/node/nodeconfig.hpp>
diff --git a/nano/node/message_processor.cpp b/nano/node/message_processor.cpp
@@ -2,6 +2,7 @@
 #include <nano/lib/stats.hpp>
 #include <nano/lib/thread_roles.hpp>
 #include <nano/lib/vote.hpp>
+#include <nano/messages/messages.hpp>
 #include <nano/node/block_processor.hpp>
 #include <nano/node/bootstrap/bootstrap_server.hpp>
 #include <nano/node/bootstrap/bootstrap_service.hpp>
diff --git a/nano/node/network.cpp b/nano/node/network.cpp
@@ -5,6 +5,7 @@
 #include <nano/lib/thread_pool.hpp>
 #include <nano/lib/threading.hpp>
 #include <nano/lib/utility.hpp>
+#include <nano/messages/messages.hpp>
 #include <nano/node/message_processor.hpp>
 #include <nano/node/network.hpp>
 #include <nano/node/node.hpp>
diff --git a/nano/node/network.hpp b/nano/node/network.hpp
@@ -4,7 +4,8 @@
 #include <nano/lib/fwd.hpp>
 #include <nano/lib/interval.hpp>
 #include <nano/lib/network_filter.hpp>
-#include <nano/messages/messages.hpp>
+#include <nano/messages/fwd.hpp>
+#include <nano/messages/node_id_handshake.hpp>
 #include <nano/node/endpoint.hpp>
 #include <nano/node/peer_exclusion.hpp>
 #include <nano/node/transport/common.hpp>
diff --git a/nano/node/node_observers.hpp b/nano/node/node_observers.hpp
@@ -2,6 +2,7 @@
 
 #include <nano/lib/numbers.hpp>
 #include <nano/lib/utility.hpp>
+#include <nano/messages/fwd.hpp>
 #include <nano/node/fwd.hpp>
 #include <nano/node/transport/transport.hpp>
 #include <nano/node/vote_with_weight_info.hpp>
diff --git a/nano/node/repcrawler.cpp b/nano/node/repcrawler.cpp
@@ -2,6 +2,7 @@
 #include <nano/lib/formatting.hpp>
 #include <nano/lib/logging.hpp>
 #include <nano/lib/vote.hpp>
+#include <nano/messages/confirm.hpp>
 #include <nano/node/active_elections.hpp>
 #include <nano/node/network.hpp>
 #include <nano/node/node.hpp>
diff --git a/nano/node/telemetry.cpp b/nano/node/telemetry.cpp
@@ -2,6 +2,7 @@
 #include <nano/lib/stats.hpp>
 #include <nano/lib/thread_roles.hpp>
 #include <nano/lib/threading.hpp>
+#include <nano/messages/telemetry.hpp>
 #include <nano/node/network.hpp>
 #include <nano/node/node.hpp>
 #include <nano/node/node_observers.hpp>
diff --git a/nano/node/telemetry.hpp b/nano/node/telemetry.hpp
@@ -3,7 +3,7 @@
 #include <nano/lib/numbers.hpp>
 #include <nano/lib/numbers_templ.hpp>
 #include <nano/lib/utility.hpp>
-#include <nano/messages/messages.hpp>
+#include <nano/messages/telemetry.hpp>
 #include <nano/node/endpoint.hpp>
 #include <nano/node/endpoint_templ.hpp>
 #include <nano/node/fwd.hpp>
diff --git a/nano/node/transport/channel.cpp b/nano/node/transport/channel.cpp
@@ -1,4 +1,5 @@
 #include <nano/lib/object_stream.hpp>
+#include <nano/messages/messages.hpp>
 #include <nano/node/endpoint.hpp>
 #include <nano/node/node.hpp>
 #include <nano/node/transport/channel.hpp>
diff --git a/nano/node/transport/channel.hpp b/nano/node/transport/channel.hpp
@@ -4,7 +4,8 @@
 #include <nano/lib/locks.hpp>
 #include <nano/lib/node_capabilities.hpp>
 #include <nano/lib/stats.hpp>
-#include <nano/messages/messages.hpp>
+#include <nano/messages/fwd.hpp>
+#include <nano/messages/keepalive.hpp>
 #include <nano/node/bandwidth_limiter.hpp>
 #include <nano/node/endpoint.hpp>
 #include <nano/node/transport/tcp_socket.hpp>
diff --git a/nano/node/transport/tcp_channels.cpp b/nano/node/transport/tcp_channels.cpp
@@ -1,6 +1,7 @@
 #include <nano/lib/formatting.hpp>
 #include <nano/lib/logging.hpp>
 #include <nano/lib/network_formatting.hpp>
+#include <nano/messages/keepalive.hpp>
 #include <nano/node/network.hpp>
 #include <nano/node/node.hpp>
 #include <nano/node/node_observers.hpp>
diff --git a/nano/node/transport/transport.hpp b/nano/node/transport/transport.hpp
@@ -2,7 +2,6 @@
 
 #include <nano/lib/locks.hpp>
 #include <nano/lib/stats.hpp>
-#include <nano/messages/messages.hpp>
 #include <nano/node/bandwidth_limiter.hpp>
 #include <nano/node/endpoint.hpp>
 #include <nano/node/transport/tcp_socket.hpp>
diff --git a/nano/node/websocket.cpp b/nano/node/websocket.cpp
@@ -7,6 +7,7 @@
 #include <nano/lib/logging.hpp>
 #include <nano/lib/vote.hpp>
 #include <nano/lib/work.hpp>
+#include <nano/messages/telemetry.hpp>
 #include <nano/node/election_status.hpp>
 #include <nano/node/node.hpp>
 #include <nano/node/node_observers.hpp>
diff --git a/nano/test_common/telemetry.cpp b/nano/test_common/telemetry.cpp
@@ -1,5 +1,5 @@
 #include <nano/lib/version.hpp>
-#include <nano/messages/messages.hpp>
+#include <nano/messages/telemetry.hpp>
 #include <nano/node/endpoint.hpp>
 #include <nano/node/node.hpp>
 #include <nano/test_common/telemetry.hpp>

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`#include <nano/lib/blocks.hpp>`
	`2`	`+#include <nano/messages/asc_pull.hpp>`
`2`	`3`	`#include <nano/node/bootstrap/bootstrap_server.hpp>`
`3`	`4`	`#include <nano/node/transport/fake.hpp>`
`4`	`5`	`#include <nano/test_common/chains.hpp>`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+#include <nano/messages/keepalive.hpp>`
`1`	`2`	`#include <nano/node/network.hpp>`
`2`	`3`	`#include <nano/node/nodeconfig.hpp>`
`3`	`4`	`#include <nano/node/transport/tcp_server.hpp>`