git.delta.rocks / unique-network / refs/commits / 00a765656f26

difftreelog

feat(rmrk) benchmark reject_nft

Daniel Shiposha2022-06-10parent: #66e7432.patch.diff
in: master

3 files changed

modifiedpallets/proxy-rmrk-core/src/benchmarking.rsdiffbeforeafterboth
104		}104		}
105	}105	}
106
107	fn current_nft_id(&self) -> RmrkNftId {
108		self.current_nft_id
109	}
106110
107	fn build<T: Config>(&mut self, owner: &T::AccountId) -> Result<RmrkNftId, DispatchError> {111	fn build<T: Config>(&mut self, owner: &T::AccountId) -> Result<RmrkNftId, DispatchError> {
108		create_max_nft::<T>(owner, self.collection_id)?;112		create_max_nft::<T>(owner, self.collection_id)?;
115		&mut self,119		&mut self,
116		owner: &T::AccountId,120		owner: &T::AccountId,
117		height: u32,121		height: u32,
118	) -> Result<RmrkNftId, DispatchError> {122	) -> Result<(RmrkNftId, RmrkNftId), DispatchError> {
119		self.build::<T>(owner)?;123		self.build::<T>(owner)?;
120124
121		let mut prev_nft_id = self.current_nft_id;125		let root_nft_id = self.current_nft_id;
126		let mut prev_nft_id = root_nft_id;
122127
123		for _ in 0..height {128		for _ in 0..height {
124			self.build::<T>(owner)?;129			self.build::<T>(owner)?;
141146
142		let deepest_nft_id = self.current_nft_id;147		let deepest_nft_id = self.current_nft_id;
143148
144		Ok(deepest_nft_id)149		Ok((root_nft_id, deepest_nft_id))
145	}150	}
146}151}
147152
207212
208		let mut nft_builder = NftBuilder::new(collection_id);213		let mut nft_builder = NftBuilder::new(collection_id);
209		let src_nft_id = nft_builder.build::<T>(&caller)?;214		let src_nft_id = nft_builder.build::<T>(&caller)?;
210		let target_nft_id = nft_builder.build_tower::<T>(&caller, NESTING_BUDGET - 2)?;215		let (_, target_nft_id) = nft_builder.build_tower::<T>(&caller, NESTING_BUDGET - 2)?;
211	}: _(216	}: _(
212		RawOrigin::Signed(caller),217		RawOrigin::Signed(caller),
213		collection_id,218		collection_id,
230235
231		let mut target_nft_builder = NftBuilder::new(target_collection_id);236		let mut target_nft_builder = NftBuilder::new(target_collection_id);
232		let fake_target_nft_id = target_nft_builder.build::<T>(&caller)?;237		let fake_target_nft_id = target_nft_builder.build::<T>(&caller)?;
233		let target_nft_id = target_nft_builder.build_tower::<T>(&caller, NESTING_BUDGET - 1)?;238		let (_, target_nft_id) = target_nft_builder.build_tower::<T>(&caller, NESTING_BUDGET - 1)?;
234239
235		let new_owner = <RmrkAccountIdOrCollectionNftTuple<T::AccountId>>::CollectionAndNftTuple(240		let new_owner = <RmrkAccountIdOrCollectionNftTuple<T::AccountId>>::CollectionAndNftTuple(
236			target_collection_id,241			target_collection_id,
255		actual_new_owner260		actual_new_owner
256	)261	)
262
263	reject_nft {
264		let caller: T::AccountId = account("caller", 0, SEED);
265		let sender: T::AccountId = account("sender", 0, SEED);
266
267		create_max_collection::<T>(&sender)?;
268		let src_collection_id = 0;
269
270		create_max_collection::<T>(&caller)?;
271		let target_collection_id = 1;
272
273		let mut src_nft_builder = NftBuilder::new(src_collection_id);
274		let (src_root_nft_id, _) = src_nft_builder.build_tower::<T>(&sender, NESTING_BUDGET - 1)?;
275
276		let mut target_nft_builder = NftBuilder::new(target_collection_id);
277		let target_nft_id = target_nft_builder.build::<T>(&caller)?;
278
279		let new_owner = <RmrkAccountIdOrCollectionNftTuple<T::AccountId>>::CollectionAndNftTuple(
280			target_collection_id,
281			target_nft_id
282		);
283
284		<Pallet<T>>::send(
285			RawOrigin::Signed(sender.clone()).into(),
286			src_collection_id,
287			src_root_nft_id,
288			new_owner,
289		)?;
290	}: _(
291		RawOrigin::Signed(caller),
292		src_collection_id,
293		src_root_nft_id
294	)
257295
258	set_property {296	set_property {
259		let caller: T::AccountId = account("caller", 0, SEED);297		let caller: T::AccountId = account("caller", 0, SEED);
260		create_max_collection::<T>(&caller)?;298		create_max_collection::<T>(&caller)?;
261		let collection_id = 0;299		let collection_id = 0;
262300
263		let mut nft_builder = NftBuilder::new(collection_id);301		let mut nft_builder = NftBuilder::new(collection_id);
264		let nft_id = nft_builder.build_tower::<T>(&caller, NESTING_BUDGET - 1)?;302		let (_, nft_id) = nft_builder.build_tower::<T>(&caller, NESTING_BUDGET - 1)?;
265303
266		let key = create_data();304		let key = create_data();
267		let value = create_data();305		let value = create_data();
279		let collection_id = 0;317		let collection_id = 0;
280318
281		let mut nft_builder = NftBuilder::new(collection_id);319		let mut nft_builder = NftBuilder::new(collection_id);
282		let nft_id = nft_builder.build_tower::<T>(&caller, NESTING_BUDGET - 1)?;320		let (_, nft_id) = nft_builder.build_tower::<T>(&caller, NESTING_BUDGET - 1)?;
283		let priorities = create_u32_array();321		let priorities = create_u32_array();
284	}: _(322	}: _(
285		RawOrigin::Signed(caller),323		RawOrigin::Signed(caller),
296		let collection_id = 0;334		let collection_id = 0;
297335
298		let mut nft_builder = NftBuilder::new(collection_id);336		let mut nft_builder = NftBuilder::new(collection_id);
299		let nft_id = nft_builder.build_tower::<T>(&caller, NESTING_BUDGET - 1)?;337		let (_, nft_id) = nft_builder.build_tower::<T>(&caller, NESTING_BUDGET - 1)?;
300		let resource = create_basic_resource();338		let resource = create_basic_resource();
301	}: _(339	}: _(
302		RawOrigin::Signed(caller),340		RawOrigin::Signed(caller),
313		let collection_id = 0;351		let collection_id = 0;
314352
315		let mut nft_builder = NftBuilder::new(collection_id);353		let mut nft_builder = NftBuilder::new(collection_id);
316		let nft_id = nft_builder.build_tower::<T>(&caller, NESTING_BUDGET - 1)?;354		let (_, nft_id) = nft_builder.build_tower::<T>(&caller, NESTING_BUDGET - 1)?;
317		let resource = create_composable_resource();355		let resource = create_composable_resource();
318	}: _(356	}: _(
319		RawOrigin::Signed(caller),357		RawOrigin::Signed(caller),
330		let collection_id = 0;368		let collection_id = 0;
331369
332		let mut nft_builder = NftBuilder::new(collection_id);370		let mut nft_builder = NftBuilder::new(collection_id);
333		let nft_id = nft_builder.build_tower::<T>(&caller, NESTING_BUDGET - 1)?;371		let (_, nft_id) = nft_builder.build_tower::<T>(&caller, NESTING_BUDGET - 1)?;
334		let resource = create_slot_resource();372		let resource = create_slot_resource();
335	}: _(373	}: _(
336		RawOrigin::Signed(caller),374		RawOrigin::Signed(caller),
347		let collection_id = 0;385		let collection_id = 0;
348386
349		let mut nft_builder = NftBuilder::new(collection_id);387		let mut nft_builder = NftBuilder::new(collection_id);
350		let nft_id = nft_builder.build_tower::<T>(&caller, NESTING_BUDGET - 1)?;388		let (_, nft_id) = nft_builder.build_tower::<T>(&caller, NESTING_BUDGET - 1)?;
351		let resource = create_basic_resource();389		let resource = create_basic_resource();
352390
353		<Pallet<T>>::add_basic_resource(391		<Pallet<T>>::add_basic_resource(
376414
377		let mut nft_builder = NftBuilder::new(collection_id);415		let mut nft_builder = NftBuilder::new(collection_id);
378		let root_nft_id = 1;416		let root_nft_id = 1;
379		let nested_nft_id = nft_builder.build_tower::<T>(&admin, NESTING_BUDGET - 1)?;417		let (_, nested_nft_id) = nft_builder.build_tower::<T>(&admin, NESTING_BUDGET - 1)?;
380		let resource = create_basic_resource();418		let resource = create_basic_resource();
381419
382		let new_owner = <RmrkAccountIdOrCollectionNftTuple<T::AccountId>>::AccountId(caller.clone());420		let new_owner = <RmrkAccountIdOrCollectionNftTuple<T::AccountId>>::AccountId(caller.clone());
414452
415		let mut nft_builder = NftBuilder::new(collection_id);453		let mut nft_builder = NftBuilder::new(collection_id);
416		let root_nft_id = 1;454		let root_nft_id = 1;
417		let nested_nft_id = nft_builder.build_tower::<T>(&admin, NESTING_BUDGET - 1)?;455		let (_, nested_nft_id) = nft_builder.build_tower::<T>(&admin, NESTING_BUDGET - 1)?;
418		let resource = create_basic_resource();456		let resource = create_basic_resource();
419457
420		<Pallet<T>>::add_basic_resource(458		<Pallet<T>>::add_basic_resource(
modifiedpallets/proxy-rmrk-core/src/lib.rsdiffbeforeafterboth
--- a/pallets/proxy-rmrk-core/src/lib.rs
+++ b/pallets/proxy-rmrk-core/src/lib.rs
@@ -628,8 +628,8 @@
 		/// - `origin`: sender of the transaction
 		/// - `rmrk_collection_id`: collection id of the nft to be accepted
 		/// - `rmrk_nft_id`: nft id of the nft to be accepted
-		#[pallet::weight(10_000 + T::DbWeight::get().reads_writes(1,1))]
 		#[transactional]
+		#[pallet::weight(<SelfWeightOf<T>>::reject_nft())]
 		pub fn reject_nft(
 			origin: OriginFor<T>,
 			rmrk_collection_id: RmrkCollectionId,
modifiedpallets/proxy-rmrk-core/src/weights.rsdiffbeforeafterboth
--- a/pallets/proxy-rmrk-core/src/weights.rs
+++ b/pallets/proxy-rmrk-core/src/weights.rs
@@ -40,6 +40,7 @@
 	fn mint_nft() -> Weight;
 	fn send() -> Weight;
 	fn accept_nft() -> Weight;
+	fn reject_nft() -> Weight;
 	fn set_property() -> Weight;
 	fn set_priority() -> Weight;
 	fn add_basic_resource() -> Weight;
@@ -61,11 +62,10 @@
 	// Storage: Common CollectionProperties (r:0 w:1)
 	// Storage: Common CollectionById (r:0 w:1)
 	// Storage: RmrkCore UniqueCollectionId (r:0 w:1)
-	// Storage: RmrkCore RmrkInernalCollectionId (r:0 w:1)
 	fn create_collection() -> Weight {
-		(40_146_000 as Weight)
+		(40_456_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
-			.saturating_add(T::DbWeight::get().writes(9 as Weight))
+			.saturating_add(T::DbWeight::get().writes(8 as Weight))
 	}
 	// Storage: RmrkCore UniqueCollectionId (r:1 w:0)
 	// Storage: Common CollectionProperties (r:1 w:1)
@@ -76,7 +76,7 @@
 	// Storage: Nonfungible TokensBurnt (r:0 w:1)
 	// Storage: Common AdminAmount (r:0 w:1)
 	fn destroy_collection() -> Weight {
-		(44_905_000 as Weight)
+		(43_812_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().writes(6 as Weight))
 	}
@@ -84,7 +84,7 @@
 	// Storage: Common CollectionById (r:1 w:1)
 	// Storage: Common CollectionProperties (r:1 w:0)
 	fn change_collection_issuer() -> Weight {
-		(22_502_000 as Weight)
+		(22_032_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
@@ -94,7 +94,7 @@
 	// Storage: Nonfungible TokensMinted (r:1 w:0)
 	// Storage: Nonfungible TokensBurnt (r:1 w:0)
 	fn lock_collection() -> Weight {
-		(23_705_000 as Weight)
+		(23_314_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
@@ -107,7 +107,7 @@
 	// Storage: Nonfungible TokenData (r:0 w:1)
 	// Storage: Nonfungible Owned (r:0 w:1)
 	fn mint_nft() -> Weight {
-		(40_727_000 as Weight)
+		(40_075_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(6 as Weight))
 			.saturating_add(T::DbWeight::get().writes(5 as Weight))
 	}
@@ -121,7 +121,7 @@
 	// Storage: Nonfungible TokenChildren (r:0 w:1)
 	// Storage: Nonfungible Owned (r:0 w:2)
 	fn send() -> Weight {
-		(73_288_000 as Weight)
+		(71_474_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(12 as Weight))
 			.saturating_add(T::DbWeight::get().writes(6 as Weight))
 	}
@@ -135,17 +135,32 @@
 	// Storage: Nonfungible TokenChildren (r:0 w:1)
 	// Storage: Nonfungible Owned (r:0 w:2)
 	fn accept_nft() -> Weight {
-		(81_985_000 as Weight)
+		(79_890_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(15 as Weight))
 			.saturating_add(T::DbWeight::get().writes(7 as Weight))
 	}
 	// Storage: RmrkCore UniqueCollectionId (r:1 w:0)
 	// Storage: Common CollectionProperties (r:1 w:0)
 	// Storage: Common CollectionById (r:1 w:0)
+	// Storage: Nonfungible TokenProperties (r:1 w:5)
+	// Storage: Nonfungible TokenData (r:5 w:5)
+	// Storage: Nonfungible TokenChildren (r:9 w:4)
+	// Storage: Nonfungible TokensBurnt (r:1 w:1)
+	// Storage: Nonfungible AccountBalance (r:5 w:5)
+	// Storage: Nonfungible Allowance (r:5 w:0)
+	// Storage: Nonfungible Owned (r:0 w:5)
+	fn reject_nft() -> Weight {
+		(236_754_000 as Weight)
+			.saturating_add(T::DbWeight::get().reads(29 as Weight))
+			.saturating_add(T::DbWeight::get().writes(25 as Weight))
+	}
+	// Storage: RmrkCore UniqueCollectionId (r:1 w:0)
+	// Storage: Common CollectionProperties (r:1 w:0)
+	// Storage: Common CollectionById (r:1 w:0)
 	// Storage: Nonfungible TokenProperties (r:1 w:1)
 	// Storage: Nonfungible TokenData (r:5 w:0)
 	fn set_property() -> Weight {
-		(50_535_000 as Weight)
+		(48_370_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(9 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
@@ -155,7 +170,7 @@
 	// Storage: Nonfungible TokenProperties (r:1 w:1)
 	// Storage: Nonfungible TokenData (r:5 w:0)
 	fn set_priority() -> Weight {
-		(49_443_000 as Weight)
+		(47_128_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(9 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
@@ -172,7 +187,7 @@
 	// Storage: Nonfungible Owned (r:0 w:1)
 	// Storage: Common CollectionPropertyPermissions (r:0 w:1)
 	fn add_basic_resource() -> Weight {
-		(104_226_000 as Weight)
+		(101_501_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(16 as Weight))
 			.saturating_add(T::DbWeight::get().writes(12 as Weight))
 	}
@@ -189,7 +204,7 @@
 	// Storage: Nonfungible Owned (r:0 w:1)
 	// Storage: Common CollectionPropertyPermissions (r:0 w:1)
 	fn add_composable_resource() -> Weight {
-		(105_197_000 as Weight)
+		(103_004_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(16 as Weight))
 			.saturating_add(T::DbWeight::get().writes(12 as Weight))
 	}
@@ -206,7 +221,7 @@
 	// Storage: Nonfungible Owned (r:0 w:1)
 	// Storage: Common CollectionPropertyPermissions (r:0 w:1)
 	fn add_slot_resource() -> Weight {
-		(105_899_000 as Weight)
+		(102_613_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(16 as Weight))
 			.saturating_add(T::DbWeight::get().writes(12 as Weight))
 	}
@@ -221,7 +236,7 @@
 	// Storage: Nonfungible Allowance (r:1 w:0)
 	// Storage: Nonfungible Owned (r:0 w:1)
 	fn remove_resource() -> Weight {
-		(82_997_000 as Weight)
+		(82_084_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(16 as Weight))
 			.saturating_add(T::DbWeight::get().writes(5 as Weight))
 	}
@@ -231,7 +246,7 @@
 	// Storage: Nonfungible TokenData (r:5 w:0)
 	// Storage: Nonfungible TokenProperties (r:2 w:1)
 	fn accept_resource() -> Weight {
-		(56_848_000 as Weight)
+		(56_426_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(10 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
@@ -246,7 +261,7 @@
 	// Storage: Nonfungible Allowance (r:1 w:0)
 	// Storage: Nonfungible Owned (r:0 w:1)
 	fn accept_resource_removal() -> Weight {
-		(86_303_000 as Weight)
+		(85_631_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(17 as Weight))
 			.saturating_add(T::DbWeight::get().writes(5 as Weight))
 	}
@@ -262,11 +277,10 @@
 	// Storage: Common CollectionProperties (r:0 w:1)
 	// Storage: Common CollectionById (r:0 w:1)
 	// Storage: RmrkCore UniqueCollectionId (r:0 w:1)
-	// Storage: RmrkCore RmrkInernalCollectionId (r:0 w:1)
 	fn create_collection() -> Weight {
-		(40_146_000 as Weight)
+		(40_456_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
-			.saturating_add(RocksDbWeight::get().writes(9 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(8 as Weight))
 	}
 	// Storage: RmrkCore UniqueCollectionId (r:1 w:0)
 	// Storage: Common CollectionProperties (r:1 w:1)
@@ -277,7 +291,7 @@
 	// Storage: Nonfungible TokensBurnt (r:0 w:1)
 	// Storage: Common AdminAmount (r:0 w:1)
 	fn destroy_collection() -> Weight {
-		(44_905_000 as Weight)
+		(43_812_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(6 as Weight))
 	}
@@ -285,7 +299,7 @@
 	// Storage: Common CollectionById (r:1 w:1)
 	// Storage: Common CollectionProperties (r:1 w:0)
 	fn change_collection_issuer() -> Weight {
-		(22_502_000 as Weight)
+		(22_032_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
@@ -295,7 +309,7 @@
 	// Storage: Nonfungible TokensMinted (r:1 w:0)
 	// Storage: Nonfungible TokensBurnt (r:1 w:0)
 	fn lock_collection() -> Weight {
-		(23_705_000 as Weight)
+		(23_314_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
@@ -308,7 +322,7 @@
 	// Storage: Nonfungible TokenData (r:0 w:1)
 	// Storage: Nonfungible Owned (r:0 w:1)
 	fn mint_nft() -> Weight {
-		(40_727_000 as Weight)
+		(40_075_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(6 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(5 as Weight))
 	}
@@ -322,7 +336,7 @@
 	// Storage: Nonfungible TokenChildren (r:0 w:1)
 	// Storage: Nonfungible Owned (r:0 w:2)
 	fn send() -> Weight {
-		(73_288_000 as Weight)
+		(71_474_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(12 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(6 as Weight))
 	}
@@ -336,17 +350,32 @@
 	// Storage: Nonfungible TokenChildren (r:0 w:1)
 	// Storage: Nonfungible Owned (r:0 w:2)
 	fn accept_nft() -> Weight {
-		(81_985_000 as Weight)
+		(79_890_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(15 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(7 as Weight))
 	}
 	// Storage: RmrkCore UniqueCollectionId (r:1 w:0)
 	// Storage: Common CollectionProperties (r:1 w:0)
 	// Storage: Common CollectionById (r:1 w:0)
+	// Storage: Nonfungible TokenProperties (r:1 w:5)
+	// Storage: Nonfungible TokenData (r:5 w:5)
+	// Storage: Nonfungible TokenChildren (r:9 w:4)
+	// Storage: Nonfungible TokensBurnt (r:1 w:1)
+	// Storage: Nonfungible AccountBalance (r:5 w:5)
+	// Storage: Nonfungible Allowance (r:5 w:0)
+	// Storage: Nonfungible Owned (r:0 w:5)
+	fn reject_nft() -> Weight {
+		(236_754_000 as Weight)
+			.saturating_add(RocksDbWeight::get().reads(29 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(25 as Weight))
+	}
+	// Storage: RmrkCore UniqueCollectionId (r:1 w:0)
+	// Storage: Common CollectionProperties (r:1 w:0)
+	// Storage: Common CollectionById (r:1 w:0)
 	// Storage: Nonfungible TokenProperties (r:1 w:1)
 	// Storage: Nonfungible TokenData (r:5 w:0)
 	fn set_property() -> Weight {
-		(50_535_000 as Weight)
+		(48_370_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(9 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
@@ -356,7 +385,7 @@
 	// Storage: Nonfungible TokenProperties (r:1 w:1)
 	// Storage: Nonfungible TokenData (r:5 w:0)
 	fn set_priority() -> Weight {
-		(49_443_000 as Weight)
+		(47_128_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(9 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
@@ -373,7 +402,7 @@
 	// Storage: Nonfungible Owned (r:0 w:1)
 	// Storage: Common CollectionPropertyPermissions (r:0 w:1)
 	fn add_basic_resource() -> Weight {
-		(104_226_000 as Weight)
+		(101_501_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(16 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(12 as Weight))
 	}
@@ -390,7 +419,7 @@
 	// Storage: Nonfungible Owned (r:0 w:1)
 	// Storage: Common CollectionPropertyPermissions (r:0 w:1)
 	fn add_composable_resource() -> Weight {
-		(105_197_000 as Weight)
+		(103_004_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(16 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(12 as Weight))
 	}
@@ -407,7 +436,7 @@
 	// Storage: Nonfungible Owned (r:0 w:1)
 	// Storage: Common CollectionPropertyPermissions (r:0 w:1)
 	fn add_slot_resource() -> Weight {
-		(105_899_000 as Weight)
+		(102_613_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(16 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(12 as Weight))
 	}
@@ -422,7 +451,7 @@
 	// Storage: Nonfungible Allowance (r:1 w:0)
 	// Storage: Nonfungible Owned (r:0 w:1)
 	fn remove_resource() -> Weight {
-		(82_997_000 as Weight)
+		(82_084_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(16 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(5 as Weight))
 	}
@@ -432,7 +461,7 @@
 	// Storage: Nonfungible TokenData (r:5 w:0)
 	// Storage: Nonfungible TokenProperties (r:2 w:1)
 	fn accept_resource() -> Weight {
-		(56_848_000 as Weight)
+		(56_426_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(10 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
@@ -447,7 +476,7 @@
 	// Storage: Nonfungible Allowance (r:1 w:0)
 	// Storage: Nonfungible Owned (r:0 w:1)
 	fn accept_resource_removal() -> Weight {
-		(86_303_000 as Weight)
+		(85_631_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(17 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(5 as Weight))
 	}