difftreelog
fix AbiWrite implementations
in: master
4 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
@@ -137,7 +137,7 @@
let abi_write = if is_named_fields {
quote!(
#(
- self.#field_names.abi_write(writer);
+ self.#field_names.abi_write(sub);
)*
)
} else {
@@ -146,14 +146,24 @@
.map(proc_macro2::Literal::usize_unsuffixed);
quote!(
#(
- self.#field_names.abi_write(writer);
+ self.#field_names.abi_write(sub);
)*
)
};
quote!(
impl ::evm_coder::abi::AbiWrite for #name {
fn abi_write(&self, writer: &mut ::evm_coder::abi::AbiWriter) {
- #abi_write
+ if <Self as ::evm_coder::abi::AbiType>::is_dynamic() {
+ let mut sub = ::evm_coder::abi::AbiWriter::new();
+ {
+ let sub = &mut sub;
+ #abi_write
+ }
+ writer.write_subresult(sub);
+ } else {
+ let sub = writer;
+ #abi_write
+ }
}
}
)
crates/evm-coder/src/abi/impls.rsdiffbeforeafterboth--- a/crates/evm-coder/src/abi/impls.rs
+++ b/crates/evm-coder/src/abi/impls.rs
@@ -310,11 +310,11 @@
#[allow(non_snake_case)]
impl<$($ident),+> AbiWrite for ($($ident,)+)
where
- $($ident: AbiWrite,)+
+ $($ident: AbiWrite + AbiType,)+
{
fn abi_write(&self, writer: &mut AbiWriter) {
let ($($ident,)+) = self;
- if writer.is_dynamic {
+ if <Self as AbiType>::is_dynamic() {
let mut sub = AbiWriter::new();
$($ident.abi_write(&mut sub);)+
writer.write_subresult(sub);
crates/evm-coder/src/lib.rsdiffbeforeafterboth--- a/crates/evm-coder/src/lib.rs
+++ b/crates/evm-coder/src/lib.rs
@@ -137,7 +137,7 @@
#[cfg(feature = "std")]
pub type string = ::std::string::String;
- #[derive(Default, Debug, PartialEq)]
+ #[derive(Default, Debug, PartialEq, Clone)]
pub struct bytes(pub Vec<u8>);
/// Solidity doesn't have `void` type, however we have special implementation
crates/evm-coder/tests/abi_derive_generation.rsdiffbeforeafterboth1use evm_coder_procedural::AbiCoder;2use evm_coder::{3 types::*,4 abi::{AbiType},5};67// TODO: move to build_failed tests8// #[derive(AbiCoder)]9// struct TypeStructUnit {}1011#[derive(AbiCoder)]12struct TypeStruct1SimpleParam {13 _a: u8,14}1516#[derive(AbiCoder)]17struct TypeStruct1DynamicParam {18 _a: String,19}2021#[derive(AbiCoder)]22struct TypeStruct2SimpleParam {23 _a: u8,24 _b: u32,25}2627#[derive(AbiCoder)]28struct TypeStruct2DynamicParam {29 _a: String,30 _b: bytes,31}3233#[derive(AbiCoder)]34struct TypeStruct2MixedParam {35 _a: u8,36 _b: bytes,37}3839#[derive(AbiCoder)]40struct TypeStruct1DerivedSimpleParam {41 _a: TypeStruct1SimpleParam,42}4344#[derive(AbiCoder)]45struct TypeStruct2DerivedSimpleParam {46 _a: TypeStruct1SimpleParam,47 _b: TypeStruct2SimpleParam,48}4950#[derive(AbiCoder)]51struct TypeStruct1DerivedDynamicParam {52 _a: TypeStruct1DynamicParam,53}5455#[derive(AbiCoder)]56struct TypeStruct2DerivedDynamicParam {57 _a: TypeStruct1DynamicParam,58 _b: TypeStruct2DynamicParam,59}6061#[derive(AbiCoder)]62struct TypeStruct3DerivedMixedParam {63 _a: TypeStruct1SimpleParam,64 _b: TypeStruct2DynamicParam,65 _c: TypeStruct2MixedParam,66}6768#[test]69fn empty() {}7071#[test]72fn impl_abi_type_signature() {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!(<TypeStruct1SimpleParam as AbiType>::is_dynamic(), false);138 assert_eq!(<TypeStruct1DynamicParam as AbiType>::is_dynamic(), true);139 assert_eq!(<TypeStruct2SimpleParam as AbiType>::is_dynamic(), false);140 assert_eq!(<TypeStruct2DynamicParam as AbiType>::is_dynamic(), true);141 assert_eq!(<TypeStruct2MixedParam as AbiType>::is_dynamic(), true);142 assert_eq!(143 <TypeStruct1DerivedSimpleParam as AbiType>::is_dynamic(),144 false145 );146 assert_eq!(147 <TypeStruct2DerivedSimpleParam as AbiType>::is_dynamic(),148 false149 );150 assert_eq!(151 <TypeStruct1DerivedDynamicParam as AbiType>::is_dynamic(),152 true153 );154 assert_eq!(155 <TypeStruct2DerivedDynamicParam as AbiType>::is_dynamic(),156 true157 );158 assert_eq!(159 <TypeStruct3DerivedMixedParam as AbiType>::is_dynamic(),160 true161 );162}163164#[test]165fn impl_abi_type_size() {166 const ABI_ALIGNMENT: usize = 32;167 assert_eq!(<TypeStruct1SimpleParam as AbiType>::size(), ABI_ALIGNMENT);168 assert_eq!(<TypeStruct1DynamicParam as AbiType>::size(), ABI_ALIGNMENT);169 assert_eq!(170 <TypeStruct2SimpleParam as AbiType>::size(),171 ABI_ALIGNMENT * 2172 );173 assert_eq!(174 <TypeStruct2DynamicParam as AbiType>::size(),175 ABI_ALIGNMENT * 2176 );177 assert_eq!(178 <TypeStruct2MixedParam as AbiType>::size(),179 ABI_ALIGNMENT * 2180 );181 assert_eq!(182 <TypeStruct1DerivedSimpleParam as AbiType>::size(),183 ABI_ALIGNMENT184 );185 assert_eq!(186 <TypeStruct2DerivedSimpleParam as AbiType>::size(),187 ABI_ALIGNMENT * 3188 );189 assert_eq!(190 <TypeStruct1DerivedDynamicParam as AbiType>::size(),191 ABI_ALIGNMENT192 );193 assert_eq!(194 <TypeStruct2DerivedDynamicParam as AbiType>::size(),195 ABI_ALIGNMENT * 3196 );197 assert_eq!(198 <TypeStruct3DerivedMixedParam as AbiType>::size(),199 ABI_ALIGNMENT * 5200 );201}202203#[derive(AbiCoder)]204struct TupleStruct1SimpleParam(u8);205206#[derive(AbiCoder)]207struct TupleStruct1DynamicParam(String);208209#[derive(AbiCoder)]210struct TupleStruct2SimpleParam(u8, u32);211212#[derive(AbiCoder)]213struct TupleStruct2DynamicParam(String, bytes);214215#[derive(AbiCoder)]216struct TupleStruct2MixedParam(u8, bytes);217218#[derive(AbiCoder)]219struct TupleStruct1DerivedSimpleParam(TupleStruct1SimpleParam);220221#[derive(AbiCoder)]222struct TupleStruct2DerivedSimpleParam(TupleStruct1SimpleParam, TupleStruct2SimpleParam);223224#[derive(AbiCoder)]225struct TupleStruct1DerivedDynamicParam(TupleStruct1DynamicParam);226227#[derive(AbiCoder)]228struct TupleStruct2DerivedDynamicParam(TupleStruct1DynamicParam, TupleStruct2DynamicParam);229230#[derive(AbiCoder)]231struct TupleStruct3DerivedMixedParam(232 TupleStruct1SimpleParam,233 TupleStruct2DynamicParam,234 TupleStruct2MixedParam,235);236237#[test]238fn impl_abi_type_signature_same_for_structs() {239 assert_eq!(240 <TypeStruct1SimpleParam as AbiType>::SIGNATURE241 .as_str()242 .unwrap(),243 <TupleStruct1SimpleParam as AbiType>::SIGNATURE244 .as_str()245 .unwrap()246 );247 assert_eq!(248 <TypeStruct1DynamicParam as AbiType>::SIGNATURE249 .as_str()250 .unwrap(),251 <TupleStruct1DynamicParam as AbiType>::SIGNATURE252 .as_str()253 .unwrap()254 );255 assert_eq!(256 <TypeStruct2SimpleParam as AbiType>::SIGNATURE257 .as_str()258 .unwrap(),259 <TupleStruct2SimpleParam as AbiType>::SIGNATURE260 .as_str()261 .unwrap()262 );263 assert_eq!(264 <TypeStruct2DynamicParam as AbiType>::SIGNATURE265 .as_str()266 .unwrap(),267 <TupleStruct2DynamicParam as AbiType>::SIGNATURE268 .as_str()269 .unwrap()270 );271 assert_eq!(272 <TypeStruct2MixedParam as AbiType>::SIGNATURE273 .as_str()274 .unwrap(),275 <TupleStruct2MixedParam as AbiType>::SIGNATURE276 .as_str()277 .unwrap(),278 );279 assert_eq!(280 <TypeStruct1DerivedSimpleParam as AbiType>::SIGNATURE281 .as_str()282 .unwrap(),283 <TupleStruct1DerivedSimpleParam as AbiType>::SIGNATURE284 .as_str()285 .unwrap(),286 );287 assert_eq!(288 <TypeStruct2DerivedSimpleParam as AbiType>::SIGNATURE289 .as_str()290 .unwrap(),291 <TupleStruct2DerivedSimpleParam as AbiType>::SIGNATURE292 .as_str()293 .unwrap(),294 );295 assert_eq!(296 <TypeStruct1DerivedDynamicParam as AbiType>::SIGNATURE297 .as_str()298 .unwrap(),299 <TupleStruct1DerivedDynamicParam as AbiType>::SIGNATURE300 .as_str()301 .unwrap(),302 );303 assert_eq!(304 <TypeStruct2DerivedDynamicParam as AbiType>::SIGNATURE305 .as_str()306 .unwrap(),307 <TupleStruct2DerivedDynamicParam as AbiType>::SIGNATURE308 .as_str()309 .unwrap(),310 );311 assert_eq!(312 <TypeStruct3DerivedMixedParam as AbiType>::SIGNATURE313 .as_str()314 .unwrap(),315 <TupleStruct3DerivedMixedParam as AbiType>::SIGNATURE316 .as_str()317 .unwrap(),318 );319}320321#[test]322fn impl_abi_type_is_dynamic_same_for_structs() {323 assert_eq!(324 <TypeStruct1SimpleParam as AbiType>::is_dynamic(),325 <TupleStruct1SimpleParam as AbiType>::is_dynamic()326 );327 assert_eq!(328 <TypeStruct1DynamicParam as AbiType>::is_dynamic(),329 <TupleStruct1DynamicParam as AbiType>::is_dynamic()330 );331 assert_eq!(332 <TypeStruct2SimpleParam as AbiType>::is_dynamic(),333 <TupleStruct2SimpleParam as AbiType>::is_dynamic()334 );335 assert_eq!(336 <TypeStruct2DynamicParam as AbiType>::is_dynamic(),337 <TupleStruct2DynamicParam as AbiType>::is_dynamic()338 );339 assert_eq!(340 <TypeStruct2MixedParam as AbiType>::is_dynamic(),341 <TupleStruct2MixedParam as AbiType>::is_dynamic()342 );343 assert_eq!(344 <TypeStruct1DerivedSimpleParam as AbiType>::is_dynamic(),345 <TupleStruct1DerivedSimpleParam as AbiType>::is_dynamic()346 );347 assert_eq!(348 <TypeStruct2DerivedSimpleParam as AbiType>::is_dynamic(),349 <TupleStruct2DerivedSimpleParam as AbiType>::is_dynamic()350 );351 assert_eq!(352 <TypeStruct1DerivedDynamicParam as AbiType>::is_dynamic(),353 <TupleStruct1DerivedDynamicParam as AbiType>::is_dynamic()354 );355 assert_eq!(356 <TypeStruct2DerivedDynamicParam as AbiType>::is_dynamic(),357 <TupleStruct2DerivedDynamicParam as AbiType>::is_dynamic()358 );359 assert_eq!(360 <TypeStruct3DerivedMixedParam as AbiType>::is_dynamic(),361 <TupleStruct3DerivedMixedParam as AbiType>::is_dynamic()362 );363}364365#[test]366fn impl_abi_type_size_same_for_structs() {367 assert_eq!(368 <TypeStruct1SimpleParam as AbiType>::size(),369 <TupleStruct1SimpleParam as AbiType>::size()370 );371 assert_eq!(372 <TypeStruct1DynamicParam as AbiType>::size(),373 <TupleStruct1DynamicParam as AbiType>::size()374 );375 assert_eq!(376 <TypeStruct2SimpleParam as AbiType>::size(),377 <TupleStruct2SimpleParam as AbiType>::size()378 );379 assert_eq!(380 <TypeStruct2DynamicParam as AbiType>::size(),381 <TupleStruct2DynamicParam as AbiType>::size()382 );383 assert_eq!(384 <TypeStruct2MixedParam as AbiType>::size(),385 <TupleStruct2MixedParam as AbiType>::size()386 );387 assert_eq!(388 <TypeStruct1DerivedSimpleParam as AbiType>::size(),389 <TupleStruct1DerivedSimpleParam as AbiType>::size()390 );391 assert_eq!(392 <TypeStruct2DerivedSimpleParam as AbiType>::size(),393 <TupleStruct2DerivedSimpleParam as AbiType>::size()394 );395 assert_eq!(396 <TypeStruct1DerivedDynamicParam as AbiType>::size(),397 <TupleStruct1DerivedDynamicParam as AbiType>::size()398 );399 assert_eq!(400 <TypeStruct2DerivedDynamicParam as AbiType>::size(),401 <TupleStruct2DerivedDynamicParam as AbiType>::size()402 );403 assert_eq!(404 <TypeStruct3DerivedMixedParam as AbiType>::size(),405 <TupleStruct3DerivedMixedParam as AbiType>::size()406 );407}408409// #[test]410// fn impl_abi_read() {411// TypeStruct1SimpleParam::412// }1use evm_coder_procedural::AbiCoder;2use evm_coder::{3 types::*,4 abi::{AbiType, AbiRead, AbiWrite},5};67// TODO: move to build_failed tests8// #[derive(AbiCoder, PartialEq, Debug)]9// struct TypeStructUnit {}1011#[derive(AbiCoder, PartialEq, Debug)]12struct TypeStruct1SimpleParam {13 _a: u8,14}1516#[derive(AbiCoder, PartialEq, Debug)]17struct TypeStruct1DynamicParam {18 _a: String,19}2021#[derive(AbiCoder, PartialEq, Debug)]22struct TypeStruct2SimpleParam {23 _a: u8,24 _b: u32,25}2627#[derive(AbiCoder, PartialEq, Debug)]28struct TypeStruct2DynamicParam {29 _a: String,30 _b: bytes,31}3233#[derive(AbiCoder, PartialEq, Debug)]34struct TypeStruct2MixedParam {35 _a: u8,36 _b: bytes,37}3839#[derive(AbiCoder, PartialEq, Debug)]40struct TypeStruct1DerivedSimpleParam {41 _a: TypeStruct1SimpleParam,42}4344#[derive(AbiCoder, PartialEq, Debug)]45struct TypeStruct2DerivedSimpleParam {46 _a: TypeStruct1SimpleParam,47 _b: TypeStruct2SimpleParam,48}4950#[derive(AbiCoder, PartialEq, Debug)]51struct TypeStruct1DerivedDynamicParam {52 _a: TypeStruct1DynamicParam,53}5455#[derive(AbiCoder, PartialEq, Debug)]56struct TypeStruct2DerivedDynamicParam {57 _a: TypeStruct1DynamicParam,58 _b: TypeStruct2DynamicParam,59}6061#[derive(AbiCoder, PartialEq, Debug)]62struct TypeStruct3DerivedMixedParam {63 _a: TypeStruct1SimpleParam,64 _b: TypeStruct2DynamicParam,65 _c: TypeStruct2MixedParam,66}6768#[test]69fn empty() {}7071#[test]72fn impl_abi_type_signature() {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!(<TypeStruct1SimpleParam as AbiType>::is_dynamic(), false);138 assert_eq!(<TypeStruct1DynamicParam as AbiType>::is_dynamic(), true);139 assert_eq!(<TypeStruct2SimpleParam as AbiType>::is_dynamic(), false);140 assert_eq!(<TypeStruct2DynamicParam as AbiType>::is_dynamic(), true);141 assert_eq!(<TypeStruct2MixedParam as AbiType>::is_dynamic(), true);142 assert_eq!(143 <TypeStruct1DerivedSimpleParam as AbiType>::is_dynamic(),144 false145 );146 assert_eq!(147 <TypeStruct2DerivedSimpleParam as AbiType>::is_dynamic(),148 false149 );150 assert_eq!(151 <TypeStruct1DerivedDynamicParam as AbiType>::is_dynamic(),152 true153 );154 assert_eq!(155 <TypeStruct2DerivedDynamicParam as AbiType>::is_dynamic(),156 true157 );158 assert_eq!(159 <TypeStruct3DerivedMixedParam as AbiType>::is_dynamic(),160 true161 );162}163164#[test]165fn impl_abi_type_size() {166 const ABI_ALIGNMENT: usize = 32;167 assert_eq!(<TypeStruct1SimpleParam as AbiType>::size(), ABI_ALIGNMENT);168 assert_eq!(<TypeStruct1DynamicParam as AbiType>::size(), ABI_ALIGNMENT);169 assert_eq!(170 <TypeStruct2SimpleParam as AbiType>::size(),171 ABI_ALIGNMENT * 2172 );173 assert_eq!(174 <TypeStruct2DynamicParam as AbiType>::size(),175 ABI_ALIGNMENT * 2176 );177 assert_eq!(178 <TypeStruct2MixedParam as AbiType>::size(),179 ABI_ALIGNMENT * 2180 );181 assert_eq!(182 <TypeStruct1DerivedSimpleParam as AbiType>::size(),183 ABI_ALIGNMENT184 );185 assert_eq!(186 <TypeStruct2DerivedSimpleParam as AbiType>::size(),187 ABI_ALIGNMENT * 3188 );189 assert_eq!(190 <TypeStruct1DerivedDynamicParam as AbiType>::size(),191 ABI_ALIGNMENT192 );193 assert_eq!(194 <TypeStruct2DerivedDynamicParam as AbiType>::size(),195 ABI_ALIGNMENT * 3196 );197 assert_eq!(198 <TypeStruct3DerivedMixedParam as AbiType>::size(),199 ABI_ALIGNMENT * 5200 );201}202203#[derive(AbiCoder, PartialEq, Debug)]204struct TupleStruct1SimpleParam(u8);205206#[derive(AbiCoder, PartialEq, Debug)]207struct TupleStruct1DynamicParam(String);208209#[derive(AbiCoder, PartialEq, Debug)]210struct TupleStruct2SimpleParam(u8, u32);211212#[derive(AbiCoder, PartialEq, Debug)]213struct TupleStruct2DynamicParam(String, bytes);214215#[derive(AbiCoder, PartialEq, Debug)]216struct TupleStruct2MixedParam(u8, bytes);217218#[derive(AbiCoder, PartialEq, Debug)]219struct TupleStruct1DerivedSimpleParam(TupleStruct1SimpleParam);220221#[derive(AbiCoder, PartialEq, Debug)]222struct TupleStruct2DerivedSimpleParam(TupleStruct1SimpleParam, TupleStruct2SimpleParam);223224#[derive(AbiCoder, PartialEq, Debug)]225struct TupleStruct1DerivedDynamicParam(TupleStruct1DynamicParam);226227#[derive(AbiCoder, PartialEq, Debug)]228struct TupleStruct2DerivedDynamicParam(TupleStruct1DynamicParam, TupleStruct2DynamicParam);229230#[derive(AbiCoder, PartialEq, Debug)]231struct TupleStruct3DerivedMixedParam(232 TupleStruct1SimpleParam,233 TupleStruct2DynamicParam,234 TupleStruct2MixedParam,235);236237#[test]238fn impl_abi_type_signature_same_for_structs() {239 assert_eq!(240 <TypeStruct1SimpleParam as AbiType>::SIGNATURE241 .as_str()242 .unwrap(),243 <TupleStruct1SimpleParam as AbiType>::SIGNATURE244 .as_str()245 .unwrap()246 );247 assert_eq!(248 <TypeStruct1DynamicParam as AbiType>::SIGNATURE249 .as_str()250 .unwrap(),251 <TupleStruct1DynamicParam as AbiType>::SIGNATURE252 .as_str()253 .unwrap()254 );255 assert_eq!(256 <TypeStruct2SimpleParam as AbiType>::SIGNATURE257 .as_str()258 .unwrap(),259 <TupleStruct2SimpleParam as AbiType>::SIGNATURE260 .as_str()261 .unwrap()262 );263 assert_eq!(264 <TypeStruct2DynamicParam as AbiType>::SIGNATURE265 .as_str()266 .unwrap(),267 <TupleStruct2DynamicParam as AbiType>::SIGNATURE268 .as_str()269 .unwrap()270 );271 assert_eq!(272 <TypeStruct2MixedParam as AbiType>::SIGNATURE273 .as_str()274 .unwrap(),275 <TupleStruct2MixedParam as AbiType>::SIGNATURE276 .as_str()277 .unwrap(),278 );279 assert_eq!(280 <TypeStruct1DerivedSimpleParam as AbiType>::SIGNATURE281 .as_str()282 .unwrap(),283 <TupleStruct1DerivedSimpleParam as AbiType>::SIGNATURE284 .as_str()285 .unwrap(),286 );287 assert_eq!(288 <TypeStruct2DerivedSimpleParam as AbiType>::SIGNATURE289 .as_str()290 .unwrap(),291 <TupleStruct2DerivedSimpleParam as AbiType>::SIGNATURE292 .as_str()293 .unwrap(),294 );295 assert_eq!(296 <TypeStruct1DerivedDynamicParam as AbiType>::SIGNATURE297 .as_str()298 .unwrap(),299 <TupleStruct1DerivedDynamicParam as AbiType>::SIGNATURE300 .as_str()301 .unwrap(),302 );303 assert_eq!(304 <TypeStruct2DerivedDynamicParam as AbiType>::SIGNATURE305 .as_str()306 .unwrap(),307 <TupleStruct2DerivedDynamicParam as AbiType>::SIGNATURE308 .as_str()309 .unwrap(),310 );311 assert_eq!(312 <TypeStruct3DerivedMixedParam as AbiType>::SIGNATURE313 .as_str()314 .unwrap(),315 <TupleStruct3DerivedMixedParam as AbiType>::SIGNATURE316 .as_str()317 .unwrap(),318 );319}320321#[test]322fn impl_abi_type_is_dynamic_same_for_structs() {323 assert_eq!(324 <TypeStruct1SimpleParam as AbiType>::is_dynamic(),325 <TupleStruct1SimpleParam as AbiType>::is_dynamic()326 );327 assert_eq!(328 <TypeStruct1DynamicParam as AbiType>::is_dynamic(),329 <TupleStruct1DynamicParam as AbiType>::is_dynamic()330 );331 assert_eq!(332 <TypeStruct2SimpleParam as AbiType>::is_dynamic(),333 <TupleStruct2SimpleParam as AbiType>::is_dynamic()334 );335 assert_eq!(336 <TypeStruct2DynamicParam as AbiType>::is_dynamic(),337 <TupleStruct2DynamicParam as AbiType>::is_dynamic()338 );339 assert_eq!(340 <TypeStruct2MixedParam as AbiType>::is_dynamic(),341 <TupleStruct2MixedParam as AbiType>::is_dynamic()342 );343 assert_eq!(344 <TypeStruct1DerivedSimpleParam as AbiType>::is_dynamic(),345 <TupleStruct1DerivedSimpleParam as AbiType>::is_dynamic()346 );347 assert_eq!(348 <TypeStruct2DerivedSimpleParam as AbiType>::is_dynamic(),349 <TupleStruct2DerivedSimpleParam as AbiType>::is_dynamic()350 );351 assert_eq!(352 <TypeStruct1DerivedDynamicParam as AbiType>::is_dynamic(),353 <TupleStruct1DerivedDynamicParam as AbiType>::is_dynamic()354 );355 assert_eq!(356 <TypeStruct2DerivedDynamicParam as AbiType>::is_dynamic(),357 <TupleStruct2DerivedDynamicParam as AbiType>::is_dynamic()358 );359 assert_eq!(360 <TypeStruct3DerivedMixedParam as AbiType>::is_dynamic(),361 <TupleStruct3DerivedMixedParam as AbiType>::is_dynamic()362 );363}364365#[test]366fn impl_abi_type_size_same_for_structs() {367 assert_eq!(368 <TypeStruct1SimpleParam as AbiType>::size(),369 <TupleStruct1SimpleParam as AbiType>::size()370 );371 assert_eq!(372 <TypeStruct1DynamicParam as AbiType>::size(),373 <TupleStruct1DynamicParam as AbiType>::size()374 );375 assert_eq!(376 <TypeStruct2SimpleParam as AbiType>::size(),377 <TupleStruct2SimpleParam as AbiType>::size()378 );379 assert_eq!(380 <TypeStruct2DynamicParam as AbiType>::size(),381 <TupleStruct2DynamicParam as AbiType>::size()382 );383 assert_eq!(384 <TypeStruct2MixedParam as AbiType>::size(),385 <TupleStruct2MixedParam as AbiType>::size()386 );387 assert_eq!(388 <TypeStruct1DerivedSimpleParam as AbiType>::size(),389 <TupleStruct1DerivedSimpleParam as AbiType>::size()390 );391 assert_eq!(392 <TypeStruct2DerivedSimpleParam as AbiType>::size(),393 <TupleStruct2DerivedSimpleParam as AbiType>::size()394 );395 assert_eq!(396 <TypeStruct1DerivedDynamicParam as AbiType>::size(),397 <TupleStruct1DerivedDynamicParam as AbiType>::size()398 );399 assert_eq!(400 <TypeStruct2DerivedDynamicParam as AbiType>::size(),401 <TupleStruct2DerivedDynamicParam as AbiType>::size()402 );403 assert_eq!(404 <TypeStruct3DerivedMixedParam as AbiType>::size(),405 <TupleStruct3DerivedMixedParam as AbiType>::size()406 );407}408409fn test_impl<TypeStruct, TupleStruct, Tuple>(410 type_struct_data: TypeStruct,411 tuple_struct_data: TupleStruct,412 tuple_data: Tuple,413) where414 TypeStruct: AbiWrite + AbiRead + std::cmp::PartialEq + std::fmt::Debug,415 Tuple: AbiWrite + AbiRead + std::cmp::PartialEq + std::fmt::Debug,416{417 use evm_coder::abi::{AbiReader, AbiWriter};418 const FUNCTION_IDENTIFIER: u32 = 0xdeadbeef;419420 let mut writer = AbiWriter::new_call(FUNCTION_IDENTIFIER);421 tuple_data.abi_write(&mut writer);422 let encoded_tuple = writer.finish();423424 let mut writer = AbiWriter::new_call(FUNCTION_IDENTIFIER);425 type_struct_data.abi_write(&mut writer);426 let encoded_struct = writer.finish();427428 similar_asserts::assert_eq!(encoded_tuple, encoded_struct);429430 // let (_, mut decoder) = AbiReader::new_call(&encoded_tuple).unwrap();431 // let restored_struct_data = <TypeStruct>::abi_read(&mut decoder).unwrap();432 // assert_eq!(restored_struct_data, type_struct_data);433434 // let (_, mut decoder) = AbiReader::new_call(&encoded_struct).unwrap();435 // let restored_tuple_data = <Tuple>::abi_read(&mut decoder).unwrap();436 // assert_eq!(restored_tuple_data, tuple_data);437}438439#[test]440fn codec_struct_1_simple() {441 let _a = 0xff;442 test_impl::<TypeStruct1SimpleParam, TupleStruct1SimpleParam, (uint8,)>(443 TypeStruct1SimpleParam { _a },444 TupleStruct1SimpleParam(_a),445 (_a,),446 );447}448449#[test]450fn codec_struct_1_dynamic() {451 let _a: String = "some string".into();452 test_impl::<TypeStruct1DynamicParam, TupleStruct1DynamicParam, (String,)>(453 TypeStruct1DynamicParam { _a: _a.clone() },454 TupleStruct1DynamicParam(_a.clone()),455 (_a,),456 );457}458459#[test]460fn codec_struct_2_dynamic() {461 let _a: String = "some string".into();462 let _b: bytes = bytes(vec![0x11, 0x22, 0x33]);463 test_impl::<TypeStruct2DynamicParam, TupleStruct2DynamicParam, (String, bytes)>(464 TypeStruct2DynamicParam {465 _a: _a.clone(),466 _b: _b.clone(),467 },468 TupleStruct2DynamicParam(_a.clone(), _b.clone()),469 (_a, _b),470 );471}