change: Benchmark selection pallet (#1045)

Author: AmbientTea

Cargo.lock

@@ -15,7 +15,6 @@ members = [
 	"substrate-extensions/aura/consensus",
 	"toolkit/block-production-log/pallet",
 	"toolkit/committee-selection/pallet",
-	"toolkit/committee-selection/pallet/benchmarking",
 	"toolkit/committee-selection/rpc",
 	"substrate-extensions/aura/primitives",
 	"toolkit/block-production-log/primitives",
@@ -293,7 +292,6 @@ selection = { path = "toolkit/committee-selection/selection", default-features =
 sp-session-validator-management = { default-features = false, path = "toolkit/committee-selection/primitives" }
 sp-session-validator-management-query = { default-features = false, path = "toolkit/committee-selection/query" }
 pallet-session-validator-management = { default-features = false, path = "toolkit/committee-selection/pallet" }
-pallet-session-validator-management-benchmarking = { default-features = false, path = "toolkit/committee-selection/pallet/benchmarking" }
 pallet-session-validator-management-rpc = { path = "toolkit/committee-selection/rpc" }
 authority-selection-inherents = { path = "toolkit/committee-selection/authority-selection-inherents", default-features = false }
 

Cargo.toml

@@ -18,6 +18,8 @@ session in order to make `pallet_session` use authorities with less delay.
 
 ## Fixed
 
+* Improper weights for `set_main_chain_scripts` in `pallet_session_validator_management`
+
 ## Added
 
 * Added `partner-chains-node smart-contracts upsert-script` command for inserting and updating versioned scripts.

changelog.md

@@ -74,7 +74,6 @@ sp-sidechain = { workspace = true }
 pallet-sidechain = { workspace = true }
 pallet-session-validator-management = { workspace = true }
 sp-session-validator-management = { workspace = true, features = ["serde"] }
-pallet-session-validator-management-benchmarking = { workspace = true, optional = true }
 sidechain-domain = { workspace = true, features = ["serde"] }
 sidechain-slots = { workspace = true }
 pallet-address-associations = { workspace = true }
@@ -127,7 +126,6 @@ std = [
 	"pallet-grandpa/std",
 	"pallet-sudo/std",
 	"pallet-session-validator-management/std",
-	"pallet-session-validator-management-benchmarking?/std",
 	"pallet-timestamp/std",
 	"pallet-transaction-payment-rpc-runtime-api/std",
 	"pallet-transaction-payment/std",
@@ -185,6 +183,7 @@ runtime-benchmarks = [
 	"pallet-block-participation/runtime-benchmarks",
 	"pallet-governed-map/runtime-benchmarks",
 	"pallet-partner-chains-bridge/runtime-benchmarks",
+	"pallet-session-validator-management/runtime-benchmarks",
 ]
 try-runtime = [
 	"frame-try-runtime/try-runtime",

demo/runtime/Cargo.toml

@@ -408,6 +408,9 @@ impl pallet_session_validator_management::Config for Runtime {
 	fn current_epoch_number() -> ScEpochNumber {
 		Sidechain::current_epoch_number()
 	}
+
+	#[cfg(feature = "runtime-benchmarks")]
+	type BenchmarkHelper = ();
 }
 
 parameter_types! {
@@ -774,6 +777,7 @@ mod benches {
 		[pallet_block_participation, BlockParticipation]
 		[pallet_governed_map, GovernedMap]
 		[pallet_partner_chains_bridge, Bridge]
+		[pallet_session_validator_management, SessionCommitteeManagement]
 	);
 }
 

demo/runtime/src/lib.rs

@@ -187,6 +187,9 @@ impl pallet_session_validator_management::Config for Test {
 	}
 
 	type WeightInfo = ();
+
+	#[cfg(feature = "runtime-benchmarks")]
+	type BenchmarkHelper = ();
 }
 
 impl pallet_timestamp::Config for Test {

demo/runtime/src/mock.rs

@@ -29,6 +29,7 @@ sp-io = { workspace = true }
 sidechain-domain = { workspace = true }
 pallet-session = { workspace = true }
 sp-staking = { workspace = true }
+frame-benchmarking = { workspace = true, optional = true }
 
 [dev-dependencies]
 sp-io = { workspace = true }
@@ -50,5 +51,11 @@ std = [
     "sidechain-domain/serde",
     "pallet-session/std",
     "sp-staking/std",
+    "frame-benchmarking?/std",
 ]
 try-runtime = ["frame-support/try-runtime"]
+runtime-benchmarks = [
+    "frame-benchmarking/runtime-benchmarks",
+    "frame-support/runtime-benchmarks",
+    "frame-system/runtime-benchmarks",
+]