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(),

--- 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(),
 			})

353	) -> DispatchResult {353	) -> DispatchResult {
354		let permission = <PalletCommon<T>>::property_permissions(collection.id)354		let permission = <PalletCommon<T>>::property_permissions(collection.id)
355			.get(property_key)355			.get(property_key)
356			.map(|p| p.clone())356			.cloned()
357			.unwrap_or(PropertyPermission::none());357			.unwrap_or_else(PropertyPermission::none);
358358
359		let token_data = <TokenData<T>>::get((collection.id, token_id))359		let token_data = <TokenData<T>>::get((collection.id, token_id))
360			.ok_or(<CommonError<T>>::TokenNotFound)?;360			.ok_or(<CommonError<T>>::TokenNotFound)?;