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

--- a/pallets/common/src/lib.rs
+++ b/pallets/common/src/lib.rs
@@ -858,8 +858,8 @@
 				})
 			})
 			.collect()
-		}).unwrap_or(
-			properties.iter()
+		}).unwrap_or_else(
+			|| properties.iter()
 				.map(|(key, value)| Property {
 					key: key.clone(),
 					value: value.clone(),
@@ -887,8 +887,8 @@
 					})
 			})
 			.collect()
-		}).unwrap_or(
-			permissions.iter()
+		}).unwrap_or_else(
+			|| permissions.iter()
 				.map(|(key, permission)| PropertyKeyPermission {
 					key: key.clone(),
 					permission: permission.clone(),

179		let weight = <CommonWeights<T>>::delete_collection_properties(property_keys.len() as u32);179		let weight = <CommonWeights<T>>::delete_collection_properties(property_keys.len() as u32);
180180
181		with_weight(181		with_weight(
182			<Pallet<T>>::delete_collection_properties(self, &sender, property_keys),182			<Pallet<T>>::delete_collection_properties(self, sender, property_keys),
183			weight,183			weight,
184		)184		)
185	}185	}
374				})374				})
375			})375			})
376			.collect()376			.collect()
377		}).unwrap_or(377		}).unwrap_or_else(
378			properties.iter().map(|(key, value)| Property {378			|| properties.iter().map(|(key, value)| Property {
379				key: key.clone(),379				key: key.clone(),
380				value: value.clone(),380				value: value.clone(),
381			})381			})

--- 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)?;