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

--- 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(<StructureWeight<T>>::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);
 
 		<Pallet<T>>::set_token_property(Property { key, value }, &mut guard)
 			.map_err(dispatch_to_evm::<T>)
@@ -112,16 +106,10 @@
 			.recorder
 			.weight_calls_budget(<StructureWeight<T>>::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);
 
-		<Pallet<T>>::delete_token_property(key, &mut guard)
-			.map_err(dispatch_to_evm::<T>)
+		<Pallet<T>>::delete_token_property(key, &mut guard).map_err(dispatch_to_evm::<T>)
 	}
 
 	/// Throws error if key not found

no syntactic changes

--- 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<T>,
-    pub token: TokenId,
-    pub is_token_create: bool,
-    budget: &'a dyn Budget,
+	pub sender: &'a T::CrossAccountId,
+	pub collection: &'a NonfungibleHandle<T>,
+	pub token: TokenId,
+	pub is_token_create: bool,
+	budget: &'a dyn Budget,
 
-    collection_admin_result: Option<DispatchResult>,
-    token_owner_result: Option<DispatchResult>,
+	collection_admin_result: Option<DispatchResult>,
+	token_owner_result: Option<DispatchResult>,
 }
 
 impl<'a, T: Config> PropertyGuard<'a, T> {
-    pub fn new(
-        sender: &'a T::CrossAccountId,
-        collection: &'a NonfungibleHandle<T>,
-        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<T>,
+		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 = <PalletStructure<T>>::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 = <PalletStructure<T>>::check_indirectly_owned(
+				self.sender.clone(),
+				self.collection.id,
+				self.token,
+				None,
+				self.budget,
+			)?;
 
-            let result = if is_owned {
-                Ok(())
-            } else {
-                Err(<CommonError<T>>::NoPermission.into())
-            };
+			let result = if is_owned {
+				Ok(())
+			} else {
+				Err(<CommonError<T>>::NoPermission.into())
+			};
 
-            self.token_owner_result = Some(result);
-        }
+			self.token_owner_result = Some(result);
+		}
 
-        self.token_owner_result.unwrap()
-    }
+		self.token_owner_result.unwrap()
+	}
 }