From e20b05e467b038b96bb978df3936dd3a455434e7 Mon Sep 17 00:00:00 2001 From: Daniel Shiposha Date: Thu, 30 Jun 2022 18:39:04 +0000 Subject: [PATCH] cargo fmt --- --- a/pallets/nonfungible/src/erc.rs +++ b/pallets/nonfungible/src/erc.rs @@ -37,8 +37,7 @@ use crate::{ AccountBalance, Config, CreateItemData, NonfungibleHandle, Pallet, TokenData, TokensMinted, - SelfWeightOf, weights::WeightInfo, TokenProperties, - property_guard::PropertyGuard, + SelfWeightOf, weights::WeightInfo, TokenProperties, property_guard::PropertyGuard, }; #[solidity_interface(name = "TokenProperties")] @@ -88,13 +87,8 @@ .recorder .weight_calls_budget(>::find_parent()); - let mut guard = PropertyGuard::new( - &caller, - self, - TokenId(token_id), - is_token_create, - &budget, - ); + let mut guard = + PropertyGuard::new(&caller, self, TokenId(token_id), is_token_create, &budget); >::set_token_property(Property { key, value }, &mut guard) .map_err(dispatch_to_evm::) @@ -112,16 +106,10 @@ .recorder .weight_calls_budget(>::find_parent()); - let mut guard = PropertyGuard::new( - &caller, - self, - TokenId(token_id), - is_token_create, - &budget, - ); + let mut guard = + PropertyGuard::new(&caller, self, TokenId(token_id), is_token_create, &budget); - >::delete_token_property(key, &mut guard) - .map_err(dispatch_to_evm::) + >::delete_token_property(key, &mut guard).map_err(dispatch_to_evm::) } /// Throws error if key not found --- a/pallets/nonfungible/src/lib.rs +++ b/pallets/nonfungible/src/lib.rs @@ -488,7 +488,10 @@ }) } - pub fn set_token_property(property: Property, guard: &mut PropertyGuard<'_, T>) -> DispatchResult { + pub fn set_token_property( + property: Property, + guard: &mut PropertyGuard<'_, T>, + ) -> DispatchResult { Self::check_token_change_permission(&property.key, guard)?; >::try_mutate((guard.collection.id, guard.token), |properties| { @@ -530,7 +533,10 @@ Ok(()) } - pub fn delete_token_property(property_key: PropertyKey, guard: &mut PropertyGuard<'_, T>) -> DispatchResult { + pub fn delete_token_property( + property_key: PropertyKey, + guard: &mut PropertyGuard<'_, T>, + ) -> DispatchResult { Self::check_token_change_permission(&property_key, guard)?; >::try_mutate((guard.collection.id, guard.token), |properties| { @@ -547,7 +553,10 @@ Ok(()) } - fn check_token_change_permission(property_key: &PropertyKey, guard: &mut PropertyGuard<'_, T>) -> DispatchResult { + fn check_token_change_permission( + property_key: &PropertyKey, + guard: &mut PropertyGuard<'_, T>, + ) -> DispatchResult { let permission = >::property_permissions(guard.collection.id) .get(property_key) .cloned() --- a/pallets/nonfungible/src/property_guard.rs +++ b/pallets/nonfungible/src/property_guard.rs @@ -1,63 +1,64 @@ use super::*; pub struct PropertyGuard<'a, T: Config> { - pub sender: &'a T::CrossAccountId, - pub collection: &'a NonfungibleHandle, - pub token: TokenId, - pub is_token_create: bool, - budget: &'a dyn Budget, + pub sender: &'a T::CrossAccountId, + pub collection: &'a NonfungibleHandle, + pub token: TokenId, + pub is_token_create: bool, + budget: &'a dyn Budget, - collection_admin_result: Option, - token_owner_result: Option, + collection_admin_result: Option, + token_owner_result: Option, } impl<'a, T: Config> PropertyGuard<'a, T> { - pub fn new( - sender: &'a T::CrossAccountId, - collection: &'a NonfungibleHandle, - token: TokenId, - is_token_create: bool, - budget: &'a dyn Budget, - ) -> Self { - Self { - sender, - collection, - token, - is_token_create, - budget, + pub fn new( + sender: &'a T::CrossAccountId, + collection: &'a NonfungibleHandle, + token: TokenId, + is_token_create: bool, + budget: &'a dyn Budget, + ) -> Self { + Self { + sender, + collection, + token, + is_token_create, + budget, - collection_admin_result: None, - token_owner_result: None - } - } + collection_admin_result: None, + token_owner_result: None, + } + } - pub fn check_collection_admin(&mut self) -> DispatchResult { - if self.collection_admin_result.is_none() { - self.collection_admin_result = Some(self.collection.check_is_owner_or_admin(self.sender)); - } + pub fn check_collection_admin(&mut self) -> DispatchResult { + if self.collection_admin_result.is_none() { + self.collection_admin_result = + Some(self.collection.check_is_owner_or_admin(self.sender)); + } - self.collection_admin_result.unwrap() - } + self.collection_admin_result.unwrap() + } - pub fn check_token_owner(&mut self) -> DispatchResult { - if self.token_owner_result.is_none() { - let is_owned = >::check_indirectly_owned( - self.sender.clone(), - self.collection.id, - self.token, - None, - self.budget, - )?; + pub fn check_token_owner(&mut self) -> DispatchResult { + if self.token_owner_result.is_none() { + let is_owned = >::check_indirectly_owned( + self.sender.clone(), + self.collection.id, + self.token, + None, + self.budget, + )?; - let result = if is_owned { - Ok(()) - } else { - Err(>::NoPermission.into()) - }; + let result = if is_owned { + Ok(()) + } else { + Err(>::NoPermission.into()) + }; - self.token_owner_result = Some(result); - } + self.token_owner_result = Some(result); + } - self.token_owner_result.unwrap() - } + self.token_owner_result.unwrap() + } } -- gitstuff