difftreelog
refactor change panic to syn::Error
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
@@ -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())*
}
}
- }
+ })
}
crates/evm-coder/procedural/src/lib.rsdiffbeforeafterboth--- 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()
}
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 empty() {}6970#[test]71fn impl_abi_type_signature() {72 assert_eq!(73 <TypeStructUnit as AbiType>::SIGNATURE.as_str().unwrap(),74 "()"75 );76 assert_eq!(77 <TypeStruct1SimpleParam as AbiType>::SIGNATURE78 .as_str()79 .unwrap(),80 "(uint8)"81 );82 assert_eq!(83 <TypeStruct1DynamicParam as AbiType>::SIGNATURE84 .as_str()85 .unwrap(),86 "(string)"87 );88 assert_eq!(89 <TypeStruct2SimpleParam as AbiType>::SIGNATURE90 .as_str()91 .unwrap(),92 "(uint8,uint32)"93 );94 assert_eq!(95 <TypeStruct2DynamicParam as AbiType>::SIGNATURE96 .as_str()97 .unwrap(),98 "(string,bytes)"99 );100 assert_eq!(101 <TypeStruct2MixedParam as AbiType>::SIGNATURE102 .as_str()103 .unwrap(),104 "(uint8,bytes)"105 );106 assert_eq!(107 <TypeStruct1DerivedSimpleParam as AbiType>::SIGNATURE108 .as_str()109 .unwrap(),110 "((uint8))"111 );112 assert_eq!(113 <TypeStruct2DerivedSimpleParam as AbiType>::SIGNATURE114 .as_str()115 .unwrap(),116 "((uint8),(uint8,uint32))"117 );118 assert_eq!(119 <TypeStruct1DerivedDynamicParam as AbiType>::SIGNATURE120 .as_str()121 .unwrap(),122 "((string))"123 );124 assert_eq!(125 <TypeStruct2DerivedDynamicParam as AbiType>::SIGNATURE126 .as_str()127 .unwrap(),128 "((string),(string,bytes))"129 );130 assert_eq!(131 <TypeStruct3DerivedMixedParam as AbiType>::SIGNATURE132 .as_str()133 .unwrap(),134 "((uint8),(string,bytes),(uint8,bytes))"135 );136}137138#[test]139fn impl_abi_type_is_dynamic() {140 assert_eq!(<TypeStructUnit as AbiType>::is_dynamic(), false);141 assert_eq!(<TypeStruct1SimpleParam as AbiType>::is_dynamic(), false);142 assert_eq!(<TypeStruct1DynamicParam as AbiType>::is_dynamic(), true);143 assert_eq!(<TypeStruct2SimpleParam as AbiType>::is_dynamic(), false);144 assert_eq!(<TypeStruct2DynamicParam as AbiType>::is_dynamic(), true);145 assert_eq!(<TypeStruct2MixedParam as AbiType>::is_dynamic(), true);146 assert_eq!(147 <TypeStruct1DerivedSimpleParam as AbiType>::is_dynamic(),148 false149 );150 assert_eq!(151 <TypeStruct2DerivedSimpleParam as AbiType>::is_dynamic(),152 false153 );154 assert_eq!(155 <TypeStruct1DerivedDynamicParam as AbiType>::is_dynamic(),156 true157 );158 assert_eq!(159 <TypeStruct2DerivedDynamicParam as AbiType>::is_dynamic(),160 true161 );162 assert_eq!(163 <TypeStruct3DerivedMixedParam as AbiType>::is_dynamic(),164 true165 );166}167168#[test]169fn impl_abi_type_size() {170 const ABI_ALIGNMENT: usize = 32;171 assert_eq!(<TypeStructUnit as AbiType>::size(), 0);172 assert_eq!(<TypeStruct1SimpleParam as AbiType>::size(), ABI_ALIGNMENT);173 assert_eq!(<TypeStruct1DynamicParam as AbiType>::size(), ABI_ALIGNMENT);174 assert_eq!(175 <TypeStruct2SimpleParam as AbiType>::size(),176 ABI_ALIGNMENT * 2177 );178 assert_eq!(179 <TypeStruct2DynamicParam as AbiType>::size(),180 ABI_ALIGNMENT * 2181 );182 assert_eq!(183 <TypeStruct2MixedParam as AbiType>::size(),184 ABI_ALIGNMENT * 2185 );186 assert_eq!(187 <TypeStruct1DerivedSimpleParam as AbiType>::size(),188 ABI_ALIGNMENT189 );190 assert_eq!(191 <TypeStruct2DerivedSimpleParam as AbiType>::size(),192 ABI_ALIGNMENT * 3193 );194 assert_eq!(195 <TypeStruct1DerivedDynamicParam as AbiType>::size(),196 ABI_ALIGNMENT197 );198 assert_eq!(199 <TypeStruct2DerivedDynamicParam as AbiType>::size(),200 ABI_ALIGNMENT * 3201 );202 assert_eq!(203 <TypeStruct3DerivedMixedParam as AbiType>::size(),204 ABI_ALIGNMENT * 5205 );206}207208#[derive(AbiCoder)]209struct TupleStruct1SimpleParam(u8);210211#[derive(AbiCoder)]212struct TupleStruct1DynamicParam(String);213214#[derive(AbiCoder)]215struct TupleStruct2SimpleParam(u8, u32);216217#[derive(AbiCoder)]218struct TupleStruct2DynamicParam(String, bytes);219220#[derive(AbiCoder)]221struct TupleStruct2MixedParam(u8, bytes);222223#[derive(AbiCoder)]224struct TupleStruct1DerivedSimpleParam(TupleStruct1SimpleParam);225226#[derive(AbiCoder)]227struct TupleStruct2DerivedSimpleParam(TupleStruct1SimpleParam, TupleStruct2SimpleParam);228229#[derive(AbiCoder)]230struct TupleStruct1DerivedDynamicParam(TupleStruct1DynamicParam);231232#[derive(AbiCoder)]233struct TupleStruct2DerivedDynamicParam(TupleStruct1DynamicParam, TupleStruct2DynamicParam);234235#[derive(AbiCoder)]236struct TupleStruct3DerivedMixedParam(237 TupleStruct1SimpleParam,238 TupleStruct2DynamicParam,239 TupleStruct2MixedParam,240);241242#[test]243fn impl_abi_type_signature_same_for_structs() {244 assert_eq!(245 <TypeStruct1SimpleParam as AbiType>::SIGNATURE246 .as_str()247 .unwrap(),248 <TupleStruct1SimpleParam as AbiType>::SIGNATURE249 .as_str()250 .unwrap()251 );252 assert_eq!(253 <TypeStruct1DynamicParam as AbiType>::SIGNATURE254 .as_str()255 .unwrap(),256 <TupleStruct1DynamicParam as AbiType>::SIGNATURE257 .as_str()258 .unwrap()259 );260 assert_eq!(261 <TypeStruct2SimpleParam as AbiType>::SIGNATURE262 .as_str()263 .unwrap(),264 <TupleStruct2SimpleParam as AbiType>::SIGNATURE265 .as_str()266 .unwrap()267 );268 assert_eq!(269 <TypeStruct2DynamicParam as AbiType>::SIGNATURE270 .as_str()271 .unwrap(),272 <TupleStruct2DynamicParam as AbiType>::SIGNATURE273 .as_str()274 .unwrap()275 );276 assert_eq!(277 <TypeStruct2MixedParam as AbiType>::SIGNATURE278 .as_str()279 .unwrap(),280 <TupleStruct2MixedParam as AbiType>::SIGNATURE281 .as_str()282 .unwrap(),283 );284 assert_eq!(285 <TypeStruct1DerivedSimpleParam as AbiType>::SIGNATURE286 .as_str()287 .unwrap(),288 <TupleStruct1DerivedSimpleParam as AbiType>::SIGNATURE289 .as_str()290 .unwrap(),291 );292 assert_eq!(293 <TypeStruct2DerivedSimpleParam as AbiType>::SIGNATURE294 .as_str()295 .unwrap(),296 <TupleStruct2DerivedSimpleParam as AbiType>::SIGNATURE297 .as_str()298 .unwrap(),299 );300 assert_eq!(301 <TypeStruct1DerivedDynamicParam as AbiType>::SIGNATURE302 .as_str()303 .unwrap(),304 <TupleStruct1DerivedDynamicParam as AbiType>::SIGNATURE305 .as_str()306 .unwrap(),307 );308 assert_eq!(309 <TypeStruct2DerivedDynamicParam as AbiType>::SIGNATURE310 .as_str()311 .unwrap(),312 <TupleStruct2DerivedDynamicParam as AbiType>::SIGNATURE313 .as_str()314 .unwrap(),315 );316 assert_eq!(317 <TypeStruct3DerivedMixedParam as AbiType>::SIGNATURE318 .as_str()319 .unwrap(),320 <TupleStruct3DerivedMixedParam as AbiType>::SIGNATURE321 .as_str()322 .unwrap(),323 );324}325326#[test]327fn impl_abi_type_is_dynamic_same_for_structs() {328 assert_eq!(329 <TypeStruct1SimpleParam as AbiType>::is_dynamic(),330 <TupleStruct1SimpleParam as AbiType>::is_dynamic()331 );332 assert_eq!(333 <TypeStruct1DynamicParam as AbiType>::is_dynamic(),334 <TupleStruct1DynamicParam as AbiType>::is_dynamic()335 );336 assert_eq!(337 <TypeStruct2SimpleParam as AbiType>::is_dynamic(),338 <TupleStruct2SimpleParam as AbiType>::is_dynamic()339 );340 assert_eq!(341 <TypeStruct2DynamicParam as AbiType>::is_dynamic(),342 <TupleStruct2DynamicParam as AbiType>::is_dynamic()343 );344 assert_eq!(345 <TypeStruct2MixedParam as AbiType>::is_dynamic(),346 <TupleStruct2MixedParam as AbiType>::is_dynamic()347 );348 assert_eq!(349 <TypeStruct1DerivedSimpleParam as AbiType>::is_dynamic(),350 <TupleStruct1DerivedSimpleParam as AbiType>::is_dynamic()351 );352 assert_eq!(353 <TypeStruct2DerivedSimpleParam as AbiType>::is_dynamic(),354 <TupleStruct2DerivedSimpleParam as AbiType>::is_dynamic()355 );356 assert_eq!(357 <TypeStruct1DerivedDynamicParam as AbiType>::is_dynamic(),358 <TupleStruct1DerivedDynamicParam as AbiType>::is_dynamic()359 );360 assert_eq!(361 <TypeStruct2DerivedDynamicParam as AbiType>::is_dynamic(),362 <TupleStruct2DerivedDynamicParam as AbiType>::is_dynamic()363 );364 assert_eq!(365 <TypeStruct3DerivedMixedParam as AbiType>::is_dynamic(),366 <TupleStruct3DerivedMixedParam as AbiType>::is_dynamic()367 );368}369370#[test]371fn impl_abi_type_size_same_for_structs() {372 assert_eq!(373 <TypeStruct1SimpleParam as AbiType>::size(),374 <TupleStruct1SimpleParam as AbiType>::size()375 );376 assert_eq!(377 <TypeStruct1DynamicParam as AbiType>::size(),378 <TupleStruct1DynamicParam as AbiType>::size()379 );380 assert_eq!(381 <TypeStruct2SimpleParam as AbiType>::size(),382 <TupleStruct2SimpleParam as AbiType>::size()383 );384 assert_eq!(385 <TypeStruct2DynamicParam as AbiType>::size(),386 <TupleStruct2DynamicParam as AbiType>::size()387 );388 assert_eq!(389 <TypeStruct2MixedParam as AbiType>::size(),390 <TupleStruct2MixedParam as AbiType>::size()391 );392 assert_eq!(393 <TypeStruct1DerivedSimpleParam as AbiType>::size(),394 <TupleStruct1DerivedSimpleParam as AbiType>::size()395 );396 assert_eq!(397 <TypeStruct2DerivedSimpleParam as AbiType>::size(),398 <TupleStruct2DerivedSimpleParam as AbiType>::size()399 );400 assert_eq!(401 <TypeStruct1DerivedDynamicParam as AbiType>::size(),402 <TupleStruct1DerivedDynamicParam as AbiType>::size()403 );404 assert_eq!(405 <TypeStruct2DerivedDynamicParam as AbiType>::size(),406 <TupleStruct2DerivedDynamicParam as AbiType>::size()407 );408 assert_eq!(409 <TypeStruct3DerivedMixedParam as AbiType>::size(),410 <TupleStruct3DerivedMixedParam as AbiType>::size()411 );412}