diff --git a/nano/node/bootstrap/bootstrap_attempt.cpp b/nano/node/bootstrap/bootstrap_attempt.cpp index c0c8d9082..4de17b1e6 100644 --- a/nano/node/bootstrap/bootstrap_attempt.cpp +++ b/nano/node/bootstrap/bootstrap_attempt.cpp @@ -113,12 +113,6 @@ std::string nano::bootstrap_attempt::mode_text () return mode_text; } -bool nano::bootstrap_attempt::request_bulk_push_target (std::pair &) -{ - debug_assert (mode == nano::bootstrap_mode::legacy); - return true; -} - void nano::bootstrap_attempt::set_start_account (nano::account const &) { debug_assert (mode == nano::bootstrap_mode::legacy); diff --git a/nano/node/bootstrap/bootstrap_attempt.hpp b/nano/node/bootstrap/bootstrap_attempt.hpp index e3d771522..add9701b5 100644 --- a/nano/node/bootstrap/bootstrap_attempt.hpp +++ b/nano/node/bootstrap/bootstrap_attempt.hpp @@ -27,7 +27,6 @@ public: void pull_finished (); bool should_log (); std::string mode_text (); - virtual bool request_bulk_push_target (std::pair &); virtual void set_start_account (nano::account const &); virtual bool process_block (std::shared_ptr const &, nano::account const &, uint64_t, nano::bulk_pull::count_t, bool, unsigned); virtual void get_information (boost::property_tree::ptree &) = 0; diff --git a/nano/node/bootstrap/bootstrap_bulk_push.cpp b/nano/node/bootstrap/bootstrap_bulk_push.cpp index 2e15af324..e14b3f292 100644 --- a/nano/node/bootstrap/bootstrap_bulk_push.cpp +++ b/nano/node/bootstrap/bootstrap_bulk_push.cpp @@ -1,11 +1,12 @@ #include #include +#include #include #include #include -nano::bulk_push_client::bulk_push_client (std::shared_ptr const & connection_a, std::shared_ptr const & attempt_a) : +nano::bulk_push_client::bulk_push_client (std::shared_ptr const & connection_a, std::shared_ptr const & attempt_a) : connection (connection_a), attempt (attempt_a) { diff --git a/nano/node/bootstrap/bootstrap_bulk_push.hpp b/nano/node/bootstrap/bootstrap_bulk_push.hpp index c9f19d5ce..f43aba14d 100644 --- a/nano/node/bootstrap/bootstrap_bulk_push.hpp +++ b/nano/node/bootstrap/bootstrap_bulk_push.hpp @@ -6,7 +6,7 @@ namespace nano { -class bootstrap_attempt; +class bootstrap_attempt_legacy; class bootstrap_client; /** @@ -15,14 +15,14 @@ class bootstrap_client; class bulk_push_client final : public std::enable_shared_from_this { public: - explicit bulk_push_client (std::shared_ptr const &, std::shared_ptr const &); + explicit bulk_push_client (std::shared_ptr const &, std::shared_ptr const &); ~bulk_push_client (); void start (); void push (); void push_block (nano::block const &); void send_finished (); std::shared_ptr connection; - std::shared_ptr attempt; + std::shared_ptr attempt; std::promise promise; std::pair current_target; }; diff --git a/nano/node/bootstrap/bootstrap_legacy.cpp b/nano/node/bootstrap/bootstrap_legacy.cpp index 6a13b2c2d..1904092e6 100644 --- a/nano/node/bootstrap/bootstrap_legacy.cpp +++ b/nano/node/bootstrap/bootstrap_legacy.cpp @@ -68,8 +68,8 @@ void nano::bootstrap_attempt_legacy::request_push (nano::unique_lock future; { - auto this_l (shared_from_this ()); - auto client (std::make_shared (connection_l, this_l)); + auto this_l = std::dynamic_pointer_cast (shared_from_this ()); + auto client = std::make_shared (connection_l, this_l); client->start (); push = client; future = client->promise.get_future (); diff --git a/nano/node/bootstrap/bootstrap_legacy.hpp b/nano/node/bootstrap/bootstrap_legacy.hpp index 53258aa3d..ff2186c84 100644 --- a/nano/node/bootstrap/bootstrap_legacy.hpp +++ b/nano/node/bootstrap/bootstrap_legacy.hpp @@ -27,7 +27,7 @@ public: void request_push (nano::unique_lock &); void add_frontier (nano::pull_info const &); void add_bulk_push_target (nano::block_hash const &, nano::block_hash const &); - bool request_bulk_push_target (std::pair &) override; + bool request_bulk_push_target (std::pair &); void set_start_account (nano::account const &) override; void run_start (nano::unique_lock &); void get_information (boost::property_tree::ptree &) override;