git.delta.rocks / unique-network / refs/commits / 630fc898d4e4

--- a/pallets/balances-adapter/src/erc.rs
+++ b/pallets/balances-adapter/src/erc.rs
@@ -25,7 +25,7 @@
 	}
 
 	fn approve(&mut self, _caller: Caller, _spender: Address, _amount: U256) -> Result<bool> {
-		Err("Approve not supported".into())
+		Err("approve not supported".into())
 	}
 
 	fn balance_of(&self, owner: Address) -> Result<U256> {

--- a/pallets/nonfungible/src/erc.rs
+++ b/pallets/nonfungible/src/erc.rs
@@ -273,7 +273,7 @@
 			.map_err(|_| "key too long")?;
 
 		let props =
-			<TokenProperties<T>>::get((self.id, token_id)).ok_or("Token properties not found")?;
+			<TokenProperties<T>>::get((self.id, token_id)).ok_or("token properties not found")?;
 		let prop = props.get(&key).ok_or("key not found")?;
 
 		Ok(prop.to_vec().into())
@@ -367,7 +367,7 @@
 				.transpose()
 				.map_err(|e| {
 					Error::Revert(alloc::format!(
-						"Can not convert value \"baseURI\" to string with error \"{e}\""
+						"can not convert value \"baseURI\" to string with error \"{e}\""
 					))
 				})?;
 
@@ -658,7 +658,7 @@
 		let key = key::url();
 		let permission = get_token_permission::<T>(self.id, &key)?;
 		if !permission.collection_admin {
-			return Err("Operation is not allowed".into());
+			return Err("operation is not allowed".into());
 		}
 
 		let caller = T::CrossAccountId::from_eth(caller);
@@ -685,7 +685,7 @@
 					.try_into()
 					.map_err(|_| "token uri is too long")?,
 			})
-			.map_err(|e| Error::Revert(alloc::format!("Can't add property: {e:?}")))?;
+			.map_err(|e| Error::Revert(alloc::format!("can't add property: {e:?}")))?;
 
 		<Pallet<T>>::create_item(
 			self,
@@ -708,12 +708,12 @@
 ) -> Result<String> {
 	collection.consume_store_reads(1)?;
 	let properties = <TokenProperties<T>>::try_get((collection.id, token_id))
-		.map_err(|_| Error::Revert("Token properties not found".into()))?;
+		.map_err(|_| Error::Revert("token properties not found".into()))?;
 	if let Some(property) = properties.get(key) {
 		return Ok(String::from_utf8_lossy(property).into());
 	}
 
-	Err("Property tokenURI not found".into())
+	Err("property tokenURI not found".into())
 }
 
 fn get_token_permission<T: Config>(
@@ -721,13 +721,13 @@
 	key: &PropertyKey,
 ) -> Result<PropertyPermission> {
 	let token_property_permissions = CollectionPropertyPermissions::<T>::try_get(collection_id)
-		.map_err(|_| Error::Revert("No permissions for collection".into()))?;
+		.map_err(|_| Error::Revert("no permissions for collection".into()))?;
 	let a = token_property_permissions
 		.get(key)
 		.map(Clone::clone)
 		.ok_or_else(|| {
 			let key = String::from_utf8(key.clone().into_inner()).unwrap_or_default();
-			Error::Revert(alloc::format!("No permission for key {key}"))
+			Error::Revert(alloc::format!("no permission for key {key}"))
 		})?;
 	Ok(a)
 }
@@ -1058,7 +1058,7 @@
 						.try_into()
 						.map_err(|_| "token uri is too long")?,
 				})
-				.map_err(|e| Error::Revert(alloc::format!("Can't add property: {e:?}")))?;
+				.map_err(|e| Error::Revert(alloc::format!("can't add property: {e:?}")))?;
 
 			data.push(CreateItemData::<T> {
 				properties,

284			.map_err(|_| "key too long")?;284			.map_err(|_| "key too long")?;
285285
286		let props =286		let props =
287			<TokenProperties<T>>::get((self.id, token_id)).ok_or("Token properties not found")?;287			<TokenProperties<T>>::get((self.id, token_id)).ok_or("token properties not found")?;
288		let prop = props.get(&key).ok_or("key not found")?;288		let prop = props.get(&key).ok_or("key not found")?;
289289
290		Ok(prop.to_vec().into())290		Ok(prop.to_vec().into())
372				.transpose()372				.transpose()
373				.map_err(|e| {373				.map_err(|e| {
374					Error::Revert(alloc::format!(374					Error::Revert(alloc::format!(
375						"Can not convert value \"baseURI\" to string with error \"{e}\""375						"can not convert value \"baseURI\" to string with error \"{e}\""
376					))376					))
377				})?;377				})?;
378378
697		let key = key::url();697		let key = key::url();
698		let permission = get_token_permission::<T>(self.id, &key)?;698		let permission = get_token_permission::<T>(self.id, &key)?;
699		if !permission.collection_admin {699		if !permission.collection_admin {
700			return Err("Operation is not allowed".into());700			return Err("operation is not allowed".into());
701		}701		}
702702
703		let caller = T::CrossAccountId::from_eth(caller);703		let caller = T::CrossAccountId::from_eth(caller);
724					.try_into()724					.try_into()
725					.map_err(|_| "token uri is too long")?,725					.map_err(|_| "token uri is too long")?,
726			})726			})
727			.map_err(|e| Error::Revert(alloc::format!("Can't add property: {e:?}")))?;727			.map_err(|e| Error::Revert(alloc::format!("can't add property: {e:?}")))?;
728728
729		let users = [(to, 1)]729		let users = [(to, 1)]
730			.into_iter()730			.into_iter()
749) -> Result<String> {749) -> Result<String> {
750	collection.consume_store_reads(1)?;750	collection.consume_store_reads(1)?;
751	let properties = <TokenProperties<T>>::try_get((collection.id, token_id))751	let properties = <TokenProperties<T>>::try_get((collection.id, token_id))
752		.map_err(|_| Error::Revert("Token properties not found".into()))?;752		.map_err(|_| Error::Revert("token properties not found".into()))?;
753	if let Some(property) = properties.get(key) {753	if let Some(property) = properties.get(key) {
754		return Ok(String::from_utf8_lossy(property).into());754		return Ok(String::from_utf8_lossy(property).into());
755	}755	}
756756
757	Err("Property tokenURI not found".into())757	Err("property tokenURI not found".into())
758}758}
759759
760fn get_token_permission<T: Config>(760fn get_token_permission<T: Config>(
761	collection_id: CollectionId,761	collection_id: CollectionId,
762	key: &PropertyKey,762	key: &PropertyKey,
763) -> Result<PropertyPermission> {763) -> Result<PropertyPermission> {
764	let token_property_permissions = CollectionPropertyPermissions::<T>::try_get(collection_id)764	let token_property_permissions = CollectionPropertyPermissions::<T>::try_get(collection_id)
765		.map_err(|_| Error::Revert("No permissions for collection".into()))?;765		.map_err(|_| Error::Revert("no permissions for collection".into()))?;
766	let a = token_property_permissions766	let a = token_property_permissions
767		.get(key)767		.get(key)
768		.map(Clone::clone)768		.map(Clone::clone)
769		.ok_or_else(|| {769		.ok_or_else(|| {
770			let key = String::from_utf8(key.clone().into_inner()).unwrap_or_default();770			let key = String::from_utf8(key.clone().into_inner()).unwrap_or_default();
771			Error::Revert(alloc::format!("No permission for key {key}"))771			Error::Revert(alloc::format!("no permission for key {key}"))
772		})?;772		})?;
773	Ok(a)773	Ok(a)
774}774}
1133						.try_into()1133						.try_into()
1134						.map_err(|_| "token uri is too long")?,1134						.map_err(|_| "token uri is too long")?,
1135				})1135				})
1136				.map_err(|e| Error::Revert(alloc::format!("Can't add property: {e:?}")))?;1136				.map_err(|e| Error::Revert(alloc::format!("can't add property: {e:?}")))?;
11371137
1138			let create_item_data = CreateItemData::<T> {1138			let create_item_data = CreateItemData::<T> {
1139				users: users.clone(),1139				users: users.clone(),