difftreelog
refactor Rename SolidityTupleType to SolidityType
in: master
5 files changed
crates/evm-coder/procedural/src/abi_derive.rsdiffbeforeafterboth30 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 =333434 Ok(quote! {35 Ok(quote! {35 #can_be_plcaed_in_vec36 #can_be_plcaed_in_veccrates/evm-coder/src/solidity/impls.rsdiffbeforeafterboth--- a/crates/evm-coder/src/solidity/impls.rs
+++ b/crates/evm-coder/src/solidity/impls.rs
@@ -1,4 +1,4 @@
-use super::{TypeCollector, SolidityTypeName, SolidityTupleType};
+use super::{TypeCollector, SolidityTypeName, SolidityType};
use crate::{sealed, types::*};
use core::fmt;
@@ -70,7 +70,7 @@
macro_rules! impl_tuples {
($($ident:ident)+) => {
- impl<$($ident: SolidityTypeName + 'static),+> SolidityTupleType for ($($ident,)+) {
+ impl<$($ident: SolidityTypeName + 'static),+> SolidityType for ($($ident,)+) {
fn names(tc: &TypeCollector) -> Vec<string> {
let mut collected = Vec::with_capacity(Self::len());
$({
crates/evm-coder/src/solidity/mod.rsdiffbeforeafterboth--- a/crates/evm-coder/src/solidity/mod.rs
+++ b/crates/evm-coder/src/solidity/mod.rs
@@ -59,7 +59,7 @@
self.id.set(v + 1);
v
}
- pub fn collect_tuple<T: SolidityTupleType>(&self) -> String {
+ pub fn collect_tuple<T: SolidityType>(&self) -> String {
let names = T::names(self);
if let Some(id) = self.anonymous.borrow().get(&names).cloned() {
return format!("Tuple{}", id);
crates/evm-coder/src/solidity/traits.rsdiffbeforeafterboth--- a/crates/evm-coder/src/solidity/traits.rs
+++ b/crates/evm-coder/src/solidity/traits.rs
@@ -19,7 +19,7 @@
}
}
-pub trait SolidityTupleType {
+pub trait SolidityType {
fn names(tc: &TypeCollector) -> Vec<String>;
fn len() -> usize;
}
pallets/common/src/eth.rsdiffbeforeafterboth--- a/pallets/common/src/eth.rs
+++ b/pallets/common/src/eth.rs
@@ -156,10 +156,10 @@
}
#[cfg(feature = "stubgen")]
-impl ::evm_coder::solidity::SolidityTupleType for EthCrossAccount {
+impl ::evm_coder::solidity::SolidityType for EthCrossAccount {
fn names(tc: &::evm_coder::solidity::TypeCollector) -> Vec<String> {
let mut collected =
- Vec::with_capacity(<Self as ::evm_coder::solidity::SolidityTupleType>::len());
+ Vec::with_capacity(<Self as ::evm_coder::solidity::SolidityType>::len());
{
let mut out = String::new();
<address as ::evm_coder::solidity::SolidityTypeName>::solidity_name(&mut out, tc)