difftreelog
refactor Rename SolidityTupleType to SolidityType
in: master
5 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
@@ -30,6 +30,7 @@
let abi_type = impl_abi_type(name, field_types.clone());
let abi_read = impl_abi_read(name, is_named_fields, field_names.clone(), field_types);
let abi_write = impl_abi_write(name, is_named_fields, params_count, field_names);
+ // let solidity_tuple_type =
Ok(quote! {
#can_be_plcaed_in_vec
crates/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.rsdiffbeforeafterboth1use super::TypeCollector;2use core::fmt;34pub trait StructCollect: 'static {5 /// Structure name.6 fn name() -> String;7 /// Structure declaration.8 fn declaration() -> String;9}1011pub trait SolidityTypeName: 'static {12 fn solidity_name(writer: &mut impl fmt::Write, tc: &TypeCollector) -> fmt::Result;13 /// "simple" types are stored inline, no `memory` modifier should be used in solidity14 fn is_simple() -> bool;15 fn solidity_default(writer: &mut impl fmt::Write, tc: &TypeCollector) -> fmt::Result;16 /// Specialization17 fn is_void() -> bool {18 false19 }20}2122pub trait SolidityTupleType {23 fn names(tc: &TypeCollector) -> Vec<String>;24 fn len() -> usize;25}2627pub trait SolidityArguments {28 fn solidity_name(&self, writer: &mut impl fmt::Write, tc: &TypeCollector) -> fmt::Result;29 fn solidity_get(&self, prefix: &str, writer: &mut impl fmt::Write) -> fmt::Result;30 fn solidity_default(&self, writer: &mut impl fmt::Write, tc: &TypeCollector) -> fmt::Result;31 fn is_empty(&self) -> bool {32 self.len() == 033 }34 fn len(&self) -> usize;35}3637pub trait SolidityFunctions {38 fn solidity_name(39 &self,40 is_impl: bool,41 writer: &mut impl fmt::Write,42 tc: &TypeCollector,43 ) -> fmt::Result;44}1use super::TypeCollector;2use core::fmt;34pub trait StructCollect: 'static {5 /// Structure name.6 fn name() -> String;7 /// Structure declaration.8 fn declaration() -> String;9}1011pub trait SolidityTypeName: 'static {12 fn solidity_name(writer: &mut impl fmt::Write, tc: &TypeCollector) -> fmt::Result;13 /// "simple" types are stored inline, no `memory` modifier should be used in solidity14 fn is_simple() -> bool;15 fn solidity_default(writer: &mut impl fmt::Write, tc: &TypeCollector) -> fmt::Result;16 /// Specialization17 fn is_void() -> bool {18 false19 }20}2122pub trait SolidityType {23 fn names(tc: &TypeCollector) -> Vec<String>;24 fn len() -> usize;25}2627pub trait SolidityArguments {28 fn solidity_name(&self, writer: &mut impl fmt::Write, tc: &TypeCollector) -> fmt::Result;29 fn solidity_get(&self, prefix: &str, writer: &mut impl fmt::Write) -> fmt::Result;30 fn solidity_default(&self, writer: &mut impl fmt::Write, tc: &TypeCollector) -> fmt::Result;31 fn is_empty(&self) -> bool {32 self.len() == 033 }34 fn len(&self) -> usize;35}3637pub trait SolidityFunctions {38 fn solidity_name(39 &self,40 is_impl: bool,41 writer: &mut impl fmt::Write,42 tc: &TypeCollector,43 ) -> fmt::Result;44}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)