difftreelog
feat add derive macro AbiCoder for unnamed struct to implement AbiType
in: master
3 files changed
crates/evm-coder/procedural/src/abi_derive.rsdiffbeforeafterboth--- a/crates/evm-coder/procedural/src/abi_derive.rs
+++ b/crates/evm-coder/procedural/src/abi_derive.rs
@@ -5,7 +5,7 @@
let name = &ast.ident;
let can_be_plcaed_in_vec = impl_can_be_placed_in_vec(name);
let abi_type = impl_abi_type(ast);
- println!("{}", abi_type);
+ // println!("{}", abi_type);
quote! {
#can_be_plcaed_in_vec
#abi_type
@@ -18,15 +18,22 @@
}
}
+fn map_field_to_type<'a>(field: &'a syn::Field) -> &'a syn::Type {
+ &field.ty
+}
+
fn impl_abi_type(ast: &syn::DeriveInput) -> 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) => (
- fields.named.iter().map(|field| &field.ty),
+ fields.named.iter().map(map_field_to_type),
fields.named.len(),
),
- syn::Fields::Unnamed(_) => todo!(),
+ syn::Fields::Unnamed(ref fields) => (
+ fields.unnamed.iter().map(map_field_to_type),
+ fields.unnamed.len(),
+ ),
syn::Fields::Unit => unimplemented!("Unit structs not supported"),
},
syn::Data::Enum(_) => unimplemented!("Enums not supported"),
crates/evm-coder/procedural/src/lib.rsdiffbeforeafterboth--- a/crates/evm-coder/procedural/src/lib.rs
+++ b/crates/evm-coder/procedural/src/lib.rs
@@ -248,6 +248,6 @@
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);
- println!("{}", &ts);
+ // println!("{}", &ts);
ts.into()
}
crates/evm-coder/tests/abi_derive_generation.rsdiffbeforeafterboth1use evm_coder_procedural::AbiCoder;2use evm_coder::{3 types::*,4 abi::{AbiType},5};67#[derive(AbiCoder)]8struct TypeStructUnit {}910#[derive(AbiCoder)]11struct TypeStruct1SimpleParam {12 _a: u8,13}1415#[derive(AbiCoder)]16struct TypeStruct1DynamicParam {17 _a: String,18}1920#[derive(AbiCoder)]21struct TypeStruct2SimpleParam {22 _a: u8,23 _b: u32,24}2526#[derive(AbiCoder)]27struct TypeStruct2DynamicParam {28 _a: String,29 _b: bytes,30}3132#[derive(AbiCoder)]33struct TypeStruct2MixedParam {34 _a: u8,35 _b: bytes,36}3738#[derive(AbiCoder)]39struct TypeStruct1DerivedSimpleParam {40 _a: TypeStruct1SimpleParam,41}4243#[derive(AbiCoder)]44struct TypeStruct2DerivedSimpleParam {45 _a: TypeStruct1SimpleParam,46 _b: TypeStruct2SimpleParam,47}4849#[derive(AbiCoder)]50struct TypeStruct1DerivedDynamicParam {51 _a: TypeStruct1DynamicParam,52}5354#[derive(AbiCoder)]55struct TypeStruct2DerivedDynamicParam {56 _a: TypeStruct1DynamicParam,57 _b: TypeStruct2DynamicParam,58}5960#[derive(AbiCoder)]61struct TypeStruct3DerivedMixedParam {62 _a: TypeStruct1SimpleParam,63 _b: TypeStruct2DynamicParam,64 _c: TypeStruct2MixedParam,65}6667#[test]68fn impl_abi_type_signature() {69 assert_eq!(70 <TypeStructUnit as AbiType>::SIGNATURE.as_str().unwrap(),71 "()"72 );73 assert_eq!(74 <TypeStruct1SimpleParam as AbiType>::SIGNATURE75 .as_str()76 .unwrap(),77 "(uint8)"78 );79 assert_eq!(80 <TypeStruct1DynamicParam as AbiType>::SIGNATURE81 .as_str()82 .unwrap(),83 "(string)"84 );85 assert_eq!(86 <TypeStruct2SimpleParam as AbiType>::SIGNATURE87 .as_str()88 .unwrap(),89 "(uint8,uint32)"90 );91 assert_eq!(92 <TypeStruct2DynamicParam as AbiType>::SIGNATURE93 .as_str()94 .unwrap(),95 "(string,bytes)"96 );97 assert_eq!(98 <TypeStruct2MixedParam as AbiType>::SIGNATURE99 .as_str()100 .unwrap(),101 "(uint8,bytes)"102 );103 assert_eq!(104 <TypeStruct1DerivedSimpleParam as AbiType>::SIGNATURE105 .as_str()106 .unwrap(),107 "((uint8))"108 );109 assert_eq!(110 <TypeStruct2DerivedSimpleParam as AbiType>::SIGNATURE111 .as_str()112 .unwrap(),113 "((uint8),(uint8,uint32))"114 );115 assert_eq!(116 <TypeStruct1DerivedDynamicParam as AbiType>::SIGNATURE117 .as_str()118 .unwrap(),119 "((string))"120 );121 assert_eq!(122 <TypeStruct2DerivedDynamicParam as AbiType>::SIGNATURE123 .as_str()124 .unwrap(),125 "((string),(string,bytes))"126 );127 assert_eq!(128 <TypeStruct3DerivedMixedParam as AbiType>::SIGNATURE129 .as_str()130 .unwrap(),131 "((uint8),(string,bytes),(uint8,bytes))"132 );133}134135#[test]136fn impl_abi_type_is_dynamic() {137 assert_eq!(<TypeStructUnit as AbiType>::is_dynamic(), false);138 assert_eq!(<TypeStruct1SimpleParam as AbiType>::is_dynamic(), false);139 assert_eq!(<TypeStruct1DynamicParam as AbiType>::is_dynamic(), true);140 assert_eq!(<TypeStruct2SimpleParam as AbiType>::is_dynamic(), false);141 assert_eq!(<TypeStruct2DynamicParam as AbiType>::is_dynamic(), true);142 assert_eq!(<TypeStruct2MixedParam as AbiType>::is_dynamic(), true);143 assert_eq!(144 <TypeStruct1DerivedSimpleParam as AbiType>::is_dynamic(),145 false146 );147 assert_eq!(148 <TypeStruct2DerivedSimpleParam as AbiType>::is_dynamic(),149 false150 );151 assert_eq!(152 <TypeStruct1DerivedDynamicParam as AbiType>::is_dynamic(),153 true154 );155 assert_eq!(156 <TypeStruct2DerivedDynamicParam as AbiType>::is_dynamic(),157 true158 );159 assert_eq!(160 <TypeStruct3DerivedMixedParam as AbiType>::is_dynamic(),161 true162 );163}164165#[test]166fn impl_abi_type_size() {167 const ABI_ALIGNMENT: usize = 32;168 assert_eq!(<TypeStructUnit as AbiType>::size(), 0);169 assert_eq!(<TypeStruct1SimpleParam as AbiType>::size(), ABI_ALIGNMENT);170 assert_eq!(<TypeStruct1DynamicParam as AbiType>::size(), ABI_ALIGNMENT);171 assert_eq!(172 <TypeStruct2SimpleParam as AbiType>::size(),173 ABI_ALIGNMENT * 2174 );175 assert_eq!(176 <TypeStruct2DynamicParam as AbiType>::size(),177 ABI_ALIGNMENT * 2178 );179 assert_eq!(180 <TypeStruct2MixedParam as AbiType>::size(),181 ABI_ALIGNMENT * 2182 );183 assert_eq!(184 <TypeStruct1DerivedSimpleParam as AbiType>::size(),185 ABI_ALIGNMENT186 );187 assert_eq!(188 <TypeStruct2DerivedSimpleParam as AbiType>::size(),189 ABI_ALIGNMENT * 3190 );191 assert_eq!(192 <TypeStruct1DerivedDynamicParam as AbiType>::size(),193 ABI_ALIGNMENT194 );195 assert_eq!(196 <TypeStruct2DerivedDynamicParam as AbiType>::size(),197 ABI_ALIGNMENT * 3198 );199 assert_eq!(200 <TypeStruct3DerivedMixedParam as AbiType>::size(),201 ABI_ALIGNMENT * 5202 );203}