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

30	AccessMode, CollectionMode, CollectionPermissions, OwnerRestrictedSet, Property,30	AccessMode, CollectionMode, CollectionPermissions, OwnerRestrictedSet, Property,
31	SponsoringRateLimit, SponsorshipState,31	SponsoringRateLimit, SponsorshipState,
32};32};
33use alloc::format;
3433
35use crate::{34use crate::{
36	Pallet, CollectionHandle, Config, CollectionProperties, SelfWeightOf, eth, weights::WeightInfo,35	Pallet, CollectionHandle, Config, CollectionProperties, SelfWeightOf, eth, weights::WeightInfo,
123122
124		let properties = properties123		let properties = properties
125			.into_iter()124			.into_iter()
126			.map(|property| {125			.map(eth::Property::try_into)
127				let (key, value) = property.take_key_value();
128				let key = <Vec<u8>>::from(key)
129					.try_into()
130					.map_err(|_| "key too large")?;
131
132				let value = value.0.try_into().map_err(|_| "value too large")?;
133
134				Ok(Property { key, value })
135			})
136			.collect::<Result<Vec<_>>>()?;126			.collect::<Result<Vec<_>>>()?;
137127
138		<Pallet<T>>::set_collection_properties(self, &caller, properties)128		<Pallet<T>>::set_collection_properties(self, &caller, properties)
210200
211		let properties = properties201		let properties = properties
212			.into_iter()202			.into_iter()
213			.map(|p| {203			.map(Property::try_into)
214				let key =
215					string::from_utf8(p.key.into()).map_err(|e| Error::Revert(format!("{}", e)))?;
216				let value = bytes(p.value.to_vec());
217				Ok(eth::Property::new(key, value))
218			})
219			.collect::<Result<Vec<_>>>()?;204			.collect::<Result<Vec<_>>>()?;
220		Ok(properties)205		Ok(properties)
221	}206	}

--- a/pallets/common/src/eth.rs
+++ b/pallets/common/src/eth.rs
@@ -175,13 +175,28 @@
 	value: evm_coder::types::bytes,
 }
 
-impl Property {
-	pub fn new(key: evm_coder::types::string, value: evm_coder::types::bytes) -> Self {
-		Self { key, value }
+impl TryFrom<up_data_structs::Property> for Property {
+	type Error = evm_coder::execution::Error;
+
+	fn try_from(from: up_data_structs::Property) -> Result<Self, Self::Error> {
+		let key = evm_coder::types::string::from_utf8(from.key.into())
+			.map_err(|e| Self::Error::Revert(format!("utf8 conversion error: {}", e)))?;
+		let value = evm_coder::types::bytes(from.value.to_vec());
+		Ok(Property { key, value })
 	}
+}
 
-	pub fn take_key_value(self) -> (evm_coder::types::string, evm_coder::types::bytes) {
-		(self.key, self.value)
+impl TryInto<up_data_structs::Property> for Property {
+	type Error = evm_coder::execution::Error;
+
+	fn try_into(self) -> Result<up_data_structs::Property, Self::Error> {
+		let key = <Vec<u8>>::from(self.key)
+			.try_into()
+			.map_err(|_| "key too large")?;
+
+		let value = self.value.0.try_into().map_err(|_| "value too large")?;
+
+		Ok(up_data_structs::Property { key, value })
 	}
 }
 

--- a/pallets/nonfungible/src/erc.rs
+++ b/pallets/nonfungible/src/erc.rs
@@ -170,16 +170,7 @@
 
 		let properties = properties
 			.into_iter()
-			.map(|property| {
-				let (key, value) = property.take_key_value();
-				let key = <Vec<u8>>::from(key)
-					.try_into()
-					.map_err(|_| "key too large")?;
-
-				let value = value.0.try_into().map_err(|_| "value too large")?;
-
-				Ok(Property { key, value })
-			})
+			.map(pallet_common::eth::Property::try_into)
 			.collect::<Result<Vec<_>>>()?;
 
 		<Pallet<T>>::set_token_properties(
@@ -793,12 +784,7 @@
 			if keys.is_empty() { None } else { Some(keys) },
 		)
 		.into_iter()
-		.map(|p| {
-			let key = string::from_utf8(p.key.to_vec())
-				.map_err(|e| Error::Revert(alloc::format!("{}", e)))?;
-			let value = bytes(p.value.to_vec());
-			Ok(pallet_common::eth::Property::new(key, value))
-		})
+		.map(pallet_common::eth::Property::try_from)
 		.collect::<Result<Vec<_>>>()
 	}
 
@@ -1055,16 +1041,7 @@
 
 		let properties = properties
 			.into_iter()
-			.map(|property| {
-				let (key, value) = property.take_key_value();
-				let key = <Vec<u8>>::from(key)
-					.try_into()
-					.map_err(|_| "key too large")?;
-
-				let value = value.0.try_into().map_err(|_| "value too large")?;
-
-				Ok(Property { key, value })
-			})
+			.map(pallet_common::eth::Property::try_into)
 			.collect::<Result<Vec<_>>>()?
 			.try_into()
 			.map_err(|_| Error::Revert(alloc::format!("too many properties")))?;

--- a/pallets/refungible/src/erc.rs
+++ b/pallets/refungible/src/erc.rs
@@ -173,16 +173,7 @@
 
 		let properties = properties
 			.into_iter()
-			.map(|property| {
-				let (key, value) = property.take_key_value();
-				let key = <Vec<u8>>::from(key)
-					.try_into()
-					.map_err(|_| "key too large")?;
-
-				let value = value.0.try_into().map_err(|_| "value too large")?;
-
-				Ok(Property { key, value })
-			})
+			.map(pallet_common::eth::Property::try_into)
 			.collect::<Result<Vec<_>>>()?;
 
 		<Pallet<T>>::set_token_properties(
@@ -828,12 +819,7 @@
 			if keys.is_empty() { None } else { Some(keys) },
 		)
 		.into_iter()
-		.map(|p| {
-			let key = string::from_utf8(p.key.to_vec())
-				.map_err(|e| Error::Revert(alloc::format!("{}", e)))?;
-			let value = bytes(p.value.to_vec());
-			Ok(pallet_common::eth::Property::new(key, value))
-		})
+		.map(pallet_common::eth::Property::try_from)
 		.collect::<Result<Vec<_>>>()
 	}
 	/// @notice Transfer ownership of an RFT
@@ -1101,16 +1087,7 @@
 
 		let properties = properties
 			.into_iter()
-			.map(|property| {
-				let (key, value) = property.take_key_value();
-				let key = <Vec<u8>>::from(key)
-					.try_into()
-					.map_err(|_| "key too large")?;
-
-				let value = value.0.try_into().map_err(|_| "value too large")?;
-
-				Ok(Property { key, value })
-			})
+			.map(pallet_common::eth::Property::try_into)
 			.collect::<Result<Vec<_>>>()?
 			.try_into()
 			.map_err(|_| Error::Revert(alloc::format!("too many properties")))?;