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

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

Merged
paritytech-processbot merged 11 commits into from
Mar 2, 2023
Merged

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

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
bf9882e
Deprecate Weight::from_{ref_time, proof_size}
ggwpez Feb 26, 2023
e013e30
Update templates
ggwpez Feb 26, 2023
8c4be73
Use from_parts
ggwpez Feb 26, 2023
bcd5415
Use from_parts
ggwpez Feb 27, 2023
a6be787
Dont revert comment :facepalm:
ggwpez Feb 27, 2023
6d674f1
Merge branch 'master' of https://github.com/paritytech/substrate into…
Feb 27, 2023
8f24cca
".git/.scripts/commands/bench/bench.sh" pallet dev pallet_balances
Feb 27, 2023
422b685
Update weight files
ggwpez Feb 27, 2023
991fd01
More fixes
ggwpez Feb 27, 2023
3143cb9
Merge remote-tracking branch 'origin/master' into oty-deprecate-weigh…
ggwpez Mar 2, 2023
9983c41
Adapt to Master changes
ggwpez Mar 2, 2023
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
Prev Previous commit
Next Next commit
Update weight files 
Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>
  • Loading branch information
@ggwpez
ggwpez committed Feb 27, 2023
commit 422b68568c268ac09de8ce79d244bb349f535717
152 changes: 76 additions & 76 deletions frame/alliance/src/weights.rs
View file
Open in desktop

Large diffs are not rendered by default.

28 changes: 14 additions & 14 deletions frame/assets/src/weights.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,12 +128,12 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
// Minimum execution time: 17_565 nanoseconds.
Weight::from_parts(17_757_000, 5262)
// Standard Error: 15_192
.saturating_add(Weight::from_ref_time(13_799_167).saturating_mul(c.into()))
.saturating_add(Weight::from_parts(13_799_167, 0).saturating_mul(c.into()))
.saturating_add(T::DbWeight::get().reads(2_u64))
.saturating_add(T::DbWeight::get().reads((2_u64).saturating_mul(c.into())))
.saturating_add(T::DbWeight::get().writes(1_u64))
.saturating_add(T::DbWeight::get().writes((2_u64).saturating_mul(c.into())))
.saturating_add(Weight::from_proof_size(5180).saturating_mul(c.into()))
.saturating_add(Weight::from_parts(0, 5180).saturating_mul(c.into()))
Copy link
Member

@gavofyork gavofyork Feb 27, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why do these two not just get combined into a single from_parts?

Copy link
Member Author

@ggwpez ggwpez Feb 28, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The template is a bit inflexible right now, I can try but it will not look much better. Having these written as a term is very poor choice in retrospect.
Something data-based would be better like https://github.com/paritytech/substrate/issues/12580#issuecomment-1304662025

}
/// Storage: Assets Asset (r:1 w:1)
/// Proof: Assets Asset (max_values: None, max_size: Some(210), added: 2685, mode: MaxEncodedLen)
Expand All @@ -147,12 +147,12 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
// Minimum execution time: 18_251 nanoseconds.
Weight::from_parts(18_359_000, 5308)
// Standard Error: 10_051
.saturating_add(Weight::from_ref_time(13_613_342).saturating_mul(a.into()))
.saturating_add(Weight::from_parts(13_613_342, 0).saturating_mul(a.into()))
.saturating_add(T::DbWeight::get().reads(2_u64))
.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(a.into())))
.saturating_add(T::DbWeight::get().writes(1_u64))
.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(a.into())))
.saturating_add(Weight::from_proof_size(2623).saturating_mul(a.into()))
.saturating_add(Weight::from_parts(0, 2623).saturating_mul(a.into()))
}
/// Storage: Assets Asset (r:1 w:1)
/// Proof: Assets Asset (max_values: None, max_size: Some(210), added: 2685, mode: MaxEncodedLen)
Expand Down Expand Up @@ -323,9 +323,9 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
// Minimum execution time: 23_707 nanoseconds.
Weight::from_parts(24_466_834, 5300)
// Standard Error: 635
.saturating_add(Weight::from_ref_time(730).saturating_mul(n.into()))
.saturating_add(Weight::from_parts(730, 0).saturating_mul(n.into()))
// Standard Error: 635
.saturating_add(Weight::from_ref_time(3_975).saturating_mul(s.into()))
.saturating_add(Weight::from_parts(3_975, 0).saturating_mul(s.into()))
.saturating_add(T::DbWeight::get().reads(2_u64))
.saturating_add(T::DbWeight::get().writes(1_u64))
}
Expand Down Expand Up @@ -355,7 +355,7 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
// Minimum execution time: 14_028 nanoseconds.
Weight::from_parts(15_217_669, 5300)
// Standard Error: 2_266
.saturating_add(Weight::from_ref_time(2_045).saturating_mul(s.into()))
.saturating_add(Weight::from_parts(2_045, 0).saturating_mul(s.into()))
.saturating_add(T::DbWeight::get().reads(2_u64))
.saturating_add(T::DbWeight::get().writes(1_u64))
}
Expand Down Expand Up @@ -492,12 +492,12 @@ impl WeightInfo for () {
// Minimum execution time: 17_565 nanoseconds.
Weight::from_parts(17_757_000, 5262)
// Standard Error: 15_192
.saturating_add(Weight::from_ref_time(13_799_167).saturating_mul(c.into()))
.saturating_add(Weight::from_parts(13_799_167, 0).saturating_mul(c.into()))
.saturating_add(RocksDbWeight::get().reads(2_u64))
.saturating_add(RocksDbWeight::get().reads((2_u64).saturating_mul(c.into())))
.saturating_add(RocksDbWeight::get().writes(1_u64))
.saturating_add(RocksDbWeight::get().writes((2_u64).saturating_mul(c.into())))
.saturating_add(Weight::from_proof_size(5180).saturating_mul(c.into()))
.saturating_add(Weight::from_parts(0, 5180).saturating_mul(c.into()))
}
/// Storage: Assets Asset (r:1 w:1)
/// Proof: Assets Asset (max_values: None, max_size: Some(210), added: 2685, mode: MaxEncodedLen)
Expand All @@ -511,12 +511,12 @@ impl WeightInfo for () {
// Minimum execution time: 18_251 nanoseconds.
Weight::from_parts(18_359_000, 5308)
// Standard Error: 10_051
.saturating_add(Weight::from_ref_time(13_613_342).saturating_mul(a.into()))
.saturating_add(Weight::from_parts(13_613_342, 0).saturating_mul(a.into()))
.saturating_add(RocksDbWeight::get().reads(2_u64))
.saturating_add(RocksDbWeight::get().reads((1_u64).saturating_mul(a.into())))
.saturating_add(RocksDbWeight::get().writes(1_u64))
.saturating_add(RocksDbWeight::get().writes((1_u64).saturating_mul(a.into())))
.saturating_add(Weight::from_proof_size(2623).saturating_mul(a.into()))
.saturating_add(Weight::from_parts(0, 2623).saturating_mul(a.into()))
}
/// Storage: Assets Asset (r:1 w:1)
/// Proof: Assets Asset (max_values: None, max_size: Some(210), added: 2685, mode: MaxEncodedLen)
Expand Down Expand Up @@ -687,9 +687,9 @@ impl WeightInfo for () {
// Minimum execution time: 23_707 nanoseconds.
Weight::from_parts(24_466_834, 5300)
// Standard Error: 635
.saturating_add(Weight::from_ref_time(730).saturating_mul(n.into()))
.saturating_add(Weight::from_parts(730, 0).saturating_mul(n.into()))
// Standard Error: 635
.saturating_add(Weight::from_ref_time(3_975).saturating_mul(s.into()))
.saturating_add(Weight::from_parts(3_975, 0).saturating_mul(s.into()))
.saturating_add(RocksDbWeight::get().reads(2_u64))
.saturating_add(RocksDbWeight::get().writes(1_u64))
}
Expand Down Expand Up @@ -719,7 +719,7 @@ impl WeightInfo for () {
// Minimum execution time: 14_028 nanoseconds.
Weight::from_parts(15_217_669, 5300)
// Standard Error: 2_266
.saturating_add(Weight::from_ref_time(2_045).saturating_mul(s.into()))
.saturating_add(Weight::from_parts(2_045, 0).saturating_mul(s.into()))
.saturating_add(RocksDbWeight::get().reads(2_u64))
.saturating_add(RocksDbWeight::get().writes(1_u64))
}
Expand Down
Loading