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

858				})858				})
859			})859			})
860			.collect()860			.collect()
861		}).unwrap_or(861		}).unwrap_or_else(
862			properties.iter()862			|| properties.iter()
863				.map(|(key, value)| Property {863				.map(|(key, value)| Property {
864					key: key.clone(),864					key: key.clone(),
865					value: value.clone(),865					value: value.clone(),
887					})887					})
888			})888			})
889			.collect()889			.collect()
890		}).unwrap_or(890		}).unwrap_or_else(
891			permissions.iter()891			|| permissions.iter()
892				.map(|(key, permission)| PropertyKeyPermission {892				.map(|(key, permission)| PropertyKeyPermission {
893					key: key.clone(),893					key: key.clone(),
894					permission: permission.clone(),894					permission: permission.clone(),

--- a/pallets/nonfungible/src/common.rs
+++ b/pallets/nonfungible/src/common.rs
@@ -179,7 +179,7 @@
 		let weight = <CommonWeights<T>>::delete_collection_properties(property_keys.len() as u32);
 
 		with_weight(
-			<Pallet<T>>::delete_collection_properties(self, &sender, property_keys),
+			<Pallet<T>>::delete_collection_properties(self, sender, property_keys),
 			weight,
 		)
 	}
@@ -374,8 +374,8 @@
 				})
 			})
 			.collect()
-		}).unwrap_or(
-			properties.iter().map(|(key, value)| Property {
+		}).unwrap_or_else(
+			|| properties.iter().map(|(key, value)| Property {
 				key: key.clone(),
 				value: value.clone(),
 			})

--- a/pallets/nonfungible/src/lib.rs
+++ b/pallets/nonfungible/src/lib.rs
@@ -353,8 +353,8 @@
 	) -> DispatchResult {
 		let permission = <PalletCommon<T>>::property_permissions(collection.id)
 			.get(property_key)
-			.map(|p| p.clone())
-			.unwrap_or(PropertyPermission::none());
+			.cloned()
+			.unwrap_or_else(PropertyPermission::none);
 
 		let token_data = <TokenData<T>>::get((collection.id, token_id))
 			.ok_or(<CommonError<T>>::TokenNotFound)?;