From d66bc31e3ce6fd87c295b61991718aa0843bd7ad Mon Sep 17 00:00:00 2001 From: Daniel Shiposha Date: Wed, 04 May 2022 10:48:05 +0000 Subject: [PATCH] Rename property change to set --- --- 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, sender: &T::CrossAccountId, property: Property, @@ -740,7 +740,7 @@ CollectionProperties::::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, sender: &T::CrossAccountId, properties: Vec, ) -> 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, sender: &T::CrossAccountId, property_permission: PropertyKeyPermission @@ -784,13 +784,13 @@ Ok(()) } - pub fn change_property_permissions( + pub fn set_property_permissions( collection: &CollectionHandle, sender: &T::CrossAccountId, property_permissions: Vec ) -> 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) -> 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, ) -> DispatchResultWithPostInfo; - fn change_token_properties( + fn set_token_properties( &self, sender: T::CrossAccountId, token_id: TokenId, property: Vec, ) -> DispatchResultWithPostInfo; - fn change_property_permissions( + fn set_property_permissions( &self, sender: &T::CrossAccountId, property_permissions: Vec, --- a/pallets/fungible/src/common.rs +++ b/pallets/fungible/src/common.rs @@ -50,16 +50,16 @@ >::burn_item() } - fn change_collection_properties(amount: u32) -> Weight { - >::change_collection_properties(amount) + fn set_collection_properties(amount: u32) -> Weight { + >::set_collection_properties(amount) } - fn change_token_properties(amount: u32) -> Weight { - >::change_token_properties(amount) + fn set_token_properties(amount: u32) -> Weight { + >::set_token_properties(amount) } - fn change_property_permissions(amount: u32) -> Weight { - >::change_property_permissions(amount) + fn set_property_permissions(amount: u32) -> Weight { + >::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, @@ -245,7 +245,7 @@ fail!(>::PropertiesNotAllowed) } - fn change_token_properties( + fn set_token_properties( &self, _sender: T::CrossAccountId, _token_id: TokenId, @@ -254,7 +254,7 @@ fail!(>::PropertiesNotAllowed) } - fn change_property_permissions( + fn set_property_permissions( &self, _sender: &T::CrossAccountId, _property_permissions: Vec, --- 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 } --- a/pallets/nonfungible/src/common.rs +++ b/pallets/nonfungible/src/common.rs @@ -50,16 +50,16 @@ >::burn_item() } - fn change_collection_properties(amount: u32) -> Weight { - >::change_collection_properties(amount) + fn set_collection_properties(amount: u32) -> Weight { + >::set_collection_properties(amount) } - fn change_token_properties(amount: u32) -> Weight { - >::change_token_properties(amount) + fn set_token_properties(amount: u32) -> Weight { + >::set_token_properties(amount) } - fn change_property_permissions(amount: u32) -> Weight { - >::change_property_permissions(amount) + fn set_property_permissions(amount: u32) -> Weight { + >::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, ) -> DispatchResultWithPostInfo { - let weight = >::change_collection_properties(properties.len() as u32); + let weight = >::set_collection_properties(properties.len() as u32); with_weight( - >::change_collection_properties(self, &sender, properties), + >::set_collection_properties(self, &sender, properties), weight ) } - fn change_token_properties( + fn set_token_properties( &self, sender: T::CrossAccountId, token_id: TokenId, properties: Vec, ) -> DispatchResultWithPostInfo { - let weight = >::change_token_properties(properties.len() as u32); + let weight = >::set_token_properties(properties.len() as u32); with_weight( - >::change_token_properties(self, &sender, token_id, properties), + >::set_token_properties(self, &sender, token_id, properties), weight ) } - fn change_property_permissions( + fn set_property_permissions( &self, sender: &T::CrossAccountId, property_permissions: Vec, ) -> DispatchResultWithPostInfo { - let weight = >::change_property_permissions(property_permissions.len() as u32); + let weight = >::set_property_permissions(property_permissions.len() as u32); with_weight( - >::change_property_permissions(self, sender, property_permissions), + >::set_property_permissions(self, sender, property_permissions), weight ) } --- 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, sender: &T::CrossAccountId, token_id: TokenId, @@ -292,7 +292,7 @@ } >::try_mutate((collection.id, token_id), |properties| { - properties.try_change_property(property.clone()) + properties.try_set_property(property.clone()) })?; >::deposit_event(CommonEvent::TokenPropertySet( @@ -304,33 +304,33 @@ Ok(()) } - pub fn change_token_properties( + pub fn set_token_properties( collection: &NonfungibleHandle, sender: &T::CrossAccountId, token_id: TokenId, properties: Vec, ) -> 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, sender: &T::CrossAccountId, properties: Vec, ) -> DispatchResult { - >::change_collection_properties(collection, sender, properties) + >::set_collection_properties(collection, sender, properties) } - pub fn change_property_permissions( + pub fn set_property_permissions( collection: &CollectionHandle, sender: &T::CrossAccountId, property_permissions: Vec ) -> DispatchResult { - >::change_property_permissions( + >::set_property_permissions( collection, sender, property_permissions, --- 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) } --- 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 { - >::change_collection_properties(amount) + fn set_collection_properties(amount: u32) -> Weight { + >::set_collection_properties(amount) } - fn change_token_properties(amount: u32) -> Weight { - >::change_token_properties(amount) + fn set_token_properties(amount: u32) -> Weight { + >::set_token_properties(amount) } - fn change_property_permissions(amount: u32) -> Weight { - >::change_property_permissions(amount) + fn set_property_permissions(amount: u32) -> Weight { + >::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, @@ -264,7 +264,7 @@ fail!(>::PropertiesNotAllowed) } - fn change_token_properties( + fn set_token_properties( &self, _sender: T::CrossAccountId, _token_id: TokenId, @@ -273,7 +273,7 @@ fail!(>::PropertiesNotAllowed) } - fn change_property_permissions( + fn set_property_permissions( &self, _sender: &T::CrossAccountId, _property_permissions: Vec, --- 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 } --- a/pallets/unique/src/lib.rs +++ b/pallets/unique/src/lib.rs @@ -694,9 +694,9 @@ dispatch_call::(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 @@ -705,12 +705,12 @@ let sender = T::CrossAccountId::from_sub(ensure_signed(origin)?); - dispatch_call::(collection_id, |d| d.change_collection_properties(sender, properties)) + dispatch_call::(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::(collection_id, |d| d.change_token_properties(sender, token_id, properties)) + dispatch_call::(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, @@ -734,7 +734,7 @@ let sender = T::CrossAccountId::from_sub(ensure_signed(origin)?); - dispatch_call::(collection_id, |d| d.change_property_permissions(&sender, property_permissions)) + dispatch_call::(collection_id, |d| d.set_property_permissions(&sender, property_permissions)) } #[weight = T::CommonWeightInfo::create_multiple_items_ex(&data)] --- 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, "") -// } - -// #[cfg(not(feature = "std"))] -// fn opt_properties_permissions_map_debug(properties: &Option, f: &mut sp_std::fmt::Formatter) -> sp_std::fmt::Result { -// if properties.is_some() { -// write!(f, "Some()") -// } else { -// write!(f, "None") -// } -// } --- a/runtime/common/src/weights.rs +++ b/runtime/common/src/weights.rs @@ -54,16 +54,16 @@ dispatch_weight::() + max_weight_of!(burn_item()) } - fn change_collection_properties(amount: u32) -> Weight { - dispatch_weight::() + max_weight_of!(change_collection_properties(amount)) + fn set_collection_properties(amount: u32) -> Weight { + dispatch_weight::() + max_weight_of!(set_collection_properties(amount)) } - fn change_token_properties(amount: u32) -> Weight { - dispatch_weight::() + max_weight_of!(change_token_properties(amount)) + fn set_token_properties(amount: u32) -> Weight { + dispatch_weight::() + max_weight_of!(set_token_properties(amount)) } - fn change_property_permissions(amount: u32) -> Weight { - dispatch_weight::() + max_weight_of!(change_property_permissions(amount)) + fn set_property_permissions(amount: u32) -> Weight { + dispatch_weight::() + max_weight_of!(set_property_permissions(amount)) } fn transfer() -> Weight { -- gitstuff