git.delta.rocks / unique-network / refs/commits / a1997cfc97bc

--- a/pallets/common/src/lib.rs
+++ b/pallets/common/src/lib.rs
@@ -1019,7 +1019,7 @@
 	}
 
 	#[transactional]
-	pub fn set_property_permissions(
+	pub fn set_token_property_permissions(
 		collection: &CollectionHandle<T>,
 		sender: &T::CrossAccountId,
 		property_permissions: Vec<PropertyKeyPermission>,
@@ -1239,7 +1239,7 @@
 	fn delete_collection_properties(amount: u32) -> Weight;
 	fn set_token_properties(amount: u32) -> Weight;
 	fn delete_token_properties(amount: u32) -> Weight;
-	fn set_property_permissions(amount: u32) -> Weight;
+	fn set_token_property_permissions(amount: u32) -> Weight;
 	fn transfer() -> Weight;
 	fn approve() -> Weight;
 	fn transfer_from() -> Weight;
@@ -1318,7 +1318,7 @@
 		token_id: TokenId,
 		property_keys: Vec<PropertyKey>,
 	) -> DispatchResultWithPostInfo;
-	fn set_property_permissions(
+	fn set_token_property_permissions(
 		&self,
 		sender: &T::CrossAccountId,
 		property_permissions: Vec<PropertyKeyPermission>,

--- a/pallets/fungible/src/common.rs
+++ b/pallets/fungible/src/common.rs
@@ -72,7 +72,7 @@
 		0
 	}
 
-	fn set_property_permissions(_amount: u32) -> Weight {
+	fn set_token_property_permissions(_amount: u32) -> Weight {
 		// Error
 		0
 	}
@@ -302,7 +302,7 @@
 		fail!(<Error<T>>::SettingPropertiesNotAllowed)
 	}
 
-	fn set_property_permissions(
+	fn set_token_property_permissions(
 		&self,
 		_sender: &T::CrossAccountId,
 		_property_permissions: Vec<PropertyKeyPermission>,

--- a/pallets/nonfungible/src/benchmarking.rs
+++ b/pallets/nonfungible/src/benchmarking.rs
@@ -147,7 +147,7 @@
 		<Pallet<T>>::set_allowance(&collection, &sender, item, Some(&burner))?;
 	}: {<Pallet<T>>::burn_from(&collection, &burner, &sender, item, &Unlimited)?}
 
-	set_property_permissions {
+	set_token_property_permissions {
 		let b in 0..MAX_PROPERTIES_PER_ITEM;
 		bench_init!{
 			owner: sub; collection: collection(owner);
@@ -161,7 +161,7 @@
 				token_owner: false,
 			},
 		}).collect::<Vec<_>>();
-	}: {<Pallet<T>>::set_property_permissions(&collection, &owner, perms)?}
+	}: {<Pallet<T>>::set_token_property_permissions(&collection, &owner, perms)?}
 
 	set_token_properties {
 		let b in 0..MAX_PROPERTIES_PER_ITEM;
@@ -177,7 +177,7 @@
 				token_owner: true,
 			},
 		}).collect::<Vec<_>>();
-		<Pallet<T>>::set_property_permissions(&collection, &owner, perms)?;
+		<Pallet<T>>::set_token_property_permissions(&collection, &owner, perms)?;
 		let props = (0..b).map(|k| Property {
 			key: property_key(k as usize),
 			value: property_value(),
@@ -199,7 +199,7 @@
 				token_owner: true,
 			},
 		}).collect::<Vec<_>>();
-		<Pallet<T>>::set_property_permissions(&collection, &owner, perms)?;
+		<Pallet<T>>::set_token_property_permissions(&collection, &owner, perms)?;
 		let props = (0..b).map(|k| Property {
 			key: property_key(k as usize),
 			value: property_value(),

--- a/pallets/nonfungible/src/common.rs
+++ b/pallets/nonfungible/src/common.rs
@@ -89,8 +89,8 @@
 		<SelfWeightOf<T>>::delete_token_properties(amount)
 	}
 
-	fn set_property_permissions(amount: u32) -> Weight {
-		<SelfWeightOf<T>>::set_property_permissions(amount)
+	fn set_token_property_permissions(amount: u32) -> Weight {
+		<SelfWeightOf<T>>::set_token_property_permissions(amount)
 	}
 
 	fn transfer() -> Weight {
@@ -242,16 +242,16 @@
 		)
 	}
 
-	fn set_property_permissions(
+	fn set_token_property_permissions(
 		&self,
 		sender: &T::CrossAccountId,
 		property_permissions: Vec<PropertyKeyPermission>,
 	) -> DispatchResultWithPostInfo {
 		let weight =
-			<CommonWeights<T>>::set_property_permissions(property_permissions.len() as u32);
+			<CommonWeights<T>>::set_token_property_permissions(property_permissions.len() as u32);
 
 		with_weight(
-			<Pallet<T>>::set_property_permissions(self, sender, property_permissions),
+			<Pallet<T>>::set_token_property_permissions(self, sender, property_permissions),
 			weight,
 		)
 	}

--- a/pallets/nonfungible/src/lib.rs
+++ b/pallets/nonfungible/src/lib.rs
@@ -594,12 +594,12 @@
 		<PalletCommon<T>>::delete_collection_properties(collection, sender, property_keys)
 	}
 
-	pub fn set_property_permissions(
+	pub fn set_token_property_permissions(
 		collection: &CollectionHandle<T>,
 		sender: &T::CrossAccountId,
 		property_permissions: Vec<PropertyKeyPermission>,
 	) -> DispatchResult {
-		<PalletCommon<T>>::set_property_permissions(collection, sender, property_permissions)
+		<PalletCommon<T>>::set_token_property_permissions(collection, sender, property_permissions)
 	}
 
 	pub fn set_property_permission(

--- a/pallets/nonfungible/src/weights.rs
+++ b/pallets/nonfungible/src/weights.rs
@@ -42,7 +42,7 @@
 	fn approve() -> Weight;
 	fn transfer_from() -> Weight;
 	fn burn_from() -> Weight;
-	fn set_property_permissions(b: u32) -> Weight;
+	fn set_token_property_permissions(b: u32) -> Weight;
 	fn set_token_properties(b: u32) -> Weight;
 	fn delete_token_properties(b: u32) -> Weight;
 }
@@ -159,7 +159,7 @@
 			.saturating_add(T::DbWeight::get().writes(5 as Weight))
 	}
 	// Storage: Common CollectionPropertyPermissions (r:1 w:1)
-	fn set_property_permissions(b: u32, ) -> Weight {
+	fn set_token_property_permissions(b: u32, ) -> Weight {
 		(0 as Weight)
 			// Standard Error: 3_432_000
 			.saturating_add((126_888_000 as Weight).saturating_mul(b as Weight))
@@ -299,7 +299,7 @@
 			.saturating_add(RocksDbWeight::get().writes(5 as Weight))
 	}
 	// Storage: Common CollectionPropertyPermissions (r:1 w:1)
-	fn set_property_permissions(b: u32, ) -> Weight {
+	fn set_token_property_permissions(b: u32, ) -> Weight {
 		(0 as Weight)
 			// Standard Error: 3_432_000
 			.saturating_add((126_888_000 as Weight).saturating_mul(b as Weight))

--- a/pallets/refungible/src/common.rs
+++ b/pallets/refungible/src/common.rs
@@ -85,8 +85,8 @@
 		<SelfWeightOf<T>>::delete_token_properties(amount)
 	}
 
-	fn set_property_permissions(amount: u32) -> Weight {
-		<SelfWeightOf<T>>::set_property_permissions(amount)
+	fn set_token_property_permissions(amount: u32) -> Weight {
+		<SelfWeightOf<T>>::set_token_property_permissions(amount)
 	}
 
 	fn transfer() -> Weight {
@@ -315,7 +315,7 @@
 		fail!(<Error<T>>::SettingPropertiesNotAllowed)
 	}
 
-	fn set_property_permissions(
+	fn set_token_property_permissions(
 		&self,
 		_sender: &T::CrossAccountId,
 		_property_permissions: Vec<PropertyKeyPermission>,

40	fn burn_item_fully() -> Weight;40	fn burn_item_fully() -> Weight;
41	fn set_token_properties(amount: u32) -> Weight;41	fn set_token_properties(amount: u32) -> Weight;
42	fn delete_token_properties(amount: u32) -> Weight;42	fn delete_token_properties(amount: u32) -> Weight;
43	fn set_property_permissions(amount: u32) -> Weight;43	fn set_token_property_permissions(amount: u32) -> Weight;
44	fn transfer_normal() -> Weight;44	fn transfer_normal() -> Weight;
45	fn transfer_creating() -> Weight;45	fn transfer_creating() -> Weight;
46	fn transfer_removing() -> Weight;46	fn transfer_removing() -> Weight;
142		0142		0
143	}143	}
144144
145	fn set_property_permissions(_amount: u32) -> Weight {145	fn set_token_property_permissions(_amount: u32) -> Weight {
146		// Error146		// Error
147		0147		0
148	}148	}
320		0320		0
321	}321	}
322322
323	fn set_property_permissions(_amount: u32) -> Weight {323	fn set_token_property_permissions(_amount: u32) -> Weight {
324		// Error324		// Error
325		0325		0
326	}326	}

--- a/pallets/unique/src/lib.rs
+++ b/pallets/unique/src/lib.rs
@@ -670,9 +670,9 @@
 			dispatch_tx::<T, _>(collection_id, |d| d.delete_token_properties(sender, token_id, property_keys))
 		}
 
-		#[weight = T::CommonWeightInfo::set_property_permissions(property_permissions.len() as u32)]
+		#[weight = T::CommonWeightInfo::set_token_property_permissions(property_permissions.len() as u32)]
 		#[transactional]
-		pub fn set_property_permissions(
+		pub fn set_token_property_permissions(
 			origin,
 			collection_id: CollectionId,
 			property_permissions: Vec<PropertyKeyPermission>,
@@ -681,7 +681,7 @@
 
 			let sender = T::CrossAccountId::from_sub(ensure_signed(origin)?);
 
-			dispatch_tx::<T, _>(collection_id, |d| d.set_property_permissions(&sender, property_permissions))
+			dispatch_tx::<T, _>(collection_id, |d| d.set_token_property_permissions(&sender, property_permissions))
 		}
 
 		#[weight = T::CommonWeightInfo::create_multiple_items_ex(&data)]

--- a/runtime/common/src/weights.rs
+++ b/runtime/common/src/weights.rs
@@ -70,8 +70,8 @@
 		dispatch_weight::<T>() + max_weight_of!(delete_token_properties(amount))
 	}
 
-	fn set_property_permissions(amount: u32) -> Weight {
-		dispatch_weight::<T>() + max_weight_of!(set_property_permissions(amount))
+	fn set_token_property_permissions(amount: u32) -> Weight {
+		dispatch_weight::<T>() + max_weight_of!(set_token_property_permissions(amount))
 	}
 
 	fn transfer() -> Weight {

--- a/tests/src/createMultipleItems.test.ts
+++ b/tests/src/createMultipleItems.test.ts
@@ -48,7 +48,7 @@
       const alice = privateKeyWrapper('//Alice');
       await submitTransactionAsync(
         alice, 
-        api.tx.unique.setPropertyPermissions(collectionId, [{key: 'data', permission: {tokenOwner: true}}]),
+        api.tx.unique.setTokenPropertyPermissions(collectionId, [{key: 'data', permission: {tokenOwner: true}}]),
       );
       
       const args = [
@@ -470,7 +470,7 @@
 
       const collectionId = await createCollectionExpectSuccess({mode: {type: 'NFT'}});
 
-      const tx1 = api.tx.unique.setPropertyPermissions(collectionId, propPerms);
+      const tx1 = api.tx.unique.setTokenPropertyPermissions(collectionId, propPerms);
       await expect(executeTransaction(api, alice, tx1)).to.be.rejectedWith(/common\.PropertyLimitReached/);
 
       const itemsListIndexBefore = await getLastTokenId(api, collectionId);

--- a/tests/src/createMultipleItemsEx.test.ts
+++ b/tests/src/createMultipleItemsEx.test.ts
@@ -222,7 +222,7 @@
     const collection = await createCollectionExpectSuccess({mode: {type: 'NFT'}});
     await usingApi(async (api, privateKeyWrapper) => {
       const alice = privateKeyWrapper('//Alice');
-      await expect(executeTransaction(api, alice, api.tx.unique.setPropertyPermissions(collection, propPerms))).to.be.rejectedWith(/common\.PropertyLimitReached/);
+      await expect(executeTransaction(api, alice, api.tx.unique.setTokenPropertyPermissions(collection, propPerms))).to.be.rejectedWith(/common\.PropertyLimitReached/);
     });
   });
 

--- a/tests/src/eth/tokenProperties.test.ts
+++ b/tests/src/eth/tokenProperties.test.ts
@@ -29,7 +29,7 @@
     const collection = await createCollectionExpectSuccess({mode: {type: 'NFT'}});
     const token = await createItemExpectSuccess(alice, collection, 'NFT');
 
-    await executeTransaction(api, alice, api.tx.unique.setPropertyPermissions(collection, [{
+    await executeTransaction(api, alice, api.tx.unique.setTokenPropertyPermissions(collection, [{
       key: 'testKey',
       permission: {
         collectionAdmin: true,
@@ -52,7 +52,7 @@
     const collection = await createCollectionExpectSuccess({mode: {type: 'NFT'}});
     const token = await createItemExpectSuccess(alice, collection, 'NFT');
 
-    await executeTransaction(api, alice, api.tx.unique.setPropertyPermissions(collection, [{
+    await executeTransaction(api, alice, api.tx.unique.setTokenPropertyPermissions(collection, [{
       key: 'testKey',
       permission: {
         mutable: true,
@@ -77,7 +77,7 @@
     const collection = await createCollectionExpectSuccess({mode: {type:'NFT'}});
     const token = await createItemExpectSuccess(alice, collection, 'NFT');
 
-    await executeTransaction(api, alice, api.tx.unique.setPropertyPermissions(collection, [{
+    await executeTransaction(api, alice, api.tx.unique.setTokenPropertyPermissions(collection, [{
       key: 'testKey',
       permission: {
         collectionAdmin: true,

--- a/tests/src/nesting/properties.test.ts
+++ b/tests/src/nesting/properties.test.ts
@@ -38,7 +38,7 @@
       await expect(executeTransaction(
         api, 
         alice, 
-        api.tx.unique.setPropertyPermissions(collectionId, propertyPermissions), 
+        api.tx.unique.setTokenPropertyPermissions(collectionId, propertyPermissions), 
       )).to.not.be.rejected;
 
       const collectionProperties = [
@@ -362,7 +362,7 @@
       await expect(executeTransaction(
         api, 
         alice, 
-        api.tx.unique.setPropertyPermissions(collection, [{key: 'skullduggery', permission: {mutable: true}}]), 
+        api.tx.unique.setTokenPropertyPermissions(collection, [{key: 'skullduggery', permission: {mutable: true}}]), 
       )).to.not.be.rejected;
 
       await addCollectionAdminExpectSuccess(alice, collection, bob.address);
@@ -370,7 +370,7 @@
       await expect(executeTransaction(
         api, 
         alice, 
-        api.tx.unique.setPropertyPermissions(collection, [{key: 'mindgame', permission: {collectionAdmin: true, tokenOwner: false}}]), 
+        api.tx.unique.setTokenPropertyPermissions(collection, [{key: 'mindgame', permission: {collectionAdmin: true, tokenOwner: false}}]), 
       )).to.not.be.rejected;
 
       const propertyRights = (await api.rpc.unique.propertyPermissions(collection, ['skullduggery', 'mindgame'])).toHuman();
@@ -388,13 +388,13 @@
       await expect(executeTransaction(
         api, 
         alice, 
-        api.tx.unique.setPropertyPermissions(collection, [{key: 'skullduggery', permission: {mutable: true, collectionAdmin: true}}]), 
+        api.tx.unique.setTokenPropertyPermissions(collection, [{key: 'skullduggery', permission: {mutable: true, collectionAdmin: true}}]), 
       )).to.not.be.rejected;
 
       await expect(executeTransaction(
         api, 
         alice, 
-        api.tx.unique.setPropertyPermissions(collection, [{key: 'skullduggery', permission: {mutable: false, tokenOwner: true}}]), 
+        api.tx.unique.setTokenPropertyPermissions(collection, [{key: 'skullduggery', permission: {mutable: false, tokenOwner: true}}]), 
       )).to.not.be.rejected;
 
       const propertyRights = (await api.rpc.unique.propertyPermissions(collection, ['skullduggery'])).toHuman();
@@ -420,7 +420,7 @@
       await expect(executeTransaction(
         api, 
         bob, 
-        api.tx.unique.setPropertyPermissions(collection, [{key: 'skullduggery', permission: {mutable: true, tokenOwner: true}}]), 
+        api.tx.unique.setTokenPropertyPermissions(collection, [{key: 'skullduggery', permission: {mutable: true, tokenOwner: true}}]), 
       )).to.be.rejectedWith(/common\.NoPermission/);
 
       const propertyRights = (await api.rpc.unique.propertyPermissions(collection, ['skullduggery'])).toJSON();
@@ -443,7 +443,7 @@
       await expect(executeTransaction(
         api, 
         alice, 
-        api.tx.unique.setPropertyPermissions(collection, constitution), 
+        api.tx.unique.setTokenPropertyPermissions(collection, constitution), 
       )).to.be.rejectedWith(/common\.PropertyLimitReached/);
 
       const propertyRights = (await api.query.common.collectionPropertyPermissions(collection)).toJSON();
@@ -458,13 +458,13 @@
       await expect(executeTransaction(
         api, 
         alice, 
-        api.tx.unique.setPropertyPermissions(collection, [{key: 'skullduggery', permission: {mutable: false, tokenOwner: true}}]), 
+        api.tx.unique.setTokenPropertyPermissions(collection, [{key: 'skullduggery', permission: {mutable: false, tokenOwner: true}}]), 
       )).to.not.be.rejected;
 
       await expect(executeTransaction(
         api, 
         alice, 
-        api.tx.unique.setPropertyPermissions(collection, [{key: 'skullduggery', permission: {}}]), 
+        api.tx.unique.setTokenPropertyPermissions(collection, [{key: 'skullduggery', permission: {}}]), 
       )).to.be.rejectedWith(/common\.NoPermission/);
 
       const propertyRights = (await api.rpc.unique.propertyPermissions(collection, ['skullduggery'])).toHuman();
@@ -488,21 +488,21 @@
         await expect(executeTransaction(
           api, 
           alice, 
-          api.tx.unique.setPropertyPermissions(collection, invalidProperties[i]), 
+          api.tx.unique.setTokenPropertyPermissions(collection, invalidProperties[i]), 
         ), `on setting the new badly-named property #${i}`).to.be.rejectedWith(/common\.InvalidCharacterInPropertyKey/);
       }
 
       await expect(executeTransaction(
         api, 
         alice, 
-        api.tx.unique.setPropertyPermissions(collection, [{key: '', permission: {}}]), 
+        api.tx.unique.setTokenPropertyPermissions(collection, [{key: '', permission: {}}]), 
       ), 'on rejecting an unnamed property').to.be.rejectedWith(/common\.EmptyPropertyKey/);
 
       const correctKey = '--0x03116e387820CA05'; // PolkadotJS would parse this as an already encoded hex-string
       await expect(executeTransaction(
         api, 
         alice, 
-        api.tx.unique.setPropertyPermissions(collection, [
+        api.tx.unique.setTokenPropertyPermissions(collection, [
           {key: correctKey, permission: {collectionAdmin: true}},
         ]), 
       ), 'on setting the correctly-but-still-badly-named property').to.not.be.rejected;
@@ -576,7 +576,7 @@
           await expect(executeTransaction(
             api, 
             alice, 
-            api.tx.unique.setPropertyPermissions(collection, [{key: key, permission: permission.permission}]), 
+            api.tx.unique.setTokenPropertyPermissions(collection, [{key: key, permission: permission.permission}]), 
           ), `on setting permission ${i} by ${signer.address}`).to.not.be.rejected;
 
           await expect(executeTransaction(
@@ -612,7 +612,7 @@
           await expect(executeTransaction(
             api, 
             alice, 
-            api.tx.unique.setPropertyPermissions(collection, [{key: key, permission: permission.permission}]), 
+            api.tx.unique.setTokenPropertyPermissions(collection, [{key: key, permission: permission.permission}]), 
           ), `on setting permission ${i} by ${signer.address}`).to.not.be.rejected;
 
           await expect(executeTransaction(
@@ -655,7 +655,7 @@
           await expect(executeTransaction(
             api, 
             alice, 
-            api.tx.unique.setPropertyPermissions(collection, [{key: key, permission: permission.permission}]), 
+            api.tx.unique.setTokenPropertyPermissions(collection, [{key: key, permission: permission.permission}]), 
           ), `on setting permission ${i} by ${signer.address}`).to.not.be.rejected;
 
           await expect(executeTransaction(
@@ -721,7 +721,7 @@
         await expect(executeTransaction(
           api, 
           alice, 
-          api.tx.unique.setPropertyPermissions(collection, [{key: `${i}`, permission: passage.permission}]), 
+          api.tx.unique.setTokenPropertyPermissions(collection, [{key: `${i}`, permission: passage.permission}]), 
         ), `on setting permission ${i} by ${signer.address}`).to.not.be.rejected;
 
         await expect(executeTransaction(
@@ -798,7 +798,7 @@
       await expect(executeTransaction(
         api, 
         alice, 
-        api.tx.unique.setPropertyPermissions(collection, [{key: 'now-existent', permission: {}}]), 
+        api.tx.unique.setTokenPropertyPermissions(collection, [{key: 'now-existent', permission: {}}]), 
       ), 'on setting a new non-permitted property').to.not.be.rejected;
 
       await expect(executeTransaction(
@@ -818,7 +818,7 @@
       await expect(executeTransaction(
         api, 
         alice, 
-        api.tx.unique.setPropertyPermissions(collection, [
+        api.tx.unique.setTokenPropertyPermissions(collection, [
           {key: 'a_holy_book', permission: {collectionAdmin: true, tokenOwner: true}}, 
           {key: 'young_years', permission: {collectionAdmin: true, tokenOwner: true}},
         ]), 

--- a/tests/src/rmrk/rmrk.test.ts
+++ b/tests/src/rmrk/rmrk.test.ts
@@ -129,8 +129,8 @@
       await expect(executeTransaction(api, alice, txDeleteCollectionProperties), 'deleting collection properties')
         .to.be.rejectedWith(/common\.CollectionIsExternal/);
 
-      const txSetPropertyPermissions = api.tx.unique.setPropertyPermissions(uniqueCollectionId, [{key: 'a', permission: {mutable: true}}]);
-      await expect(executeTransaction(api, alice, txSetPropertyPermissions), 'setting property permissions')
+      const txsetTokenPropertyPermissions = api.tx.unique.setTokenPropertyPermissions(uniqueCollectionId, [{key: 'a', permission: {mutable: true}}]);
+      await expect(executeTransaction(api, alice, txsetTokenPropertyPermissions), 'setting property permissions')
         .to.be.rejectedWith(/common\.CollectionIsExternal/);
 
       // NFT