git.delta.rocks / unique-network / refs/commits / 1c4a2b39d6b9

difftreelog

Use Error::from when needed

Daniel Shiposha2022-05-12parent: #599b514.patch.diff
in: master

2 files changed

modifiedpallets/common/src/lib.rsdiffbeforeafterboth
674 let mut collection_properties = up_data_structs::CollectionProperties::get();674 let mut collection_properties = up_data_structs::CollectionProperties::get();
675 collection_properties675 collection_properties
676 .try_set_from_iter(data.properties.into_iter().map(|p| (p.key, p.value)))676 .try_set_from_iter(data.properties.into_iter().map(|p| (p.key, p.value)))
677 .map_err(|e| -> Error<T> { e.into() })?;677 .map_err(<Error<T>>::from)?;
678678
679 CollectionProperties::<T>::insert(id, collection_properties);679 CollectionProperties::<T>::insert(id, collection_properties);
680680
685 .into_iter()685 .into_iter()
686 .map(|property| (property.key, property.permission)),686 .map(|property| (property.key, property.permission)),
687 )687 )
688 .map_err(|e| -> Error<T> { e.into() })?;688 .map_err(<Error<T>>::from)?;
689689
690 CollectionPropertyPermissions::<T>::insert(id, token_props_permissions);690 CollectionPropertyPermissions::<T>::insert(id, token_props_permissions);
691691
765 let property = property.clone();765 let property = property.clone();
766 properties.try_set(property.key, property.value)766 properties.try_set(property.key, property.value)
767 })767 })
768 .map_err(|e| -> Error<T> { e.into() })?;768 .map_err(<Error<T>>::from)?;
769769
770 Self::deposit_event(Event::CollectionPropertySet(collection.id, property.key));770 Self::deposit_event(Event::CollectionPropertySet(collection.id, property.key));
771771
794 CollectionProperties::<T>::try_mutate(collection.id, |properties| {794 CollectionProperties::<T>::try_mutate(collection.id, |properties| {
795 properties.remove(&property_key)795 properties.remove(&property_key)
796 })796 })
797 .map_err(|e| -> Error<T> { e.into() })?;797 .map_err(<Error<T>>::from)?;
798798
799 Self::deposit_event(Event::CollectionPropertyDeleted(799 Self::deposit_event(Event::CollectionPropertyDeleted(
800 collection.id,800 collection.id,
836 let property_permission = property_permission.clone();836 let property_permission = property_permission.clone();
837 permissions.try_set(property_permission.key, property_permission.permission)837 permissions.try_set(property_permission.key, property_permission.permission)
838 })838 })
839 .map_err(|e| -> Error<T> { e.into() })?;839 .map_err(<Error<T>>::from)?;
840840
841 Self::deposit_event(Event::PropertyPermissionSet(841 Self::deposit_event(Event::PropertyPermissionSet(
842 collection.id,842 collection.id,
modifiedpallets/nonfungible/src/lib.rsdiffbeforeafterboth
271 let property = property.clone();271 let property = property.clone();
272 properties.try_set(property.key, property.value)272 properties.try_set(property.key, property.value)
273 })273 })
274 .map_err(|e| -> CommonError<T> { e.into() })?;274 .map_err(<CommonError<T>>::from)?;
275275
276 <PalletCommon<T>>::deposit_event(CommonEvent::TokenPropertySet(276 <PalletCommon<T>>::deposit_event(CommonEvent::TokenPropertySet(
277 collection.id,277 collection.id,
306 <TokenProperties<T>>::try_mutate((collection.id, token_id), |properties| {306 <TokenProperties<T>>::try_mutate((collection.id, token_id), |properties| {
307 properties.remove(&property_key)307 properties.remove(&property_key)
308 })308 })
309 .map_err(|e| -> CommonError<T> { e.into() })?;309 .map_err(<CommonError<T>>::from)?;
310310
311 <PalletCommon<T>>::deposit_event(CommonEvent::TokenPropertyDeleted(311 <PalletCommon<T>>::deposit_event(CommonEvent::TokenPropertyDeleted(
312 collection.id,312 collection.id,