Rename events un/subscribe to chase (noe conflict).

evoskuil · evoskuil · commit 4f5c4d2efdf5 · 2026-05-16T12:37:50.000-04:00
diff --git a/include/bitcoin/node/chasers/chaser.hpp b/include/bitcoin/node/chasers/chaser.hpp
@@ -98,7 +98,7 @@ class BCN_API chaser
     /// -----------------------------------------------------------------------
 
     /// Call from chaser start methods (requires node strand).
-    virtual object_key subscribe_events(event_notifier&& handler) NOEXCEPT;
+    virtual object_key subscribe_chase(event_notifier&& handler) NOEXCEPT;
 
     /// Set event (does not require node strand).
     virtual void notify(const code& ec, chase event_,
@@ -164,8 +164,8 @@ class BCN_API chaser
     size_t position_{};
 };
 
-#define SUBSCRIBE_EVENTS(method, ...) \
-    subscribe_events(BIND(method, __VA_ARGS__))
+#define SUBSCRIBE_CHASE(method, ...) \
+    subscribe_chase(BIND(method, __VA_ARGS__))
 
 } // namespace node
 } // namespace libbitcoin
diff --git a/include/bitcoin/node/full_node.hpp b/include/bitcoin/node/full_node.hpp
@@ -93,14 +93,14 @@ class BCN_API full_node
         event_value value) NOEXCEPT;
 
     /// Call from chaser start() methods (requires strand).
-    virtual object_key subscribe_events(event_notifier&& handler) NOEXCEPT;
+    virtual object_key subscribe_chase(event_notifier&& handler) NOEXCEPT;
 
     /// Call from protocol start() methods.
-    virtual void subscribe_events(event_notifier&& handler,
+    virtual void subscribe_chase(event_notifier&& handler,
         event_completer&& complete) NOEXCEPT;
 
     /// Unsubscribe from chaser events.
-    virtual void unsubscribe_events(object_key key) NOEXCEPT;
+    virtual void unsubscribe_chase(object_key key) NOEXCEPT;
 
     /// Suspensions.
     /// -----------------------------------------------------------------------
@@ -174,7 +174,7 @@ class BCN_API full_node
     void do_close() NOEXCEPT override;
 
 private:
-    void do_subscribe_events(const event_notifier& handler,
+    void do_subscribe_chase(const event_notifier& handler,
         const event_completer& complete) NOEXCEPT;
     void do_notify(const code& ec, chase event_, event_value value) NOEXCEPT;
     void do_notify_one(object_key key, const code& ec, chase event_,
diff --git a/include/bitcoin/node/impl/chasers/chaser_organize.ipp b/include/bitcoin/node/impl/chasers/chaser_organize.ipp
@@ -61,7 +61,7 @@ code CLASS::start() NOEXCEPT
     LOGN("Candidate top [" << system::encode_hash(state_->hash()) << ":"
         << state_->height() << "].");
 
-    SUBSCRIBE_EVENTS(handle_chase, _1, _2, _3);
+    SUBSCRIBE_CHASE(handle_chase, _1, _2, _3);
     return error::success;
 }
 
diff --git a/include/bitcoin/node/protocols/protocol.hpp b/include/bitcoin/node/protocols/protocol.hpp
@@ -71,14 +71,14 @@ class BCN_API protocol
     /// -----------------------------------------------------------------------
 
     /// Subscribe to chaser events (max one active per protocol).
-    virtual void subscribe_events(event_notifier&& handler) NOEXCEPT;
+    virtual void subscribe_chase(event_notifier&& handler) NOEXCEPT;
 
     /// Override to handle subscription completion (stranded).
     virtual void subscribed(const code& ec, object_key key) NOEXCEPT;
 
     /// Unsubscribe from chaser events.
     /// Subscribing protocol must invoke from overridden stopping().
-    virtual void unsubscribe_events() NOEXCEPT;
+    virtual void unsubscribe_chase() NOEXCEPT;
 
     /// Get the subscription key (for notify_one).
     virtual object_key events_key() const NOEXCEPT;
diff --git a/include/bitcoin/node/sessions/session.hpp b/include/bitcoin/node/sessions/session.hpp
@@ -63,14 +63,14 @@ class BCN_API session
         event_value value) const NOEXCEPT;
 
     /// Subscribe to chaser events (requires node strand).
-    virtual object_key subscribe_events(event_notifier&& handler) NOEXCEPT;
+    virtual object_key subscribe_chase(event_notifier&& handler) NOEXCEPT;
 
     /// Subscribe to chaser events.
-    virtual void subscribe_events(event_notifier&& handler,
+    virtual void subscribe_chase(event_notifier&& handler,
         event_completer&& complete) NOEXCEPT;
 
     /// Unsubscribe from chaser events.
-    virtual void unsubscribe_events(object_key key) NOEXCEPT;
+    virtual void unsubscribe_chase(object_key key) NOEXCEPT;
 
     /// Methods.
     /// -----------------------------------------------------------------------
@@ -115,7 +115,7 @@ class BCN_API session
     session(full_node& node) NOEXCEPT;
 
 private:
-    void do_subscribe_events(const event_notifier& handler,
+    void do_subscribe_chase(const event_notifier& handler,
         const event_completer& complete) NOEXCEPT;
 
 private:
diff --git a/src/chasers/chaser.cpp b/src/chasers/chaser.cpp
@@ -89,9 +89,9 @@ code chaser::reload(const store::event_handler& handler) NOEXCEPT
 // Events.
 // ----------------------------------------------------------------------------
 
-object_key chaser::subscribe_events(event_notifier&& handler) NOEXCEPT
+object_key chaser::subscribe_chase(event_notifier&& handler) NOEXCEPT
 {
-    return node_.subscribe_events(std::move(handler));
+    return node_.subscribe_chase(std::move(handler));
 }
 
 void chaser::notify(const code& ec, chase event_,
diff --git a/src/chasers/chaser_check.cpp b/src/chasers/chaser_check.cpp
@@ -96,7 +96,7 @@ code chaser_check::start() NOEXCEPT
     const auto added = set_unassociated();
     LOGN("Fork point (" << requested_ << ") unassociated (" << added << ").");
 
-    SUBSCRIBE_EVENTS(handle_chase, _1, _2, _3);
+    SUBSCRIBE_CHASE(handle_chase, _1, _2, _3);
     return error::success;
 }
 
diff --git a/src/chasers/chaser_confirm.cpp b/src/chasers/chaser_confirm.cpp
@@ -52,7 +52,7 @@ code chaser_confirm::start() NOEXCEPT
 
     if (!defer_)
     {
-        SUBSCRIBE_EVENTS(handle_chase, _1, _2, _3);
+        SUBSCRIBE_CHASE(handle_chase, _1, _2, _3);
     }
 
     return error::success;
diff --git a/src/chasers/chaser_snapshot.cpp b/src/chasers/chaser_snapshot.cpp
@@ -65,7 +65,7 @@ code chaser_snapshot::start() NOEXCEPT
     ////if (enabled_confirm_)
     ////    confirm_ = std::max(archive().get_top_confirmed(), checkpoint());
 
-    SUBSCRIBE_EVENTS(handle_chase, _1, _2, _3);
+    SUBSCRIBE_CHASE(handle_chase, _1, _2, _3);
     return error::success;
 }
 
diff --git a/src/chasers/chaser_storage.cpp b/src/chasers/chaser_storage.cpp
@@ -50,7 +50,7 @@ code chaser_storage::start() NOEXCEPT
     // Construct is too early to create the unstarted timer.
     disk_timer_ = std::make_shared<deadline>(log, strand(), seconds{1});
 
-    SUBSCRIBE_EVENTS(handle_chase, _1, _2, _3);
+    SUBSCRIBE_CHASE(handle_chase, _1, _2, _3);
     return error::success;
 }
 
diff --git a/src/chasers/chaser_template.cpp b/src/chasers/chaser_template.cpp
@@ -43,7 +43,7 @@ chaser_template::chaser_template(full_node& node) NOEXCEPT
 // TODO: initialize template state.
 code chaser_template::start() NOEXCEPT
 {
-    SUBSCRIBE_EVENTS(handle_chase, _1, _2, _3);
+    SUBSCRIBE_CHASE(handle_chase, _1, _2, _3);
     return error::success;
 }
 
diff --git a/src/chasers/chaser_transaction.cpp b/src/chasers/chaser_transaction.cpp
@@ -43,7 +43,7 @@ chaser_transaction::chaser_transaction(full_node& node) NOEXCEPT
 // TODO: initialize tx graph from store, log and stop on error.
 code chaser_transaction::start() NOEXCEPT
 {
-    SUBSCRIBE_EVENTS(handle_chase, _1, _2, _3);
+    SUBSCRIBE_CHASE(handle_chase, _1, _2, _3);
     return error::success;
 }
 
diff --git a/src/chasers/chaser_validate.cpp b/src/chasers/chaser_validate.cpp
@@ -56,7 +56,7 @@ code chaser_validate::start() NOEXCEPT
 
     const auto& query = archive();
     set_position(query.get_fork());
-    SUBSCRIBE_EVENTS(handle_chase, _1, _2, _3);
+    SUBSCRIBE_CHASE(handle_chase, _1, _2, _3);
     return error::success;
 }
 
diff --git a/src/full_node.cpp b/src/full_node.cpp
@@ -216,32 +216,32 @@ void full_node::do_notify_one(object_key key, const code& ec, chase event_,
     event_subscriber_.notify_one(key, ec, event_, value);
 }
 
-object_key full_node::subscribe_events(event_notifier&& handler) NOEXCEPT
+object_key full_node::subscribe_chase(event_notifier&& handler) NOEXCEPT
 {
     BC_ASSERT(stranded());
     const auto key = create_key();
     event_subscriber_.subscribe(std::move(handler), key);
     return key;
 }
 
-void full_node::subscribe_events(event_notifier&& handler,
+void full_node::subscribe_chase(event_notifier&& handler,
     event_completer&& complete) NOEXCEPT
 {
     boost::asio::post(strand(),
-        std::bind(&full_node::do_subscribe_events,
+        std::bind(&full_node::do_subscribe_chase,
             this, std::move(handler), std::move(complete)));
 }
 
 // private
-void full_node::do_subscribe_events(const event_notifier& handler,
+void full_node::do_subscribe_chase(const event_notifier& handler,
     const event_completer& complete) NOEXCEPT
 {
     BC_ASSERT(stranded());
     const auto key = create_key();
     complete(event_subscriber_.subscribe(move_copy(handler), key), key);
 }
 
-void full_node::unsubscribe_events(object_key key) NOEXCEPT
+void full_node::unsubscribe_chase(object_key key) NOEXCEPT
 {
     notify_one(key, network::error::service_stopped, chase::stop, {});
 }
diff --git a/src/protocols/protocol.cpp b/src/protocols/protocol.cpp
@@ -69,7 +69,7 @@ bool protocol::is_current(bool confirmed) const NOEXCEPT
 // Events subscription.
 // ----------------------------------------------------------------------------
 
-void protocol::subscribe_events(event_notifier&& handler) NOEXCEPT
+void protocol::subscribe_chase(event_notifier&& handler) NOEXCEPT
 {
     // This is a shared instance multiply-derived from network::protocol.
     const auto self = dynamic_cast<network::protocol&>(*this)
@@ -78,7 +78,7 @@ void protocol::subscribe_events(event_notifier&& handler) NOEXCEPT
     event_completer completer = std::bind(&protocol::handle_subscribed, self,
         _1, _2);
 
-    session_->subscribe_events(std::move(handler),
+    session_->subscribe_chase(std::move(handler),
         std::bind(&protocol::handle_subscribe,
             self, _1, _2, std::move(completer)));
 }
@@ -117,13 +117,13 @@ void protocol::subscribed(const code& ec, object_key) NOEXCEPT
 
     // Unsubscriber race is ok.
     if (channel_->stopped() || ec)
-        unsubscribe_events();
+        unsubscribe_chase();
 }
 
 // As this has no completion handler resubscription is not allowed.
-void protocol::unsubscribe_events() NOEXCEPT
+void protocol::unsubscribe_chase() NOEXCEPT
 {
-    session_->unsubscribe_events(key_);
+    session_->unsubscribe_chase(key_);
     key_ = {};
 }
 
diff --git a/src/protocols/protocol_block_in_31800.cpp b/src/protocols/protocol_block_in_31800.cpp
@@ -50,7 +50,7 @@ void protocol_block_in_31800::start() NOEXCEPT
         return;
 
     // Events subscription is asynchronous, events may be missed.
-    subscribe_events(BIND(handle_chase, _1, _2, _3));
+    subscribe_chase(BIND(handle_chase, _1, _2, _3));
     SUBSCRIBE_CHANNEL(block, handle_receive_block, _1, _2);
     protocol_performer::start();
 }
@@ -63,7 +63,7 @@ void protocol_block_in_31800::subscribed(const code& ec, object_key) NOEXCEPT
     // stopped() is true before stopping() is called (by base).
     if (stopped(ec))
     {
-        unsubscribe_events();
+        unsubscribe_chase();
         return;
     }
 
@@ -83,7 +83,7 @@ void protocol_block_in_31800::stopping(const code& ec) NOEXCEPT
     restore(map_);
     map_ = chaser_check::empty_map();
     stop_performance();
-    unsubscribe_events();
+    unsubscribe_chase();
     protocol_performer::stopping(ec);
 }
 
diff --git a/src/protocols/protocol_block_out_106.cpp b/src/protocols/protocol_block_out_106.cpp
@@ -46,7 +46,7 @@ void protocol_block_out_106::start() NOEXCEPT
         return;
 
     // Events subscription is asynchronous, events may be missed.
-    subscribe_events(BIND(handle_chase, _1, _2, _3));
+    subscribe_chase(BIND(handle_chase, _1, _2, _3));
     SUBSCRIBE_CHANNEL(get_data, handle_receive_get_data, _1, _2);
     SUBSCRIBE_CHANNEL(get_blocks, handle_receive_get_blocks, _1, _2);
     protocol_peer::start();
@@ -56,7 +56,7 @@ void protocol_block_out_106::stopping(const code& ec) NOEXCEPT
 {
     // Unsubscriber race is ok.
     BC_ASSERT(stranded());
-    unsubscribe_events();
+    unsubscribe_chase();
     protocol_peer::stopping(ec);
 }
 
diff --git a/src/protocols/protocol_header_out_70012.cpp b/src/protocols/protocol_header_out_70012.cpp
@@ -52,7 +52,7 @@ void protocol_header_out_70012::stopping(const code& ec) NOEXCEPT
 {
     // Unsubscriber race is ok.
     BC_ASSERT(stranded());
-    unsubscribe_events();
+    unsubscribe_chase();
     protocol_header_out_31800::stopping(ec);
 }
 
@@ -130,7 +130,7 @@ bool protocol_header_out_70012::handle_receive_send_headers(const code& ec,
         return false;
 
     // Events subscription is asynchronous, events may be missed.
-    subscribe_events(BIND(handle_chase, _1, _2, _3));
+    subscribe_chase(BIND(handle_chase, _1, _2, _3));
     return false;
 }
 
diff --git a/src/protocols/protocol_observer.cpp b/src/protocols/protocol_observer.cpp
@@ -43,7 +43,7 @@ void protocol_observer::start() NOEXCEPT
         return;
 
     // Events subscription is asynchronous, events may be missed.
-    subscribe_events(BIND(handle_chase, _1, _2, _3));
+    subscribe_chase(BIND(handle_chase, _1, _2, _3));
 
     if (relay_disallowed_)
     {
@@ -58,7 +58,7 @@ void protocol_observer::stopping(const code& ec) NOEXCEPT
 {
     // Unsubscriber race is ok.
     BC_ASSERT(stranded());
-    unsubscribe_events();
+    unsubscribe_chase();
     protocol_peer::stopping(ec);
 }
 
diff --git a/src/protocols/protocol_transaction_out_106.cpp b/src/protocols/protocol_transaction_out_106.cpp
@@ -44,7 +44,7 @@ void protocol_transaction_out_106::start() NOEXCEPT
         return;
 
     // Events subscription is asynchronous, events may be missed.
-    subscribe_events(BIND(handle_chase, _1, _2, _3));
+    subscribe_chase(BIND(handle_chase, _1, _2, _3));
     SUBSCRIBE_CHANNEL(get_data, handle_receive_get_data, _1, _2);
     protocol_peer::start();
 }
@@ -53,7 +53,7 @@ void protocol_transaction_out_106::stopping(const code& ec) NOEXCEPT
 {
     // Unsubscriber race is ok.
     BC_ASSERT(stranded());
-    unsubscribe_events();
+    unsubscribe_chase();
     protocol_peer::stopping(ec);
 }
 
diff --git a/src/sessions/session.cpp b/src/sessions/session.cpp
@@ -78,20 +78,20 @@ void session::notify_one(object_key key, const code& ec, chase event_,
     node_.notify_one(key, ec, event_, value);
 }
 
-object_key session::subscribe_events(event_notifier&& handler) NOEXCEPT
+object_key session::subscribe_chase(event_notifier&& handler) NOEXCEPT
 {
-    return node_.subscribe_events(std::move(handler));
+    return node_.subscribe_chase(std::move(handler));
 }
 
-void session::subscribe_events(event_notifier&& handler,
+void session::subscribe_chase(event_notifier&& handler,
     event_completer&& complete) NOEXCEPT
 {
-    node_.subscribe_events(std::move(handler), std::move(complete));
+    node_.subscribe_chase(std::move(handler), std::move(complete));
 }
 
-void session::unsubscribe_events(object_key key) NOEXCEPT
+void session::unsubscribe_chase(object_key key) NOEXCEPT
 {
-    node_.unsubscribe_events(key);
+    node_.unsubscribe_chase(key);
 }
 
 // Methods.

Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ code CLASS::start() NOEXCEPT`
`61`	`61`	`LOGN("Candidate top [" << system::encode_hash(state_->hash()) << ":"`
`62`	`62`	`<< state_->height() << "].");`
`63`	`63`
`64`		`- SUBSCRIBE_EVENTS(handle_chase, _1, _2, _3);`
	`64`	`+ SUBSCRIBE_CHASE(handle_chase, _1, _2, _3);`
`65`	`65`	`return error::success;`
`66`	`66`	`}`
`67`	`67`
Original file line number	Diff line number	Diff line change
`@@ -89,9 +89,9 @@ code chaser::reload(const store::event_handler& handler) NOEXCEPT`
`89`	`89`	`// Events.`
`90`	`90`	`// ----------------------------------------------------------------------------`
`91`	`91`
`92`		`-object_key chaser::subscribe_events(event_notifier&& handler) NOEXCEPT`
	`92`	`+object_key chaser::subscribe_chase(event_notifier&& handler) NOEXCEPT`
`93`	`93`	`{`
`94`		`- return node_.subscribe_events(std::move(handler));`
	`94`	`+ return node_.subscribe_chase(std::move(handler));`
`95`	`95`	`}`
`96`	`96`
`97`	`97`	`void chaser::notify(const code& ec, chase event_,`
Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,7 @@ code chaser_check::start() NOEXCEPT`
`96`	`96`	`const auto added = set_unassociated();`
`97`	`97`	`LOGN("Fork point (" << requested_ << ") unassociated (" << added << ").");`
`98`	`98`
`99`		`- SUBSCRIBE_EVENTS(handle_chase, _1, _2, _3);`
	`99`	`+ SUBSCRIBE_CHASE(handle_chase, _1, _2, _3);`
`100`	`100`	`return error::success;`
`101`	`101`	`}`
`102`	`102`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ code chaser_confirm::start() NOEXCEPT`
`52`	`52`
`53`	`53`	`if (!defer_)`
`54`	`54`	`{`
`55`		`- SUBSCRIBE_EVENTS(handle_chase, _1, _2, _3);`
	`55`	`+ SUBSCRIBE_CHASE(handle_chase, _1, _2, _3);`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`return error::success;`
Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ code chaser_snapshot::start() NOEXCEPT`
`65`	`65`	`////if (enabled_confirm_)`
`66`	`66`	`//// confirm_ = std::max(archive().get_top_confirmed(), checkpoint());`
`67`	`67`
`68`		`- SUBSCRIBE_EVENTS(handle_chase, _1, _2, _3);`
	`68`	`+ SUBSCRIBE_CHASE(handle_chase, _1, _2, _3);`
`69`	`69`	`return error::success;`
`70`	`70`	`}`
`71`	`71`
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ code chaser_storage::start() NOEXCEPT`
`50`	`50`	`// Construct is too early to create the unstarted timer.`
`51`	`51`	`disk_timer_ = std::make_shared<deadline>(log, strand(), seconds{1});`
`52`	`52`
`53`		`- SUBSCRIBE_EVENTS(handle_chase, _1, _2, _3);`
	`53`	`+ SUBSCRIBE_CHASE(handle_chase, _1, _2, _3);`
`54`	`54`	`return error::success;`
`55`	`55`	`}`
`56`	`56`