diff --git a/include/bitcoin/node/chasers/chaser.hpp b/include/bitcoin/node/chasers/chaser.hpp index 3feff482..54e7200f 100644 --- a/include/bitcoin/node/chasers/chaser.hpp +++ b/include/bitcoin/node/chasers/chaser.hpp @@ -38,8 +38,9 @@ class full_node; /// Notifications are bounced from sink (e.g. chaser) to its strand, and /// notify bounces from source (e.g. chaser) to network strand. /// Unlike protocols chasers can stop the node. +/// Logging is currently disabled so that logging is kept to the protocols. class BCN_API chaser - : public network::reporter +//// : public network::reporter { public: enum class chase diff --git a/src/chasers/chaser.cpp b/src/chasers/chaser.cpp index b4174f96..21e5db52 100644 --- a/src/chasers/chaser.cpp +++ b/src/chasers/chaser.cpp @@ -35,8 +35,8 @@ BC_PUSH_WARNING(NO_THROW_IN_NOEXCEPT) chaser::chaser(full_node& node) NOEXCEPT : node_(node), strand_(node.service().get_executor()), - subscriber_(node.event_subscriber()), - reporter(node.log) + subscriber_(node.event_subscriber()) + ////reporter(node.log) { } diff --git a/src/chasers/chaser_block.cpp b/src/chasers/chaser_block.cpp index 7241ec68..a252dcd8 100644 --- a/src/chasers/chaser_block.cpp +++ b/src/chasers/chaser_block.cpp @@ -49,11 +49,10 @@ chaser_block::~chaser_block() NOEXCEPT code chaser_block::start() NOEXCEPT { - BC_ASSERT_MSG(node_stranded(), "chaser_block"); - state_ = archive().get_candidate_chain_state(config().bitcoin); BC_ASSERT_MSG(state_, "Store not initialized."); + BC_ASSERT_MSG(node_stranded(), "chaser_block"); return subscribe( std::bind(&chaser_block::handle_event, this, _1, _2, _3)); diff --git a/src/chasers/chaser_candidate.cpp b/src/chasers/chaser_candidate.cpp index a964302e..e39523c8 100644 --- a/src/chasers/chaser_candidate.cpp +++ b/src/chasers/chaser_candidate.cpp @@ -80,10 +80,9 @@ void chaser_candidate::do_handle_event(const code& ec, chase event_, } // TODO: handle transaction graph change (may issue 'candidate'). -void chaser_candidate::handle_transaction(transaction_t tx) NOEXCEPT +void chaser_candidate::handle_transaction(transaction_t) NOEXCEPT { BC_ASSERT_MSG(stranded(), "chaser_candidate"); - LOGN("Handle transaction pool updated (" << tx << ")."); } BC_POP_WARNING() diff --git a/src/chasers/chaser_check.cpp b/src/chasers/chaser_check.cpp index 6bf98b21..ae134e1c 100644 --- a/src/chasers/chaser_check.cpp +++ b/src/chasers/chaser_check.cpp @@ -46,11 +46,10 @@ chaser_check::~chaser_check() NOEXCEPT code chaser_check::start() NOEXCEPT { - BC_ASSERT_MSG(node_stranded(), "chaser_check"); - // Initialize from genesis block. handle_header(zero); + BC_ASSERT_MSG(node_stranded(), "chaser_check"); return subscribe( std::bind(&chaser_check::handle_event, this, _1, _2, _3)); @@ -109,16 +108,12 @@ void chaser_check::do_put_hashes(const chaser_check::map&, void chaser_check::handle_header(height_t branch_point) NOEXCEPT { - BC_ASSERT_MSG(stranded(), "chaser_check"); - // Map and peer maps may have newly stale blocks. // All stale branches can just be allowed to complete. // The connect chaser will verify proper advancement. - - // get_all_unassociated_above(branch_point) and add to map. const auto& query = archive(); - const auto last = query.get_last_associated_from(branch_point); - map_.merge(query.get_all_unassociated_above(last)); + map_.merge(query.get_all_unassociated_above( + query.get_last_associated_from(branch_point))); } BC_POP_WARNING() diff --git a/src/chasers/chaser_confirm.cpp b/src/chasers/chaser_confirm.cpp index 0926e07d..1efaece6 100644 --- a/src/chasers/chaser_confirm.cpp +++ b/src/chasers/chaser_confirm.cpp @@ -79,10 +79,9 @@ void chaser_confirm::do_handle_event(const code& ec, chase event_, } // TODO: handle new strong connected branch (may issue 'confirmed'). -void chaser_confirm::handle_connected(header_t block) NOEXCEPT +void chaser_confirm::handle_connected(header_t) NOEXCEPT { BC_ASSERT_MSG(stranded(), "chaser_confirm"); - LOGN("Handle connected block (" << block << ")."); } BC_POP_WARNING() diff --git a/src/chasers/chaser_connect.cpp b/src/chasers/chaser_connect.cpp index b7bf57e6..18c6cfc4 100644 --- a/src/chasers/chaser_connect.cpp +++ b/src/chasers/chaser_connect.cpp @@ -82,7 +82,6 @@ void chaser_connect::do_handle_event(const code& ec, chase event_, void chaser_connect::handle_checked(header_t) NOEXCEPT { BC_ASSERT_MSG(stranded(), "chaser_connect"); - ////LOGN("Handle candidate organization above height (" << block << ")."); } BC_POP_WARNING() diff --git a/src/chasers/chaser_header.cpp b/src/chasers/chaser_header.cpp index d4321cf2..96b14533 100644 --- a/src/chasers/chaser_header.cpp +++ b/src/chasers/chaser_header.cpp @@ -64,11 +64,10 @@ bool chaser_header::use_currency_window() const NOEXCEPT // protected code chaser_header::start() NOEXCEPT { - BC_ASSERT_MSG(node_stranded(), "chaser_header"); - state_ = archive().get_candidate_chain_state(config().bitcoin); BC_ASSERT_MSG(state_, "Store not initialized."); + BC_ASSERT_MSG(node_stranded(), "chaser_header"); return subscribe( std::bind(&chaser_header::handle_event, this, _1, _2, _3));