difftreelog
fix use lowercase letters in EVM errors
in: master
3 files changed
pallets/balances-adapter/src/erc.rsdiffbeforeafterboth--- 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> {
pallets/nonfungible/src/erc.rsdiffbeforeafterboth273 .map_err(|_| "key too long")?;273 .map_err(|_| "key too long")?;274274275 let props =275 let props =276 <TokenProperties<T>>::get((self.id, token_id)).ok_or("Token properties not found")?;276 <TokenProperties<T>>::get((self.id, token_id)).ok_or("token properties not found")?;277 let prop = props.get(&key).ok_or("key not found")?;277 let prop = props.get(&key).ok_or("key not found")?;278278279 Ok(prop.to_vec().into())279 Ok(prop.to_vec().into())367 .transpose()367 .transpose()368 .map_err(|e| {368 .map_err(|e| {369 Error::Revert(alloc::format!(369 Error::Revert(alloc::format!(370 "Can not convert value \"baseURI\" to string with error \"{e}\""370 "can not convert value \"baseURI\" to string with error \"{e}\""371 ))371 ))372 })?;372 })?;373373658 let key = key::url();658 let key = key::url();659 let permission = get_token_permission::<T>(self.id, &key)?;659 let permission = get_token_permission::<T>(self.id, &key)?;660 if !permission.collection_admin {660 if !permission.collection_admin {661 return Err("Operation is not allowed".into());661 return Err("operation is not allowed".into());662 }662 }663663664 let caller = T::CrossAccountId::from_eth(caller);664 let caller = T::CrossAccountId::from_eth(caller);685 .try_into()685 .try_into()686 .map_err(|_| "token uri is too long")?,686 .map_err(|_| "token uri is too long")?,687 })687 })688 .map_err(|e| Error::Revert(alloc::format!("Can't add property: {e:?}")))?;688 .map_err(|e| Error::Revert(alloc::format!("can't add property: {e:?}")))?;689689690 <Pallet<T>>::create_item(690 <Pallet<T>>::create_item(691 self,691 self,708) -> Result<String> {708) -> Result<String> {709 collection.consume_store_reads(1)?;709 collection.consume_store_reads(1)?;710 let properties = <TokenProperties<T>>::try_get((collection.id, token_id))710 let properties = <TokenProperties<T>>::try_get((collection.id, token_id))711 .map_err(|_| Error::Revert("Token properties not found".into()))?;711 .map_err(|_| Error::Revert("token properties not found".into()))?;712 if let Some(property) = properties.get(key) {712 if let Some(property) = properties.get(key) {713 return Ok(String::from_utf8_lossy(property).into());713 return Ok(String::from_utf8_lossy(property).into());714 }714 }715715716 Err("Property tokenURI not found".into())716 Err("property tokenURI not found".into())717}717}718718719fn get_token_permission<T: Config>(719fn get_token_permission<T: Config>(720 collection_id: CollectionId,720 collection_id: CollectionId,721 key: &PropertyKey,721 key: &PropertyKey,722) -> Result<PropertyPermission> {722) -> Result<PropertyPermission> {723 let token_property_permissions = CollectionPropertyPermissions::<T>::try_get(collection_id)723 let token_property_permissions = CollectionPropertyPermissions::<T>::try_get(collection_id)724 .map_err(|_| Error::Revert("No permissions for collection".into()))?;724 .map_err(|_| Error::Revert("no permissions for collection".into()))?;725 let a = token_property_permissions725 let a = token_property_permissions726 .get(key)726 .get(key)727 .map(Clone::clone)727 .map(Clone::clone)728 .ok_or_else(|| {728 .ok_or_else(|| {729 let key = String::from_utf8(key.clone().into_inner()).unwrap_or_default();729 let key = String::from_utf8(key.clone().into_inner()).unwrap_or_default();730 Error::Revert(alloc::format!("No permission for key {key}"))730 Error::Revert(alloc::format!("no permission for key {key}"))731 })?;731 })?;732 Ok(a)732 Ok(a)733}733}1058 .try_into()1058 .try_into()1059 .map_err(|_| "token uri is too long")?,1059 .map_err(|_| "token uri is too long")?,1060 })1060 })1061 .map_err(|e| Error::Revert(alloc::format!("Can't add property: {e:?}")))?;1061 .map_err(|e| Error::Revert(alloc::format!("can't add property: {e:?}")))?;106210621063 data.push(CreateItemData::<T> {1063 data.push(CreateItemData::<T> {1064 properties,1064 properties,pallets/refungible/src/erc.rsdiffbeforeafterboth--- a/pallets/refungible/src/erc.rs
+++ b/pallets/refungible/src/erc.rs
@@ -284,7 +284,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())
@@ -372,7 +372,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}\""
))
})?;
@@ -697,7 +697,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);
@@ -724,7 +724,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:?}")))?;
let users = [(to, 1)]
.into_iter()
@@ -749,12 +749,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>(
@@ -762,13 +762,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)
}
@@ -1133,7 +1133,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:?}")))?;
let create_item_data = CreateItemData::<T> {
users: users.clone(),