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

difftreelog

fix use CollectionUnknown instead of NotRmrkCollection

Daniel Shiposha2022-05-20parent: #fbd9bd5.patch.diff
in: master

2 files changed

modifiedpallets/proxy-rmrk-core/src/lib.rsdiffbeforeafterboth
75 pub enum Error<T> {75 pub enum Error<T> {
76 /* Unique-specific events */76 /* Unique-specific events */
77 CorruptedCollectionType,77 CorruptedCollectionType,
78 NotRmrkCollection,
79 RmrkPropertyKeyIsTooLong,78 RmrkPropertyKeyIsTooLong,
80 RmrkPropertyValueIsTooLong,79 RmrkPropertyValueIsTooLong,
8180
240 fn get_collection_type(collection_id: CollectionId) -> Result<CollectionType, DispatchError> {239 fn get_collection_type(collection_id: CollectionId) -> Result<CollectionType, DispatchError> {
241 let collection_type: CollectionType = <PalletCommon<T>>::collection_properties(collection_id)240 let collection_type: CollectionType = <PalletCommon<T>>::collection_properties(collection_id)
242 .get(&rmrk_property!(Config=T, CollectionType)?)241 .get(&rmrk_property!(Config=T, CollectionType)?)
243 .ok_or(<Error<T>>::NotRmrkCollection)?242 .ok_or(<Error<T>>::CollectionUnknown)?
244 .try_into()243 .try_into()
245 .map_err(<Error<T>>::from)?;244 .map_err(<Error<T>>::from)?;
246245
modifiedpallets/proxy-rmrk-core/src/misc.rsdiffbeforeafterboth
48 fn into_nft_collection(self) -> Result<NonfungibleHandle<T>, Error<T>> {48 fn into_nft_collection(self) -> Result<NonfungibleHandle<T>, Error<T>> {
49 match self.mode {49 match self.mode {
50 CollectionMode::NFT => Ok(NonfungibleHandle::cast(self)),50 CollectionMode::NFT => Ok(NonfungibleHandle::cast(self)),
51 _ => Err(<Error<T>>::NotRmrkCollection)51 _ => Err(<Error<T>>::CollectionUnknown)
52 }52 }
53 }53 }
54}54}