diff --git a/nano/node/election_scheduler.cpp b/nano/node/election_scheduler.cpp index 62c3b999a..a68773edd 100644 --- a/nano/node/election_scheduler.cpp +++ b/nano/node/election_scheduler.cpp @@ -32,10 +32,10 @@ void nano::election_scheduler::stop () nano::join_or_pass (thread); } -void nano::election_scheduler::manual (std::shared_ptr const & block_a, boost::optional const & previous_balance_a, nano::election_behavior election_behavior_a, std::function const &)> const & confirmation_action_a) +void nano::election_scheduler::manual (std::shared_ptr const & block_a, boost::optional const & previous_balance_a, nano::election_behavior election_behavior_a) { nano::lock_guard lock{ mutex }; - manual_queue.push_back (std::make_tuple (block_a, previous_balance_a, election_behavior_a, confirmation_action_a)); + manual_queue.push_back (std::make_tuple (block_a, previous_balance_a, election_behavior_a)); notify (); } @@ -140,11 +140,11 @@ void nano::election_scheduler::run () } else if (manual_queue_predicate ()) { - auto const [block, previous_balance, election_behavior, confirmation_action] = manual_queue.front (); + auto const [block, previous_balance, election_behavior] = manual_queue.front (); manual_queue.pop_front (); lock.unlock (); nano::unique_lock lock2 (node.active.mutex); - node.active.insert_impl (lock2, block, election_behavior, confirmation_action); + node.active.insert_impl (lock2, block, election_behavior); } else if (priority_queue_predicate ()) { diff --git a/nano/node/election_scheduler.hpp b/nano/node/election_scheduler.hpp index 9136c11b6..a8ce5cd71 100644 --- a/nano/node/election_scheduler.hpp +++ b/nano/node/election_scheduler.hpp @@ -27,7 +27,7 @@ public: // Manualy start an election for a block // Call action with confirmed block, may be different than what we started with - void manual (std::shared_ptr const &, boost::optional const & = boost::none, nano::election_behavior = nano::election_behavior::normal, std::function const &)> const & = nullptr); + void manual (std::shared_ptr const &, boost::optional const & = boost::none, nano::election_behavior = nano::election_behavior::normal); /** * Activates the first unconfirmed block of \p account_a * @return true if account was activated @@ -52,8 +52,8 @@ private: bool overfill_predicate () const; nano::prioritization priority; - std::deque, boost::optional, nano::election_behavior, std::function)>>> manual_queue; + std::deque, boost::optional, nano::election_behavior>> manual_queue; bool stopped{ false }; nano::condition_variable condition; mutable nano::mutex mutex;