Merge pull request #473 from evoskuil/master

Add error::seeding_complete, apply to seed protocol stop, move boost error.

Author: evoskuil

include/bitcoin/network/error.hpp

@@ -62,6 +62,7 @@ enum error_t : uint8_t
     address_unsupported,
     address_insufficient,
     seeding_unsuccessful,
+    seeding_complete,
 
     // file system
     file_load,

src/error.cpp

@@ -38,6 +38,7 @@ DEFINE_ERROR_T_MESSAGE_MAP(error)
     { address_unsupported, "advertised services unsupported" },
     { address_insufficient, "advertised services insufficient" },
     { seeding_unsuccessful, "seeding unsuccessful" },
+    { seeding_complete, "seeding complete" },
 
     // file system
     { file_load, "failed to load file" },
@@ -141,15 +142,15 @@ code asio_to_error_code(const error::boost_code& ec) NOEXCEPT
 
     // connect-resolve
     if (ec == boost_error_t::address_family_not_supported ||
-        ec == boost_error_t::address_not_available ||
         ec == boost_error_t::bad_address ||
         ec == boost_error_t::destination_address_required ||
         ec == asio_netdb_error_t::host_not_found ||
         ec == asio_netdb_error_t::host_not_found_try_again)
         return error::resolve_failed;
 
     // connect-connect
-    if (ec == boost_error_t::not_connected ||
+    if (ec == boost_error_t::address_not_available ||
+        ec == boost_error_t::not_connected ||
         ec == boost_error_t::connection_refused ||
         ec == boost_error_t::broken_pipe ||
         ec == boost_error_t::host_unreachable ||

src/net/connector.cpp

@@ -119,8 +119,7 @@ void connector::start(const std::string& hostname, uint16_t port,
 
     // Create a socket and shared finish context.
     const auto finish = std::make_shared<bool>(false);
-    const auto socket = std::make_shared<network::socket>(log, service_,
-        host);
+    const auto socket = std::make_shared<network::socket>(log, service_, host);
 
     // Posts handle_timer to strand.
     timer_->start(

src/protocols/protocol_seed_209.cpp

@@ -111,7 +111,7 @@ void protocol_seed_209::handle_send_get_address(const code& ec) NOEXCEPT
     sent_get_address_ = true;
 
     if (complete())
-        stop(error::success);
+        stop(error::seeding_complete);
 }
 
 address::cptr protocol_seed_209::filter(
@@ -192,7 +192,7 @@ void protocol_seed_209::handle_save_addresses(const code& ec,
     received_address_ = !is_one(start_size);
 
     if (complete())
-        stop(error::success);
+        stop(error::seeding_complete);
 }
 
 // Outbound (fetch and send addresses).
@@ -232,7 +232,7 @@ void protocol_seed_209::handle_send_address(const code& ec) NOEXCEPT
     ////sent_address_ = true;
 
     if (complete())
-        stop(error::success);
+        stop(error::seeding_complete);
 }
 
 BC_POP_WARNING()

test/error.cpp

@@ -97,6 +97,15 @@ BOOST_AUTO_TEST_CASE(error_t__code__seeding_unsuccessful__true_exected_message)
     BOOST_REQUIRE_EQUAL(ec.message(), "seeding unsuccessful");
 }
 
+BOOST_AUTO_TEST_CASE(error_t__code__seeding_complete__true_exected_message)
+{
+    constexpr auto value = error::seeding_complete;
+    const auto ec = code(value);
+    BOOST_REQUIRE(ec);
+    BOOST_REQUIRE(ec == value);
+    BOOST_REQUIRE_EQUAL(ec.message(), "seeding complete");
+}
+
 // file system
 
 BOOST_AUTO_TEST_CASE(error_t__code__file_load__true_exected_message)