From 008833a7ebae6dfe87dd8be42e95fea36ae99dac Mon Sep 17 00:00:00 2001 From: PraetorP Date: Fri, 31 Mar 2023 05:37:18 +0000 Subject: [PATCH] refactor(weight): bench rename `transfer` to `transfer_raw` --- --- a/pallets/fungible/src/benchmarking.rs +++ b/pallets/fungible/src/benchmarking.rs @@ -66,7 +66,7 @@ >::create_item(&collection, &owner, (burner.clone(), 200), &Unlimited)?; }: {>::burn(&collection, &burner, 100)?} - transfer { + transfer_raw { bench_init!{ owner: sub; collection: collection(owner); owner: cross_from_sub; sender: cross_sub; to: cross_sub; --- a/pallets/fungible/src/common.rs +++ b/pallets/fungible/src/common.rs @@ -78,7 +78,7 @@ } fn transfer() -> Weight { - >::transfer() + >::check_accesslist() * 2 + >::transfer_raw() + >::check_accesslist() * 2 } fn approve() -> Weight { --- a/pallets/fungible/src/lib.rs +++ b/pallets/fungible/src/lib.rs @@ -400,7 +400,7 @@ >::TransferNotAllowed, ); - let mut actual_weight = >::transfer(); + let mut actual_weight = >::transfer_raw(); if collection.permissions.access() == AccessMode::AllowList { collection.check_allowlist(from)?; --- a/pallets/fungible/src/weights.rs +++ b/pallets/fungible/src/weights.rs @@ -37,7 +37,7 @@ fn create_item() -> Weight; fn create_multiple_items_ex(b: u32, ) -> Weight; fn burn_item() -> Weight; - fn transfer() -> Weight; + fn transfer_raw() -> Weight; fn approve() -> Weight; fn approve_from() -> Weight; fn check_allowed_raw() -> Weight; @@ -93,16 +93,11 @@ .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } - /// Storage: Fungible Balance (r:2 w:2) - /// Proof: Fungible Balance (max_values: None, max_size: Some(77), added: 2552, mode: MaxEncodedLen) - fn transfer() -> Weight { - // Proof Size summary in bytes: - // Measured: `182` - // Estimated: `5104` - // Minimum execution time: 13_832_000 picoseconds. - Weight::from_parts(14_064_000, 5104) - .saturating_add(T::DbWeight::get().reads(2_u64)) - .saturating_add(T::DbWeight::get().writes(2_u64)) + // Storage: Fungible Balance (r:2 w:2) + fn transfer_raw() -> Weight { + Weight::from_ref_time(12_041_000 as u64) + .saturating_add(T::DbWeight::get().reads(2 as u64)) + .saturating_add(T::DbWeight::get().writes(2 as u64)) } /// Storage: Fungible Balance (r:1 w:0) /// Proof: Fungible Balance (max_values: None, max_size: Some(77), added: 2552, mode: MaxEncodedLen) @@ -205,16 +200,11 @@ .saturating_add(RocksDbWeight::get().reads(2_u64)) .saturating_add(RocksDbWeight::get().writes(2_u64)) } - /// Storage: Fungible Balance (r:2 w:2) - /// Proof: Fungible Balance (max_values: None, max_size: Some(77), added: 2552, mode: MaxEncodedLen) - fn transfer() -> Weight { - // Proof Size summary in bytes: - // Measured: `182` - // Estimated: `5104` - // Minimum execution time: 13_832_000 picoseconds. - Weight::from_parts(14_064_000, 5104) - .saturating_add(RocksDbWeight::get().reads(2_u64)) - .saturating_add(RocksDbWeight::get().writes(2_u64)) + // Storage: Fungible Balance (r:2 w:2) + fn transfer_raw() -> Weight { + Weight::from_ref_time(12_041_000 as u64) + .saturating_add(RocksDbWeight::get().reads(2 as u64)) + .saturating_add(RocksDbWeight::get().writes(2 as u64)) } /// Storage: Fungible Balance (r:1 w:0) /// Proof: Fungible Balance (max_values: None, max_size: Some(77), added: 2552, mode: MaxEncodedLen) --- a/pallets/nonfungible/src/benchmarking.rs +++ b/pallets/nonfungible/src/benchmarking.rs @@ -121,7 +121,7 @@ } }: {>::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; --- a/pallets/nonfungible/src/common.rs +++ b/pallets/nonfungible/src/common.rs @@ -91,7 +91,7 @@ } fn transfer() -> Weight { - >::transfer() + >::check_accesslist() * 2 + >::transfer_raw() + >::check_accesslist() * 2 } fn approve() -> Weight { --- a/pallets/nonfungible/src/lib.rs +++ b/pallets/nonfungible/src/lib.rs @@ -809,7 +809,7 @@ >::TransferNotAllowed ); - let mut actual_weight = >::transfer(); + let mut actual_weight = >::transfer_raw(); let token_data = >::get((collection.id, token)).ok_or(>::TokenNotFound)?; ensure!(&token_data.owner == from, >::NoPermission); --- 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) -- gitstuff