Merge pull request #840 from evoskuil/master

evoskuil · web-flow · commit b19e5acff736 · 2025-09-12T01:24:05.000-04:00
Adapt to network::messages namespace changes.
diff --git a/include/bitcoin/node/define.hpp b/include/bitcoin/node/define.hpp
@@ -90,7 +90,7 @@ typedef event_subscriber::handler event_notifier;
 typedef event_subscriber::completer event_completer;
 
 // Inventory messages.
-using type_id = network::messages::inventory_item::type_id;
+using type_id = network::messages::p2p::inventory_item::type_id;
 
 // NDEBUG MSVC
 ////static_assert(sizeof(uint64_t) == 8u);
diff --git a/include/bitcoin/node/protocols/protocol_block_in_106.hpp b/include/bitcoin/node/protocols/protocol_block_in_106.hpp
@@ -63,28 +63,28 @@ class BCN_API protocol_block_in_106
 
     /// Accept incoming inventory message.
     virtual bool handle_receive_inventory(const code& ec,
-        const network::messages::inventory::cptr& message) NOEXCEPT;
+        const network::messages::p2p::inventory::cptr& message) NOEXCEPT;
 
     /// Accept incoming block message.
     virtual bool handle_receive_block(const code& ec,
-        const network::messages::block::cptr& message) NOEXCEPT;
+        const network::messages::p2p::block::cptr& message) NOEXCEPT;
     virtual void handle_organize(const code& ec, size_t height,
         const system::chain::block::cptr& block_ptr) NOEXCEPT;
     virtual void do_handle_organize(const code& ec, size_t height,
         const system::chain::block::cptr& block_ptr) NOEXCEPT;
 
 private:
     static hashmap to_hashes(size_t reserve,
-        const network::messages::get_data& getter) NOEXCEPT;
+        const network::messages::p2p::get_data& getter) NOEXCEPT;
 
-    network::messages::get_blocks create_get_inventory() const NOEXCEPT;
-    network::messages::get_blocks create_get_inventory(
+    network::messages::p2p::get_blocks create_get_inventory() const NOEXCEPT;
+    network::messages::p2p::get_blocks create_get_inventory(
         const system::hash_digest& last) const NOEXCEPT;
-    network::messages::get_blocks create_get_inventory(
+    network::messages::p2p::get_blocks create_get_inventory(
         system::hashes&& start_hashes) const NOEXCEPT;
 
-    network::messages::get_data create_get_data(
-        const network::messages::inventory& message) const NOEXCEPT;
+    network::messages::p2p::get_data create_get_data(
+        const network::messages::p2p::inventory& message) const NOEXCEPT;
 
     // This is thread safe.
     const type_id block_type_;
diff --git a/include/bitcoin/node/protocols/protocol_block_in_31800.hpp b/include/bitcoin/node/protocols/protocol_block_in_31800.hpp
@@ -75,14 +75,14 @@ class BCN_API protocol_block_in_31800
 
     /// Check incoming block message.
     virtual bool handle_receive_block(const code& ec,
-        const network::messages::block::cptr& message) NOEXCEPT;
+        const network::messages::p2p::block::cptr& message) NOEXCEPT;
 
 private:
     code check(const system::chain::block& block,
         const system::chain::context& ctx, bool bypass) const NOEXCEPT;
 
     void send_get_data(const map_ptr& map, const job::ptr& job) NOEXCEPT;
-    network::messages::get_data create_get_data(
+    network::messages::p2p::get_data create_get_data(
         const database::associations& map) const NOEXCEPT;
 
     void restore(const map_ptr& map) NOEXCEPT;
diff --git a/include/bitcoin/node/protocols/protocol_block_out_106.hpp b/include/bitcoin/node/protocols/protocol_block_out_106.hpp
@@ -60,15 +60,15 @@ class BCN_API protocol_block_out_106
     virtual bool do_announce(header_t link) NOEXCEPT;
 
     virtual bool handle_receive_get_blocks(const code& ec,
-        const network::messages::get_blocks::cptr& message) NOEXCEPT;
+        const network::messages::p2p::get_blocks::cptr& message) NOEXCEPT;
     virtual bool handle_receive_get_data(const code& ec,
-        const network::messages::get_data::cptr& message) NOEXCEPT;
+        const network::messages::p2p::get_data::cptr& message) NOEXCEPT;
     virtual void send_block(const code& ec, size_t index,
-        const network::messages::get_data::cptr& message) NOEXCEPT;
+        const network::messages::p2p::get_data::cptr& message) NOEXCEPT;
 
 private:
-    network::messages::inventory create_inventory(
-        const network::messages::get_blocks& locator) const NOEXCEPT;
+    network::messages::p2p::inventory create_inventory(
+        const network::messages::p2p::get_blocks& locator) const NOEXCEPT;
 
 private:
     // These are thread safe.
diff --git a/include/bitcoin/node/protocols/protocol_block_out_70012.hpp b/include/bitcoin/node/protocols/protocol_block_out_70012.hpp
@@ -49,7 +49,7 @@ class BCN_API protocol_block_out_70012
     bool superseded() const NOEXCEPT override;
 
     virtual bool handle_receive_send_headers(const code& ec,
-        const network::messages::send_headers::cptr& message) NOEXCEPT;
+        const network::messages::p2p::send_headers::cptr& message) NOEXCEPT;
 
 private:
     // This is protected by strand.
diff --git a/include/bitcoin/node/protocols/protocol_filter_out_70015.hpp b/include/bitcoin/node/protocols/protocol_filter_out_70015.hpp
@@ -47,11 +47,11 @@ class BCN_API protocol_filter_out_70015
 
 protected:
     virtual bool handle_receive_get_filter_checkpoint(const code& ec,
-        const network::messages::get_client_filter_checkpoint::cptr& message) NOEXCEPT;
+        const network::messages::p2p::get_client_filter_checkpoint::cptr& message) NOEXCEPT;
     virtual bool handle_receive_get_filter_headers(const code& ec,
-        const network::messages::get_client_filter_headers::cptr& message) NOEXCEPT;
+        const network::messages::p2p::get_client_filter_headers::cptr& message) NOEXCEPT;
     virtual bool handle_receive_get_filters(const code& ec,
-        const network::messages::get_client_filters::cptr& message) NOEXCEPT;
+        const network::messages::p2p::get_client_filters::cptr& message) NOEXCEPT;
 
 private:
     using ancestry_ptr = std::shared_ptr<database::header_links>;
diff --git a/include/bitcoin/node/protocols/protocol_header_in_31800.hpp b/include/bitcoin/node/protocols/protocol_header_in_31800.hpp
@@ -46,9 +46,9 @@ class BCN_API protocol_header_in_31800
 
 protected:
     virtual bool handle_receive_inventory(const code& ec,
-        const network::messages::inventory::cptr& message) NOEXCEPT;
+        const network::messages::p2p::inventory::cptr& message) NOEXCEPT;
     virtual bool handle_receive_headers(const code& ec,
-        const network::messages::headers::cptr& message) NOEXCEPT;
+        const network::messages::p2p::headers::cptr& message) NOEXCEPT;
     virtual void handle_organize(const code& ec, size_t height,
         const system::chain::header::cptr& header_ptr) NOEXCEPT;
     virtual void complete() NOEXCEPT;
@@ -57,10 +57,10 @@ class BCN_API protocol_header_in_31800
     bool subscribed{};
 
 private:
-    network::messages::get_headers create_get_headers() const NOEXCEPT;
-    network::messages::get_headers create_get_headers(
+    network::messages::p2p::get_headers create_get_headers() const NOEXCEPT;
+    network::messages::p2p::get_headers create_get_headers(
         const system::hash_digest& last) const NOEXCEPT;
-    network::messages::get_headers create_get_headers(
+    network::messages::p2p::get_headers create_get_headers(
         system::hashes&& start_hashes) const NOEXCEPT;
 };
 
diff --git a/include/bitcoin/node/protocols/protocol_header_out_31800.hpp b/include/bitcoin/node/protocols/protocol_header_out_31800.hpp
@@ -46,11 +46,11 @@ class BCN_API protocol_header_out_31800
 
 protected:
     virtual bool handle_receive_get_headers(const code& ec,
-        const network::messages::get_headers::cptr& message) NOEXCEPT;
+        const network::messages::p2p::get_headers::cptr& message) NOEXCEPT;
 
 private:
-    network::messages::headers create_headers(
-        const network::messages::get_headers& locator) const NOEXCEPT;
+    network::messages::p2p::headers create_headers(
+        const network::messages::p2p::get_headers& locator) const NOEXCEPT;
 };
 
 } // namespace node
diff --git a/include/bitcoin/node/protocols/protocol_header_out_70012.hpp b/include/bitcoin/node/protocols/protocol_header_out_70012.hpp
@@ -56,7 +56,7 @@ class BCN_API protocol_header_out_70012
     virtual bool do_announce(header_t link) NOEXCEPT;
 
     virtual bool handle_receive_send_headers(const code& ec,
-        const network::messages::send_headers::cptr& message) NOEXCEPT;
+        const network::messages::p2p::send_headers::cptr& message) NOEXCEPT;
 };
 
 } // namespace node
diff --git a/include/bitcoin/node/protocols/protocol_observer.hpp b/include/bitcoin/node/protocols/protocol_observer.hpp
@@ -43,7 +43,7 @@ class BCN_API protocol_observer
         relay_disallowed_
         (
             std::dynamic_pointer_cast<network::channel_peer>(channel)->
-                is_negotiated(network::messages::level::bip37) &&
+                is_negotiated(network::messages::p2p::level::bip37) &&
             !session->config().network.enable_relay
         ),
         node_witness_(session->config().network.witness_node()),
@@ -64,11 +64,11 @@ class BCN_API protocol_observer
 
     /////// Accept incoming get_data message.
     ////virtual bool handle_receive_get_data(const code& ec,
-    ////    const network::messages::get_data::cptr& message) NOEXCEPT;
+    ////    const network::messages::p2p::get_data::cptr& message) NOEXCEPT;
 
     /// Accept incoming inventory message.
     virtual bool handle_receive_inventory(const code& ec,
-        const network::messages::inventory::cptr& message) NOEXCEPT;
+        const network::messages::p2p::inventory::cptr& message) NOEXCEPT;
 
     // This is thread safe.
     const bool relay_disallowed_;
diff --git a/include/bitcoin/node/protocols/protocol_transaction_in_106.hpp b/include/bitcoin/node/protocols/protocol_transaction_in_106.hpp
@@ -49,7 +49,7 @@ class BCN_API protocol_transaction_in_106
 protected:
     /// Accept incoming inventory message.
     virtual bool handle_receive_inventory(const code& ec,
-        const network::messages::inventory::cptr& message) NOEXCEPT;
+        const network::messages::p2p::inventory::cptr& message) NOEXCEPT;
 
 private:
     // This is thread safe.
diff --git a/include/bitcoin/node/protocols/protocol_transaction_out_106.hpp b/include/bitcoin/node/protocols/protocol_transaction_out_106.hpp
@@ -57,9 +57,9 @@ class BCN_API protocol_transaction_out_106
     virtual bool do_announce(transaction_t link) NOEXCEPT;
 
     virtual bool handle_receive_get_data(const code& ec,
-        const network::messages::get_data::cptr& message) NOEXCEPT;
+        const network::messages::p2p::get_data::cptr& message) NOEXCEPT;
     virtual void send_transaction(const code& ec, size_t index,
-        const network::messages::get_data::cptr& message) NOEXCEPT;
+        const network::messages::p2p::get_data::cptr& message) NOEXCEPT;
 
 private:
     // These are thread safe.
diff --git a/include/bitcoin/node/sessions/attach.hpp b/include/bitcoin/node/sessions/attach.hpp
@@ -48,12 +48,12 @@ class attach
         node_network_(to_bool(system::bit_and<uint64_t>
         (
             node.config().network.services_maximum,
-            network::messages::service::node_network
+            network::messages::p2p::service::node_network
         ))),
         node_client_filters_(to_bool(system::bit_and<uint64_t>
         (
             node.config().network.services_maximum,
-            network::messages::service::node_client_filters
+            network::messages::p2p::service::node_client_filters
         )))
     {
     }
@@ -72,7 +72,7 @@ class attach
 
     void attach_protocols(const network::channel::ptr& channel) NOEXCEPT override
     {
-        using namespace network::messages;
+        using namespace network::messages::p2p;
         const auto self = session::shared_from_sibling<attach<Session>,
             network::session>();
 
diff --git a/src/chasers/chaser_check.cpp b/src/chasers/chaser_check.cpp
@@ -527,7 +527,7 @@ size_t chaser_check::get_inventory_size() const NOEXCEPT
     const auto& query = archive();
     const auto fork = query.get_fork();
 
-    const auto span = ceilinged_multiply(messages::max_inventory, peers);
+    const auto span = ceilinged_multiply(messages::p2p::max_inventory, peers);
     const auto step = std::min(maximum_concurrency_, span);
     const auto inventory = query.get_unassociated_count_above(fork, step);
     return ceilinged_divide(inventory, peers);
diff --git a/src/parser.cpp b/src/parser.cpp
@@ -53,8 +53,8 @@ parser::parser(system::chain::selection context) NOEXCEPT
 
     // network
 
-    using level = network::messages::level;
-    using service = network::messages::service;
+    using level = network::messages::p2p::level;
+    using service = network::messages::p2p::service;
 
     configured.network.threads = 16;
     configured.network.enable_relay = true;
@@ -69,7 +69,7 @@ parser::parser(system::chain::selection context) NOEXCEPT
     configured.network.protocol_minimum = level::headers_protocol;
     configured.network.protocol_maximum = level::bip130;
 
-    // TODO: presently network::messages::block/tx/compact hardwire witness
+    // TODO: presently network::messages::p2p::block/tx/compact hardwire witness
     // to true, but that should be drive off of configured and peer services.
 
     // services_minimum must be node_witness to be a witness node.
diff --git a/src/protocols/protocol_block_in_106.cpp b/src/protocols/protocol_block_in_106.cpp
@@ -37,7 +37,7 @@ namespace node {
 
 using namespace system;
 using namespace network;
-using namespace network::messages;
+using namespace network::messages::p2p;
 using namespace std::placeholders;
 
 // Shared pointers required for lifetime in handler parameters.
diff --git a/src/protocols/protocol_block_in_31800.cpp b/src/protocols/protocol_block_in_31800.cpp
@@ -33,7 +33,7 @@ namespace node {
 using namespace system;
 using namespace database;
 using namespace network;
-using namespace network::messages;
+using namespace network::messages::p2p;
 using namespace std::placeholders;
 
 // Shared pointers required for lifetime in handler parameters.
diff --git a/src/protocols/protocol_block_out_106.cpp b/src/protocols/protocol_block_out_106.cpp
@@ -30,7 +30,7 @@ namespace node {
 
 using namespace system;
 using namespace network;
-using namespace network::messages;
+using namespace network::messages::p2p;
 using namespace std::chrono;
 using namespace std::placeholders;
 
diff --git a/src/protocols/protocol_block_out_70012.cpp b/src/protocols/protocol_block_out_70012.cpp
@@ -29,7 +29,7 @@ namespace node {
 
 using namespace system;
 using namespace network;
-using namespace network::messages;
+using namespace network::messages::p2p;
 using namespace std::placeholders;
 
 BC_PUSH_WARNING(SMART_PTR_NOT_NEEDED)
diff --git a/src/protocols/protocol_filter_out_70015.cpp b/src/protocols/protocol_filter_out_70015.cpp
@@ -29,7 +29,7 @@ namespace node {
 
 using namespace system;
 using namespace network;
-using namespace network::messages;
+using namespace network::messages::p2p;
 using namespace std::chrono;
 using namespace std::placeholders;
 
diff --git a/src/protocols/protocol_header_in_31800.cpp b/src/protocols/protocol_header_in_31800.cpp
@@ -29,7 +29,7 @@ namespace node {
 
 using namespace system;
 using namespace network;
-using namespace network::messages;
+using namespace network::messages::p2p;
 using namespace std::placeholders;
 
 // Shared pointers required for lifetime in handler parameters.
diff --git a/src/protocols/protocol_header_in_70012.cpp b/src/protocols/protocol_header_in_70012.cpp
@@ -26,7 +26,7 @@ namespace node {
 
 #define CLASS protocol_header_in_70012
 
-using namespace network::messages;
+using namespace network::messages::p2p;
 using namespace std::placeholders;
 
 void protocol_header_in_70012::complete() NOEXCEPT
diff --git a/src/protocols/protocol_header_out_31800.cpp b/src/protocols/protocol_header_out_31800.cpp
@@ -29,7 +29,7 @@ namespace node {
 
 using namespace system;
 using namespace network;
-using namespace network::messages;
+using namespace network::messages::p2p;
 using namespace std::placeholders;
 
 // Shared pointers required for lifetime in handler parameters.
@@ -71,7 +71,7 @@ bool protocol_header_out_31800::handle_receive_get_headers(const code& ec,
 // utilities
 // ----------------------------------------------------------------------------
 
-network::messages::headers protocol_header_out_31800::create_headers(
+network::messages::p2p::headers protocol_header_out_31800::create_headers(
     const get_headers& locator) const NOEXCEPT
 {
     // Empty response implies complete (success).
diff --git a/src/protocols/protocol_header_out_70012.cpp b/src/protocols/protocol_header_out_70012.cpp
@@ -28,7 +28,7 @@ namespace node {
 #define CLASS protocol_header_out_70012
     
 using namespace system;
-using namespace network::messages;
+using namespace network::messages::p2p;
 using namespace std::placeholders;
 
 // Shared pointers required for lifetime in handler parameters.
diff --git a/src/protocols/protocol_observer.cpp b/src/protocols/protocol_observer.cpp
@@ -26,7 +26,7 @@ namespace node {
 
 #define CLASS protocol_observer
 
-using namespace network::messages;
+using namespace network::messages::p2p;
 using namespace std::placeholders;
 
 // Shared pointers required for lifetime in handler parameters.
diff --git a/src/protocols/protocol_transaction_in_106.cpp b/src/protocols/protocol_transaction_in_106.cpp
@@ -27,7 +27,7 @@ namespace node {
 
 #define CLASS protocol_transaction_in_106
 
-using namespace network::messages;
+using namespace network::messages::p2p;
 using namespace std::placeholders;
 
 // Shared pointers required for lifetime in handler parameters.
diff --git a/src/protocols/protocol_transaction_out_106.cpp b/src/protocols/protocol_transaction_out_106.cpp
@@ -28,7 +28,7 @@ namespace node {
 #define CLASS protocol_transaction_out_106
 
 using namespace system;
-using namespace network::messages;
+using namespace network::messages::p2p;
 using namespace std::placeholders;
 
 // Shared pointers required for lifetime in handler parameters.
