git.delta.rocks / unique-network / refs/commits / 3d5704a1dece

--- a/crates/evm-coder/procedural/src/abi_derive.rs
+++ b/crates/evm-coder/procedural/src/abi_derive.rs
@@ -1,15 +1,15 @@
 use quote::quote;
 
-pub(crate) fn impl_abi_macro(ast: &syn::DeriveInput) -> proc_macro2::TokenStream {
+pub(crate) fn impl_abi_macro(ast: &syn::DeriveInput) -> syn::Result<proc_macro2::TokenStream> {
 	// dbg!(ast);
 	let name = &ast.ident;
 	let can_be_plcaed_in_vec = impl_can_be_placed_in_vec(name);
-	let abi_type = impl_abi_type(ast);
+	let abi_type = impl_abi_type(ast)?;
 	// println!("{}", abi_type);
-	quote! {
+	Ok(quote! {
 		#can_be_plcaed_in_vec
 		#abi_type
-	}
+	})
 }
 
 fn impl_can_be_placed_in_vec(ident: &syn::Ident) -> proc_macro2::TokenStream {
@@ -22,23 +22,23 @@
 	&field.ty
 }
 
-fn impl_abi_type(ast: &syn::DeriveInput) -> proc_macro2::TokenStream {
+fn impl_abi_type(ast: &syn::DeriveInput) -> syn::Result<proc_macro2::TokenStream> {
 	let name = &ast.ident;
 	let (fields, params_count) = match &ast.data {
 		syn::Data::Struct(ds) => match ds.fields {
-			syn::Fields::Named(ref fields) => (
+			syn::Fields::Named(ref fields) => Ok((
 				fields.named.iter().map(map_field_to_type),
 				fields.named.len(),
-			),
-			syn::Fields::Unnamed(ref fields) => (
+			)),
+			syn::Fields::Unnamed(ref fields) => Ok((
 				fields.unnamed.iter().map(map_field_to_type),
 				fields.unnamed.len(),
-			),
-			syn::Fields::Unit => unimplemented!("Unit structs not supported"),
+			)),
+			syn::Fields::Unit => Err(syn::Error::new(name.span(), "Unit structs not supported")),
 		},
-		syn::Data::Enum(_) => unimplemented!("Enums not supported"),
-		syn::Data::Union(_) => unimplemented!("Unions not supported"),
-	};
+		syn::Data::Enum(_) => Err(syn::Error::new(name.span(), "Enums not supported")),
+		syn::Data::Union(_) => Err(syn::Error::new(name.span(), "Unions not supported")),
+	}?;
 
 	let mut params_signature = {
 		let fields = fields.clone();
@@ -46,13 +46,16 @@
 			#(nameof(<#fields as ::evm_coder::abi::AbiType>::SIGNATURE) fixed(","))*
 		)
 	};
-	if params_count > 0 {
-		params_signature.extend(quote!(shift_left(1)))
+
+	if params_count == 0 {
+		return Err(syn::Error::new(name.span(), "Empty structs not supported"));
 	};
 
+	params_signature.extend(quote!(shift_left(1)));
+
 	let fields_for_dynamic = fields.clone();
 
-	quote! {
+	Ok(quote! {
 		impl ::evm_coder::abi::AbiType for #name {
 			const SIGNATURE: ::evm_coder::custom_signature::SignatureUnit = ::evm_coder::make_signature!(
 				new fixed("(")
@@ -69,5 +72,5 @@
 				0 #(+ <#fields as ::evm_coder::abi::AbiType>::size())*
 			}
 		}
-	}
+	})
 }

--- a/crates/evm-coder/procedural/src/lib.rs
+++ b/crates/evm-coder/procedural/src/lib.rs
@@ -247,7 +247,10 @@
 #[proc_macro_derive(AbiCoder)]
 pub fn abi_derive(input: proc_macro::TokenStream) -> proc_macro::TokenStream {
 	let ast = syn::parse(input).unwrap();
-	let ts = abi_derive::impl_abi_macro(&ast);
+	let ts = match abi_derive::impl_abi_macro(&ast) {
+		Ok(e) => e,
+		Err(e) => e.to_compile_error(),
+	};
 	// println!("{}", &ts);
 	ts.into()
 }

4	abi::{AbiType},4	abi::{AbiType},
5};5};
66
7#[derive(AbiCoder)]7// TODO: move to build_failed tests
8struct TypeStructUnit {}8// #[derive(AbiCoder)]
9// struct TypeStructUnit {}
910
10#[derive(AbiCoder)]11#[derive(AbiCoder)]
11struct TypeStruct1SimpleParam {12struct TypeStruct1SimpleParam {
6970
70#[test]71#[test]
71fn impl_abi_type_signature() {72fn impl_abi_type_signature() {
72	assert_eq!(
73		<TypeStructUnit as AbiType>::SIGNATURE.as_str().unwrap(),
74		"()"
75	);
76	assert_eq!(73	assert_eq!(
77		<TypeStruct1SimpleParam as AbiType>::SIGNATURE74		<TypeStruct1SimpleParam as AbiType>::SIGNATURE
78			.as_str()75			.as_str()
137134
138#[test]135#[test]
139fn impl_abi_type_is_dynamic() {136fn impl_abi_type_is_dynamic() {
140	assert_eq!(<TypeStructUnit as AbiType>::is_dynamic(), false);
141	assert_eq!(<TypeStruct1SimpleParam as AbiType>::is_dynamic(), false);137	assert_eq!(<TypeStruct1SimpleParam as AbiType>::is_dynamic(), false);
142	assert_eq!(<TypeStruct1DynamicParam as AbiType>::is_dynamic(), true);138	assert_eq!(<TypeStruct1DynamicParam as AbiType>::is_dynamic(), true);
143	assert_eq!(<TypeStruct2SimpleParam as AbiType>::is_dynamic(), false);139	assert_eq!(<TypeStruct2SimpleParam as AbiType>::is_dynamic(), false);
168#[test]164#[test]
169fn impl_abi_type_size() {165fn impl_abi_type_size() {
170	const ABI_ALIGNMENT: usize = 32;166	const ABI_ALIGNMENT: usize = 32;
171	assert_eq!(<TypeStructUnit as AbiType>::size(), 0);
172	assert_eq!(<TypeStruct1SimpleParam as AbiType>::size(), ABI_ALIGNMENT);167	assert_eq!(<TypeStruct1SimpleParam as AbiType>::size(), ABI_ALIGNMENT);
173	assert_eq!(<TypeStruct1DynamicParam as AbiType>::size(), ABI_ALIGNMENT);168	assert_eq!(<TypeStruct1DynamicParam as AbiType>::size(), ABI_ALIGNMENT);
174	assert_eq!(169	assert_eq!(