git.delta.rocks / unique-network / refs/commits / a16933bbf61b

difftreelog

refactor Rename SolidityTupleType to SolidityType

Trubnikov Sergey2022-11-18parent: #69b68ba.patch.diff
in: master

5 files changed

modifiedcrates/evm-coder/procedural/src/abi_derive.rsdiffbeforeafterboth
30 let abi_type = impl_abi_type(name, field_types.clone());30 let abi_type = impl_abi_type(name, field_types.clone());
31 let abi_read = impl_abi_read(name, is_named_fields, field_names.clone(), field_types);31 let abi_read = impl_abi_read(name, is_named_fields, field_names.clone(), field_types);
32 let abi_write = impl_abi_write(name, is_named_fields, params_count, field_names);32 let abi_write = impl_abi_write(name, is_named_fields, params_count, field_names);
33 // let solidity_tuple_type =
3334
34 Ok(quote! {35 Ok(quote! {
35 #can_be_plcaed_in_vec36 #can_be_plcaed_in_vec
modifiedcrates/evm-coder/src/solidity/impls.rsdiffbeforeafterboth
1use super::{TypeCollector, SolidityTypeName, SolidityTupleType};1use super::{TypeCollector, SolidityTypeName, SolidityType};
2use crate::{sealed, types::*};2use crate::{sealed, types::*};
3use core::fmt;3use core::fmt;
44
7070
71macro_rules! impl_tuples {71macro_rules! impl_tuples {
72 ($($ident:ident)+) => {72 ($($ident:ident)+) => {
73 impl<$($ident: SolidityTypeName + 'static),+> SolidityTupleType for ($($ident,)+) {73 impl<$($ident: SolidityTypeName + 'static),+> SolidityType for ($($ident,)+) {
74 fn names(tc: &TypeCollector) -> Vec<string> {74 fn names(tc: &TypeCollector) -> Vec<string> {
75 let mut collected = Vec::with_capacity(Self::len());75 let mut collected = Vec::with_capacity(Self::len());
76 $({76 $({
modifiedcrates/evm-coder/src/solidity/mod.rsdiffbeforeafterboth
59 self.id.set(v + 1);59 self.id.set(v + 1);
60 v60 v
61 }61 }
62 pub fn collect_tuple<T: SolidityTupleType>(&self) -> String {62 pub fn collect_tuple<T: SolidityType>(&self) -> String {
63 let names = T::names(self);63 let names = T::names(self);
64 if let Some(id) = self.anonymous.borrow().get(&names).cloned() {64 if let Some(id) = self.anonymous.borrow().get(&names).cloned() {
65 return format!("Tuple{}", id);65 return format!("Tuple{}", id);
modifiedcrates/evm-coder/src/solidity/traits.rsdiffbeforeafterboth
19 }19 }
20}20}
2121
22pub trait SolidityTupleType {22pub trait SolidityType {
23 fn names(tc: &TypeCollector) -> Vec<String>;23 fn names(tc: &TypeCollector) -> Vec<String>;
24 fn len() -> usize;24 fn len() -> usize;
25}25}
modifiedpallets/common/src/eth.rsdiffbeforeafterboth
156}156}
157157
158#[cfg(feature = "stubgen")]158#[cfg(feature = "stubgen")]
159impl ::evm_coder::solidity::SolidityTupleType for EthCrossAccount {159impl ::evm_coder::solidity::SolidityType for EthCrossAccount {
160 fn names(tc: &::evm_coder::solidity::TypeCollector) -> Vec<String> {160 fn names(tc: &::evm_coder::solidity::TypeCollector) -> Vec<String> {
161 let mut collected =161 let mut collected =
162 Vec::with_capacity(<Self as ::evm_coder::solidity::SolidityTupleType>::len());162 Vec::with_capacity(<Self as ::evm_coder::solidity::SolidityType>::len());
163 {163 {
164 let mut out = String::new();164 let mut out = String::new();
165 <address as ::evm_coder::solidity::SolidityTypeName>::solidity_name(&mut out, tc)165 <address as ::evm_coder::solidity::SolidityTypeName>::solidity_name(&mut out, tc)