WeightInfo for Session Pallet (#7136)

* whitelist caller in benchmarks

* remove unused component

* Add benchmark weights

* Remove `weightinfo` for `offences`

substrate/bin/node/runtime/src/lib.rs

@@ -403,7 +403,7 @@ impl pallet_session::Trait for Runtime {
 	type SessionHandler = <SessionKeys as OpaqueKeys>::KeyTypeIdProviders;
 	type Keys = SessionKeys;
 	type DisabledValidatorsThreshold = DisabledValidatorsThreshold;
-	type WeightInfo = ();
+	type WeightInfo = weights::pallet_session::WeightInfo;
 }
 
 impl pallet_session::historical::Trait for Runtime {
@@ -762,7 +762,6 @@ impl pallet_offences::Trait for Runtime {
 	type IdentificationTuple = pallet_session::historical::IdentificationTuple<Self>;
 	type OnOffenceHandler = Staking;
 	type WeightSoftLimit = OffencesWeightSoftLimit;
-	type WeightInfo = ();
 }
 
 impl pallet_authority_discovery::Trait for Runtime {}

substrate/bin/node/runtime/src/weights/mod.rs

@@ -25,6 +25,7 @@ pub mod pallet_indices;
 pub mod pallet_im_online;
 pub mod pallet_proxy;
 pub mod pallet_scheduler;
+pub mod pallet_session;
 pub mod pallet_staking;
 pub mod pallet_timestamp;
 pub mod pallet_utility;

substrate/bin/node/runtime/src/weights/pallet_session.rs

@@ -0,0 +1,37 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.0-rc6
+
+#![allow(unused_parens)]
+#![allow(unused_imports)]
+
+use frame_support::weights::{Weight, constants::RocksDbWeight as DbWeight};
+
+pub struct WeightInfo;
+impl pallet_session::WeightInfo for WeightInfo {
+	fn set_keys() -> Weight {
+		(88_411_000 as Weight)
+			.saturating_add(DbWeight::get().reads(6 as Weight))
+			.saturating_add(DbWeight::get().writes(5 as Weight))
+	}
+	fn purge_keys() -> Weight {
+		(51_843_000 as Weight)
+			.saturating_add(DbWeight::get().reads(2 as Weight))
+			.saturating_add(DbWeight::get().writes(5 as Weight))
+	}
+}

substrate/frame/babe/src/mock.rs

@@ -230,7 +230,6 @@ impl pallet_offences::Trait for Test {
 	type IdentificationTuple = pallet_session::historical::IdentificationTuple<Self>;
 	type OnOffenceHandler = Staking;
 	type WeightSoftLimit = OffencesWeightSoftLimit;
-	type WeightInfo = ();
 }
 
 impl Trait for Test {

substrate/frame/grandpa/src/mock.rs

@@ -245,7 +245,6 @@ impl pallet_offences::Trait for Test {
 	type IdentificationTuple = pallet_session::historical::IdentificationTuple<Self>;
 	type OnOffenceHandler = Staking;
 	type WeightSoftLimit = OffencesWeightSoftLimit;
-	type WeightInfo = ();
 }
 
 impl Trait for Test {

substrate/frame/offences/benchmarking/src/mock.rs

@@ -204,7 +204,6 @@ impl pallet_offences::Trait for Test {
 	type IdentificationTuple = pallet_session::historical::IdentificationTuple<Self>;
 	type OnOffenceHandler = Staking;
 	type WeightSoftLimit = OffencesWeightSoftLimit;
-	type WeightInfo = ();
 }
 
 impl<T> frame_system::offchain::SendTransactionTypes<T> for Test where Call: From<T> {

substrate/frame/offences/src/lib.rs

@@ -77,8 +77,6 @@ pub trait Trait: frame_system::Trait {
 	/// `on_initialize`.
 	/// Note it's going to be exceeded before we stop adding to it, so it has to be set conservatively.
 	type WeightSoftLimit: Get<Weight>;
-	/// Weight information for extrinsics in this pallet.
-	type WeightInfo: WeightInfo;
 }
 
 decl_storage! {
@@ -111,7 +109,7 @@ decl_event!(
 	pub enum Event {
 		/// There is an offence reported of the given `kind` happened at the `session_index` and
 		/// (kind-specific) time slot. This event is not deposited for duplicate slashes. last
-		/// element indicates of the offence was applied (true) or queued (false) 
+		/// element indicates of the offence was applied (true) or queued (false)
 		/// \[kind, timeslot, applied\].
 		Offence(Kind, OpaqueTimeSlot, bool),
 	}

substrate/frame/offences/src/mock.rs

@@ -132,7 +132,6 @@ impl Trait for Runtime {
 	type IdentificationTuple = u64;
 	type OnOffenceHandler = OnOffenceHandler;
 	type WeightSoftLimit = OffencesWeightSoftLimit;
-	type WeightInfo = ();
 }
 
 mod offences {

substrate/frame/session/benchmarking/src/lib.rs

@@ -28,7 +28,7 @@ use sp_std::vec;
 use frame_benchmarking::benchmarks;
 use frame_support::{
 	codec::Decode,
-	storage::StorageValue,
+	storage::{StorageValue, StorageMap},
 	traits::{KeyOwnerProofSystem, OnInitialize},
 };
 use frame_system::RawOrigin;
@@ -54,7 +54,7 @@ benchmarks! {
 	_ {	}
 
 	set_keys {
-		let n in 1 .. MAX_NOMINATIONS as u32;
+		let n = MAX_NOMINATIONS as u32;
 		let v_stash = create_validator_with_nominators::<T>(
 			n,
 			MAX_NOMINATIONS as u32,
@@ -64,17 +64,24 @@ benchmarks! {
 		let v_controller = pallet_staking::Module::<T>::bonded(&v_stash).ok_or("not stash")?;
 		let keys = T::Keys::default();
 		let proof: Vec<u8> = vec![0,1,2,3];
+		// Whitelist controller account from further DB operations.
+		let v_controller_key = frame_system::Account::<T>::hashed_key_for(&v_controller);
+		frame_benchmarking::benchmarking::add_to_whitelist(v_controller_key.into());
 	}: _(RawOrigin::Signed(v_controller), keys, proof)
 
 	purge_keys {
-		let n in 1 .. MAX_NOMINATIONS as u32;
+		let n = MAX_NOMINATIONS as u32;
 		let v_stash = create_validator_with_nominators::<T>(n, MAX_NOMINATIONS as u32, false, RewardDestination::Staked)?;
 		let v_controller = pallet_staking::Module::<T>::bonded(&v_stash).ok_or("not stash")?;
 		let keys = T::Keys::default();
 		let proof: Vec<u8> = vec![0,1,2,3];
 		Session::<T>::set_keys(RawOrigin::Signed(v_controller.clone()).into(), keys, proof)?;
+		// Whitelist controller account from further DB operations.
+		let v_controller_key = frame_system::Account::<T>::hashed_key_for(&v_controller);
+		frame_benchmarking::benchmarking::add_to_whitelist(v_controller_key.into());
 	}: _(RawOrigin::Signed(v_controller))
 
+	#[extra]
 	check_membership_proof_current_session {
 		let n in 2 .. MAX_VALIDATORS as u32;
 
@@ -87,6 +94,7 @@ benchmarks! {
 		assert!(Historical::<T>::check_proof(key, key_owner_proof2).is_some());
 	}
 
+	#[extra]
 	check_membership_proof_historical_session {
 		let n in 2 .. MAX_VALIDATORS as u32;
 

substrate/frame/session/src/default_weights.rs

@@ -0,0 +1,36 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.0-rc6
+
+#![allow(unused_parens)]
+#![allow(unused_imports)]
+
+use frame_support::weights::{Weight, constants::RocksDbWeight as DbWeight};
+
+impl crate::WeightInfo for () {
+	fn set_keys() -> Weight {
+		(88_411_000 as Weight)
+			.saturating_add(DbWeight::get().reads(6 as Weight))
+			.saturating_add(DbWeight::get().writes(5 as Weight))
+	}
+	fn purge_keys() -> Weight {
+		(51_843_000 as Weight)
+			.saturating_add(DbWeight::get().reads(2 as Weight))
+			.saturating_add(DbWeight::get().writes(5 as Weight))
+	}
+}

substrate/frame/session/src/lib.rs

@@ -123,6 +123,8 @@ mod tests;
 #[cfg(feature = "historical")]
 pub mod historical;
 
+mod default_weights;
+
 /// Decides whether the session should be ended.
 pub trait ShouldEndSession<BlockNumber> {
 	/// Return `true` if the session should be ended.
@@ -352,13 +354,8 @@ impl<T: Trait> ValidatorRegistration<T::ValidatorId> for Module<T> {
 }
 
 pub trait WeightInfo {
-	fn set_keys(n: u32, ) -> Weight;
-	fn purge_keys(n: u32, ) -> Weight;
-}
-
-impl WeightInfo for () {
-	fn set_keys(_n: u32, ) -> Weight { 1_000_000_000 }
-	fn purge_keys(_n: u32, ) -> Weight { 1_000_000_000 }
+	fn set_keys() -> Weight;
+	fn purge_keys() -> Weight;
 }
 
 pub trait Trait: frame_system::Trait {
@@ -524,9 +521,7 @@ decl_module! {
 		/// - DbReads per key id: `KeyOwner`
 		/// - DbWrites per key id: `KeyOwner`
 		/// # </weight>
-		#[weight = 200_000_000
-			+ T::DbWeight::get().reads(2 + T::Keys::key_ids().len() as Weight)
-			+ T::DbWeight::get().writes(1 + T::Keys::key_ids().len() as Weight)]
+		#[weight = T::WeightInfo::set_keys()]
 		pub fn set_keys(origin, keys: T::Keys, proof: Vec<u8>) -> dispatch::DispatchResult {
 			let who = ensure_signed(origin)?;
 
@@ -549,8 +544,7 @@ decl_module! {
 		/// - DbWrites: `NextKeys`, `origin account`
 		/// - DbWrites per key id: `KeyOwnder`
 		/// # </weight>
-		#[weight = 120_000_000
-			+ T::DbWeight::get().reads_writes(2, 1 + T::Keys::key_ids().len() as Weight)]
+		#[weight = T::WeightInfo::purge_keys()]
 		pub fn purge_keys(origin) {
 			let who = ensure_signed(origin)?;
 			Self::do_purge_keys(&who)?;