Skip to content
This repository has been archived by the owner on Nov 15, 2023. It is now read-only.

technical committee is using the weight of council, but should have its own generated weight instead #3511

Merged
24 commits merged into from
Sep 1, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
71669e7
collectives have different weight
gui1117 Jul 22, 2021
4a4988f
fix path
gui1117 Jul 22, 2021
3e42d63
Merge branch 'master' of https://github.com/paritytech/polkadot into …
Jul 22, 2021
2d89b8a
fix typo
shawntabrizi Jul 22, 2021
fbca361
cargo run --quiet --release --features=runtime-benchmarks -- benchmar…
Jul 22, 2021
04bf2a1
cargo run --quiet --release --features=runtime-benchmarks -- benchmar…
Jul 22, 2021
2f7ec21
Merge remote-tracking branch 'origin/master' into gui-fix-weights-col…
gui1117 Aug 20, 2021
026cf2f
add description for technical committee
gui1117 Aug 20, 2021
7c39e87
cargo run --quiet --release --features=runtime-benchmarks -- benchmar…
Aug 20, 2021
84279aa
Merge branch 'master' of https://github.com/paritytech/polkadot into …
Aug 20, 2021
74d31ca
use unique names
gui1117 Aug 23, 2021
b800710
Merge branch 'master' of https://github.com/paritytech/polkadot into …
Aug 23, 2021
9d98379
makes compiling weights result
gui1117 Aug 23, 2021
690fdb6
cargo run --quiet --release --features=runtime-benchmarks -- benchmar…
Aug 23, 2021
e9818fd
Revert "cargo run --quiet --release --features=runtime-benchmarks -- …
gui1117 Aug 25, 2021
e72394a
revert unique names
gui1117 Aug 25, 2021
6fd5836
cargo update -p sp-io
gui1117 Aug 27, 2021
bccf273
Merge remote-tracking branch 'origin/master' into gui-fix-weights-col…
gui1117 Aug 27, 2021
3670dde
fix
gui1117 Aug 27, 2021
c476579
cargo update -p sp-io
gui1117 Aug 27, 2021
72d643c
Merge branch 'master' of https://github.com/paritytech/polkadot into …
Aug 27, 2021
dc5176a
cargo run --quiet --release --features=runtime-benchmarks -- benchmar…
Aug 27, 2021
4ef75ae
cargo run --quiet --release --features=runtime-benchmarks -- benchmar…
Aug 27, 2021
f4961b3
Merge remote-tracking branch 'origin/master' into gui-fix-weights-col…
gui1117 Aug 30, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions runtime/kusama/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -590,7 +590,7 @@ impl pallet_collective::Config<CouncilCollective> for Runtime {
type MaxProposals = CouncilMaxProposals;
type MaxMembers = CouncilMaxMembers;
type DefaultVote = pallet_collective::PrimeDefaultVote;
type WeightInfo = weights::pallet_collective::WeightInfo<Runtime>;
type WeightInfo = weights::pallet_collective_council::WeightInfo<Runtime>;
}

parameter_types! {
Expand Down Expand Up @@ -642,7 +642,7 @@ impl pallet_collective::Config<TechnicalCollective> for Runtime {
type MaxProposals = TechnicalMaxProposals;
type MaxMembers = TechnicalMaxMembers;
type DefaultVote = pallet_collective::PrimeDefaultVote;
type WeightInfo = weights::pallet_collective::WeightInfo<Runtime>;
type WeightInfo = weights::pallet_collective_technical_committee::WeightInfo<Runtime>;
}

impl pallet_membership::Config<pallet_membership::Instance1> for Runtime {
Expand Down Expand Up @@ -1832,6 +1832,7 @@ sp_api::impl_runtime_apis! {
list_benchmark!(list, extra, pallet_balances, Balances);
list_benchmark!(list, extra, pallet_bounties, Bounties);
list_benchmark!(list, extra, pallet_collective, Council);
list_benchmark!(list, extra, pallet_collective, TechnicalCommittee);
list_benchmark!(list, extra, pallet_democracy, Democracy);
list_benchmark!(list, extra, pallet_elections_phragmen, PhragmenElection);
list_benchmark!(list, extra, pallet_election_provider_multi_phase, ElectionProviderMultiPhase);
Expand Down Expand Up @@ -1904,6 +1905,7 @@ sp_api::impl_runtime_apis! {
add_benchmark!(params, batches, pallet_balances, Balances);
add_benchmark!(params, batches, pallet_bounties, Bounties);
add_benchmark!(params, batches, pallet_collective, Council);
add_benchmark!(params, batches, pallet_collective, TechnicalCommittee);
add_benchmark!(params, batches, pallet_democracy, Democracy);
add_benchmark!(params, batches, pallet_elections_phragmen, PhragmenElection);
add_benchmark!(params, batches, pallet_election_provider_multi_phase, ElectionProviderMultiPhase);
Expand Down
3 changes: 2 additions & 1 deletion runtime/kusama/src/weights/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@
pub mod frame_system;
pub mod pallet_balances;
pub mod pallet_bounties;
pub mod pallet_collective;
pub mod pallet_collective_council;
pub mod pallet_collective_technical_committee;
pub mod pallet_democracy;
pub mod pallet_election_provider_multi_phase;
pub mod pallet_elections_phragmen;
Expand Down
139 changes: 0 additions & 139 deletions runtime/kusama/src/weights/pallet_collective.rs

This file was deleted.

176 changes: 176 additions & 0 deletions runtime/kusama/src/weights/pallet_collective_council.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,176 @@
// Copyright 2017-2021 Parity Technologies (UK) Ltd.
// This file is part of Polkadot.

// Polkadot is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.

// Polkadot is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.

// You should have received a copy of the GNU General Public License
// along with Polkadot. If not, see <http://www.gnu.org/licenses/>.
//! Autogenerated weights for `pallet_collective`
//!
//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
//! DATE: 2021-08-27, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("kusama-dev"), DB CACHE: 128

// Executed Command:
// target/release/polkadot
// benchmark
// --chain=kusama-dev
// --steps=50
// --repeat=20
// --pallet=pallet_collective
// --extrinsic=*
// --execution=wasm
// --wasm-execution=compiled
// --heap-pages=4096
// --header=./file_header.txt
// --output=./runtime/kusama/src/weights/


#![cfg_attr(rustfmt, rustfmt_skip)]
#![allow(unused_parens)]
#![allow(unused_imports)]

use frame_support::{traits::Get, weights::Weight};
use sp_std::marker::PhantomData;

/// Weight functions for pallet_collective.
pub struct WeightInfo<T>(PhantomData<T>);
impl<T: frame_system::Config> pallet_collective::WeightInfo for WeightInfo<T> {
// Storage: Instance1Collective Members (r:1 w:1)
// Storage: Instance1Collective Proposals (r:1 w:0)
// Storage: Instance1Collective Voting (r:100 w:100)
// Storage: Instance1Collective Prime (r:0 w:1)
fn set_members(m: u32, n: u32, p: u32, ) -> Weight {
(0 as Weight)
// Standard Error: 6_000
.saturating_add((14_448_000 as Weight).saturating_mul(m as Weight))
// Standard Error: 6_000
.saturating_add((85_000 as Weight).saturating_mul(n as Weight))
// Standard Error: 6_000
.saturating_add((19_620_000 as Weight).saturating_mul(p as Weight))
.saturating_add(T::DbWeight::get().reads(2 as Weight))
.saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(p as Weight)))
.saturating_add(T::DbWeight::get().writes(2 as Weight))
.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(p as Weight)))
}
// Storage: Instance1Collective Members (r:1 w:0)
fn execute(b: u32, m: u32, ) -> Weight {
(22_536_000 as Weight)
// Standard Error: 0
.saturating_add((3_000 as Weight).saturating_mul(b as Weight))
// Standard Error: 0
.saturating_add((84_000 as Weight).saturating_mul(m as Weight))
.saturating_add(T::DbWeight::get().reads(1 as Weight))
}
// Storage: Instance1Collective Members (r:1 w:0)
// Storage: Instance1Collective ProposalOf (r:1 w:0)
fn propose_execute(b: u32, m: u32, ) -> Weight {
(27_600_000 as Weight)
// Standard Error: 0
.saturating_add((3_000 as Weight).saturating_mul(b as Weight))
// Standard Error: 0
.saturating_add((161_000 as Weight).saturating_mul(m as Weight))
.saturating_add(T::DbWeight::get().reads(2 as Weight))
}
// Storage: Instance1Collective Members (r:1 w:0)
// Storage: Instance1Collective ProposalOf (r:1 w:1)
// Storage: Instance1Collective Proposals (r:1 w:1)
// Storage: Instance1Collective ProposalCount (r:1 w:1)
// Storage: Instance1Collective Voting (r:0 w:1)
fn propose_proposed(b: u32, m: u32, p: u32, ) -> Weight {
(42_192_000 as Weight)
// Standard Error: 0
.saturating_add((4_000 as Weight).saturating_mul(b as Weight))
// Standard Error: 0
.saturating_add((87_000 as Weight).saturating_mul(m as Weight))
// Standard Error: 0
.saturating_add((361_000 as Weight).saturating_mul(p as Weight))
.saturating_add(T::DbWeight::get().reads(4 as Weight))
.saturating_add(T::DbWeight::get().writes(4 as Weight))
}
// Storage: Instance1Collective Members (r:1 w:0)
// Storage: Instance1Collective Voting (r:1 w:1)
fn vote(m: u32, ) -> Weight {
(32_307_000 as Weight)
// Standard Error: 0
.saturating_add((199_000 as Weight).saturating_mul(m as Weight))
.saturating_add(T::DbWeight::get().reads(2 as Weight))
.saturating_add(T::DbWeight::get().writes(1 as Weight))
}
// Storage: Instance1Collective Voting (r:1 w:1)
// Storage: Instance1Collective Members (r:1 w:0)
// Storage: Instance1Collective Proposals (r:1 w:1)
// Storage: Instance1Collective ProposalOf (r:0 w:1)
fn close_early_disapproved(m: u32, p: u32, ) -> Weight {
(41_436_000 as Weight)
// Standard Error: 0
.saturating_add((170_000 as Weight).saturating_mul(m as Weight))
// Standard Error: 0
.saturating_add((333_000 as Weight).saturating_mul(p as Weight))
.saturating_add(T::DbWeight::get().reads(3 as Weight))
.saturating_add(T::DbWeight::get().writes(3 as Weight))
}
// Storage: Instance1Collective Voting (r:1 w:1)
// Storage: Instance1Collective Members (r:1 w:0)
// Storage: Instance1Collective ProposalOf (r:1 w:1)
// Storage: Instance1Collective Proposals (r:1 w:1)
fn close_early_approved(b: u32, m: u32, p: u32, ) -> Weight {
(57_836_000 as Weight)
// Standard Error: 0
.saturating_add((2_000 as Weight).saturating_mul(b as Weight))
// Standard Error: 0
.saturating_add((170_000 as Weight).saturating_mul(m as Weight))
// Standard Error: 0
.saturating_add((339_000 as Weight).saturating_mul(p as Weight))
.saturating_add(T::DbWeight::get().reads(4 as Weight))
.saturating_add(T::DbWeight::get().writes(3 as Weight))
}
// Storage: Instance1Collective Voting (r:1 w:1)
// Storage: Instance1Collective Members (r:1 w:0)
// Storage: Instance1Collective Prime (r:1 w:0)
// Storage: Instance1Collective Proposals (r:1 w:1)
// Storage: Instance1Collective ProposalOf (r:0 w:1)
fn close_disapproved(m: u32, p: u32, ) -> Weight {
(45_551_000 as Weight)
// Standard Error: 0
.saturating_add((172_000 as Weight).saturating_mul(m as Weight))
// Standard Error: 0
.saturating_add((338_000 as Weight).saturating_mul(p as Weight))
.saturating_add(T::DbWeight::get().reads(4 as Weight))
.saturating_add(T::DbWeight::get().writes(3 as Weight))
}
// Storage: Instance1Collective Voting (r:1 w:1)
// Storage: Instance1Collective Members (r:1 w:0)
// Storage: Instance1Collective Prime (r:1 w:0)
// Storage: Instance1Collective ProposalOf (r:1 w:1)
// Storage: Instance1Collective Proposals (r:1 w:1)
fn close_approved(b: u32, m: u32, p: u32, ) -> Weight {
(61_497_000 as Weight)
// Standard Error: 0
.saturating_add((2_000 as Weight).saturating_mul(b as Weight))
// Standard Error: 0
.saturating_add((171_000 as Weight).saturating_mul(m as Weight))
// Standard Error: 0
.saturating_add((343_000 as Weight).saturating_mul(p as Weight))
.saturating_add(T::DbWeight::get().reads(5 as Weight))
.saturating_add(T::DbWeight::get().writes(3 as Weight))
}
// Storage: Instance1Collective Proposals (r:1 w:1)
// Storage: Instance1Collective Voting (r:0 w:1)
// Storage: Instance1Collective ProposalOf (r:0 w:1)
fn disapprove_proposal(p: u32, ) -> Weight {
(25_573_000 as Weight)
// Standard Error: 0
.saturating_add((335_000 as Weight).saturating_mul(p as Weight))
.saturating_add(T::DbWeight::get().reads(1 as Weight))
.saturating_add(T::DbWeight::get().writes(3 as Weight))
}
}
Loading