benches with lazy voter sorting

paritytech · Jun 1, 2024 · b286d3e · b286d3e
1 parent 7fcc09b
commit b286d3e
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 11 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/substrate/bin/node/runtime/src/lib.rs b/substrate/bin/node/runtime/src/lib.rs
@@ -704,7 +704,7 @@ impl pallet_staking::Config for Runtime {
 }
 
 parameter_types! {
-	pub const VoterUpdateMode: pallet_stake_tracker::VoterUpdateMode = pallet_stake_tracker::VoterUpdateMode::Strict;
+	pub const VoterUpdateMode: pallet_stake_tracker::VoterUpdateMode = pallet_stake_tracker::VoterUpdateMode::Lazy;
 }
 
 impl pallet_stake_tracker::Config for Runtime {

diff --git a/substrate/frame/staking/src/benchmarking.rs b/substrate/frame/staking/src/benchmarking.rs
@@ -1214,7 +1214,7 @@ mod benchmarks {
 
 	impl_benchmark_test_suite!(
 		Staking,
-		crate::mock::ExtBuilder::default().has_stakers(true).set_voter_list_lazy(),
+		crate::mock::ExtBuilder::default().has_stakers(true),
 		crate::mock::Test,
 		exec_name = build_and_execute
 	);

diff --git a/substrate/frame/staking/src/mock.rs b/substrate/frame/staking/src/mock.rs
@@ -363,7 +363,7 @@ impl OnStakingUpdate<AccountId, Balance> for EventTracker {
 }
 
 parameter_types! {
-	pub static VoterUpdateMode: pallet_stake_tracker::VoterUpdateMode = pallet_stake_tracker::VoterUpdateMode::Strict;
+	pub static VoterUpdateMode: pallet_stake_tracker::VoterUpdateMode = pallet_stake_tracker::VoterUpdateMode::Lazy;
 }
 
 impl pallet_stake_tracker::Config for Test {
@@ -565,8 +565,8 @@ impl ExtBuilder {
 		SkipTryStateCheck::set(!enable);
 		self
 	}
-	pub fn set_voter_list_lazy(self) -> Self {
-		VoterUpdateMode::set(pallet_stake_tracker::VoterUpdateMode::Lazy);
+	pub fn set_voter_list_strict(self) -> Self {
+		VoterUpdateMode::set(pallet_stake_tracker::VoterUpdateMode::Strict);
 		self
 	}
 	pub fn max_winners(self, max: u32) -> Self {

diff --git a/substrate/frame/staking/src/tests.rs b/substrate/frame/staking/src/tests.rs
@@ -5169,7 +5169,7 @@ mod sorted_list_provider_integration {
 
 	#[test]
 	fn nominator_bond_unbond_chill_works() {
-		ExtBuilder::default().build_and_execute(|| {
+		ExtBuilder::default().set_voter_list_strict().build_and_execute(|| {
 			Balances::make_free_balance_be(&42, 100);
 
 			// initial stakers.
@@ -5237,7 +5237,7 @@ mod sorted_list_provider_integration {
 
 	#[test]
 	fn validator_validate_chill_works() {
-		ExtBuilder::default().build_and_execute(|| {
+		ExtBuilder::default().set_voter_list_strict().build_and_execute(|| {
 			Balances::make_free_balance_be(&42, 100);
 
 			// initial targets.

diff --git a/substrate/frame/staking/stake-tracker/Cargo.toml b/substrate/frame/staking/stake-tracker/Cargo.toml
@@ -24,8 +24,6 @@ frame-election-provider-support = { default-features = false, path = "../../elec
 frame-support = { default-features = false, path = "../../support" }
 frame-system = { default-features = false, path = "../../system" }
 
-log = { version = "0.4.17", default-features = false }
-
 # Optional imports for benchmarking
 frame-benchmarking = { path = "../../benchmarking", default-features = false, optional = true }
 
@@ -48,7 +46,6 @@ std = [
 	"frame-election-provider-support/std",
 	"frame-support/std",
 	"frame-system/std",
-	"log/std",
 	"pallet-bags-list/std",
 	"pallet-balances/std",
 	"scale-info/std",