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

difftreelog

Rename property change to set

Daniel Shiposha2022-05-04parent: #117d4ce.patch.diff
in: master

11 files changed

modifiedpallets/common/src/lib.rsdiffbeforeafterboth
--- a/pallets/common/src/lib.rs
+++ b/pallets/common/src/lib.rs
@@ -731,7 +731,7 @@
 		Ok(())
 	}
 
-	pub fn change_collection_property(
+	pub fn set_collection_property(
 		collection: &CollectionHandle<T>,
 		sender: &T::CrossAccountId,
 		property: Property,
@@ -740,7 +740,7 @@
 
 		CollectionProperties::<T>::try_mutate(
 			collection.id,
-			|properties| properties.try_change_property(property.clone())
+			|properties| properties.try_set_property(property.clone())
 		)?;
 
 		Self::deposit_event(Event::CollectionPropertySet(collection.id, property));
@@ -748,19 +748,19 @@
 		Ok(())
 	}
 
-	pub fn change_collection_properties(
+	pub fn set_collection_properties(
 		collection: &CollectionHandle<T>,
 		sender: &T::CrossAccountId,
 		properties: Vec<Property>,
 	) -> DispatchResult {
 		for property in properties {
-			Self::change_collection_property(collection, sender, property)?;
+			Self::set_collection_property(collection, sender, property)?;
 		}
 
 		Ok(())
 	}
 
-	pub fn change_property_permission(
+	pub fn set_property_permission(
 		collection: &CollectionHandle<T>,
 		sender: &T::CrossAccountId,
 		property_permission: PropertyKeyPermission
@@ -784,13 +784,13 @@
 		Ok(())
 	}
 
-	pub fn change_property_permissions(
+	pub fn set_property_permissions(
 		collection: &CollectionHandle<T>,
 		sender: &T::CrossAccountId,
 		property_permissions: Vec<PropertyKeyPermission>
 	) -> DispatchResult {
 		for prop_pemission in property_permissions {
-			Self::change_property_permission(collection, sender, prop_pemission)?;
+			Self::set_property_permission(collection, sender, prop_pemission)?;
 		}
 
 		Ok(())
@@ -948,9 +948,9 @@
 	fn create_multiple_items(amount: u32) -> Weight;
 	fn create_multiple_items_ex(cost: &CreateItemExData<CrossAccountId>) -> Weight;
 	fn burn_item() -> Weight;
-	fn change_collection_properties(amount: u32) -> Weight;
-	fn change_token_properties(amount: u32) -> Weight;
-	fn change_property_permissions(amount: u32) -> Weight;
+	fn set_collection_properties(amount: u32) -> Weight;
+	fn set_token_properties(amount: u32) -> Weight;
+	fn set_property_permissions(amount: u32) -> Weight;
 	fn transfer() -> Weight;
 	fn approve() -> Weight;
 	fn transfer_from() -> Weight;
@@ -985,18 +985,18 @@
 		token: TokenId,
 		amount: u128,
 	) -> DispatchResultWithPostInfo;
-	fn change_collection_properties(
+	fn set_collection_properties(
 		&self,
 		sender: T::CrossAccountId,
 		properties: Vec<Property>,
 	) -> DispatchResultWithPostInfo;
-	fn change_token_properties(
+	fn set_token_properties(
 		&self,
 		sender: T::CrossAccountId,
 		token_id: TokenId,
 		property: Vec<Property>,
 	) -> DispatchResultWithPostInfo;
-	fn change_property_permissions(
+	fn set_property_permissions(
 		&self,
 		sender: &T::CrossAccountId,
 		property_permissions: Vec<PropertyKeyPermission>,
modifiedpallets/fungible/src/common.rsdiffbeforeafterboth
--- a/pallets/fungible/src/common.rs
+++ b/pallets/fungible/src/common.rs
@@ -50,16 +50,16 @@
 		<SelfWeightOf<T>>::burn_item()
 	}
 
-	fn change_collection_properties(amount: u32) -> Weight {
-		<SelfWeightOf<T>>::change_collection_properties(amount)
+	fn set_collection_properties(amount: u32) -> Weight {
+		<SelfWeightOf<T>>::set_collection_properties(amount)
 	}
 
-	fn change_token_properties(amount: u32) -> Weight {
-		<SelfWeightOf<T>>::change_token_properties(amount)
+	fn set_token_properties(amount: u32) -> Weight {
+		<SelfWeightOf<T>>::set_token_properties(amount)
 	}
 
-	fn change_property_permissions(amount: u32) -> Weight {
-		<SelfWeightOf<T>>::change_property_permissions(amount)
+	fn set_property_permissions(amount: u32) -> Weight {
+		<SelfWeightOf<T>>::set_property_permissions(amount)
 	}
 
 	fn transfer() -> Weight {
@@ -237,7 +237,7 @@
 		)
 	}
 
-	fn change_collection_properties(
+	fn set_collection_properties(
 		&self,
 		_sender: T::CrossAccountId,
 		_property: Vec<Property>,
@@ -245,7 +245,7 @@
 		fail!(<Error<T>>::PropertiesNotAllowed)
 	}
 
-	fn change_token_properties(
+	fn set_token_properties(
 		&self,
 		_sender: T::CrossAccountId,
 		_token_id: TokenId,
@@ -254,7 +254,7 @@
 		fail!(<Error<T>>::PropertiesNotAllowed)
 	}
 
-	fn change_property_permissions(
+	fn set_property_permissions(
 		&self,
 		_sender: &T::CrossAccountId,
 		_property_permissions: Vec<PropertyKeyPermission>,
modifiedpallets/fungible/src/weights.rsdiffbeforeafterboth
--- a/pallets/fungible/src/weights.rs
+++ b/pallets/fungible/src/weights.rs
@@ -35,9 +35,9 @@
 	fn create_item() -> Weight;
 	fn create_multiple_items_ex(b: u32, ) -> Weight;
 	fn burn_item() -> Weight;
-	fn change_collection_properties(amount: u32) -> Weight;
-	fn change_token_properties(amount: u32) -> Weight;
-	fn change_property_permissions(amount: u32) -> Weight;
+	fn set_collection_properties(amount: u32) -> Weight;
+	fn set_token_properties(amount: u32) -> Weight;
+	fn set_property_permissions(amount: u32) -> Weight;
 	fn transfer() -> Weight;
 	fn approve() -> Weight;
 	fn transfer_from() -> Weight;
@@ -73,17 +73,17 @@
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
 
-	fn change_collection_properties(amount: u32) -> Weight {
+	fn set_collection_properties(amount: u32) -> Weight {
 		// Error
 		0
 	}
 
-	fn change_token_properties(amount: u32) -> Weight {
+	fn set_token_properties(amount: u32) -> Weight {
 		// Error
 		0
 	}
 
-	fn change_property_permissions(amount: u32) -> Weight {
+	fn set_property_permissions(amount: u32) -> Weight {
 		// Error
 		0
 	}
@@ -146,17 +146,17 @@
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
 
-	fn change_collection_properties(amount: u32) -> Weight {
+	fn set_collection_properties(amount: u32) -> Weight {
 		// Error
 		0
 	}
 
-	fn change_token_properties(amount: u32) -> Weight {
+	fn set_token_properties(amount: u32) -> Weight {
 		// Error
 		0
 	}
 
-	fn change_property_permissions(amount: u32) -> Weight {
+	fn set_property_permissions(amount: u32) -> Weight {
 		// Error
 		0
 	}
modifiedpallets/nonfungible/src/common.rsdiffbeforeafterboth
--- a/pallets/nonfungible/src/common.rs
+++ b/pallets/nonfungible/src/common.rs
@@ -50,16 +50,16 @@
 		<SelfWeightOf<T>>::burn_item()
 	}
 
-	fn change_collection_properties(amount: u32) -> Weight {
-		<SelfWeightOf<T>>::change_collection_properties(amount)
+	fn set_collection_properties(amount: u32) -> Weight {
+		<SelfWeightOf<T>>::set_collection_properties(amount)
 	}
 
-	fn change_token_properties(amount: u32) -> Weight {
-		<SelfWeightOf<T>>::change_token_properties(amount)
+	fn set_token_properties(amount: u32) -> Weight {
+		<SelfWeightOf<T>>::set_token_properties(amount)
 	}
 
-	fn change_property_permissions(amount: u32) -> Weight {
-		<SelfWeightOf<T>>::change_property_permissions(amount)
+	fn set_property_permissions(amount: u32) -> Weight {
+		<SelfWeightOf<T>>::set_property_permissions(amount)
 	}
 
 	fn transfer() -> Weight {
@@ -153,42 +153,42 @@
 		)
 	}
 
-	fn change_collection_properties(
+	fn set_collection_properties(
 		&self,
 		sender: T::CrossAccountId,
 		properties: Vec<Property>,
 	) -> DispatchResultWithPostInfo {
-		let weight = <CommonWeights<T>>::change_collection_properties(properties.len() as u32);
+		let weight = <CommonWeights<T>>::set_collection_properties(properties.len() as u32);
 
 		with_weight(
-			<Pallet<T>>::change_collection_properties(self, &sender, properties),
+			<Pallet<T>>::set_collection_properties(self, &sender, properties),
 			weight
 		)
 	}
 
-	fn change_token_properties(
+	fn set_token_properties(
 		&self,
 		sender: T::CrossAccountId,
 		token_id: TokenId,
 		properties: Vec<Property>,
 	) -> DispatchResultWithPostInfo {
-		let weight = <CommonWeights<T>>::change_token_properties(properties.len() as u32);
+		let weight = <CommonWeights<T>>::set_token_properties(properties.len() as u32);
 
 		with_weight(
-			<Pallet<T>>::change_token_properties(self, &sender, token_id, properties),
+			<Pallet<T>>::set_token_properties(self, &sender, token_id, properties),
 			weight
 		)
 	}
 
-	fn change_property_permissions(
+	fn set_property_permissions(
 		&self,
 		sender: &T::CrossAccountId,
 		property_permissions: Vec<PropertyKeyPermission>,
 	) -> DispatchResultWithPostInfo {
-		let weight = <CommonWeights<T>>::change_property_permissions(property_permissions.len() as u32);
+		let weight = <CommonWeights<T>>::set_property_permissions(property_permissions.len() as u32);
 
 		with_weight(
-			<Pallet<T>>::change_property_permissions(self, sender, property_permissions),
+			<Pallet<T>>::set_property_permissions(self, sender, property_permissions),
 			weight
 		)
 	}
modifiedpallets/nonfungible/src/lib.rsdiffbeforeafterboth
--- a/pallets/nonfungible/src/lib.rs
+++ b/pallets/nonfungible/src/lib.rs
@@ -255,7 +255,7 @@
 		Ok(())
 	}
 
-	pub fn change_token_property(
+	pub fn set_token_property(
 		collection: &NonfungibleHandle<T>,
 		sender: &T::CrossAccountId,
 		token_id: TokenId,
@@ -292,7 +292,7 @@
 		}
 
 		<TokenProperties<T>>::try_mutate((collection.id, token_id), |properties| {
-			properties.try_change_property(property.clone())
+			properties.try_set_property(property.clone())
 		})?;
 
 		<PalletCommon<T>>::deposit_event(CommonEvent::TokenPropertySet(
@@ -304,33 +304,33 @@
 		Ok(())
 	}
 
-	pub fn change_token_properties(
+	pub fn set_token_properties(
 		collection: &NonfungibleHandle<T>,
 		sender: &T::CrossAccountId,
 		token_id: TokenId,
 		properties: Vec<Property>,
 	) -> DispatchResult {
 		for property in properties {
-			Self::change_token_property(collection, sender, token_id, property)?;
+			Self::set_token_property(collection, sender, token_id, property)?;
 		}
 
 		Ok(())
 	}
 
-	pub fn change_collection_properties(
+	pub fn set_collection_properties(
 		collection: &NonfungibleHandle<T>,
 		sender: &T::CrossAccountId,
 		properties: Vec<Property>,
 	) -> DispatchResult {
-		<PalletCommon<T>>::change_collection_properties(collection, sender, properties)
+		<PalletCommon<T>>::set_collection_properties(collection, sender, properties)
 	}
 
-	pub fn change_property_permissions(
+	pub fn set_property_permissions(
 		collection: &CollectionHandle<T>,
 		sender: &T::CrossAccountId,
 		property_permissions: Vec<PropertyKeyPermission>
 	) -> DispatchResult {
-		<PalletCommon<T>>::change_property_permissions(
+		<PalletCommon<T>>::set_property_permissions(
 			collection,
 			sender,
 			property_permissions,
modifiedpallets/nonfungible/src/weights.rsdiffbeforeafterboth
--- a/pallets/nonfungible/src/weights.rs
+++ b/pallets/nonfungible/src/weights.rs
@@ -36,9 +36,9 @@
 	fn create_multiple_items(b: u32, ) -> Weight;
 	fn create_multiple_items_ex(b: u32, ) -> Weight;
 	fn burn_item() -> Weight;
-	fn change_collection_properties(amount: u32) -> Weight;
-	fn change_token_properties(amount: u32) -> Weight;
-	fn change_property_permissions(amount: u32) -> Weight;
+	fn set_collection_properties(amount: u32) -> Weight;
+	fn set_token_properties(amount: u32) -> Weight;
+	fn set_property_permissions(amount: u32) -> Weight;
 	fn transfer() -> Weight;
 	fn approve() -> Weight;
 	fn transfer_from() -> Weight;
@@ -94,17 +94,17 @@
 			.saturating_add(T::DbWeight::get().writes(4 as Weight))
 	}
 
-	fn change_collection_properties(amount: u32) -> Weight {
+	fn set_collection_properties(amount: u32) -> Weight {
 		// TODO calculate appropriate weight
 		(50_000_000 as Weight).saturating_mul(amount as Weight)
 	}
 
-	fn change_token_properties(amount: u32) -> Weight {
+	fn set_token_properties(amount: u32) -> Weight {
 		// TODO calculate appropriate weight
 		(50_000_000 as Weight).saturating_mul(amount as Weight)
 	}
 
-	fn change_property_permissions(amount: u32) -> Weight {
+	fn set_property_permissions(amount: u32) -> Weight {
 		// TODO calculate appropriate weight
 		(50_000_000 as Weight).saturating_mul(amount as Weight)
 	}
@@ -199,17 +199,17 @@
 			.saturating_add(RocksDbWeight::get().writes(4 as Weight))
 	}
 
-	fn change_collection_properties(amount: u32) -> Weight {
+	fn set_collection_properties(amount: u32) -> Weight {
 		// TODO calculate appropriate weight
 		(50_000_000 as Weight).saturating_mul(amount as Weight)
 	}
 
-	fn change_token_properties(amount: u32) -> Weight {
+	fn set_token_properties(amount: u32) -> Weight {
 		// TODO calculate appropriate weight
 		(50_000_000 as Weight).saturating_mul(amount as Weight)
 	}
 
-	fn change_property_permissions(amount: u32) -> Weight {
+	fn set_property_permissions(amount: u32) -> Weight {
 		// TODO calculate appropriate weight
 		(50_000_000 as Weight).saturating_mul(amount as Weight)
 	}
modifiedpallets/refungible/src/common.rsdiffbeforeafterboth
--- a/pallets/refungible/src/common.rs
+++ b/pallets/refungible/src/common.rs
@@ -66,16 +66,16 @@
 		max_weight_of!(burn_item_partial(), burn_item_fully())
 	}
 
-	fn change_collection_properties(amount: u32) -> Weight {
-		<SelfWeightOf<T>>::change_collection_properties(amount)
+	fn set_collection_properties(amount: u32) -> Weight {
+		<SelfWeightOf<T>>::set_collection_properties(amount)
 	}
 
-	fn change_token_properties(amount: u32) -> Weight {
-		<SelfWeightOf<T>>::change_token_properties(amount)
+	fn set_token_properties(amount: u32) -> Weight {
+		<SelfWeightOf<T>>::set_token_properties(amount)
 	}
 
-	fn change_property_permissions(amount: u32) -> Weight {
-		<SelfWeightOf<T>>::change_property_permissions(amount)
+	fn set_property_permissions(amount: u32) -> Weight {
+		<SelfWeightOf<T>>::set_property_permissions(amount)
 	}
 
 	fn transfer() -> Weight {
@@ -256,7 +256,7 @@
 		)
 	}
 
-	fn change_collection_properties(
+	fn set_collection_properties(
 		&self,
 		_sender: T::CrossAccountId,
 		_property: Vec<Property>,
@@ -264,7 +264,7 @@
 		fail!(<Error<T>>::PropertiesNotAllowed)
 	}
 
-	fn change_token_properties(
+	fn set_token_properties(
 		&self,
 		_sender: T::CrossAccountId,
 		_token_id: TokenId,
@@ -273,7 +273,7 @@
 		fail!(<Error<T>>::PropertiesNotAllowed)
 	}
 
-	fn change_property_permissions(
+	fn set_property_permissions(
 		&self,
 		_sender: &T::CrossAccountId,
 		_property_permissions: Vec<PropertyKeyPermission>,
modifiedpallets/refungible/src/weights.rsdiffbeforeafterboth
--- a/pallets/refungible/src/weights.rs
+++ b/pallets/refungible/src/weights.rs
@@ -38,9 +38,9 @@
 	fn create_multiple_items_ex_multiple_owners(b: u32, ) -> Weight;
 	fn burn_item_partial() -> Weight;
 	fn burn_item_fully() -> Weight;
-	fn change_collection_properties(amount: u32) -> Weight;
-	fn change_token_properties(amount: u32) -> Weight;
-	fn change_property_permissions(amount: u32) -> Weight;
+	fn set_collection_properties(amount: u32) -> Weight;
+	fn set_token_properties(amount: u32) -> Weight;
+	fn set_property_permissions(amount: u32) -> Weight;
 	fn transfer_normal() -> Weight;
 	fn transfer_creating() -> Weight;
 	fn transfer_removing() -> Weight;
@@ -133,17 +133,17 @@
 			.saturating_add(T::DbWeight::get().writes(6 as Weight))
 	}
 
-	fn change_collection_properties(amount: u32) -> Weight {
+	fn set_collection_properties(amount: u32) -> Weight {
 		// Error
 		0
 	}
 
-	fn change_token_properties(amount: u32) -> Weight {
+	fn set_token_properties(amount: u32) -> Weight {
 		// Error
 		0
 	}
 
-	fn change_property_permissions(amount: u32) -> Weight {
+	fn set_property_permissions(amount: u32) -> Weight {
 		// Error
 		0
 	}
@@ -317,17 +317,17 @@
 			.saturating_add(RocksDbWeight::get().writes(6 as Weight))
 	}
 
-	fn change_collection_properties(amount: u32) -> Weight {
+	fn set_collection_properties(amount: u32) -> Weight {
 		// Error
 		0
 	}
 
-	fn change_token_properties(amount: u32) -> Weight {
+	fn set_token_properties(amount: u32) -> Weight {
 		// Error
 		0
 	}
 
-	fn change_property_permissions(amount: u32) -> Weight {
+	fn set_property_permissions(amount: u32) -> Weight {
 		// Error
 		0
 	}
modifiedpallets/unique/src/lib.rsdiffbeforeafterboth
--- a/pallets/unique/src/lib.rs
+++ b/pallets/unique/src/lib.rs
@@ -694,9 +694,9 @@
 			dispatch_call::<T, _>(collection_id, |d| d.create_multiple_items(sender, owner, items_data, &budget))
 		}
 
-		#[weight = T::CommonWeightInfo::change_collection_properties(properties.len() as u32)]
+		#[weight = T::CommonWeightInfo::set_collection_properties(properties.len() as u32)]
 		#[transactional]
-		pub fn change_collection_properties(
+		pub fn set_collection_properties(
 			origin,
 			collection_id: CollectionId,
 			properties: Vec<Property>
@@ -705,12 +705,12 @@
 
 			let sender = T::CrossAccountId::from_sub(ensure_signed(origin)?);
 
-			dispatch_call::<T, _>(collection_id, |d| d.change_collection_properties(sender, properties))
+			dispatch_call::<T, _>(collection_id, |d| d.set_collection_properties(sender, properties))
 		}
 
-		#[weight = T::CommonWeightInfo::change_token_properties(properties.len() as u32)]
+		#[weight = T::CommonWeightInfo::set_token_properties(properties.len() as u32)]
 		#[transactional]
-		pub fn change_token_properties(
+		pub fn set_token_properties(
 			origin,
 			collection_id: CollectionId,
 			token_id: TokenId,
@@ -720,12 +720,12 @@
 
 			let sender = T::CrossAccountId::from_sub(ensure_signed(origin)?);
 
-			dispatch_call::<T, _>(collection_id, |d| d.change_token_properties(sender, token_id, properties))
+			dispatch_call::<T, _>(collection_id, |d| d.set_token_properties(sender, token_id, properties))
 		}
 
-		#[weight = T::CommonWeightInfo::change_property_permissions(property_permissions.len() as u32)]
+		#[weight = T::CommonWeightInfo::set_property_permissions(property_permissions.len() as u32)]
 		#[transactional]
-		pub fn change_property_permissions(
+		pub fn set_property_permissions(
 			origin,
 			collection_id: CollectionId,
 			property_permissions: Vec<PropertyKeyPermission>,
@@ -734,7 +734,7 @@
 
 			let sender = T::CrossAccountId::from_sub(ensure_signed(origin)?);
 
-			dispatch_call::<T, _>(collection_id, |d| d.change_property_permissions(&sender, property_permissions))
+			dispatch_call::<T, _>(collection_id, |d| d.set_property_permissions(&sender, property_permissions))
 		}
 
 		#[weight = T::CommonWeightInfo::create_multiple_items_ex(&data)]
modifiedprimitives/data-structs/src/lib.rsdiffbeforeafterboth
--- a/primitives/data-structs/src/lib.rs
+++ b/primitives/data-structs/src/lib.rs
@@ -698,13 +698,13 @@
 		let mut props = Self::new(MAX_COLLECTION_PROPERTIES_SIZE);
 
 		for property in data.into_iter() {
-			props.try_change_property(property)?;
+			props.try_set_property(property)?;
 		}
 
 		Ok(props)
 	}
 
-	pub fn try_change_property(&mut self, property: Property) -> Result<(), PropertiesError> {
+	pub fn try_set_property(&mut self, property: Property) -> Result<(), PropertiesError> {
 		let value_len = property.value.len();
 
 		if self.consumed_space as usize + value_len > self.space_limit as usize {
@@ -740,17 +740,3 @@
 		Properties::new(MAX_TOKEN_PROPERTIES_SIZE)
 	}
 }
-
-// #[cfg(not(feature = "std"))]
-// fn properties_map_debug(_properties: &PropertiesMap, f: &mut sp_std::fmt::Formatter) -> sp_std::fmt::Result {
-// 	write!(f, "<properties>")
-// }
-
-// #[cfg(not(feature = "std"))]
-// fn opt_properties_permissions_map_debug(properties: &Option<PropertiesPermissionMap>, f: &mut sp_std::fmt::Formatter) -> sp_std::fmt::Result {
-// 	if properties.is_some() {
-// 		write!(f, "Some(<properties permissions>)")
-// 	 } else {
-// 		write!(f, "None")
-// 	}
-// }
modifiedruntime/common/src/weights.rsdiffbeforeafterboth
54 dispatch_weight::<T>() + max_weight_of!(burn_item())54 dispatch_weight::<T>() + max_weight_of!(burn_item())
55 }55 }
5656
57 fn change_collection_properties(amount: u32) -> Weight {57 fn set_collection_properties(amount: u32) -> Weight {
58 dispatch_weight::<T>() + max_weight_of!(change_collection_properties(amount))58 dispatch_weight::<T>() + max_weight_of!(set_collection_properties(amount))
59 }59 }
6060
61 fn change_token_properties(amount: u32) -> Weight {61 fn set_token_properties(amount: u32) -> Weight {
62 dispatch_weight::<T>() + max_weight_of!(change_token_properties(amount))62 dispatch_weight::<T>() + max_weight_of!(set_token_properties(amount))
63 }63 }
6464
65 fn change_property_permissions(amount: u32) -> Weight {65 fn set_property_permissions(amount: u32) -> Weight {
66 dispatch_weight::<T>() + max_weight_of!(change_property_permissions(amount))66 dispatch_weight::<T>() + max_weight_of!(set_property_permissions(amount))
67 }67 }
6868
69 fn transfer() -> Weight {69 fn transfer() -> Weight {