Adding active_transactions::insert_fn

nanocurrency · Sep 3, 2023 · 8d0415e · 8d0415e
1 parent 2b8245c
commit 8d0415e
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 9 deletions.
diff --git a/nano/core_test/scheduler_buckets.cpp b/nano/core_test/scheduler_buckets.cpp
@@ -106,7 +106,9 @@ std::shared_ptr<nano::state_block> & block3 ()
 	return result;
 }
 
+namespace {
 auto test_insert = [] (std::shared_ptr<nano::block> const & block, nano::election_behavior behavior) { return nano::election_insertion_result{}; };
+}
 
 TEST (buckets, construction)
 {

diff --git a/nano/core_test/scheduler_limiter.cpp b/nano/core_test/scheduler_limiter.cpp
@@ -5,7 +5,9 @@
 
 #include <gtest/gtest.h>
 
+namespace {
 auto test_insert = [] (std::shared_ptr<nano::block> const & block, nano::election_behavior behavior) { return nano::election_insertion_result{}; };
+}
 
 TEST (scheduler_limiter, construction)
 {

diff --git a/nano/node/active_transactions.cpp b/nano/node/active_transactions.cpp
@@ -373,6 +373,13 @@ nano::election_insertion_result nano::active_transactions::insert (const std::sh
 	return result;
 }
 
+std::function<nano::election_insertion_result (std::shared_ptr<nano::block> const & block, nano::election_behavior behavior)> nano::active_transactions::insert_fn ()
+{
+	return [this] (std::shared_ptr<nano::block> const & block, nano::election_behavior behavior) {
+		return insert (block, behavior);
+	};
+}
+
 void nano::active_transactions::trim ()
 {
 	/*

diff --git a/nano/node/active_transactions.hpp b/nano/node/active_transactions.hpp
@@ -142,6 +142,8 @@ class active_transactions final
 	 * Starts new election with a specified behavior type
 	 */
 	nano::election_insertion_result insert (std::shared_ptr<nano::block> const & block, nano::election_behavior behavior = nano::election_behavior::normal);
+	// Function wrapper around call to ::insert
+	std::function<nano::election_insertion_result (std::shared_ptr<nano::block> const & block, nano::election_behavior behavior)> insert_fn ();
 	// Distinguishes replay votes, cannot be determined if the block is not in any election
 	nano::vote_code vote (std::shared_ptr<nano::vote> const &);
 	// Is the root of this block in the roots container

diff --git a/nano/node/scheduler/hinted.cpp b/nano/node/scheduler/hinted.cpp
@@ -12,9 +12,7 @@ nano::scheduler::hinted::hinted (config const & config_a, nano::node & node_a, n
 	config_m{ config_a },
 	node{ node_a },
 	inactive_vote_cache{ inactive_vote_cache_a },
-	limiter{ std::make_shared<nano::scheduler::limiter> ([this] (auto const & block, auto const & behavior) {
-		return node.active.insert (block, behavior);
-	}, node.config.active_elections_hinted_limit_percentage * node.config.active_elections_size / 100, nano::election_behavior::hinted) },
+	limiter{ std::make_shared<nano::scheduler::limiter> (node.active.insert_fn (), node.config.active_elections_hinted_limit_percentage * node.config.active_elections_size / 100, nano::election_behavior::hinted) },
 	online_reps{ online_reps_a }, stats{ stats_a }
 {
 }

diff --git a/nano/node/scheduler/optimistic.cpp b/nano/node/scheduler/optimistic.cpp
@@ -8,9 +8,7 @@ nano::scheduler::optimistic::optimistic (optimistic_config const & config_a, nan
 	config{ config_a },
 	node{ node_a },
 	ledger{ ledger_a },
-	limiter{ std::make_shared <nano::scheduler::limiter> ([this] (auto const & block, auto const & behavior) {
-		return node.active.insert(block, behavior);
-	}, node.config.active_elections_optimistic_limit_percentage * node.config.active_elections_size / 100, nano::election_behavior::optimistic) },
+	limiter{ std::make_shared <nano::scheduler::limiter> (node.active.insert_fn (), node.config.active_elections_optimistic_limit_percentage * node.config.active_elections_size / 100, nano::election_behavior::optimistic) },
 	network_constants{ network_constants_a },
 	stats{ stats_a }
 {

diff --git a/nano/node/scheduler/priority.cpp b/nano/node/scheduler/priority.cpp
@@ -5,9 +5,7 @@
 nano::scheduler::priority::priority (nano::node & node_a, nano::stats & stats_a) :
 	node{ node_a },
 	stats{ stats_a },
-	buckets{ [this] (auto const & block, auto const & behavior) {
-		return node.active.insert (block, behavior);
-	} }
+	buckets{ node.active.insert_fn () }
 {
 }