difftreelog
fix solidity param parser
in: master
4 files changed
crates/evm-coder/procedural/src/solidity_interface.rsdiffbeforeafterboth--- a/crates/evm-coder/procedural/src/solidity_interface.rs
+++ b/crates/evm-coder/procedural/src/solidity_interface.rs
@@ -404,7 +404,11 @@
let name = &self.name;
let ty = &self.ty;
quote! {
- #name: <#ty>::abi_read(reader)?
+ #name: {
+ let value = <#ty as ::evm_coder::abi::AbiRead>::abi_read(reader)?;
+ if !is_dynamic {reader.seek(<#ty as ::evm_coder::abi::AbiType>::size())};
+ value
+ }
}
}
@@ -630,17 +634,18 @@
let pascal_name = &self.pascal_name;
let screaming_name = &self.screaming_name;
if self.has_normal_args {
- let parsers = self
- .args
- .iter()
- .filter(|a| !a.is_special())
- .map(|a| a.expand_parse());
+ let args_iter = self.args.iter().filter(|a| !a.is_special());
+ let arg_type = args_iter.clone().map(|a| &a.ty);
+ let parsers = args_iter.map(|a| a.expand_parse());
quote! {
- Self::#screaming_name => return Ok(Some(Self::#pascal_name {
- #(
- #parsers,
- )*
- }))
+ Self::#screaming_name => {
+ let is_dynamic = false #(|| <#arg_type as ::evm_coder::abi::AbiType>::is_dynamic())*;
+ return Ok(Some(Self::#pascal_name {
+ #(
+ #parsers,
+ )*
+ }))
+ }
}
} else {
quote! { Self::#screaming_name => return Ok(Some(Self::#pascal_name)) }
crates/evm-coder/src/abi/impls.rsdiffbeforeafterboth--- a/crates/evm-coder/src/abi/impls.rs
+++ b/crates/evm-coder/src/abi/impls.rs
@@ -262,12 +262,12 @@
impl<$($ident),+> AbiRead for ($($ident,)+)
where
+ Self: AbiType,
$($ident: AbiRead + AbiType,)+
- ($($ident,)+): AbiType,
{
fn abi_read(reader: &mut AbiReader) -> Result<($($ident,)+)> {
- let is_dynamic = <($($ident,)+)>::is_dynamic();
- let size = if !is_dynamic { Some(<($($ident,)+)>::size()) } else { None };
+ let is_dynamic = <Self>::is_dynamic();
+ let size = if !is_dynamic { Some(<Self>::size()) } else { None };
let mut subresult = reader.subresult(size)?;
Ok((
$({
crates/evm-coder/src/abi/test.rsdiffbeforeafterboth--- a/crates/evm-coder/src/abi/test.rs
+++ b/crates/evm-coder/src/abi/test.rs
@@ -450,6 +450,24 @@
}
#[test]
+fn encode_decode_tuple0_tuple1_uint8_uint8_tuple1_uint8_uint8_and_uint8() {
+ test_impl::<((u8, u8), (u8, u8), u8)>(
+ 0xdeadbeef,
+ ((10, 11), (12, 13), 14),
+ &hex!(
+ "
+ deadbeef
+ 000000000000000000000000000000000000000000000000000000000000000a
+ 000000000000000000000000000000000000000000000000000000000000000b
+ 000000000000000000000000000000000000000000000000000000000000000c
+ 000000000000000000000000000000000000000000000000000000000000000d
+ 000000000000000000000000000000000000000000000000000000000000000e
+ "
+ ),
+ );
+}
+
+#[test]
fn encode_decode_tuple0_tuple1_string() {
test_impl::<((String,),)>(
0xdeadbeef,
@@ -525,3 +543,19 @@
),
);
}
+
+#[test]
+fn parse_multiple_params() {
+ let encoded_data = hex!(
+ "
+ deadbeef
+ 000000000000000000000000000000000000000000000000000000000000000a
+ 000000000000000000000000000000000000000000000000000000000000000b
+ "
+ );
+ let (_, mut decoder) = AbiReader::new_call(&encoded_data).unwrap();
+ let p1 = <u8>::abi_read(&mut decoder).unwrap();
+ let p2 = <u8>::abi_read(&mut decoder).unwrap();
+ assert_eq!(p1, 0x0a);
+ assert_eq!(p2, 0x0b);
+}
crates/evm-coder/tests/abi_derive_generation.rsdiffbeforeafterboth1use evm_coder_procedural::AbiCoder;2use evm_coder::types::bytes;34// TODO: move to build_failed tests5// #[derive(AbiCoder, PartialEq, Debug)]6// struct TypeStructUnit {}78#[derive(AbiCoder, PartialEq, Debug)]9struct TypeStruct1SimpleParam {10 _a: u8,11}1213#[derive(AbiCoder, PartialEq, Debug)]14struct TypeStruct1DynamicParam {15 _a: String,16}1718#[derive(AbiCoder, PartialEq, Debug)]19struct TypeStruct2SimpleParam {20 _a: u8,21 _b: u32,22}2324#[derive(AbiCoder, PartialEq, Debug)]25struct TypeStruct2DynamicParam {26 _a: String,27 _b: bytes,28}2930#[derive(AbiCoder, PartialEq, Debug)]31struct TypeStruct2MixedParam {32 _a: u8,33 _b: bytes,34}3536#[derive(AbiCoder, PartialEq, Debug)]37struct TypeStruct1DerivedSimpleParam {38 _a: TypeStruct1SimpleParam,39}4041#[derive(AbiCoder, PartialEq, Debug)]42struct TypeStruct2DerivedSimpleParam {43 _a: TypeStruct1SimpleParam,44 _b: TypeStruct2SimpleParam,45}4647#[derive(AbiCoder, PartialEq, Debug)]48struct TypeStruct1DerivedDynamicParam {49 _a: TypeStruct1DynamicParam,50}5152#[derive(AbiCoder, PartialEq, Debug)]53struct TypeStruct2DerivedDynamicParam {54 _a: TypeStruct1DynamicParam,55 _b: TypeStruct2DynamicParam,56}5758#[derive(AbiCoder, PartialEq, Debug)]59struct TypeStruct3DerivedMixedParam {60 _a: TypeStruct1SimpleParam,61 _b: TypeStruct2DynamicParam,62 _c: TypeStruct2MixedParam,63}6465#[test]66fn empty() {}6768#[test]69fn impl_abi_type_signature() {70 assert_eq!(71 <TypeStruct1SimpleParam as evm_coder::abi::AbiType>::SIGNATURE72 .as_str()73 .unwrap(),74 "(uint8)"75 );76 assert_eq!(77 <TypeStruct1DynamicParam as evm_coder::abi::AbiType>::SIGNATURE78 .as_str()79 .unwrap(),80 "(string)"81 );82 assert_eq!(83 <TypeStruct2SimpleParam as evm_coder::abi::AbiType>::SIGNATURE84 .as_str()85 .unwrap(),86 "(uint8,uint32)"87 );88 assert_eq!(89 <TypeStruct2DynamicParam as evm_coder::abi::AbiType>::SIGNATURE90 .as_str()91 .unwrap(),92 "(string,bytes)"93 );94 assert_eq!(95 <TypeStruct2MixedParam as evm_coder::abi::AbiType>::SIGNATURE96 .as_str()97 .unwrap(),98 "(uint8,bytes)"99 );100 assert_eq!(101 <TypeStruct1DerivedSimpleParam as evm_coder::abi::AbiType>::SIGNATURE102 .as_str()103 .unwrap(),104 "((uint8))"105 );106 assert_eq!(107 <TypeStruct2DerivedSimpleParam as evm_coder::abi::AbiType>::SIGNATURE108 .as_str()109 .unwrap(),110 "((uint8),(uint8,uint32))"111 );112 assert_eq!(113 <TypeStruct1DerivedDynamicParam as evm_coder::abi::AbiType>::SIGNATURE114 .as_str()115 .unwrap(),116 "((string))"117 );118 assert_eq!(119 <TypeStruct2DerivedDynamicParam as evm_coder::abi::AbiType>::SIGNATURE120 .as_str()121 .unwrap(),122 "((string),(string,bytes))"123 );124 assert_eq!(125 <TypeStruct3DerivedMixedParam as evm_coder::abi::AbiType>::SIGNATURE126 .as_str()127 .unwrap(),128 "((uint8),(string,bytes),(uint8,bytes))"129 );130}131132#[test]133fn impl_abi_type_is_dynamic() {134 assert_eq!(135 <TypeStruct1SimpleParam as evm_coder::abi::AbiType>::is_dynamic(),136 false137 );138 assert_eq!(139 <TypeStruct1DynamicParam as evm_coder::abi::AbiType>::is_dynamic(),140 true141 );142 assert_eq!(143 <TypeStruct2SimpleParam as evm_coder::abi::AbiType>::is_dynamic(),144 false145 );146 assert_eq!(147 <TypeStruct2DynamicParam as evm_coder::abi::AbiType>::is_dynamic(),148 true149 );150 assert_eq!(151 <TypeStruct2MixedParam as evm_coder::abi::AbiType>::is_dynamic(),152 true153 );154 assert_eq!(155 <TypeStruct1DerivedSimpleParam as evm_coder::abi::AbiType>::is_dynamic(),156 false157 );158 assert_eq!(159 <TypeStruct2DerivedSimpleParam as evm_coder::abi::AbiType>::is_dynamic(),160 false161 );162 assert_eq!(163 <TypeStruct1DerivedDynamicParam as evm_coder::abi::AbiType>::is_dynamic(),164 true165 );166 assert_eq!(167 <TypeStruct2DerivedDynamicParam as evm_coder::abi::AbiType>::is_dynamic(),168 true169 );170 assert_eq!(171 <TypeStruct3DerivedMixedParam as evm_coder::abi::AbiType>::is_dynamic(),172 true173 );174}175176#[test]177fn impl_abi_type_size() {178 const ABI_ALIGNMENT: usize = 32;179 assert_eq!(180 <TypeStruct1SimpleParam as evm_coder::abi::AbiType>::size(),181 ABI_ALIGNMENT182 );183 assert_eq!(184 <TypeStruct1DynamicParam as evm_coder::abi::AbiType>::size(),185 ABI_ALIGNMENT186 );187 assert_eq!(188 <TypeStruct2SimpleParam as evm_coder::abi::AbiType>::size(),189 ABI_ALIGNMENT * 2190 );191 assert_eq!(192 <TypeStruct2DynamicParam as evm_coder::abi::AbiType>::size(),193 ABI_ALIGNMENT * 2194 );195 assert_eq!(196 <TypeStruct2MixedParam as evm_coder::abi::AbiType>::size(),197 ABI_ALIGNMENT * 2198 );199 assert_eq!(200 <TypeStruct1DerivedSimpleParam as evm_coder::abi::AbiType>::size(),201 ABI_ALIGNMENT202 );203 assert_eq!(204 <TypeStruct2DerivedSimpleParam as evm_coder::abi::AbiType>::size(),205 ABI_ALIGNMENT * 3206 );207 assert_eq!(208 <TypeStruct1DerivedDynamicParam as evm_coder::abi::AbiType>::size(),209 ABI_ALIGNMENT210 );211 assert_eq!(212 <TypeStruct2DerivedDynamicParam as evm_coder::abi::AbiType>::size(),213 ABI_ALIGNMENT * 3214 );215 assert_eq!(216 <TypeStruct3DerivedMixedParam as evm_coder::abi::AbiType>::size(),217 ABI_ALIGNMENT * 5218 );219}220221#[derive(AbiCoder, PartialEq, Debug)]222struct TupleStruct1SimpleParam(u8);223224#[derive(AbiCoder, PartialEq, Debug)]225struct TupleStruct1DynamicParam(String);226227#[derive(AbiCoder, PartialEq, Debug)]228struct TupleStruct2SimpleParam(u8, u32);229230#[derive(AbiCoder, PartialEq, Debug)]231struct TupleStruct2DynamicParam(String, bytes);232233#[derive(AbiCoder, PartialEq, Debug)]234struct TupleStruct2MixedParam(u8, bytes);235236#[derive(AbiCoder, PartialEq, Debug)]237struct TupleStruct1DerivedSimpleParam(TupleStruct1SimpleParam);238239#[derive(AbiCoder, PartialEq, Debug)]240struct TupleStruct2DerivedSimpleParam(TupleStruct1SimpleParam, TupleStruct2SimpleParam);241242#[derive(AbiCoder, PartialEq, Debug)]243struct TupleStruct1DerivedDynamicParam(TupleStruct1DynamicParam);244245#[derive(AbiCoder, PartialEq, Debug)]246struct TupleStruct2DerivedDynamicParam(TupleStruct1DynamicParam, TupleStruct2DynamicParam);247248#[derive(AbiCoder, PartialEq, Debug)]249struct TupleStruct3DerivedMixedParam(250 TupleStruct1SimpleParam,251 TupleStruct2DynamicParam,252 TupleStruct2MixedParam,253);254255#[test]256fn impl_abi_type_signature_same_for_structs() {257 assert_eq!(258 <TypeStruct1SimpleParam as evm_coder::abi::AbiType>::SIGNATURE259 .as_str()260 .unwrap(),261 <TupleStruct1SimpleParam as evm_coder::abi::AbiType>::SIGNATURE262 .as_str()263 .unwrap()264 );265 assert_eq!(266 <TypeStruct1DynamicParam as evm_coder::abi::AbiType>::SIGNATURE267 .as_str()268 .unwrap(),269 <TupleStruct1DynamicParam as evm_coder::abi::AbiType>::SIGNATURE270 .as_str()271 .unwrap()272 );273 assert_eq!(274 <TypeStruct2SimpleParam as evm_coder::abi::AbiType>::SIGNATURE275 .as_str()276 .unwrap(),277 <TupleStruct2SimpleParam as evm_coder::abi::AbiType>::SIGNATURE278 .as_str()279 .unwrap()280 );281 assert_eq!(282 <TypeStruct2DynamicParam as evm_coder::abi::AbiType>::SIGNATURE283 .as_str()284 .unwrap(),285 <TupleStruct2DynamicParam as evm_coder::abi::AbiType>::SIGNATURE286 .as_str()287 .unwrap()288 );289 assert_eq!(290 <TypeStruct2MixedParam as evm_coder::abi::AbiType>::SIGNATURE291 .as_str()292 .unwrap(),293 <TupleStruct2MixedParam as evm_coder::abi::AbiType>::SIGNATURE294 .as_str()295 .unwrap(),296 );297 assert_eq!(298 <TypeStruct1DerivedSimpleParam as evm_coder::abi::AbiType>::SIGNATURE299 .as_str()300 .unwrap(),301 <TupleStruct1DerivedSimpleParam as evm_coder::abi::AbiType>::SIGNATURE302 .as_str()303 .unwrap(),304 );305 assert_eq!(306 <TypeStruct2DerivedSimpleParam as evm_coder::abi::AbiType>::SIGNATURE307 .as_str()308 .unwrap(),309 <TupleStruct2DerivedSimpleParam as evm_coder::abi::AbiType>::SIGNATURE310 .as_str()311 .unwrap(),312 );313 assert_eq!(314 <TypeStruct1DerivedDynamicParam as evm_coder::abi::AbiType>::SIGNATURE315 .as_str()316 .unwrap(),317 <TupleStruct1DerivedDynamicParam as evm_coder::abi::AbiType>::SIGNATURE318 .as_str()319 .unwrap(),320 );321 assert_eq!(322 <TypeStruct2DerivedDynamicParam as evm_coder::abi::AbiType>::SIGNATURE323 .as_str()324 .unwrap(),325 <TupleStruct2DerivedDynamicParam as evm_coder::abi::AbiType>::SIGNATURE326 .as_str()327 .unwrap(),328 );329 assert_eq!(330 <TypeStruct3DerivedMixedParam as evm_coder::abi::AbiType>::SIGNATURE331 .as_str()332 .unwrap(),333 <TupleStruct3DerivedMixedParam as evm_coder::abi::AbiType>::SIGNATURE334 .as_str()335 .unwrap(),336 );337}338339#[test]340fn impl_abi_type_is_dynamic_same_for_structs() {341 assert_eq!(342 <TypeStruct1SimpleParam as evm_coder::abi::AbiType>::is_dynamic(),343 <TupleStruct1SimpleParam as evm_coder::abi::AbiType>::is_dynamic()344 );345 assert_eq!(346 <TypeStruct1DynamicParam as evm_coder::abi::AbiType>::is_dynamic(),347 <TupleStruct1DynamicParam as evm_coder::abi::AbiType>::is_dynamic()348 );349 assert_eq!(350 <TypeStruct2SimpleParam as evm_coder::abi::AbiType>::is_dynamic(),351 <TupleStruct2SimpleParam as evm_coder::abi::AbiType>::is_dynamic()352 );353 assert_eq!(354 <TypeStruct2DynamicParam as evm_coder::abi::AbiType>::is_dynamic(),355 <TupleStruct2DynamicParam as evm_coder::abi::AbiType>::is_dynamic()356 );357 assert_eq!(358 <TypeStruct2MixedParam as evm_coder::abi::AbiType>::is_dynamic(),359 <TupleStruct2MixedParam as evm_coder::abi::AbiType>::is_dynamic()360 );361 assert_eq!(362 <TypeStruct1DerivedSimpleParam as evm_coder::abi::AbiType>::is_dynamic(),363 <TupleStruct1DerivedSimpleParam as evm_coder::abi::AbiType>::is_dynamic()364 );365 assert_eq!(366 <TypeStruct2DerivedSimpleParam as evm_coder::abi::AbiType>::is_dynamic(),367 <TupleStruct2DerivedSimpleParam as evm_coder::abi::AbiType>::is_dynamic()368 );369 assert_eq!(370 <TypeStruct1DerivedDynamicParam as evm_coder::abi::AbiType>::is_dynamic(),371 <TupleStruct1DerivedDynamicParam as evm_coder::abi::AbiType>::is_dynamic()372 );373 assert_eq!(374 <TypeStruct2DerivedDynamicParam as evm_coder::abi::AbiType>::is_dynamic(),375 <TupleStruct2DerivedDynamicParam as evm_coder::abi::AbiType>::is_dynamic()376 );377 assert_eq!(378 <TypeStruct3DerivedMixedParam as evm_coder::abi::AbiType>::is_dynamic(),379 <TupleStruct3DerivedMixedParam as evm_coder::abi::AbiType>::is_dynamic()380 );381}382383#[test]384fn impl_abi_type_size_same_for_structs() {385 assert_eq!(386 <TypeStruct1SimpleParam as evm_coder::abi::AbiType>::size(),387 <TupleStruct1SimpleParam as evm_coder::abi::AbiType>::size()388 );389 assert_eq!(390 <TypeStruct1DynamicParam as evm_coder::abi::AbiType>::size(),391 <TupleStruct1DynamicParam as evm_coder::abi::AbiType>::size()392 );393 assert_eq!(394 <TypeStruct2SimpleParam as evm_coder::abi::AbiType>::size(),395 <TupleStruct2SimpleParam as evm_coder::abi::AbiType>::size()396 );397 assert_eq!(398 <TypeStruct2DynamicParam as evm_coder::abi::AbiType>::size(),399 <TupleStruct2DynamicParam as evm_coder::abi::AbiType>::size()400 );401 assert_eq!(402 <TypeStruct2MixedParam as evm_coder::abi::AbiType>::size(),403 <TupleStruct2MixedParam as evm_coder::abi::AbiType>::size()404 );405 assert_eq!(406 <TypeStruct1DerivedSimpleParam as evm_coder::abi::AbiType>::size(),407 <TupleStruct1DerivedSimpleParam as evm_coder::abi::AbiType>::size()408 );409 assert_eq!(410 <TypeStruct2DerivedSimpleParam as evm_coder::abi::AbiType>::size(),411 <TupleStruct2DerivedSimpleParam as evm_coder::abi::AbiType>::size()412 );413 assert_eq!(414 <TypeStruct1DerivedDynamicParam as evm_coder::abi::AbiType>::size(),415 <TupleStruct1DerivedDynamicParam as evm_coder::abi::AbiType>::size()416 );417 assert_eq!(418 <TypeStruct2DerivedDynamicParam as evm_coder::abi::AbiType>::size(),419 <TupleStruct2DerivedDynamicParam as evm_coder::abi::AbiType>::size()420 );421 assert_eq!(422 <TypeStruct3DerivedMixedParam as evm_coder::abi::AbiType>::size(),423 <TupleStruct3DerivedMixedParam as evm_coder::abi::AbiType>::size()424 );425}426427const FUNCTION_IDENTIFIER: u32 = 0xdeadbeef;428429fn test_impl<Tuple, TupleStruct, TypeStruct>(430 tuple_data: Tuple,431 tuple_struct_data: TupleStruct,432 type_struct_data: TypeStruct,433) where434 TypeStruct:435 evm_coder::abi::AbiWrite + evm_coder::abi::AbiRead + std::cmp::PartialEq + std::fmt::Debug,436 TupleStruct:437 evm_coder::abi::AbiWrite + evm_coder::abi::AbiRead + std::cmp::PartialEq + std::fmt::Debug,438 Tuple:439 evm_coder::abi::AbiWrite + evm_coder::abi::AbiRead + std::cmp::PartialEq + std::fmt::Debug,440{441 let encoded_type_struct = test_abi_write_impl(&type_struct_data);442 let encoded_tuple_struct = test_abi_write_impl(&tuple_struct_data);443 let encoded_tuple = test_abi_write_impl(&tuple_data);444445 similar_asserts::assert_eq!(encoded_tuple, encoded_type_struct);446 similar_asserts::assert_eq!(encoded_tuple, encoded_tuple_struct);447448 {449 let (_, mut decoder) = evm_coder::abi::AbiReader::new_call(&encoded_tuple).unwrap();450 let restored_struct_data = <TypeStruct>::abi_read(&mut decoder).unwrap();451 assert_eq!(restored_struct_data, type_struct_data);452 }453 {454 let (_, mut decoder) = evm_coder::abi::AbiReader::new_call(&encoded_tuple).unwrap();455 let restored_struct_data = <TupleStruct>::abi_read(&mut decoder).unwrap();456 assert_eq!(restored_struct_data, tuple_struct_data);457 }458459 {460 let (_, mut decoder) = evm_coder::abi::AbiReader::new_call(&encoded_type_struct).unwrap();461 let restored_tuple_data = <Tuple>::abi_read(&mut decoder).unwrap();462 assert_eq!(restored_tuple_data, tuple_data);463 }464 {465 let (_, mut decoder) = evm_coder::abi::AbiReader::new_call(&encoded_tuple_struct).unwrap();466 let restored_tuple_data = <Tuple>::abi_read(&mut decoder).unwrap();467 assert_eq!(restored_tuple_data, tuple_data);468 }469}470471fn test_abi_write_impl<A>(data: &A) -> Vec<u8>472where473 A: evm_coder::abi::AbiWrite + evm_coder::abi::AbiRead + std::cmp::PartialEq + std::fmt::Debug,474{475 let mut writer = evm_coder::abi::AbiWriter::new_call(FUNCTION_IDENTIFIER);476 data.abi_write(&mut writer);477 let encoded_tuple = writer.finish();478 encoded_tuple479}480481#[test]482fn codec_struct_1_simple() {483 let _a = 0xff;484 test_impl::<(u8,), TupleStruct1SimpleParam, TypeStruct1SimpleParam>(485 (_a,),486 TupleStruct1SimpleParam(_a),487 TypeStruct1SimpleParam { _a },488 );489}490491#[test]492fn codec_struct_1_dynamic() {493 let _a: String = "some string".into();494 test_impl::<(String,), TupleStruct1DynamicParam, TypeStruct1DynamicParam>(495 (_a.clone(),),496 TupleStruct1DynamicParam(_a.clone()),497 TypeStruct1DynamicParam { _a },498 );499}500501#[test]502fn codec_struct_1_derived_simple() {503 let _a: u8 = 0xff;504 test_impl::<((u8,),), TupleStruct1DerivedSimpleParam, TypeStruct1DerivedSimpleParam>(505 ((_a,),),506 TupleStruct1DerivedSimpleParam(TupleStruct1SimpleParam(_a)),507 TypeStruct1DerivedSimpleParam {508 _a: TypeStruct1SimpleParam { _a },509 },510 );511}512513#[test]514fn codec_struct_1_derived_dynamic() {515 let _a: String = "some string".into();516 test_impl::<((String,),), TupleStruct1DerivedDynamicParam, TypeStruct1DerivedDynamicParam>(517 ((_a.clone(),),),518 TupleStruct1DerivedDynamicParam(TupleStruct1DynamicParam(_a.clone())),519 TypeStruct1DerivedDynamicParam {520 _a: TypeStruct1DynamicParam { _a },521 },522 );523}524525#[test]526fn codec_struct_2_simple() {527 let _a = 0xff;528 let _b = 0xbeefbaba;529 test_impl::<(u8, u32), TupleStruct2SimpleParam, TypeStruct2SimpleParam>(530 (_a, _b),531 TupleStruct2SimpleParam(_a, _b),532 TypeStruct2SimpleParam { _a, _b },533 );534}535536#[test]537fn codec_struct_2_dynamic() {538 let _a: String = "some string".into();539 let _b: bytes = bytes(vec![0x11, 0x22, 0x33]);540 test_impl::<(String, bytes), TupleStruct2DynamicParam, TypeStruct2DynamicParam>(541 (_a.clone(), _b.clone()),542 TupleStruct2DynamicParam(_a.clone(), _b.clone()),543 TypeStruct2DynamicParam { _a, _b },544 );545}546547#[test]548fn codec_struct_2_mixed() {549 let _a: u8 = 0xff;550 let _b: bytes = bytes(vec![0x11, 0x22, 0x33]);551 test_impl::<(u8, bytes), TupleStruct2MixedParam, TypeStruct2MixedParam>(552 (_a.clone(), _b.clone()),553 TupleStruct2MixedParam(_a.clone(), _b.clone()),554 TypeStruct2MixedParam { _a, _b },555 );556}557558#[test]559fn codec_struct_2_derived_simple() {560 let _a = 0xff;561 let _b = 0xbeefbaba;562 test_impl::<((u8,), (u8, u32)), TupleStruct2DerivedSimpleParam, TypeStruct2DerivedSimpleParam>(563 ((_a,), (_a, _b)),564 TupleStruct2DerivedSimpleParam(565 TupleStruct1SimpleParam(_a),566 TupleStruct2SimpleParam(_a, _b),567 ),568 TypeStruct2DerivedSimpleParam {569 _a: TypeStruct1SimpleParam { _a },570 _b: TypeStruct2SimpleParam { _a, _b },571 },572 );573}574575#[test]576fn codec_struct_2_derived_dynamic() {577 let _a = "some string".to_string();578 let _b = bytes(vec![0x11, 0x22, 0x33]);579 test_impl::<580 ((String,), (String, bytes)),581 TupleStruct2DerivedDynamicParam,582 TypeStruct2DerivedDynamicParam,583 >(584 ((_a.clone(),), (_a.clone(), _b.clone())),585 TupleStruct2DerivedDynamicParam(586 TupleStruct1DynamicParam(_a.clone()),587 TupleStruct2DynamicParam(_a.clone(), _b.clone()),588 ),589 TypeStruct2DerivedDynamicParam {590 _a: TypeStruct1DynamicParam { _a: _a.clone() },591 _b: TypeStruct2DynamicParam { _a, _b },592 },593 );594}595596#[test]597fn codec_struct_3_derived_mixed() {598 let int = 0xff;599 let by = bytes(vec![0x11, 0x22, 0x33]);600 let string = "some string".to_string();601 test_impl::<602 ((u8,), (String, bytes), (u8, bytes)),603 TupleStruct3DerivedMixedParam,604 TypeStruct3DerivedMixedParam,605 >(606 ((int,), (string.clone(), by.clone()), (int, by.clone())),607 TupleStruct3DerivedMixedParam(608 TupleStruct1SimpleParam(int),609 TupleStruct2DynamicParam(string.clone(), by.clone()),610 TupleStruct2MixedParam(int, by.clone()),611 ),612 TypeStruct3DerivedMixedParam {613 _a: TypeStruct1SimpleParam { _a: int },614 _b: TypeStruct2DynamicParam {615 _a: string.clone(),616 _b: by.clone(),617 },618 _c: TypeStruct2MixedParam { _a: int, _b: by },619 },620 );621}