difftreelog
refactor(weight) bench rename `transfer` to `transfer_raw`
in: master
8 files changed
pallets/fungible/src/benchmarking.rsdiffbeforeafterboth--- a/pallets/fungible/src/benchmarking.rs
+++ b/pallets/fungible/src/benchmarking.rs
@@ -66,7 +66,7 @@
<Pallet<T>>::create_item(&collection, &owner, (burner.clone(), 200), &Unlimited)?;
}: {<Pallet<T>>::burn(&collection, &burner, 100)?}
- transfer {
+ transfer_raw {
bench_init!{
owner: sub; collection: collection(owner);
owner: cross_from_sub; sender: cross_sub; to: cross_sub;
pallets/fungible/src/common.rsdiffbeforeafterboth--- a/pallets/fungible/src/common.rs
+++ b/pallets/fungible/src/common.rs
@@ -78,7 +78,7 @@
}
fn transfer() -> Weight {
- <SelfWeightOf<T>>::transfer() + <PalletCommonWeightOf<T>>::check_accesslist() * 2
+ <SelfWeightOf<T>>::transfer_raw() + <PalletCommonWeightOf<T>>::check_accesslist() * 2
}
fn approve() -> Weight {
pallets/fungible/src/lib.rsdiffbeforeafterboth--- a/pallets/fungible/src/lib.rs
+++ b/pallets/fungible/src/lib.rs
@@ -400,7 +400,7 @@
<CommonError<T>>::TransferNotAllowed,
);
- let mut actual_weight = <SelfWeightOf<T>>::transfer();
+ let mut actual_weight = <SelfWeightOf<T>>::transfer_raw();
if collection.permissions.access() == AccessMode::AllowList {
collection.check_allowlist(from)?;
pallets/fungible/src/weights.rsdiffbeforeafterboth1// Template adopted from https://github.com/paritytech/substrate/blob/master/.maintain/frame-weight-template.hbs23//! Autogenerated weights for pallet_fungible4//!5//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev6//! DATE: 2023-03-30, STEPS: `50`, REPEAT: 80, LOW RANGE: `[]`, HIGH RANGE: `[]`7//! WORST CASE MAP SIZE: `1000000`8//! EXECUTION: None, WASM-EXECUTION: Compiled, CHAIN: None, DB CACHE: 1024910// Executed Command:11// target/release/unique-collator12// benchmark13// pallet14// --pallet15// pallet-fungible16// --wasm-execution17// compiled18// --extrinsic19// *20// --template=.maintain/frame-weight-template.hbs21// --steps=5022// --repeat=8023// --heap-pages=409624// --output=./pallets/fungible/src/weights.rs2526#![cfg_attr(rustfmt, rustfmt_skip)]27#![allow(unused_parens)]28#![allow(unused_imports)]29#![allow(missing_docs)]30#![allow(clippy::unnecessary_cast)]3132use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};33use sp_std::marker::PhantomData;3435/// Weight functions needed for pallet_fungible.36pub trait WeightInfo {37 fn create_item() -> Weight;38 fn create_multiple_items_ex(b: u32, ) -> Weight;39 fn burn_item() -> Weight;40 fn transfer_raw() -> Weight;41 fn approve() -> Weight;42 fn approve_from() -> Weight;43 fn check_allowed_raw() -> Weight;44 fn set_allowance_unchecked_raw() -> Weight;45 fn burn_from() -> Weight;46}4748/// Weights for pallet_fungible using the Substrate node and recommended hardware.49pub struct SubstrateWeight<T>(PhantomData<T>);50impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {51 /// Storage: Fungible TotalSupply (r:1 w:1)52 /// Proof: Fungible TotalSupply (max_values: None, max_size: Some(28), added: 2503, mode: MaxEncodedLen)53 /// Storage: Fungible Balance (r:1 w:1)54 /// Proof: Fungible Balance (max_values: None, max_size: Some(77), added: 2552, mode: MaxEncodedLen)55 fn create_item() -> Weight {56 // Proof Size summary in bytes:57 // Measured: `42`58 // Estimated: `5055`59 // Minimum execution time: 10_152_000 picoseconds.60 Weight::from_parts(10_520_000, 5055)61 .saturating_add(T::DbWeight::get().reads(2_u64))62 .saturating_add(T::DbWeight::get().writes(2_u64))63 }64 /// Storage: Fungible TotalSupply (r:1 w:1)65 /// Proof: Fungible TotalSupply (max_values: None, max_size: Some(28), added: 2503, mode: MaxEncodedLen)66 /// Storage: Fungible Balance (r:200 w:200)67 /// Proof: Fungible Balance (max_values: None, max_size: Some(77), added: 2552, mode: MaxEncodedLen)68 /// The range of component `b` is `[0, 200]`.69 fn create_multiple_items_ex(b: u32, ) -> Weight {70 // Proof Size summary in bytes:71 // Measured: `42`72 // Estimated: `2503 + b * (2552 ±0)`73 // Minimum execution time: 3_437_000 picoseconds.74 Weight::from_parts(13_322_752, 2503)75 // Standard Error: 1_72876 .saturating_add(Weight::from_parts(3_605_522, 0).saturating_mul(b.into()))77 .saturating_add(T::DbWeight::get().reads(1_u64))78 .saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(b.into())))79 .saturating_add(T::DbWeight::get().writes(1_u64))80 .saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(b.into())))81 .saturating_add(Weight::from_parts(0, 2552).saturating_mul(b.into()))82 }83 /// Storage: Fungible TotalSupply (r:1 w:1)84 /// Proof: Fungible TotalSupply (max_values: None, max_size: Some(28), added: 2503, mode: MaxEncodedLen)85 /// Storage: Fungible Balance (r:1 w:1)86 /// Proof: Fungible Balance (max_values: None, max_size: Some(77), added: 2552, mode: MaxEncodedLen)87 fn burn_item() -> Weight {88 // Proof Size summary in bytes:89 // Measured: `197`90 // Estimated: `5055`91 // Minimum execution time: 12_894_000 picoseconds.92 Weight::from_parts(13_347_000, 5055)93 .saturating_add(T::DbWeight::get().reads(2_u64))94 .saturating_add(T::DbWeight::get().writes(2_u64))95 }96 // Storage: Fungible Balance (r:2 w:2)97 fn transfer_raw() -> Weight {98 Weight::from_ref_time(12_041_000 as u64)99 .saturating_add(T::DbWeight::get().reads(2 as u64))100 .saturating_add(T::DbWeight::get().writes(2 as u64))101 }102 /// Storage: Fungible Balance (r:1 w:0)103 /// Proof: Fungible Balance (max_values: None, max_size: Some(77), added: 2552, mode: MaxEncodedLen)104 /// Storage: Fungible Allowance (r:0 w:1)105 /// Proof: Fungible Allowance (max_values: None, max_size: Some(93), added: 2568, mode: MaxEncodedLen)106 fn approve() -> Weight {107 // Proof Size summary in bytes:108 // Measured: `182`109 // Estimated: `2552`110 // Minimum execution time: 12_417_000 picoseconds.111 Weight::from_parts(12_658_000, 2552)112 .saturating_add(T::DbWeight::get().reads(1_u64))113 .saturating_add(T::DbWeight::get().writes(1_u64))114 }115 /// Storage: Fungible Balance (r:1 w:0)116 /// Proof: Fungible Balance (max_values: None, max_size: Some(77), added: 2552, mode: MaxEncodedLen)117 /// Storage: Fungible Allowance (r:0 w:1)118 /// Proof: Fungible Allowance (max_values: None, max_size: Some(93), added: 2568, mode: MaxEncodedLen)119 fn approve_from() -> Weight {120 // Proof Size summary in bytes:121 // Measured: `170`122 // Estimated: `2552`123 // Minimum execution time: 12_322_000 picoseconds.124 Weight::from_parts(12_629_000, 2552)125 .saturating_add(T::DbWeight::get().reads(1_u64))126 .saturating_add(T::DbWeight::get().writes(1_u64))127 }128 // Storage: Fungible Allowance (r:1 w:0)129 fn check_allowed_raw() -> Weight {130 Weight::from_ref_time(3_550_000 as u64)131 .saturating_add(T::DbWeight::get().reads(1 as u64))132 }133 // Storage: Fungible Allowance (r:1 w:1)134 fn set_allowance_unchecked_raw() -> Weight {135 Weight::from_ref_time(10_682_000 as u64)136 .saturating_add(T::DbWeight::get().reads(1 as u64))137 .saturating_add(T::DbWeight::get().writes(1 as u64))138 }139 /// Storage: Fungible Allowance (r:1 w:1)140 /// Proof: Fungible Allowance (max_values: None, max_size: Some(93), added: 2568, mode: MaxEncodedLen)141 /// Storage: Fungible TotalSupply (r:1 w:1)142 /// Proof: Fungible TotalSupply (max_values: None, max_size: Some(28), added: 2503, mode: MaxEncodedLen)143 /// Storage: Fungible Balance (r:1 w:1)144 /// Proof: Fungible Balance (max_values: None, max_size: Some(77), added: 2552, mode: MaxEncodedLen)145 fn burn_from() -> Weight {146 // Proof Size summary in bytes:147 // Measured: `315`148 // Estimated: `7623`149 // Minimum execution time: 21_271_000 picoseconds.150 Weight::from_parts(21_709_000, 7623)151 .saturating_add(T::DbWeight::get().reads(3_u64))152 .saturating_add(T::DbWeight::get().writes(3_u64))153 }154}155156// For backwards compatibility and tests157impl WeightInfo for () {158 /// Storage: Fungible TotalSupply (r:1 w:1)159 /// Proof: Fungible TotalSupply (max_values: None, max_size: Some(28), added: 2503, mode: MaxEncodedLen)160 /// Storage: Fungible Balance (r:1 w:1)161 /// Proof: Fungible Balance (max_values: None, max_size: Some(77), added: 2552, mode: MaxEncodedLen)162 fn create_item() -> Weight {163 // Proof Size summary in bytes:164 // Measured: `42`165 // Estimated: `5055`166 // Minimum execution time: 10_152_000 picoseconds.167 Weight::from_parts(10_520_000, 5055)168 .saturating_add(RocksDbWeight::get().reads(2_u64))169 .saturating_add(RocksDbWeight::get().writes(2_u64))170 }171 /// Storage: Fungible TotalSupply (r:1 w:1)172 /// Proof: Fungible TotalSupply (max_values: None, max_size: Some(28), added: 2503, mode: MaxEncodedLen)173 /// Storage: Fungible Balance (r:200 w:200)174 /// Proof: Fungible Balance (max_values: None, max_size: Some(77), added: 2552, mode: MaxEncodedLen)175 /// The range of component `b` is `[0, 200]`.176 fn create_multiple_items_ex(b: u32, ) -> Weight {177 // Proof Size summary in bytes:178 // Measured: `42`179 // Estimated: `2503 + b * (2552 ±0)`180 // Minimum execution time: 3_437_000 picoseconds.181 Weight::from_parts(13_322_752, 2503)182 // Standard Error: 1_728183 .saturating_add(Weight::from_parts(3_605_522, 0).saturating_mul(b.into()))184 .saturating_add(RocksDbWeight::get().reads(1_u64))185 .saturating_add(RocksDbWeight::get().reads((1_u64).saturating_mul(b.into())))186 .saturating_add(RocksDbWeight::get().writes(1_u64))187 .saturating_add(RocksDbWeight::get().writes((1_u64).saturating_mul(b.into())))188 .saturating_add(Weight::from_parts(0, 2552).saturating_mul(b.into()))189 }190 /// Storage: Fungible TotalSupply (r:1 w:1)191 /// Proof: Fungible TotalSupply (max_values: None, max_size: Some(28), added: 2503, mode: MaxEncodedLen)192 /// Storage: Fungible Balance (r:1 w:1)193 /// Proof: Fungible Balance (max_values: None, max_size: Some(77), added: 2552, mode: MaxEncodedLen)194 fn burn_item() -> Weight {195 // Proof Size summary in bytes:196 // Measured: `197`197 // Estimated: `5055`198 // Minimum execution time: 12_894_000 picoseconds.199 Weight::from_parts(13_347_000, 5055)200 .saturating_add(RocksDbWeight::get().reads(2_u64))201 .saturating_add(RocksDbWeight::get().writes(2_u64))202 }203 // Storage: Fungible Balance (r:2 w:2)204 fn transfer_raw() -> Weight {205 Weight::from_ref_time(12_041_000 as u64)206 .saturating_add(RocksDbWeight::get().reads(2 as u64))207 .saturating_add(RocksDbWeight::get().writes(2 as u64))208 }209 /// Storage: Fungible Balance (r:1 w:0)210 /// Proof: Fungible Balance (max_values: None, max_size: Some(77), added: 2552, mode: MaxEncodedLen)211 /// Storage: Fungible Allowance (r:0 w:1)212 /// Proof: Fungible Allowance (max_values: None, max_size: Some(93), added: 2568, mode: MaxEncodedLen)213 fn approve() -> Weight {214 // Proof Size summary in bytes:215 // Measured: `182`216 // Estimated: `2552`217 // Minimum execution time: 12_417_000 picoseconds.218 Weight::from_parts(12_658_000, 2552)219 .saturating_add(RocksDbWeight::get().reads(1_u64))220 .saturating_add(RocksDbWeight::get().writes(1_u64))221 }222 /// Storage: Fungible Balance (r:1 w:0)223 /// Proof: Fungible Balance (max_values: None, max_size: Some(77), added: 2552, mode: MaxEncodedLen)224 /// Storage: Fungible Allowance (r:0 w:1)225 /// Proof: Fungible Allowance (max_values: None, max_size: Some(93), added: 2568, mode: MaxEncodedLen)226 fn approve_from() -> Weight {227 // Proof Size summary in bytes:228 // Measured: `170`229 // Estimated: `2552`230 // Minimum execution time: 12_322_000 picoseconds.231 Weight::from_parts(12_629_000, 2552)232 .saturating_add(RocksDbWeight::get().reads(1_u64))233 .saturating_add(RocksDbWeight::get().writes(1_u64))234 }235 // Storage: Fungible Allowance (r:1 w:0)236 fn check_allowed_raw() -> Weight {237 Weight::from_ref_time(3_550_000 as u64)238 .saturating_add(RocksDbWeight::get().reads(1 as u64))239 }240 // Storage: Fungible Allowance (r:1 w:1)241 fn set_allowance_unchecked_raw() -> Weight {242 Weight::from_ref_time(10_682_000 as u64)243 .saturating_add(RocksDbWeight::get().reads(1 as u64))244 .saturating_add(RocksDbWeight::get().writes(1 as u64))245 }246 /// Storage: Fungible Allowance (r:1 w:1)247 /// Proof: Fungible Allowance (max_values: None, max_size: Some(93), added: 2568, mode: MaxEncodedLen)248 /// Storage: Fungible TotalSupply (r:1 w:1)249 /// Proof: Fungible TotalSupply (max_values: None, max_size: Some(28), added: 2503, mode: MaxEncodedLen)250 /// Storage: Fungible Balance (r:1 w:1)251 /// Proof: Fungible Balance (max_values: None, max_size: Some(77), added: 2552, mode: MaxEncodedLen)252 fn burn_from() -> Weight {253 // Proof Size summary in bytes:254 // Measured: `315`255 // Estimated: `7623`256 // Minimum execution time: 21_271_000 picoseconds.257 Weight::from_parts(21_709_000, 7623)258 .saturating_add(RocksDbWeight::get().reads(3_u64))259 .saturating_add(RocksDbWeight::get().writes(3_u64))260 }261}262pallets/nonfungible/src/benchmarking.rsdiffbeforeafterboth--- a/pallets/nonfungible/src/benchmarking.rs
+++ b/pallets/nonfungible/src/benchmarking.rs
@@ -121,7 +121,7 @@
}
}: {<Pallet<T>>::burn_recursively(&collection, &burner, item, &Unlimited, &Unlimited)?}
- transfer {
+ transfer_raw {
bench_init!{
owner: sub; collection: collection(owner);
owner: cross_from_sub; sender: cross_sub; receiver: cross_sub;
pallets/nonfungible/src/common.rsdiffbeforeafterboth--- a/pallets/nonfungible/src/common.rs
+++ b/pallets/nonfungible/src/common.rs
@@ -91,7 +91,7 @@
}
fn transfer() -> Weight {
- <SelfWeightOf<T>>::transfer() + <PalletCommonWeightOf<T>>::check_accesslist() * 2
+ <SelfWeightOf<T>>::transfer_raw() + <PalletCommonWeightOf<T>>::check_accesslist() * 2
}
fn approve() -> Weight {
pallets/nonfungible/src/lib.rsdiffbeforeafterboth--- a/pallets/nonfungible/src/lib.rs
+++ b/pallets/nonfungible/src/lib.rs
@@ -809,7 +809,7 @@
<CommonError<T>>::TransferNotAllowed
);
- let mut actual_weight = <SelfWeightOf<T>>::transfer();
+ let mut actual_weight = <SelfWeightOf<T>>::transfer_raw();
let token_data =
<TokenData<T>>::get((collection.id, token)).ok_or(<CommonError<T>>::TokenNotFound)?;
ensure!(&token_data.owner == from, <CommonError<T>>::NoPermission);
pallets/nonfungible/src/weights.rsdiffbeforeafterboth--- a/pallets/nonfungible/src/weights.rs
+++ b/pallets/nonfungible/src/weights.rs
@@ -40,7 +40,7 @@
fn burn_item() -> Weight;
fn burn_recursively_self_raw() -> Weight;
fn burn_recursively_breadth_plus_self_plus_self_per_each_raw(b: u32, ) -> Weight;
- fn transfer() -> Weight;
+ fn transfer_raw() -> Weight;
fn approve() -> Weight;
fn approve_from() -> Weight;
fn checks_allowed_raw() -> Weight;
@@ -209,22 +209,14 @@
.saturating_add(T::DbWeight::get().writes((4_u64).saturating_mul(b.into())))
.saturating_add(Weight::from_parts(0, 10097).saturating_mul(b.into()))
}
- /// Storage: Nonfungible TokenData (r:1 w:1)
- /// Proof: Nonfungible TokenData (max_values: None, max_size: Some(57), added: 2532, mode: MaxEncodedLen)
- /// Storage: Nonfungible AccountBalance (r:2 w:2)
- /// Proof: Nonfungible AccountBalance (max_values: None, max_size: Some(65), added: 2540, mode: MaxEncodedLen)
- /// Storage: Nonfungible Allowance (r:1 w:0)
- /// Proof: Nonfungible Allowance (max_values: None, max_size: Some(57), added: 2532, mode: MaxEncodedLen)
- /// Storage: Nonfungible Owned (r:0 w:2)
- /// Proof: Nonfungible Owned (max_values: None, max_size: Some(74), added: 2549, mode: MaxEncodedLen)
- fn transfer() -> Weight {
- // Proof Size summary in bytes:
- // Measured: `412`
- // Estimated: `10144`
- // Minimum execution time: 18_629_000 picoseconds.
- Weight::from_parts(18_997_000, 10144)
- .saturating_add(T::DbWeight::get().reads(4_u64))
- .saturating_add(T::DbWeight::get().writes(5_u64))
+ // Storage: Nonfungible TokenData (r:1 w:1)
+ // Storage: Nonfungible AccountBalance (r:2 w:2)
+ // Storage: Nonfungible Allowance (r:1 w:0)
+ // Storage: Nonfungible Owned (r:0 w:2)
+ fn transfer_raw() -> Weight {
+ Weight::from_ref_time(14_909_000 as u64)
+ .saturating_add(T::DbWeight::get().reads(4 as u64))
+ .saturating_add(T::DbWeight::get().writes(5 as u64))
}
/// Storage: Nonfungible TokenData (r:1 w:0)
/// Proof: Nonfungible TokenData (max_values: None, max_size: Some(57), added: 2532, mode: MaxEncodedLen)
@@ -523,22 +515,14 @@
.saturating_add(RocksDbWeight::get().writes((4_u64).saturating_mul(b.into())))
.saturating_add(Weight::from_parts(0, 10097).saturating_mul(b.into()))
}
- /// Storage: Nonfungible TokenData (r:1 w:1)
- /// Proof: Nonfungible TokenData (max_values: None, max_size: Some(57), added: 2532, mode: MaxEncodedLen)
- /// Storage: Nonfungible AccountBalance (r:2 w:2)
- /// Proof: Nonfungible AccountBalance (max_values: None, max_size: Some(65), added: 2540, mode: MaxEncodedLen)
- /// Storage: Nonfungible Allowance (r:1 w:0)
- /// Proof: Nonfungible Allowance (max_values: None, max_size: Some(57), added: 2532, mode: MaxEncodedLen)
- /// Storage: Nonfungible Owned (r:0 w:2)
- /// Proof: Nonfungible Owned (max_values: None, max_size: Some(74), added: 2549, mode: MaxEncodedLen)
- fn transfer() -> Weight {
- // Proof Size summary in bytes:
- // Measured: `412`
- // Estimated: `10144`
- // Minimum execution time: 18_629_000 picoseconds.
- Weight::from_parts(18_997_000, 10144)
- .saturating_add(RocksDbWeight::get().reads(4_u64))
- .saturating_add(RocksDbWeight::get().writes(5_u64))
+ // Storage: Nonfungible TokenData (r:1 w:1)
+ // Storage: Nonfungible AccountBalance (r:2 w:2)
+ // Storage: Nonfungible Allowance (r:1 w:0)
+ // Storage: Nonfungible Owned (r:0 w:2)
+ fn transfer_raw() -> Weight {
+ Weight::from_ref_time(14_909_000 as u64)
+ .saturating_add(RocksDbWeight::get().reads(4 as u64))
+ .saturating_add(RocksDbWeight::get().writes(5 as u64))
}
/// Storage: Nonfungible TokenData (r:1 w:0)
/// Proof: Nonfungible TokenData (max_values: None, max_size: Some(57), added: 2532, mode: MaxEncodedLen)