difftreelog
CORE-390 Refactor naming
in: master
7 files changed
pallets/common/src/erc.rsdiffbeforeafterboth317317318fn save<T: Config>(collection: &CollectionHandle<T>) -> Result<void> {318fn save<T: Config>(collection: &CollectionHandle<T>) -> Result<void> {319 collection319 collection320 .check_is_read_only()320 .check_is_mutable()321 .map_err(dispatch_to_evm::<T>)?;321 .map_err(dispatch_to_evm::<T>)?;322 <crate::CollectionById<T>>::insert(collection.id, collection.collection.clone());322 <crate::CollectionById<T>>::insert(collection.id, collection.collection.clone());323 Ok(())323 Ok(())pallets/common/src/lib.rsdiffbeforeafterboth149 ))149 ))150 }150 }151 pub fn save(self) -> Result<(), DispatchError> {151 pub fn save(self) -> Result<(), DispatchError> {152 self.check_is_read_only()?;152 self.check_is_mutable()?;153 <CollectionById<T>>::insert(self.id, self.collection);153 <CollectionById<T>>::insert(self.id, self.collection);154 Ok(())154 Ok(())155 }155 }156156157 pub fn set_sponsor(&mut self, sponsor: T::AccountId) -> DispatchResult {157 pub fn set_sponsor(&mut self, sponsor: T::AccountId) -> DispatchResult {158 self.check_is_read_only()?;158 self.check_is_mutable()?;159 self.collection.sponsorship = SponsorshipState::Unconfirmed(sponsor);159 self.collection.sponsorship = SponsorshipState::Unconfirmed(sponsor);160 Ok(())160 Ok(())161 }161 }162162163 pub fn confirm_sponsorship(&mut self, sender: &T::AccountId) -> Result<bool, DispatchError> {163 pub fn confirm_sponsorship(&mut self, sender: &T::AccountId) -> Result<bool, DispatchError> {164 self.check_is_read_only()?;164 self.check_is_mutable()?;165165166 if self.collection.sponsorship.pending_sponsor() != Some(sender) {166 if self.collection.sponsorship.pending_sponsor() != Some(sender) {167 return Ok(false);167 return Ok(false);686 sponsorship,686 sponsorship,687 limits,687 limits,688 permissions,688 permissions,689 read_only,689 external_collection,690 } = <CollectionById<T>>::get(collection)?;690 } = <CollectionById<T>>::get(collection)?;691691692 let token_property_permissions = <CollectionPropertyPermissions<T>>::get(collection)692 let token_property_permissions = <CollectionPropertyPermissions<T>>::get(collection)716 permissions,716 permissions,717 token_property_permissions,717 token_property_permissions,718 properties,718 properties,719 read_only,719 read_only: external_collection,720 })720 })721 }721 }722}722}797 Self::clamp_permissions(data.mode.clone(), &Default::default(), permissions)797 Self::clamp_permissions(data.mode.clone(), &Default::default(), permissions)798 })798 })799 .unwrap_or_else(|| Ok(CollectionPermissions::default()))?,799 .unwrap_or_else(|| Ok(CollectionPermissions::default()))?,800 read_only: false,800 external_collection: false,801 };801 };802802803 let mut collection_properties = up_data_structs::CollectionProperties::get();803 let mut collection_properties = up_data_structs::CollectionProperties::get();854 collection: CollectionHandle<T>,854 collection: CollectionHandle<T>,855 sender: &T::CrossAccountId,855 sender: &T::CrossAccountId,856 ) -> DispatchResult {856 ) -> DispatchResult {857 collection.check_is_read_only()?;857 collection.check_is_mutable()?;858 ensure!(858 ensure!(859 collection.limits.owner_can_destroy(),859 collection.limits.owner_can_destroy(),860 <Error<T>>::NoPermission,860 <Error<T>>::NoPermission,884 sender: &T::CrossAccountId,884 sender: &T::CrossAccountId,885 property: Property,885 property: Property,886 ) -> DispatchResult {886 ) -> DispatchResult {887 collection.check_is_read_only()?;887 collection.check_is_mutable()?;888 collection.check_is_owner_or_admin(sender)?;888 collection.check_is_owner_or_admin(sender)?;889889890 CollectionProperties::<T>::try_mutate(collection.id, |properties| {890 CollectionProperties::<T>::try_mutate(collection.id, |properties| {930 sender: &T::CrossAccountId,930 sender: &T::CrossAccountId,931 properties: Vec<Property>,931 properties: Vec<Property>,932 ) -> DispatchResult {932 ) -> DispatchResult {933 collection.check_is_read_only()?;933 collection.check_is_mutable()?;934934935 for property in properties {935 for property in properties {936 Self::set_collection_property(collection, sender, property)?;936 Self::set_collection_property(collection, sender, property)?;944 sender: &T::CrossAccountId,944 sender: &T::CrossAccountId,945 property_key: PropertyKey,945 property_key: PropertyKey,946 ) -> DispatchResult {946 ) -> DispatchResult {947 collection.check_is_read_only()?;947 collection.check_is_mutable()?;948 collection.check_is_owner_or_admin(sender)?;948 collection.check_is_owner_or_admin(sender)?;949949950 CollectionProperties::<T>::try_mutate(collection.id, |properties| {950 CollectionProperties::<T>::try_mutate(collection.id, |properties| {966 sender: &T::CrossAccountId,966 sender: &T::CrossAccountId,967 property_keys: Vec<PropertyKey>,967 property_keys: Vec<PropertyKey>,968 ) -> DispatchResult {968 ) -> DispatchResult {969 collection.check_is_read_only()?;969 collection.check_is_mutable()?;970970971 for key in property_keys {971 for key in property_keys {972 Self::delete_collection_property(collection, sender, key)?;972 Self::delete_collection_property(collection, sender, key)?;992 sender: &T::CrossAccountId,992 sender: &T::CrossAccountId,993 property_permission: PropertyKeyPermission,993 property_permission: PropertyKeyPermission,994 ) -> DispatchResult {994 ) -> DispatchResult {995 collection.check_is_read_only()?;995 collection.check_is_mutable()?;996 collection.check_is_owner_or_admin(sender)?;996 collection.check_is_owner_or_admin(sender)?;997997998 let all_permissions = CollectionPropertyPermissions::<T>::get(collection.id);998 let all_permissions = CollectionPropertyPermissions::<T>::get(collection.id);1024 sender: &T::CrossAccountId,1024 sender: &T::CrossAccountId,1025 property_permissions: Vec<PropertyKeyPermission>,1025 property_permissions: Vec<PropertyKeyPermission>,1026 ) -> DispatchResult {1026 ) -> DispatchResult {1027 collection.check_is_read_only()?;1027 collection.check_is_mutable()?;102810281029 for prop_pemission in property_permissions {1029 for prop_pemission in property_permissions {1030 Self::set_property_permission(collection, sender, prop_pemission)?;1030 Self::set_property_permission(collection, sender, prop_pemission)?;1113 user: &T::CrossAccountId,1113 user: &T::CrossAccountId,1114 allowed: bool,1114 allowed: bool,1115 ) -> DispatchResult {1115 ) -> DispatchResult {1116 collection.check_is_read_only()?;1116 collection.check_is_mutable()?;1117 collection.check_is_owner_or_admin(sender)?;1117 collection.check_is_owner_or_admin(sender)?;111811181119 // =========1119 // =========1133 user: &T::CrossAccountId,1133 user: &T::CrossAccountId,1134 admin: bool,1134 admin: bool,1135 ) -> DispatchResult {1135 ) -> DispatchResult {1136 collection.check_is_read_only()?;1136 collection.check_is_mutable()?;1137 collection.check_is_owner_or_admin(sender)?;1137 collection.check_is_owner_or_admin(sender)?;113811381139 let was_admin = <IsAdmin<T>>::get((collection.id, user));1139 let was_admin = <IsAdmin<T>>::get((collection.id, user));pallets/fungible/src/lib.rsdiffbeforeafterboth168 owner: &T::CrossAccountId,168 owner: &T::CrossAccountId,169 amount: u128,169 amount: u128,170 ) -> DispatchResult {170 ) -> DispatchResult {171 collection.check_is_read_only()?;171 collection.check_is_mutable()?;172172173 let total_supply = <TotalSupply<T>>::get(collection.id)173 let total_supply = <TotalSupply<T>>::get(collection.id)174 .checked_sub(amount)174 .checked_sub(amount)216 amount: u128,216 amount: u128,217 nesting_budget: &dyn Budget,217 nesting_budget: &dyn Budget,218 ) -> DispatchResult {218 ) -> DispatchResult {219 collection.check_is_read_only()?;219 collection.check_is_mutable()?;220220221 ensure!(221 ensure!(222 collection.limits.transfers_enabled(),222 collection.limits.transfers_enabled(),287 data: BTreeMap<T::CrossAccountId, u128>,287 data: BTreeMap<T::CrossAccountId, u128>,288 nesting_budget: &dyn Budget,288 nesting_budget: &dyn Budget,289 ) -> DispatchResult {289 ) -> DispatchResult {290 collection.check_is_read_only()?;290 collection.check_is_mutable()?;291291292 if !collection.is_owner_or_admin(sender) {292 if !collection.is_owner_or_admin(sender) {293 ensure!(293 ensure!(390 spender: &T::CrossAccountId,390 spender: &T::CrossAccountId,391 amount: u128,391 amount: u128,392 ) -> DispatchResult {392 ) -> DispatchResult {393 collection.check_is_read_only()?;393 collection.check_is_mutable()?;394 if collection.permissions.access() == AccessMode::AllowList {394 if collection.permissions.access() == AccessMode::AllowList {395 collection.check_allowlist(owner)?;395 collection.check_allowlist(owner)?;396 collection.check_allowlist(spender)?;396 collection.check_allowlist(spender)?;pallets/nonfungible/src/lib.rsdiffbeforeafterboth336 sender: &T::CrossAccountId,336 sender: &T::CrossAccountId,337 token: TokenId,337 token: TokenId,338 ) -> DispatchResult {338 ) -> DispatchResult {339 collection.check_is_read_only()?;339 collection.check_is_mutable()?;340340341 let token_data =341 let token_data =342 <TokenData<T>>::get((collection.id, token)).ok_or(<CommonError<T>>::TokenNotFound)?;342 <TokenData<T>>::get((collection.id, token)).ok_or(<CommonError<T>>::TokenNotFound)?;458 &property.key,458 &property.key,459 is_token_create,459 is_token_create,460 )?;460 )?;461 collection.check_is_read_only()?;461 collection.check_is_mutable()?;462462463 <TokenProperties<T>>::try_mutate((collection.id, token_id), |properties| {463 <TokenProperties<T>>::try_mutate((collection.id, token_id), |properties| {464 let property = property.clone();464 let property = property.clone();496 token_id: TokenId,496 token_id: TokenId,497 property_key: PropertyKey,497 property_key: PropertyKey,498 ) -> DispatchResult {498 ) -> DispatchResult {499 collection.check_is_mutable()?;499 Self::check_token_change_permission(collection, sender, token_id, &property_key, false)?;500 Self::check_token_change_permission(collection, sender, token_id, &property_key, false)?;500 collection.check_is_read_only()?;501501502 <TokenProperties<T>>::try_mutate((collection.id, token_id), |properties| {502 <TokenProperties<T>>::try_mutate((collection.id, token_id), |properties| {503 properties.remove(&property_key)503 properties.remove(&property_key)574 token_id: TokenId,574 token_id: TokenId,575 property_keys: Vec<PropertyKey>,575 property_keys: Vec<PropertyKey>,576 ) -> DispatchResult {576 ) -> DispatchResult {577 collection.check_is_read_only()?;577 collection.check_is_mutable()?;578578579 for key in property_keys {579 for key in property_keys {580 Self::delete_token_property(collection, sender, token_id, key)?;580 Self::delete_token_property(collection, sender, token_id, key)?;622 token: TokenId,622 token: TokenId,623 nesting_budget: &dyn Budget,623 nesting_budget: &dyn Budget,624 ) -> DispatchResult {624 ) -> DispatchResult {625 collection.check_is_read_only()?;625 collection.check_is_mutable()?;626626627 ensure!(627 ensure!(628 collection.limits.transfers_enabled(),628 collection.limits.transfers_enabled(),902 token: TokenId,902 token: TokenId,903 spender: Option<&T::CrossAccountId>,903 spender: Option<&T::CrossAccountId>,904 ) -> DispatchResult {904 ) -> DispatchResult {905 collection.check_is_read_only()?;905 collection.check_is_mutable()?;906906907 if collection.permissions.access() == AccessMode::AllowList {907 if collection.permissions.access() == AccessMode::AllowList {908 collection.check_allowlist(sender)?;908 collection.check_allowlist(sender)?;pallets/refungible/src/lib.rsdiffbeforeafterboth234 }234 }235235236 pub fn burn_token(collection: &RefungibleHandle<T>, token_id: TokenId) -> DispatchResult {236 pub fn burn_token(collection: &RefungibleHandle<T>, token_id: TokenId) -> DispatchResult {237 collection.check_is_read_only()?;237 collection.check_is_mutable()?;238 let burnt = <TokensBurnt<T>>::get(collection.id)238 let burnt = <TokensBurnt<T>>::get(collection.id)239 .checked_add(1)239 .checked_add(1)240 .ok_or(ArithmeticError::Overflow)?;240 .ok_or(ArithmeticError::Overflow)?;254 token: TokenId,254 token: TokenId,255 amount: u128,255 amount: u128,256 ) -> DispatchResult {256 ) -> DispatchResult {257 collection.check_is_read_only()?;257 collection.check_is_mutable()?;258 let total_supply = <TotalSupply<T>>::get((collection.id, token))258 let total_supply = <TotalSupply<T>>::get((collection.id, token))259 .checked_sub(amount)259 .checked_sub(amount)260 .ok_or(<CommonError<T>>::TokenValueTooLow)?;260 .ok_or(<CommonError<T>>::TokenValueTooLow)?;327 amount: u128,327 amount: u128,328 nesting_budget: &dyn Budget,328 nesting_budget: &dyn Budget,329 ) -> DispatchResult {329 ) -> DispatchResult {330 collection.check_is_read_only()?;330 collection.check_is_mutable()?;331 ensure!(331 ensure!(332 collection.limits.transfers_enabled(),332 collection.limits.transfers_enabled(),333 <CommonError<T>>::TransferNotAllowed333 <CommonError<T>>::TransferNotAllowed576 token: TokenId,576 token: TokenId,577 amount: u128,577 amount: u128,578 ) -> DispatchResult {578 ) -> DispatchResult {579 collection.check_is_read_only()?;579 collection.check_is_mutable()?;580 if collection.permissions.access() == AccessMode::AllowList {580 if collection.permissions.access() == AccessMode::AllowList {581 collection.check_allowlist(sender)?;581 collection.check_allowlist(sender)?;582 collection.check_allowlist(spender)?;582 collection.check_allowlist(spender)?;pallets/unique/src/lib.rsdiffbeforeafterboth304 pub fn destroy_collection(origin, collection_id: CollectionId) -> DispatchResult {304 pub fn destroy_collection(origin, collection_id: CollectionId) -> DispatchResult {305 let sender = T::CrossAccountId::from_sub(ensure_signed(origin)?);305 let sender = T::CrossAccountId::from_sub(ensure_signed(origin)?);306 let collection = <CollectionHandle<T>>::try_get(collection_id)?;306 let collection = <CollectionHandle<T>>::try_get(collection_id)?;307 collection.check_is_read_only()?;307 collection.check_is_mutable()?;308308309 // =========309 // =========310310407 let sender = T::CrossAccountId::from_sub(ensure_signed(origin)?);407 let sender = T::CrossAccountId::from_sub(ensure_signed(origin)?);408408409 let mut target_collection = <CollectionHandle<T>>::try_get(collection_id)?;409 let mut target_collection = <CollectionHandle<T>>::try_get(collection_id)?;410 target_collection.check_is_read_only()?;410 target_collection.check_is_mutable()?;411 target_collection.check_is_owner(&sender)?;411 target_collection.check_is_owner(&sender)?;412412413 target_collection.owner = new_owner.clone();413 target_collection.owner = new_owner.clone();primitives/data-structs/src/lib.rsdiffbeforeafterboth316 #[version(2.., upper(Default::default()))]316 #[version(2.., upper(Default::default()))]317 pub permissions: CollectionPermissions,317 pub permissions: CollectionPermissions,318318319 /// Marks that this collection is not "unique", and managed from external.319 #[version(2.., upper(false))]320 #[version(2.., upper(false))]320 pub read_only: bool,321 pub external_collection: bool,321322322 #[version(..2)]323 #[version(..2)]323 pub variable_on_chain_schema: BoundedVec<u8, ConstU32<VARIABLE_ON_CHAIN_SCHEMA_LIMIT>>,324 pub variable_on_chain_schema: BoundedVec<u8, ConstU32<VARIABLE_ON_CHAIN_SCHEMA_LIMIT>>,