From 630fc898d4e48c8dabb22e1203af70caa4f3f3ae Mon Sep 17 00:00:00 2001 From: Daniel Shiposha Date: Mon, 02 Oct 2023 16:39:52 +0000 Subject: [PATCH] fix: use lowercase letters in EVM errors --- --- 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 { - Err("Approve not supported".into()) + Err("approve not supported".into()) } fn balance_of(&self, owner: Address) -> Result { --- a/pallets/nonfungible/src/erc.rs +++ b/pallets/nonfungible/src/erc.rs @@ -273,7 +273,7 @@ .map_err(|_| "key too long")?; let props = - >::get((self.id, token_id)).ok_or("Token properties not found")?; + >::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::(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:?}")))?; >::create_item( self, @@ -708,12 +708,12 @@ ) -> Result { collection.consume_store_reads(1)?; let properties = >::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( @@ -721,13 +721,13 @@ key: &PropertyKey, ) -> Result { let token_property_permissions = CollectionPropertyPermissions::::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:: { properties, --- a/pallets/refungible/src/erc.rs +++ b/pallets/refungible/src/erc.rs @@ -284,7 +284,7 @@ .map_err(|_| "key too long")?; let props = - >::get((self.id, token_id)).ok_or("Token properties not found")?; + >::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::(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 { collection.consume_store_reads(1)?; let properties = >::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( @@ -762,13 +762,13 @@ key: &PropertyKey, ) -> Result { let token_property_permissions = CollectionPropertyPermissions::::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:: { users: users.clone(), -- gitstuff