Merge pull request #546 from evoskuil/master

Style, remove chaser reporter (log), remove bad assertion.

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

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)
 {
 }
 

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));

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()

src/chasers/chaser_check.cpp

@@ -35,13 +35,6 @@ using namespace std::placeholders;
 
 BC_PUSH_WARNING(NO_THROW_IN_NOEXCEPT)
 
-/// We need to be able to perform block.check(ctx) while we still have the
-/// deserialized block, because of the witness commitment check (hash).
-/// Requires timestamp (header) height, mtp, flags. These can be cached on the
-/// block hash registry maintained by this chaser or queried from the stored
-/// header. Caching requries rolling forward through all states as the registry
-/// is initialized. Store query is simpler and may be as fast.
-
 chaser_check::chaser_check(full_node& node) NOEXCEPT
   : chaser(node)
 {
@@ -53,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));
@@ -116,17 +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 top = query.get_top_candidate();
-    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()

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()

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()

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));