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

difftreelog

refactor change panic to syn::Error

Trubnikov Sergey2022-11-10parent: #4c95237.patch.diff
in: master

3 files changed

modifiedcrates/evm-coder/procedural/src/abi_derive.rsdiffbeforeafterboth
1use quote::quote;1use quote::quote;
22
3pub(crate) fn impl_abi_macro(ast: &syn::DeriveInput) -> proc_macro2::TokenStream {3pub(crate) fn impl_abi_macro(ast: &syn::DeriveInput) -> syn::Result<proc_macro2::TokenStream> {
4 // dbg!(ast);4 // dbg!(ast);
5 let name = &ast.ident;5 let name = &ast.ident;
6 let can_be_plcaed_in_vec = impl_can_be_placed_in_vec(name);6 let can_be_plcaed_in_vec = impl_can_be_placed_in_vec(name);
7 let abi_type = impl_abi_type(ast);7 let abi_type = impl_abi_type(ast)?;
8 // println!("{}", abi_type);8 // println!("{}", abi_type);
9 quote! {9 Ok(quote! {
10 #can_be_plcaed_in_vec10 #can_be_plcaed_in_vec
11 #abi_type11 #abi_type
12 }12 })
13}13}
1414
15fn impl_can_be_placed_in_vec(ident: &syn::Ident) -> proc_macro2::TokenStream {15fn impl_can_be_placed_in_vec(ident: &syn::Ident) -> proc_macro2::TokenStream {
22 &field.ty22 &field.ty
23}23}
2424
25fn impl_abi_type(ast: &syn::DeriveInput) -> proc_macro2::TokenStream {25fn impl_abi_type(ast: &syn::DeriveInput) -> syn::Result<proc_macro2::TokenStream> {
26 let name = &ast.ident;26 let name = &ast.ident;
27 let (fields, params_count) = match &ast.data {27 let (fields, params_count) = match &ast.data {
28 syn::Data::Struct(ds) => match ds.fields {28 syn::Data::Struct(ds) => match ds.fields {
29 syn::Fields::Named(ref fields) => (29 syn::Fields::Named(ref fields) => Ok((
30 fields.named.iter().map(map_field_to_type),30 fields.named.iter().map(map_field_to_type),
31 fields.named.len(),31 fields.named.len(),
32 ),32 )),
33 syn::Fields::Unnamed(ref fields) => (33 syn::Fields::Unnamed(ref fields) => Ok((
34 fields.unnamed.iter().map(map_field_to_type),34 fields.unnamed.iter().map(map_field_to_type),
35 fields.unnamed.len(),35 fields.unnamed.len(),
36 ),36 )),
37 syn::Fields::Unit => unimplemented!("Unit structs not supported"),37 syn::Fields::Unit => Err(syn::Error::new(name.span(), "Unit structs not supported")),
38 },38 },
39 syn::Data::Enum(_) => unimplemented!("Enums not supported"),39 syn::Data::Enum(_) => Err(syn::Error::new(name.span(), "Enums not supported")),
40 syn::Data::Union(_) => unimplemented!("Unions not supported"),40 syn::Data::Union(_) => Err(syn::Error::new(name.span(), "Unions not supported")),
41 };41 }?;
4242
43 let mut params_signature = {43 let mut params_signature = {
44 let fields = fields.clone();44 let fields = fields.clone();
45 quote!(45 quote!(
46 #(nameof(<#fields as ::evm_coder::abi::AbiType>::SIGNATURE) fixed(","))*46 #(nameof(<#fields as ::evm_coder::abi::AbiType>::SIGNATURE) fixed(","))*
47 )47 )
48 };48 };
49
49 if params_count > 0 {50 if params_count == 0 {
51 return Err(syn::Error::new(name.span(), "Empty structs not supported"));
52 };
53
50 params_signature.extend(quote!(shift_left(1)))54 params_signature.extend(quote!(shift_left(1)));
51 };
5255
53 let fields_for_dynamic = fields.clone();56 let fields_for_dynamic = fields.clone();
5457
55 quote! {58 Ok(quote! {
56 impl ::evm_coder::abi::AbiType for #name {59 impl ::evm_coder::abi::AbiType for #name {
57 const SIGNATURE: ::evm_coder::custom_signature::SignatureUnit = ::evm_coder::make_signature!(60 const SIGNATURE: ::evm_coder::custom_signature::SignatureUnit = ::evm_coder::make_signature!(
58 new fixed("(")61 new fixed("(")
69 0 #(+ <#fields as ::evm_coder::abi::AbiType>::size())*72 0 #(+ <#fields as ::evm_coder::abi::AbiType>::size())*
70 }73 }
71 }74 }
72 }75 })
73}76}
7477
modifiedcrates/evm-coder/procedural/src/lib.rsdiffbeforeafterboth
247#[proc_macro_derive(AbiCoder)]247#[proc_macro_derive(AbiCoder)]
248pub fn abi_derive(input: proc_macro::TokenStream) -> proc_macro::TokenStream {248pub fn abi_derive(input: proc_macro::TokenStream) -> proc_macro::TokenStream {
249 let ast = syn::parse(input).unwrap();249 let ast = syn::parse(input).unwrap();
250 let ts = abi_derive::impl_abi_macro(&ast);250 let ts = match abi_derive::impl_abi_macro(&ast) {
251 Ok(e) => e,
252 Err(e) => e.to_compile_error(),
253 };
251 // println!("{}", &ts);254 // println!("{}", &ts);
252 ts.into()255 ts.into()
253}256}
modifiedcrates/evm-coder/tests/abi_derive_generation.rsdiffbeforeafterboth
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!(