Remove mature_, concurrent_, and associated settings.

Author: evoskuil

include/bitcoin/node/chasers/chaser_confirm.hpp

@@ -85,12 +85,10 @@ class BCN_API chaser_confirm
         size_t fork_point) const NOEXCEPT;
 
     // These are protected by strand.
-    bool mature_{};
     network::threadpool threadpool_;
 
     // These are thread safe.
     network::asio::strand independent_strand_;
-    const bool concurrent_;
     bool prevout_;
 };
 

include/bitcoin/node/chasers/chaser_validate.hpp

@@ -75,7 +75,6 @@ class BCN_API chaser_validate
     }
 
     // These are protected by strand.
-    bool mature_{};
     size_t backlog_{};
     network::threadpool threadpool_;
 
@@ -84,7 +83,6 @@ class BCN_API chaser_validate
     const uint32_t subsidy_interval_;
     const uint64_t initial_subsidy_;
     const size_t maximum_backlog_;
-    const bool concurrent_;
     const bool filter_;
 };
 

include/bitcoin/node/settings.hpp

@@ -74,8 +74,6 @@ class BCN_API settings
     /// Properties.
     bool headers_first;
     bool priority_validation;
-    bool concurrent_validation;
-    bool concurrent_confirmation;
     float allowed_deviation;
     uint16_t allocation_multiple;
     uint64_t snapshot_bytes;

src/chasers/chaser_confirm.cpp

@@ -44,7 +44,6 @@ chaser_confirm::chaser_confirm(full_node& node) NOEXCEPT
   : chaser(node),
     threadpool_(one, node.config().node.priority_()),
     independent_strand_(threadpool_.service().get_executor()),
-    concurrent_(node.config().node.concurrent_confirmation),
     prevout_(node.archive().prevout_enabled())
 {
 }
@@ -92,34 +91,21 @@ bool chaser_confirm::handle_event(const code&, chase event_,
         ////{
         ////    BC_ASSERT(std::holds_alternative<height_t>(value));
         ////
-        ////    if (concurrent_ || mature_)
-        ////    {
-        ////        // TODO: value is branch point.
-        ////        POST(do_validated, std::get<height_t>(value));
-        ////    }
-        ////
+        ////    // TODO: value is branch point.
+        ////    POST(do_validated, std::get<height_t>(value));
         ////    break;
         ////}
         case chase::start:
         case chase::bump:
         {
-            if (concurrent_ || mature_)
-            {
-                POST(do_bump, height_t{});
-            }
-
+            POST(do_bump, height_t{});
             break;
         }
         case chase::valid:
         {
             // value is validated block height.
             BC_ASSERT(std::holds_alternative<height_t>(value));
-
-            if (concurrent_ || mature_)
-            {
-                POST(do_validated, std::get<height_t>(value));
-            }
-
+            POST(do_validated, std::get<height_t>(value));
             break;
         }
         case chase::regressed:

src/chasers/chaser_validate.cpp

@@ -48,7 +48,6 @@ chaser_validate::chaser_validate(full_node& node) NOEXCEPT
     subsidy_interval_(node.config().bitcoin.subsidy_interval_blocks),
     initial_subsidy_(node.config().bitcoin.initial_subsidy()),
     maximum_backlog_(node.config().node.maximum_concurrency_()),
-    concurrent_(node.config().node.concurrent_validation),
     filter_(node.archive().neutrino_enabled())
 {
 }
@@ -95,23 +94,14 @@ bool chaser_validate::handle_event(const code&, chase event_,
         case chase::start:
         case chase::bump:
         {
-            if (concurrent_ || mature_)
-            {
-                POST(do_bump, height_t{});
-            }
-
+            POST(do_bump, height_t{});
             break;
         }
         case chase::checked:
         {
             // value is checked block height.
             BC_ASSERT(std::holds_alternative<height_t>(value));
-
-            if (concurrent_ || mature_)
-            {
-                POST(do_checked, std::get<height_t>(value));
-            }
-
+            POST(do_checked, std::get<height_t>(value));
             break;
         }
         case chase::regressed:

src/parser.cpp

@@ -908,17 +908,7 @@ options_metadata parser::load_settings() THROWS
     (
         "node.priority_validation",
         value<bool>(&configured.node.priority_validation),
-        "Set the validation threadpool to high priority, defaults to false."
-    )
-    (
-        "node.concurrent_validation",
-        value<bool>(&configured.node.concurrent_validation),
-        "Perform validation concurrently with download, defaults to false."
-    )
-    (
-        "node.concurrent_confirmation",
-        value<bool>(&configured.node.concurrent_confirmation),
-        "Perform confirmation concurrently with download, defaults to false."
+        "Set the validation threadpool to high priority, defaults to true."
     )
     (
         "node.headers_first",

src/settings.cpp

@@ -76,9 +76,7 @@ namespace node {
 
 settings::settings() NOEXCEPT
   : headers_first{ true },
-    priority_validation{ false },
-    concurrent_validation{ false },
-    concurrent_confirmation{ false },
+    priority_validation{ true },
     allowed_deviation{ 1.5 },
     allocation_multiple{ 20 },
     snapshot_bytes{ 200'000'000'000 },

test/settings.cpp

@@ -55,9 +55,7 @@ BOOST_AUTO_TEST_CASE(settings__node__default_context__expected)
 
     const node::settings node{};
     BOOST_REQUIRE_EQUAL(node.headers_first, true);
-    BOOST_REQUIRE_EQUAL(node.priority_validation, false);
-    BOOST_REQUIRE_EQUAL(node.concurrent_validation, false);
-    BOOST_REQUIRE_EQUAL(node.concurrent_confirmation, false);
+    BOOST_REQUIRE_EQUAL(node.priority_validation, true);
     BOOST_REQUIRE_EQUAL(node.allowed_deviation, 1.5);
     BOOST_REQUIRE_EQUAL(node.maximum_height, 0_u32);
     BOOST_REQUIRE_EQUAL(node.allocation_multiple, 20_u16);