Companion for Weight v1.5 (#5943)

* fix to latest substrate pr

* update weights

* cargo build -p polkadot-runtime-parachains

* fix xcm-builder

* fix import

* fix a bunch

* fix a bunch of weight stuff

* kusama compile

* unused

* builds

* maybe fix

* cargo test -p polkadot-runtime-parachains

* xcm simulator example

* fix tests

* xcm sim fuzz

* fix runtime tests

* remove unused

* fix integration tests

* scalar div

* update lockfile for {"substrate"}

Co-authored-by: parity-processbot <>
This commit is contained in:
Shawn Tabrizi
2022-08-31 12:59:39 +01:00
committed by GitHub
parent 138aae0a22
commit 28e94d97dd
231 changed files with 4577 additions and 4514 deletions
@@ -38,7 +38,7 @@
#![allow(unused_parens)]
#![allow(unused_imports)]
use frame_support::{traits::Get, weights::Weight};
use frame_support::{traits::Get, weights::{RefTimeWeight, Weight}};
use sp_std::marker::PhantomData;
/// Weight functions for `pallet_collective`.
@@ -49,36 +49,36 @@ impl<T: frame_system::Config> pallet_collective::WeightInfo for WeightInfo<T> {
// 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)
Weight::from_ref_time(0 as RefTimeWeight)
// Standard Error: 6_000
.saturating_add((14_448_000 as Weight).saturating_mul(m as Weight))
.saturating_add(Weight::from_ref_time(14_448_000 as RefTimeWeight).scalar_saturating_mul(m as RefTimeWeight))
// Standard Error: 6_000
.saturating_add((85_000 as Weight).saturating_mul(n as Weight))
.saturating_add(Weight::from_ref_time(85_000 as RefTimeWeight).scalar_saturating_mul(n as RefTimeWeight))
// 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)))
.saturating_add(Weight::from_ref_time(19_620_000 as RefTimeWeight).scalar_saturating_mul(p as RefTimeWeight))
.saturating_add(T::DbWeight::get().reads(2 as RefTimeWeight))
.saturating_add(T::DbWeight::get().reads((1 as RefTimeWeight).saturating_mul(p as RefTimeWeight)))
.saturating_add(T::DbWeight::get().writes(2 as RefTimeWeight))
.saturating_add(T::DbWeight::get().writes((1 as RefTimeWeight).saturating_mul(p as RefTimeWeight)))
}
// Storage: Instance1Collective Members (r:1 w:0)
fn execute(b: u32, m: u32, ) -> Weight {
(22_536_000 as Weight)
Weight::from_ref_time(22_536_000 as RefTimeWeight)
// Standard Error: 0
.saturating_add((3_000 as Weight).saturating_mul(b as Weight))
.saturating_add(Weight::from_ref_time(3_000 as RefTimeWeight).scalar_saturating_mul(b as RefTimeWeight))
// Standard Error: 0
.saturating_add((84_000 as Weight).saturating_mul(m as Weight))
.saturating_add(T::DbWeight::get().reads(1 as Weight))
.saturating_add(Weight::from_ref_time(84_000 as RefTimeWeight).scalar_saturating_mul(m as RefTimeWeight))
.saturating_add(T::DbWeight::get().reads(1 as RefTimeWeight))
}
// 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)
Weight::from_ref_time(27_600_000 as RefTimeWeight)
// Standard Error: 0
.saturating_add((3_000 as Weight).saturating_mul(b as Weight))
.saturating_add(Weight::from_ref_time(3_000 as RefTimeWeight).scalar_saturating_mul(b as RefTimeWeight))
// Standard Error: 0
.saturating_add((161_000 as Weight).saturating_mul(m as Weight))
.saturating_add(T::DbWeight::get().reads(2 as Weight))
.saturating_add(Weight::from_ref_time(161_000 as RefTimeWeight).scalar_saturating_mul(m as RefTimeWeight))
.saturating_add(T::DbWeight::get().reads(2 as RefTimeWeight))
}
// Storage: Instance1Collective Members (r:1 w:0)
// Storage: Instance1Collective ProposalOf (r:1 w:1)
@@ -86,52 +86,52 @@ impl<T: frame_system::Config> pallet_collective::WeightInfo for WeightInfo<T> {
// 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)
Weight::from_ref_time(42_192_000 as RefTimeWeight)
// Standard Error: 0
.saturating_add((4_000 as Weight).saturating_mul(b as Weight))
.saturating_add(Weight::from_ref_time(4_000 as RefTimeWeight).scalar_saturating_mul(b as RefTimeWeight))
// Standard Error: 0
.saturating_add((87_000 as Weight).saturating_mul(m as Weight))
.saturating_add(Weight::from_ref_time(87_000 as RefTimeWeight).scalar_saturating_mul(m as RefTimeWeight))
// 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))
.saturating_add(Weight::from_ref_time(361_000 as RefTimeWeight).scalar_saturating_mul(p as RefTimeWeight))
.saturating_add(T::DbWeight::get().reads(4 as RefTimeWeight))
.saturating_add(T::DbWeight::get().writes(4 as RefTimeWeight))
}
// Storage: Instance1Collective Members (r:1 w:0)
// Storage: Instance1Collective Voting (r:1 w:1)
fn vote(m: u32, ) -> Weight {
(32_307_000 as Weight)
Weight::from_ref_time(32_307_000 as RefTimeWeight)
// 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))
.saturating_add(Weight::from_ref_time(199_000 as RefTimeWeight).scalar_saturating_mul(m as RefTimeWeight))
.saturating_add(T::DbWeight::get().reads(2 as RefTimeWeight))
.saturating_add(T::DbWeight::get().writes(1 as RefTimeWeight))
}
// 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)
Weight::from_ref_time(41_436_000 as RefTimeWeight)
// Standard Error: 0
.saturating_add((170_000 as Weight).saturating_mul(m as Weight))
.saturating_add(Weight::from_ref_time(170_000 as RefTimeWeight).scalar_saturating_mul(m as RefTimeWeight))
// 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))
.saturating_add(Weight::from_ref_time(333_000 as RefTimeWeight).scalar_saturating_mul(p as RefTimeWeight))
.saturating_add(T::DbWeight::get().reads(3 as RefTimeWeight))
.saturating_add(T::DbWeight::get().writes(3 as RefTimeWeight))
}
// 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)
Weight::from_ref_time(57_836_000 as RefTimeWeight)
// Standard Error: 0
.saturating_add((2_000 as Weight).saturating_mul(b as Weight))
.saturating_add(Weight::from_ref_time(2_000 as RefTimeWeight).scalar_saturating_mul(b as RefTimeWeight))
// Standard Error: 0
.saturating_add((170_000 as Weight).saturating_mul(m as Weight))
.saturating_add(Weight::from_ref_time(170_000 as RefTimeWeight).scalar_saturating_mul(m as RefTimeWeight))
// 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))
.saturating_add(Weight::from_ref_time(339_000 as RefTimeWeight).scalar_saturating_mul(p as RefTimeWeight))
.saturating_add(T::DbWeight::get().reads(4 as RefTimeWeight))
.saturating_add(T::DbWeight::get().writes(3 as RefTimeWeight))
}
// Storage: Instance1Collective Voting (r:1 w:1)
// Storage: Instance1Collective Members (r:1 w:0)
@@ -139,13 +139,13 @@ impl<T: frame_system::Config> pallet_collective::WeightInfo for WeightInfo<T> {
// 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)
Weight::from_ref_time(45_551_000 as RefTimeWeight)
// Standard Error: 0
.saturating_add((172_000 as Weight).saturating_mul(m as Weight))
.saturating_add(Weight::from_ref_time(172_000 as RefTimeWeight).scalar_saturating_mul(m as RefTimeWeight))
// 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))
.saturating_add(Weight::from_ref_time(338_000 as RefTimeWeight).scalar_saturating_mul(p as RefTimeWeight))
.saturating_add(T::DbWeight::get().reads(4 as RefTimeWeight))
.saturating_add(T::DbWeight::get().writes(3 as RefTimeWeight))
}
// Storage: Instance1Collective Voting (r:1 w:1)
// Storage: Instance1Collective Members (r:1 w:0)
@@ -153,24 +153,24 @@ impl<T: frame_system::Config> pallet_collective::WeightInfo for WeightInfo<T> {
// 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)
Weight::from_ref_time(61_497_000 as RefTimeWeight)
// Standard Error: 0
.saturating_add((2_000 as Weight).saturating_mul(b as Weight))
.saturating_add(Weight::from_ref_time(2_000 as RefTimeWeight).scalar_saturating_mul(b as RefTimeWeight))
// Standard Error: 0
.saturating_add((171_000 as Weight).saturating_mul(m as Weight))
.saturating_add(Weight::from_ref_time(171_000 as RefTimeWeight).scalar_saturating_mul(m as RefTimeWeight))
// 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))
.saturating_add(Weight::from_ref_time(343_000 as RefTimeWeight).scalar_saturating_mul(p as RefTimeWeight))
.saturating_add(T::DbWeight::get().reads(5 as RefTimeWeight))
.saturating_add(T::DbWeight::get().writes(3 as RefTimeWeight))
}
// 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)
Weight::from_ref_time(25_573_000 as RefTimeWeight)
// 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))
.saturating_add(Weight::from_ref_time(335_000 as RefTimeWeight).scalar_saturating_mul(p as RefTimeWeight))
.saturating_add(T::DbWeight::get().reads(1 as RefTimeWeight))
.saturating_add(T::DbWeight::get().writes(3 as RefTimeWeight))
}
}