Last fixes

Author: ntn-x2

runtimes/peregrine/src/lib.rs

@@ -574,14 +574,16 @@ impl pallet_membership::Config<TechnicalMembershipProvider> for Runtime {
 pub struct MockMembershipChangedForBenchmarks;
 
 impl ChangeMembers<AccountId> for MockMembershipChangedForBenchmarks {
-	fn change_members_sorted(_incoming: &[AccountId], _outgoing: &[AccountId], _sorted_new: &[AccountId]) {}
+	fn change_members_sorted(incoming: &[AccountId], outgoing: &[AccountId], sorted_new: &[AccountId]) {
+		<()>::change_members_sorted(incoming, outgoing, sorted_new)
+	}
 
 	fn get_prime() -> Option<AccountId> {
 		cfg_if! {
 			if #[cfg(feature = "runtime-benchmark")] {
 				Some(AccountId::new([0; 32]))
 			} else {
-				pallet_membership::Prime::<Runtime, TipsMembershipProvider>::get()
+				<()>::get_prime()
 			}
 		}
 	}

runtimes/spiritnet/src/lib.rs

@@ -567,14 +567,16 @@ impl pallet_membership::Config<TechnicalMembershipProvider> for Runtime {
 pub struct MockMembershipChangedForBenchmarks;
 
 impl ChangeMembers<AccountId> for MockMembershipChangedForBenchmarks {
-	fn change_members_sorted(_incoming: &[AccountId], _outgoing: &[AccountId], _sorted_new: &[AccountId]) {}
+	fn change_members_sorted(incoming: &[AccountId], outgoing: &[AccountId], sorted_new: &[AccountId]) {
+		<()>::change_members_sorted(incoming, outgoing, sorted_new)
+	}
 
 	fn get_prime() -> Option<AccountId> {
 		cfg_if! {
 			if #[cfg(feature = "runtime-benchmark")] {
 				Some(AccountId::new([0; 32]))
 			} else {
-				pallet_membership::Prime::<Runtime, TipsMembershipProvider>::get()
+				<()>::get_prime()
 			}
 		}
 	}

scripts/run_benches_for_runtime.sh

@@ -56,12 +56,12 @@ pallets=(
 	pallet-web3-names
 )
 
-# # Add Peregrine-only pallets here!
-# if [ "$runtime" = "peregrine" ]; then
-# 	pallets+=(
-# 		pallet-sudo
-# 	)
-# fi
+# Add Peregrine-only pallets here!
+if [ "$runtime" = "peregrine" ]; then
+	pallets+=(
+		pallet-sudo
+	)
+fi
 
 echo "[+] Running all runtime benchmarks for \"$runtime\", \"--chain=$chain\" and profile \"$profile\""
 
@@ -70,7 +70,7 @@ cargo build $standard_args
 if [ $profile == "dev" ]; then
 	target_folder="debug"
 	# We care about benchmark correctness, not accuracy.
-	additional_args="--header=HEADER-GPL --template=.maintain/runtime-weight-template.hbs --output=./runtimes/${runtime}/src/weights/"
+	additional_args="--steps=2 --repeat=1 --default-pov-mode=ignored --no-verify"
 else
 	target_folder=$profile
 	additional_args="--header=HEADER-GPL --template=.maintain/runtime-weight-template.hbs --output=./runtimes/${runtime}/src/weights/"