From ccbb0c2b6b713fbd831ca734882d2b8983c7983a Mon Sep 17 00:00:00 2001 From: Daniel Shiposha Date: Tue, 14 Jun 2022 08:01:17 +0000 Subject: [PATCH] cargo fmt --- --- a/pallets/proxy-rmrk-core/src/benchmarking.rs +++ b/pallets/proxy-rmrk-core/src/benchmarking.rs @@ -54,7 +54,9 @@ } fn create_max_resource_types_array>(num: usize) -> BoundedVec { - vec![RmrkResourceTypes::Composable(create_composable_resource()); num].try_into().expect("num <= S") + vec![RmrkResourceTypes::Composable(create_composable_resource()); num] + .try_into() + .expect("num <= S") } fn create_max_collection(owner: &T::AccountId) -> DispatchResult { @@ -75,10 +77,7 @@ ) } -fn create_nft( - owner: &T::AccountId, - collection_id: RmrkCollectionId, -) -> DispatchResult { +fn create_nft(owner: &T::AccountId, collection_id: RmrkCollectionId) -> DispatchResult { let royalty_recipient = Some(owner.clone()); let royalty_amount = Some(Permill::from_percent(25)); let metadata = create_data(); @@ -92,7 +91,7 @@ royalty_amount, metadata, transferable, - None + None, ) } --- a/pallets/proxy-rmrk-core/src/lib.rs +++ b/pallets/proxy-rmrk-core/src/lib.rs @@ -353,7 +353,7 @@ royalty_amount: Option, metadata: RmrkString, transferable: bool, - resources: Option> + resources: Option>, ) -> DispatchResult { let sender = ensure_signed(origin)?; let cross_sender = T::CrossAccountId::from_sub(sender.clone()); @@ -393,12 +393,7 @@ if let Some(resources) = resources { for resource in resources { - Self::resource_add( - sender.clone(), - collection.id, - nft_id, - resource - )?; + Self::resource_add(sender.clone(), collection.id, nft_id, resource)?; } } @@ -963,7 +958,7 @@ sender, collection_id, nft_id.into(), - RmrkResourceTypes::Composable(resource) + RmrkResourceTypes::Composable(resource), )?; Self::deposit_event(Event::ResourceAdded { @@ -1162,61 +1157,55 @@ sender: T::AccountId, collection_id: CollectionId, nft_id: TokenId, - resource: RmrkResourceTypes + resource: RmrkResourceTypes, ) -> Result { match resource { - RmrkResourceTypes::Basic(resource) => { - Self::resource_add_helper( - sender, - collection_id, - nft_id, - [ - Self::rmrk_property(TokenType, &NftType::Resource)?, - Self::rmrk_property(ResourceType, &misc::ResourceType::Basic)?, - Self::rmrk_property(Src, &resource.src)?, - Self::rmrk_property(Metadata, &resource.metadata)?, - Self::rmrk_property(License, &resource.license)?, - Self::rmrk_property(Thumb, &resource.thumb)?, - ] - .into_iter(), - ) - }, - RmrkResourceTypes::Composable(resource) => { - Self::resource_add_helper( - sender, - collection_id, - nft_id.into(), - [ - Self::rmrk_property(TokenType, &NftType::Resource)?, - Self::rmrk_property(ResourceType, &misc::ResourceType::Composable)?, - Self::rmrk_property(Parts, &resource.parts)?, - Self::rmrk_property(Base, &resource.base)?, - Self::rmrk_property(Src, &resource.src)?, - Self::rmrk_property(Metadata, &resource.metadata)?, - Self::rmrk_property(License, &resource.license)?, - Self::rmrk_property(Thumb, &resource.thumb)?, - ] - .into_iter(), - ) - }, - RmrkResourceTypes::Slot(resource) => { - Self::resource_add_helper( - sender, - collection_id, - nft_id.into(), - [ - Self::rmrk_property(TokenType, &NftType::Resource)?, - Self::rmrk_property(ResourceType, &misc::ResourceType::Slot)?, - Self::rmrk_property(Base, &resource.base)?, - Self::rmrk_property(Src, &resource.src)?, - Self::rmrk_property(Metadata, &resource.metadata)?, - Self::rmrk_property(Slot, &resource.slot)?, - Self::rmrk_property(License, &resource.license)?, - Self::rmrk_property(Thumb, &resource.thumb)?, - ] - .into_iter(), - ) - } + RmrkResourceTypes::Basic(resource) => Self::resource_add_helper( + sender, + collection_id, + nft_id, + [ + Self::rmrk_property(TokenType, &NftType::Resource)?, + Self::rmrk_property(ResourceType, &misc::ResourceType::Basic)?, + Self::rmrk_property(Src, &resource.src)?, + Self::rmrk_property(Metadata, &resource.metadata)?, + Self::rmrk_property(License, &resource.license)?, + Self::rmrk_property(Thumb, &resource.thumb)?, + ] + .into_iter(), + ), + RmrkResourceTypes::Composable(resource) => Self::resource_add_helper( + sender, + collection_id, + nft_id.into(), + [ + Self::rmrk_property(TokenType, &NftType::Resource)?, + Self::rmrk_property(ResourceType, &misc::ResourceType::Composable)?, + Self::rmrk_property(Parts, &resource.parts)?, + Self::rmrk_property(Base, &resource.base)?, + Self::rmrk_property(Src, &resource.src)?, + Self::rmrk_property(Metadata, &resource.metadata)?, + Self::rmrk_property(License, &resource.license)?, + Self::rmrk_property(Thumb, &resource.thumb)?, + ] + .into_iter(), + ), + RmrkResourceTypes::Slot(resource) => Self::resource_add_helper( + sender, + collection_id, + nft_id.into(), + [ + Self::rmrk_property(TokenType, &NftType::Resource)?, + Self::rmrk_property(ResourceType, &misc::ResourceType::Slot)?, + Self::rmrk_property(Base, &resource.base)?, + Self::rmrk_property(Src, &resource.src)?, + Self::rmrk_property(Metadata, &resource.metadata)?, + Self::rmrk_property(Slot, &resource.slot)?, + Self::rmrk_property(License, &resource.license)?, + Self::rmrk_property(Thumb, &resource.thumb)?, + ] + .into_iter(), + ), } } -- gitstuff