Refactor settings for uniform treatment of services.

Author: evoskuil

console/executor_runner.cpp

@@ -139,7 +139,7 @@ bool executor::do_run()
     logger(BN_NODE_INTERRUPT);
 
     // Create node.
-    metadata_.configured.network.initialize();
+    metadata_.configured.network.manual.initialize();
     node_ = std::make_shared<full_node>(query_, metadata_.configured, log_);
 
     // Subscribe node.

include/bitcoin/node/sessions/session_peer.hpp

@@ -39,7 +39,7 @@ class session_peer
 {
 public:
     typedef std::shared_ptr<session_peer<Session>> ptr;
-    using options_t = network::settings::tcp_server;
+    using options_t = typename Session::options_t;
     using channel_t = node::channel_peer;
 
     /// Construct an instance.
@@ -60,10 +60,9 @@ class session_peer
     {
         BC_ASSERT(this->stranded());
 
-        // TODO: send options_t.
         const auto channel = std::make_shared<channel_t>(
             this->get_memory(), this->log, socket, this->create_key(),
-            this->config(), options_t{});
+            this->config(), this->options());
 
         return std::static_pointer_cast<network::channel>(channel);
     }

include/bitcoin/node/settings.hpp

@@ -160,12 +160,12 @@ class BCN_API settings
     settings(system::chain::selection context, const embedded_pages& explore,
         const embedded_pages& web) NOEXCEPT;
 
-    /// native RESTful block explorer (http/s, stateless html/json)
-    server::settings::html_server explore;
-
     /// native admin web interface, isolated (http/s, stateless html)
     server::settings::html_server web;
 
+    /// native RESTful block explorer (http/s, stateless html/json)
+    server::settings::html_server explore;
+
     /// native websocket query interface (http/s->tcp/s, json, handshake)
     network::settings::websocket_server socket{ "socket" };
 

src/chasers/chaser_check.cpp

@@ -46,7 +46,7 @@ chaser_check::chaser_check(full_node& node) NOEXCEPT
   : chaser(node),
     maximum_concurrency_(node.config().node.maximum_concurrency_()),
     maximum_height_(node.config().node.maximum_height_()),
-    connections_(node.config().network.outbound_connections),
+    connections_(node.config().network.outbound.connections),
     allowed_deviation_(node.config().node.allowed_deviation)
 {
 }
@@ -518,7 +518,7 @@ size_t chaser_check::set_unassociated() NOEXCEPT
 size_t chaser_check::get_inventory_size() const NOEXCEPT
 {
     // Either condition means blocks shouldn't be getting downloaded (yet).
-    const size_t peers = config().network.outbound_connections;
+    const size_t peers = config().network.outbound.connections;
     if (is_zero(peers) || !is_current(false))
         return zero;