From 530864623f6f954d1904c97d919f1b9a43ce82ef Mon Sep 17 00:00:00 2001 From: SergiySW Date: Wed, 13 Mar 2019 14:39:51 +0300 Subject: [PATCH] Fix (#1790) merge conflict --- nano/node/bootstrap.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nano/node/bootstrap.cpp b/nano/node/bootstrap.cpp index f4a00e437..438804374 100644 --- a/nano/node/bootstrap.cpp +++ b/nano/node/bootstrap.cpp @@ -98,7 +98,7 @@ void nano::socket::close () void nano::socket::checkup (uint64_t timeout_a) { std::weak_ptr this_w (shared_from_this ()); - node->alarm.add (std::chrono::steady_clock::now () + std::chrono::seconds (nano::is_test_network ? 1 : 10), [this_w, timeout_a]() { + node->alarm.add (std::chrono::steady_clock::now () + std::chrono::seconds (node->network_params.is_test_network () ? 1 : 10), [this_w, timeout_a]() { if (auto this_l = this_w.lock ()) { if (this_l->async_start_time != std::numeric_limits::max () && this_l->async_start_time + timeout_a < static_cast (std::chrono::steady_clock::now ().time_since_epoch ().count ()))