Deprecate Weight::from_{ref_time, proof_size} (#13475)

* Deprecate Weight::from_{ref_time, proof_size}

Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>

* Update templates

Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>

* Use from_parts

Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>

* Use from_parts

Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>

* Dont revert comment 🤦

Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>

* ".git/.scripts/commands/bench/bench.sh" pallet dev pallet_balances

* Update weight files

Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>

* More fixes

Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>

* Adapt to Master changes

Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>

---------

Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>
Co-authored-by: command-bot <>
This commit is contained in:
Oliver Tale-Yazdi
2023-03-02 22:28:17 +01:00
committed by GitHub
parent 7981d4aa59
commit 9e56e1acdd
101 changed files with 2695 additions and 2857 deletions
+50 -50
View File
@@ -79,7 +79,7 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
// Minimum execution time: 10_964 nanoseconds.
Weight::from_parts(11_800_935, 1636)
// Standard Error: 1_334
.saturating_add(Weight::from_ref_time(96_038).saturating_mul(r.into()))
.saturating_add(Weight::from_parts(96_038, 0).saturating_mul(r.into()))
.saturating_add(T::DbWeight::get().reads(1_u64))
.saturating_add(T::DbWeight::get().writes(1_u64))
}
@@ -94,9 +94,9 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
// Minimum execution time: 26_400 nanoseconds.
Weight::from_parts(26_060_549, 10013)
// Standard Error: 1_561
.saturating_add(Weight::from_ref_time(72_083).saturating_mul(r.into()))
.saturating_add(Weight::from_parts(72_083, 0).saturating_mul(r.into()))
// Standard Error: 304
.saturating_add(Weight::from_ref_time(306_994).saturating_mul(x.into()))
.saturating_add(Weight::from_parts(306_994, 0).saturating_mul(x.into()))
.saturating_add(T::DbWeight::get().reads(1_u64))
.saturating_add(T::DbWeight::get().writes(1_u64))
}
@@ -114,12 +114,12 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
// Minimum execution time: 8_492 nanoseconds.
Weight::from_parts(21_645_924, 15746)
// Standard Error: 3_452
.saturating_add(Weight::from_ref_time(2_442_604).saturating_mul(s.into()))
.saturating_add(Weight::from_parts(2_442_604, 0).saturating_mul(s.into()))
.saturating_add(T::DbWeight::get().reads(2_u64))
.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(s.into())))
.saturating_add(T::DbWeight::get().writes(1_u64))
.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(s.into())))
.saturating_add(Weight::from_proof_size(2589).saturating_mul(s.into()))
.saturating_add(Weight::from_parts(0, 2589).saturating_mul(s.into()))
}
/// Storage: Identity IdentityOf (r:1 w:0)
/// Proof: Identity IdentityOf (max_values: None, max_size: Some(7538), added: 10013, mode: MaxEncodedLen)
@@ -135,7 +135,7 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
// Minimum execution time: 8_488 nanoseconds.
Weight::from_parts(20_202_601, 15746)
// Standard Error: 2_834
.saturating_add(Weight::from_ref_time(1_082_941).saturating_mul(p.into()))
.saturating_add(Weight::from_parts(1_082_941, 0).saturating_mul(p.into()))
.saturating_add(T::DbWeight::get().reads(2_u64))
.saturating_add(T::DbWeight::get().writes(1_u64))
.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(p.into())))
@@ -156,11 +156,11 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
// Minimum execution time: 41_319 nanoseconds.
Weight::from_parts(25_850_055, 15746)
// Standard Error: 4_144
.saturating_add(Weight::from_ref_time(59_619).saturating_mul(r.into()))
.saturating_add(Weight::from_parts(59_619, 0).saturating_mul(r.into()))
// Standard Error: 809
.saturating_add(Weight::from_ref_time(1_076_550).saturating_mul(s.into()))
.saturating_add(Weight::from_parts(1_076_550, 0).saturating_mul(s.into()))
// Standard Error: 809
.saturating_add(Weight::from_ref_time(163_191).saturating_mul(x.into()))
.saturating_add(Weight::from_parts(163_191, 0).saturating_mul(x.into()))
.saturating_add(T::DbWeight::get().reads(2_u64))
.saturating_add(T::DbWeight::get().writes(2_u64))
.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(s.into())))
@@ -178,9 +178,9 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
// Minimum execution time: 28_118 nanoseconds.
Weight::from_parts(27_359_471, 11649)
// Standard Error: 2_707
.saturating_add(Weight::from_ref_time(107_279).saturating_mul(r.into()))
.saturating_add(Weight::from_parts(107_279, 0).saturating_mul(r.into()))
// Standard Error: 528
.saturating_add(Weight::from_ref_time(325_165).saturating_mul(x.into()))
.saturating_add(Weight::from_parts(325_165, 0).saturating_mul(x.into()))
.saturating_add(T::DbWeight::get().reads(2_u64))
.saturating_add(T::DbWeight::get().writes(1_u64))
}
@@ -195,9 +195,9 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
// Minimum execution time: 24_817 nanoseconds.
Weight::from_parts(24_749_808, 10013)
// Standard Error: 1_938
.saturating_add(Weight::from_ref_time(63_396).saturating_mul(r.into()))
.saturating_add(Weight::from_parts(63_396, 0).saturating_mul(r.into()))
// Standard Error: 378
.saturating_add(Weight::from_ref_time(327_083).saturating_mul(x.into()))
.saturating_add(Weight::from_parts(327_083, 0).saturating_mul(x.into()))
.saturating_add(T::DbWeight::get().reads(1_u64))
.saturating_add(T::DbWeight::get().writes(1_u64))
}
@@ -211,7 +211,7 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
// Minimum execution time: 6_664 nanoseconds.
Weight::from_parts(7_286_307, 1636)
// Standard Error: 1_560
.saturating_add(Weight::from_ref_time(96_416).saturating_mul(r.into()))
.saturating_add(Weight::from_parts(96_416, 0).saturating_mul(r.into()))
.saturating_add(T::DbWeight::get().reads(1_u64))
.saturating_add(T::DbWeight::get().writes(1_u64))
}
@@ -225,7 +225,7 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
// Minimum execution time: 7_054 nanoseconds.
Weight::from_parts(7_382_954, 1636)
// Standard Error: 1_621
.saturating_add(Weight::from_ref_time(101_595).saturating_mul(r.into()))
.saturating_add(Weight::from_parts(101_595, 0).saturating_mul(r.into()))
.saturating_add(T::DbWeight::get().reads(1_u64))
.saturating_add(T::DbWeight::get().writes(1_u64))
}
@@ -239,7 +239,7 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
// Minimum execution time: 6_659 nanoseconds.
Weight::from_parts(7_188_883, 1636)
// Standard Error: 1_377
.saturating_add(Weight::from_ref_time(98_965).saturating_mul(r.into()))
.saturating_add(Weight::from_parts(98_965, 0).saturating_mul(r.into()))
.saturating_add(T::DbWeight::get().reads(1_u64))
.saturating_add(T::DbWeight::get().writes(1_u64))
}
@@ -256,9 +256,9 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
// Minimum execution time: 21_567 nanoseconds.
Weight::from_parts(21_015_310, 11649)
// Standard Error: 2_516
.saturating_add(Weight::from_ref_time(123_992).saturating_mul(r.into()))
.saturating_add(Weight::from_parts(123_992, 0).saturating_mul(r.into()))
// Standard Error: 465
.saturating_add(Weight::from_ref_time(552_116).saturating_mul(x.into()))
.saturating_add(Weight::from_parts(552_116, 0).saturating_mul(x.into()))
.saturating_add(T::DbWeight::get().reads(2_u64))
.saturating_add(T::DbWeight::get().writes(1_u64))
}
@@ -280,11 +280,11 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
// Minimum execution time: 52_881 nanoseconds.
Weight::from_parts(38_504_388, 18349)
// Standard Error: 3_909
.saturating_add(Weight::from_ref_time(51_452).saturating_mul(r.into()))
.saturating_add(Weight::from_parts(51_452, 0).saturating_mul(r.into()))
// Standard Error: 763
.saturating_add(Weight::from_ref_time(1_069_924).saturating_mul(s.into()))
.saturating_add(Weight::from_parts(1_069_924, 0).saturating_mul(s.into()))
// Standard Error: 763
.saturating_add(Weight::from_ref_time(164_906).saturating_mul(x.into()))
.saturating_add(Weight::from_parts(164_906, 0).saturating_mul(x.into()))
.saturating_add(T::DbWeight::get().reads(3_u64))
.saturating_add(T::DbWeight::get().writes(3_u64))
.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(s.into())))
@@ -303,7 +303,7 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
// Minimum execution time: 24_556 nanoseconds.
Weight::from_parts(28_641_160, 18335)
// Standard Error: 1_327
.saturating_add(Weight::from_ref_time(66_150).saturating_mul(s.into()))
.saturating_add(Weight::from_parts(66_150, 0).saturating_mul(s.into()))
.saturating_add(T::DbWeight::get().reads(3_u64))
.saturating_add(T::DbWeight::get().writes(2_u64))
}
@@ -319,7 +319,7 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
// Minimum execution time: 11_347 nanoseconds.
Weight::from_parts(13_299_367, 12602)
// Standard Error: 525
.saturating_add(Weight::from_ref_time(16_472).saturating_mul(s.into()))
.saturating_add(Weight::from_parts(16_472, 0).saturating_mul(s.into()))
.saturating_add(T::DbWeight::get().reads(2_u64))
.saturating_add(T::DbWeight::get().writes(1_u64))
}
@@ -337,7 +337,7 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
// Minimum execution time: 27_810 nanoseconds.
Weight::from_parts(30_347_763, 18335)
// Standard Error: 928
.saturating_add(Weight::from_ref_time(55_342).saturating_mul(s.into()))
.saturating_add(Weight::from_parts(55_342, 0).saturating_mul(s.into()))
.saturating_add(T::DbWeight::get().reads(3_u64))
.saturating_add(T::DbWeight::get().writes(2_u64))
}
@@ -353,7 +353,7 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
// Minimum execution time: 17_601 nanoseconds.
Weight::from_parts(19_794_971, 8322)
// Standard Error: 934
.saturating_add(Weight::from_ref_time(59_289).saturating_mul(s.into()))
.saturating_add(Weight::from_parts(59_289, 0).saturating_mul(s.into()))
.saturating_add(T::DbWeight::get().reads(2_u64))
.saturating_add(T::DbWeight::get().writes(2_u64))
}
@@ -371,7 +371,7 @@ impl WeightInfo for () {
// Minimum execution time: 10_964 nanoseconds.
Weight::from_parts(11_800_935, 1636)
// Standard Error: 1_334
.saturating_add(Weight::from_ref_time(96_038).saturating_mul(r.into()))
.saturating_add(Weight::from_parts(96_038, 0).saturating_mul(r.into()))
.saturating_add(RocksDbWeight::get().reads(1_u64))
.saturating_add(RocksDbWeight::get().writes(1_u64))
}
@@ -386,9 +386,9 @@ impl WeightInfo for () {
// Minimum execution time: 26_400 nanoseconds.
Weight::from_parts(26_060_549, 10013)
// Standard Error: 1_561
.saturating_add(Weight::from_ref_time(72_083).saturating_mul(r.into()))
.saturating_add(Weight::from_parts(72_083, 0).saturating_mul(r.into()))
// Standard Error: 304
.saturating_add(Weight::from_ref_time(306_994).saturating_mul(x.into()))
.saturating_add(Weight::from_parts(306_994, 0).saturating_mul(x.into()))
.saturating_add(RocksDbWeight::get().reads(1_u64))
.saturating_add(RocksDbWeight::get().writes(1_u64))
}
@@ -406,12 +406,12 @@ impl WeightInfo for () {
// Minimum execution time: 8_492 nanoseconds.
Weight::from_parts(21_645_924, 15746)
// Standard Error: 3_452
.saturating_add(Weight::from_ref_time(2_442_604).saturating_mul(s.into()))
.saturating_add(Weight::from_parts(2_442_604, 0).saturating_mul(s.into()))
.saturating_add(RocksDbWeight::get().reads(2_u64))
.saturating_add(RocksDbWeight::get().reads((1_u64).saturating_mul(s.into())))
.saturating_add(RocksDbWeight::get().writes(1_u64))
.saturating_add(RocksDbWeight::get().writes((1_u64).saturating_mul(s.into())))
.saturating_add(Weight::from_proof_size(2589).saturating_mul(s.into()))
.saturating_add(Weight::from_parts(0, 2589).saturating_mul(s.into()))
}
/// Storage: Identity IdentityOf (r:1 w:0)
/// Proof: Identity IdentityOf (max_values: None, max_size: Some(7538), added: 10013, mode: MaxEncodedLen)
@@ -427,7 +427,7 @@ impl WeightInfo for () {
// Minimum execution time: 8_488 nanoseconds.
Weight::from_parts(20_202_601, 15746)
// Standard Error: 2_834
.saturating_add(Weight::from_ref_time(1_082_941).saturating_mul(p.into()))
.saturating_add(Weight::from_parts(1_082_941, 0).saturating_mul(p.into()))
.saturating_add(RocksDbWeight::get().reads(2_u64))
.saturating_add(RocksDbWeight::get().writes(1_u64))
.saturating_add(RocksDbWeight::get().writes((1_u64).saturating_mul(p.into())))
@@ -448,11 +448,11 @@ impl WeightInfo for () {
// Minimum execution time: 41_319 nanoseconds.
Weight::from_parts(25_850_055, 15746)
// Standard Error: 4_144
.saturating_add(Weight::from_ref_time(59_619).saturating_mul(r.into()))
.saturating_add(Weight::from_parts(59_619, 0).saturating_mul(r.into()))
// Standard Error: 809
.saturating_add(Weight::from_ref_time(1_076_550).saturating_mul(s.into()))
.saturating_add(Weight::from_parts(1_076_550, 0).saturating_mul(s.into()))
// Standard Error: 809
.saturating_add(Weight::from_ref_time(163_191).saturating_mul(x.into()))
.saturating_add(Weight::from_parts(163_191, 0).saturating_mul(x.into()))
.saturating_add(RocksDbWeight::get().reads(2_u64))
.saturating_add(RocksDbWeight::get().writes(2_u64))
.saturating_add(RocksDbWeight::get().writes((1_u64).saturating_mul(s.into())))
@@ -470,9 +470,9 @@ impl WeightInfo for () {
// Minimum execution time: 28_118 nanoseconds.
Weight::from_parts(27_359_471, 11649)
// Standard Error: 2_707
.saturating_add(Weight::from_ref_time(107_279).saturating_mul(r.into()))
.saturating_add(Weight::from_parts(107_279, 0).saturating_mul(r.into()))
// Standard Error: 528
.saturating_add(Weight::from_ref_time(325_165).saturating_mul(x.into()))
.saturating_add(Weight::from_parts(325_165, 0).saturating_mul(x.into()))
.saturating_add(RocksDbWeight::get().reads(2_u64))
.saturating_add(RocksDbWeight::get().writes(1_u64))
}
@@ -487,9 +487,9 @@ impl WeightInfo for () {
// Minimum execution time: 24_817 nanoseconds.
Weight::from_parts(24_749_808, 10013)
// Standard Error: 1_938
.saturating_add(Weight::from_ref_time(63_396).saturating_mul(r.into()))
.saturating_add(Weight::from_parts(63_396, 0).saturating_mul(r.into()))
// Standard Error: 378
.saturating_add(Weight::from_ref_time(327_083).saturating_mul(x.into()))
.saturating_add(Weight::from_parts(327_083, 0).saturating_mul(x.into()))
.saturating_add(RocksDbWeight::get().reads(1_u64))
.saturating_add(RocksDbWeight::get().writes(1_u64))
}
@@ -503,7 +503,7 @@ impl WeightInfo for () {
// Minimum execution time: 6_664 nanoseconds.
Weight::from_parts(7_286_307, 1636)
// Standard Error: 1_560
.saturating_add(Weight::from_ref_time(96_416).saturating_mul(r.into()))
.saturating_add(Weight::from_parts(96_416, 0).saturating_mul(r.into()))
.saturating_add(RocksDbWeight::get().reads(1_u64))
.saturating_add(RocksDbWeight::get().writes(1_u64))
}
@@ -517,7 +517,7 @@ impl WeightInfo for () {
// Minimum execution time: 7_054 nanoseconds.
Weight::from_parts(7_382_954, 1636)
// Standard Error: 1_621
.saturating_add(Weight::from_ref_time(101_595).saturating_mul(r.into()))
.saturating_add(Weight::from_parts(101_595, 0).saturating_mul(r.into()))
.saturating_add(RocksDbWeight::get().reads(1_u64))
.saturating_add(RocksDbWeight::get().writes(1_u64))
}
@@ -531,7 +531,7 @@ impl WeightInfo for () {
// Minimum execution time: 6_659 nanoseconds.
Weight::from_parts(7_188_883, 1636)
// Standard Error: 1_377
.saturating_add(Weight::from_ref_time(98_965).saturating_mul(r.into()))
.saturating_add(Weight::from_parts(98_965, 0).saturating_mul(r.into()))
.saturating_add(RocksDbWeight::get().reads(1_u64))
.saturating_add(RocksDbWeight::get().writes(1_u64))
}
@@ -548,9 +548,9 @@ impl WeightInfo for () {
// Minimum execution time: 21_567 nanoseconds.
Weight::from_parts(21_015_310, 11649)
// Standard Error: 2_516
.saturating_add(Weight::from_ref_time(123_992).saturating_mul(r.into()))
.saturating_add(Weight::from_parts(123_992, 0).saturating_mul(r.into()))
// Standard Error: 465
.saturating_add(Weight::from_ref_time(552_116).saturating_mul(x.into()))
.saturating_add(Weight::from_parts(552_116, 0).saturating_mul(x.into()))
.saturating_add(RocksDbWeight::get().reads(2_u64))
.saturating_add(RocksDbWeight::get().writes(1_u64))
}
@@ -572,11 +572,11 @@ impl WeightInfo for () {
// Minimum execution time: 52_881 nanoseconds.
Weight::from_parts(38_504_388, 18349)
// Standard Error: 3_909
.saturating_add(Weight::from_ref_time(51_452).saturating_mul(r.into()))
.saturating_add(Weight::from_parts(51_452, 0).saturating_mul(r.into()))
// Standard Error: 763
.saturating_add(Weight::from_ref_time(1_069_924).saturating_mul(s.into()))
.saturating_add(Weight::from_parts(1_069_924, 0).saturating_mul(s.into()))
// Standard Error: 763
.saturating_add(Weight::from_ref_time(164_906).saturating_mul(x.into()))
.saturating_add(Weight::from_parts(164_906, 0).saturating_mul(x.into()))
.saturating_add(RocksDbWeight::get().reads(3_u64))
.saturating_add(RocksDbWeight::get().writes(3_u64))
.saturating_add(RocksDbWeight::get().writes((1_u64).saturating_mul(s.into())))
@@ -595,7 +595,7 @@ impl WeightInfo for () {
// Minimum execution time: 24_556 nanoseconds.
Weight::from_parts(28_641_160, 18335)
// Standard Error: 1_327
.saturating_add(Weight::from_ref_time(66_150).saturating_mul(s.into()))
.saturating_add(Weight::from_parts(66_150, 0).saturating_mul(s.into()))
.saturating_add(RocksDbWeight::get().reads(3_u64))
.saturating_add(RocksDbWeight::get().writes(2_u64))
}
@@ -611,7 +611,7 @@ impl WeightInfo for () {
// Minimum execution time: 11_347 nanoseconds.
Weight::from_parts(13_299_367, 12602)
// Standard Error: 525
.saturating_add(Weight::from_ref_time(16_472).saturating_mul(s.into()))
.saturating_add(Weight::from_parts(16_472, 0).saturating_mul(s.into()))
.saturating_add(RocksDbWeight::get().reads(2_u64))
.saturating_add(RocksDbWeight::get().writes(1_u64))
}
@@ -629,7 +629,7 @@ impl WeightInfo for () {
// Minimum execution time: 27_810 nanoseconds.
Weight::from_parts(30_347_763, 18335)
// Standard Error: 928
.saturating_add(Weight::from_ref_time(55_342).saturating_mul(s.into()))
.saturating_add(Weight::from_parts(55_342, 0).saturating_mul(s.into()))
.saturating_add(RocksDbWeight::get().reads(3_u64))
.saturating_add(RocksDbWeight::get().writes(2_u64))
}
@@ -645,7 +645,7 @@ impl WeightInfo for () {
// Minimum execution time: 17_601 nanoseconds.
Weight::from_parts(19_794_971, 8322)
// Standard Error: 934
.saturating_add(Weight::from_ref_time(59_289).saturating_mul(s.into()))
.saturating_add(Weight::from_parts(59_289, 0).saturating_mul(s.into()))
.saturating_add(RocksDbWeight::get().reads(2_u64))
.saturating_add(RocksDbWeight::get().writes(2_u64))
}