Skip to content
This repository has been archived by the owner on Oct 19, 2024. It is now read-only.

fix: missing AbiEncode implem for tuples of length 16 #2685

Merged
merged 1 commit into from
Nov 23, 2023
Merged

fix: missing AbiEncode implem for tuples of length 16 #2685

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 22 additions & 21 deletions ethers-core/src/abi/codec.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ impl<T: TokenizableItem + AbiArrayType> AbiDecode for Vec<T> {
}

macro_rules! impl_abi_codec_tuple {
($num: expr, $( $ty: ident),+) => {
($( $ty: ident),+) => {
impl<$($ty, )+> AbiEncode for ($($ty,)+) where
$(
$ty: Tokenizable,
Expand Down Expand Up @@ -159,26 +159,27 @@ macro_rules! impl_abi_codec_tuple {
}
}

impl_abi_codec_tuple!(1, A);
impl_abi_codec_tuple!(2, A, B);
impl_abi_codec_tuple!(3, A, B, C);
impl_abi_codec_tuple!(4, A, B, C, D);
impl_abi_codec_tuple!(5, A, B, C, D, E);
impl_abi_codec_tuple!(6, A, B, C, D, E, F);
impl_abi_codec_tuple!(7, A, B, C, D, E, F, G);
impl_abi_codec_tuple!(8, A, B, C, D, E, F, G, H);
impl_abi_codec_tuple!(9, A, B, C, D, E, F, G, H, I);
impl_abi_codec_tuple!(10, A, B, C, D, E, F, G, H, I, J);
impl_abi_codec_tuple!(11, A, B, C, D, E, F, G, H, I, J, K);
impl_abi_codec_tuple!(12, A, B, C, D, E, F, G, H, I, J, K, L);
impl_abi_codec_tuple!(13, A, B, C, D, E, F, G, H, I, J, K, L, M);
impl_abi_codec_tuple!(14, A, B, C, D, E, F, G, H, I, J, K, L, M, N);
impl_abi_codec_tuple!(15, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O);
impl_abi_codec_tuple!(16, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q);
impl_abi_codec_tuple!(17, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R);
impl_abi_codec_tuple!(18, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S);
impl_abi_codec_tuple!(19, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T);
impl_abi_codec_tuple!(20, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U);
impl_abi_codec_tuple!(A);
impl_abi_codec_tuple!(A, B);
impl_abi_codec_tuple!(A, B, C);
impl_abi_codec_tuple!(A, B, C, D);
impl_abi_codec_tuple!(A, B, C, D, E);
impl_abi_codec_tuple!(A, B, C, D, E, F);
impl_abi_codec_tuple!(A, B, C, D, E, F, G);
impl_abi_codec_tuple!(A, B, C, D, E, F, G, H);
impl_abi_codec_tuple!(A, B, C, D, E, F, G, H, I);
impl_abi_codec_tuple!(A, B, C, D, E, F, G, H, I, J);
impl_abi_codec_tuple!(A, B, C, D, E, F, G, H, I, J, K);
impl_abi_codec_tuple!(A, B, C, D, E, F, G, H, I, J, K, L);
impl_abi_codec_tuple!(A, B, C, D, E, F, G, H, I, J, K, L, M);
impl_abi_codec_tuple!(A, B, C, D, E, F, G, H, I, J, K, L, M, N);
impl_abi_codec_tuple!(A, B, C, D, E, F, G, H, I, J, K, L, M, N, O);
impl_abi_codec_tuple!(A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P);
impl_abi_codec_tuple!(A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q);
impl_abi_codec_tuple!(A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R);
impl_abi_codec_tuple!(A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S);
impl_abi_codec_tuple!(A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T);
impl_abi_codec_tuple!(A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U);

#[cfg(test)]
mod tests {
Expand Down
44 changes: 22 additions & 22 deletions ethers-core/src/abi/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ impl<'a> AbiType for &'a str {
impl<'a> AbiArrayType for &'a str {}

macro_rules! impl_abi_type_tuple {
($num: expr, $( $ty: ident),+) => {
($( $ty: ident),+) => {
impl<$($ty, )+> AbiType for ($($ty,)+) where
$(
$ty: AbiType,
Expand All @@ -242,27 +242,27 @@ macro_rules! impl_abi_type_tuple {
}
}

impl_abi_type_tuple!(1, A);
impl_abi_type_tuple!(2, A, B);
impl_abi_type_tuple!(3, A, B, C);
impl_abi_type_tuple!(4, A, B, C, D);
impl_abi_type_tuple!(5, A, B, C, D, E);
impl_abi_type_tuple!(6, A, B, C, D, E, F);
impl_abi_type_tuple!(7, A, B, C, D, E, F, G);
impl_abi_type_tuple!(8, A, B, C, D, E, F, G, H);
impl_abi_type_tuple!(9, A, B, C, D, E, F, G, H, I);
impl_abi_type_tuple!(10, A, B, C, D, E, F, G, H, I, J);
impl_abi_type_tuple!(11, A, B, C, D, E, F, G, H, I, J, K);
impl_abi_type_tuple!(12, A, B, C, D, E, F, G, H, I, J, K, L);
impl_abi_type_tuple!(13, A, B, C, D, E, F, G, H, I, J, K, L, M);
impl_abi_type_tuple!(14, A, B, C, D, E, F, G, H, I, J, K, L, M, N);
impl_abi_type_tuple!(15, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O);
impl_abi_type_tuple!(16, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P);
impl_abi_type_tuple!(17, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q);
impl_abi_type_tuple!(18, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R);
impl_abi_type_tuple!(19, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S);
impl_abi_type_tuple!(20, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T);
impl_abi_type_tuple!(21, A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U);
impl_abi_type_tuple!(A);
impl_abi_type_tuple!(A, B);
impl_abi_type_tuple!(A, B, C);
impl_abi_type_tuple!(A, B, C, D);
impl_abi_type_tuple!(A, B, C, D, E);
impl_abi_type_tuple!(A, B, C, D, E, F);
impl_abi_type_tuple!(A, B, C, D, E, F, G);
impl_abi_type_tuple!(A, B, C, D, E, F, G, H);
impl_abi_type_tuple!(A, B, C, D, E, F, G, H, I);
impl_abi_type_tuple!(A, B, C, D, E, F, G, H, I, J);
impl_abi_type_tuple!(A, B, C, D, E, F, G, H, I, J, K);
impl_abi_type_tuple!(A, B, C, D, E, F, G, H, I, J, K, L);
impl_abi_type_tuple!(A, B, C, D, E, F, G, H, I, J, K, L, M);
impl_abi_type_tuple!(A, B, C, D, E, F, G, H, I, J, K, L, M, N);
impl_abi_type_tuple!(A, B, C, D, E, F, G, H, I, J, K, L, M, N, O);
impl_abi_type_tuple!(A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P);
impl_abi_type_tuple!(A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q);
impl_abi_type_tuple!(A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R);
impl_abi_type_tuple!(A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S);
impl_abi_type_tuple!(A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T);
impl_abi_type_tuple!(A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U);

#[allow(clippy::extra_unused_type_parameters)]
#[cfg(test)]
Expand Down