--- a/crates/evm-coder/src/abi/impls.rs +++ b/crates/evm-coder/src/abi/impls.rs @@ -67,15 +67,15 @@ impl_abi_writeable!(&str, string); -impl_abi_type!(bytes, bytes, true); +impl_abi_type!(Bytes, bytes, true); -impl AbiRead for bytes { - fn abi_read(reader: &mut AbiReader) -> Result { - Ok(bytes(reader.bytes()?)) +impl AbiRead for Bytes { + fn abi_read(reader: &mut AbiReader) -> Result { + Ok(Bytes(reader.bytes()?)) } } -impl AbiWrite for bytes { +impl AbiWrite for Bytes { fn abi_write(&self, writer: &mut AbiWriter) { writer.bytes(self.0.as_slice()) } --- a/crates/evm-coder/src/abi/test.rs +++ b/crates/evm-coder/src/abi/test.rs @@ -273,12 +273,12 @@ #[test] fn encode_decode_vec_tuple_string_bytes() { - test_impl::>( + test_impl::>( 0xdeadbeef, vec![ ( "Test URI 0".to_string(), - bytes(vec![ + Bytes(vec![ 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, @@ -287,14 +287,14 @@ ), ( "Test URI 1".to_string(), - bytes(vec![ + Bytes(vec![ 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, ]), ), - ("Test URI 2".to_string(), bytes(vec![0x33, 0x33])), + ("Test URI 2".to_string(), Bytes(vec![0x33, 0x33])), ], &hex!( " @@ -337,10 +337,10 @@ // #[ignore = "reason"] fn encode_decode_tuple0_tuple1_uint8_tuple1_string_bytes_tuple1_uint8_bytes() { let int = 0xff; - let by = bytes(vec![0x11, 0x22, 0x33]); + let by = Bytes(vec![0x11, 0x22, 0x33]); let string = "some string".to_string(); - test_impl::<((u8,), (String, bytes), (u8, bytes))>( + test_impl::<((u8,), (String, Bytes), (u8, Bytes))>( 0xdeadbeef, ((int,), (string.clone(), by.clone()), (int, by)), &hex!( @@ -485,9 +485,9 @@ #[test] fn encode_decode_tuple0_tuple1_string_bytes() { - test_impl::<((String, bytes),)>( + test_impl::<((String, Bytes),)>( 0xdeadbeef, - (("some string".to_string(), bytes(vec![1, 2, 3])),), + (("some string".to_string(), Bytes(vec![1, 2, 3])),), &hex!( " deadbeef --- a/crates/evm-coder/src/lib.rs +++ b/crates/evm-coder/src/lib.rs @@ -141,7 +141,7 @@ pub type String = ::std::string::String; #[derive(Default, Debug, PartialEq, Eq, Clone)] - pub struct bytes(pub Vec); + pub struct Bytes(pub Vec); //#region Special types /// Makes function payable @@ -162,20 +162,20 @@ pub value: U256, } - impl From> for bytes { + impl From> for Bytes { fn from(src: Vec) -> Self { Self(src) } } #[allow(clippy::from_over_into)] - impl Into> for bytes { + impl Into> for Bytes { fn into(self) -> Vec { self.0 } } - impl bytes { + impl Bytes { #[must_use] pub fn len(&self) -> usize { self.0.len() --- a/crates/evm-coder/src/solidity/impls.rs +++ b/crates/evm-coder/src/solidity/impls.rs @@ -30,7 +30,7 @@ Bytes4 => "bytes4" true = "bytes4(0)", H160 => "address" true = "0x0000000000000000000000000000000000000000", String => "string" false = "\"\"", - bytes => "bytes" false = "hex\"\"", + Bytes => "bytes" false = "hex\"\"", bool => "bool" true = "false", } --- a/crates/evm-coder/tests/abi_derive_generation.rs +++ b/crates/evm-coder/tests/abi_derive_generation.rs @@ -1,6 +1,6 @@ mod test_struct { use evm_coder_procedural::AbiCoder; - use evm_coder::types::bytes; + use evm_coder::types::Bytes; #[test] fn empty_struct() { @@ -27,13 +27,13 @@ #[derive(AbiCoder, PartialEq, Debug)] struct TypeStruct2DynamicParam { _a: String, - _b: bytes, + _b: Bytes, } #[derive(AbiCoder, PartialEq, Debug)] struct TypeStruct2MixedParam { _a: u8, - _b: bytes, + _b: Bytes, } #[derive(AbiCoder, PartialEq, Debug)] @@ -236,10 +236,10 @@ struct TupleStruct2SimpleParam(u8, u32); #[derive(AbiCoder, PartialEq, Debug)] - struct TupleStruct2DynamicParam(String, bytes); + struct TupleStruct2DynamicParam(String, Bytes); #[derive(AbiCoder, PartialEq, Debug)] - struct TupleStruct2MixedParam(u8, bytes); + struct TupleStruct2MixedParam(u8, Bytes); #[derive(AbiCoder, PartialEq, Debug)] struct TupleStruct1DerivedSimpleParam(TupleStruct1SimpleParam); @@ -562,8 +562,8 @@ #[test] fn codec_struct_2_dynamic() { let _a: String = "some string".into(); - let _b: bytes = bytes(vec![0x11, 0x22, 0x33]); - test_impl::<(String, bytes), TupleStruct2DynamicParam, TypeStruct2DynamicParam>( + let _b: Bytes = Bytes(vec![0x11, 0x22, 0x33]); + test_impl::<(String, Bytes), TupleStruct2DynamicParam, TypeStruct2DynamicParam>( (_a.clone(), _b.clone()), TupleStruct2DynamicParam(_a.clone(), _b.clone()), TypeStruct2DynamicParam { _a, _b }, @@ -573,8 +573,8 @@ #[test] fn codec_struct_2_mixed() { let _a: u8 = 0xff; - let _b: bytes = bytes(vec![0x11, 0x22, 0x33]); - test_impl::<(u8, bytes), TupleStruct2MixedParam, TypeStruct2MixedParam>( + let _b: Bytes = Bytes(vec![0x11, 0x22, 0x33]); + test_impl::<(u8, Bytes), TupleStruct2MixedParam, TypeStruct2MixedParam>( (_a.clone(), _b.clone()), TupleStruct2MixedParam(_a.clone(), _b.clone()), TypeStruct2MixedParam { _a, _b }, @@ -605,9 +605,9 @@ #[test] fn codec_struct_2_derived_dynamic() { let _a = "some string".to_string(); - let _b = bytes(vec![0x11, 0x22, 0x33]); + let _b = Bytes(vec![0x11, 0x22, 0x33]); test_impl::< - ((String,), (String, bytes)), + ((String,), (String, Bytes)), TupleStruct2DerivedDynamicParam, TypeStruct2DerivedDynamicParam, >( @@ -626,10 +626,10 @@ #[test] fn codec_struct_3_derived_mixed() { let int = 0xff; - let by = bytes(vec![0x11, 0x22, 0x33]); + let by = Bytes(vec![0x11, 0x22, 0x33]); let string = "some string".to_string(); test_impl::< - ((u8,), (String, bytes), (u8, bytes)), + ((u8,), (String, Bytes), (u8, Bytes)), TupleStruct3DerivedMixedParam, TypeStruct3DerivedMixedParam, >( --- a/pallets/common/src/erc.rs +++ b/pallets/common/src/erc.rs @@ -94,7 +94,7 @@ /// @param value Propery value. #[solidity(hide)] #[weight(>::set_collection_properties(1))] - fn set_collection_property(&mut self, caller: caller, key: String, value: bytes) -> Result<()> { + fn set_collection_property(&mut self, caller: caller, key: String, value: Bytes) -> Result<()> { let caller = T::CrossAccountId::from_eth(caller); let key = >::from(key) .try_into() @@ -164,7 +164,7 @@ /// /// @param key Property key. /// @return bytes The property corresponding to the key. - fn collection_property(&self, key: String) -> Result { + fn collection_property(&self, key: String) -> Result { let key = >::from(key) .try_into() .map_err(|_| "key too large")?; @@ -172,7 +172,7 @@ let props = CollectionProperties::::get(self.id); let prop = props.get(&key).ok_or("key not found")?; - Ok(bytes(prop.to_vec())) + Ok(Bytes(prop.to_vec())) } /// Get collection properties. --- a/pallets/common/src/eth.rs +++ b/pallets/common/src/eth.rs @@ -119,7 +119,7 @@ #[derive(Debug, Default, AbiCoder)] pub struct Property { key: evm_coder::types::String, - value: evm_coder::types::bytes, + value: evm_coder::types::Bytes, } impl TryFrom for Property { @@ -128,7 +128,7 @@ fn try_from(from: up_data_structs::Property) -> Result { 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()); + let value = evm_coder::types::Bytes(from.value.to_vec()); Ok(Property { key, value }) } } --- a/pallets/nonfungible/src/erc.rs +++ b/pallets/nonfungible/src/erc.rs @@ -124,7 +124,7 @@ caller: caller, token_id: U256, key: String, - value: bytes, + value: Bytes, ) -> Result<()> { let caller = T::CrossAccountId::from_eth(caller); let token_id: u32 = token_id.try_into().map_err(|_| "token id overflow")?; @@ -239,7 +239,7 @@ /// @param tokenId ID of the token. /// @param key Property key. /// @return Property value bytes - fn property(&self, token_id: U256, key: String) -> Result { + fn property(&self, token_id: U256, key: String) -> Result { let token_id: u32 = token_id.try_into().map_err(|_| "token id overflow")?; let key = >::from(key) .try_into() @@ -422,7 +422,7 @@ _from: Address, _to: Address, _token_id: U256, - _data: bytes, + _data: Bytes, ) -> Result<()> { // TODO: Not implemetable Err("not implemented".into()) --- a/pallets/refungible/src/erc.rs +++ b/pallets/refungible/src/erc.rs @@ -127,7 +127,7 @@ caller: caller, token_id: U256, key: String, - value: bytes, + value: Bytes, ) -> Result<()> { let caller = T::CrossAccountId::from_eth(caller); let token_id: u32 = token_id.try_into().map_err(|_| "token id overflow")?; @@ -242,7 +242,7 @@ /// @param tokenId ID of the token. /// @param key Property key. /// @return Property value bytes - fn property(&self, token_id: U256, key: String) -> Result { + fn property(&self, token_id: U256, key: String) -> Result { let token_id: u32 = token_id.try_into().map_err(|_| "token id overflow")?; let key = >::from(key) .try_into() @@ -423,7 +423,7 @@ _from: Address, _to: Address, _token_id: U256, - _data: bytes, + _data: Bytes, ) -> Result<()> { // TODO: Not implemetable Err("not implemented".into())