fix: remove unused method body on solstruct (#200)

* fix: remove unused method body on solstruct * lint: clippy * fix: remove unused fields
alloy-rs · Jul 20, 2023 · 3d89ec5 · 3d89ec5
1 parent ed1fdbc
commit 3d89ec5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 36 deletions.
diff --git a/crates/sol-macro/src/expand/struct.rs b/crates/sol-macro/src/expand/struct.rs
@@ -35,9 +35,6 @@ pub(super) fn expand(cx: &ExpCtxt<'_>, s: &ItemStruct) -> Result<TokenStream> {
     let (_sol_attrs, mut attrs) = crate::attr::SolAttrs::parse(attrs)?;
     cx.derives(&mut attrs, fields, true);
 
-    let field_types_s = fields.iter().map(|f| f.ty.to_string());
-    let field_names_s = fields.iter().map(|f| f.name.as_ref().unwrap().to_string());
-
     let (field_types, field_names): (Vec<_>, Vec<_>) = fields
         .iter()
         .map(|f| (expand_type(&f.ty), f.name.as_ref().unwrap()))
@@ -100,10 +97,6 @@ pub(super) fn expand(cx: &ExpCtxt<'_>, s: &ItemStruct) -> Result<TokenStream> {
 
                 const NAME: &'static str = #name_s;
 
-                const FIELDS: &'static [(&'static str, &'static str)] = &[
-                    #((#field_types_s, #field_names_s)),*
-                ];
-
                 fn to_rust<'a>(&self) -> UnderlyingRustTuple<'a> {
                     self.clone().into()
                 }

diff --git a/crates/sol-types/src/types/struct.rs b/crates/sol-types/src/types/struct.rs
@@ -3,7 +3,7 @@
 
 use super::{Encodable, SolType};
 use crate::{token::TokenSeq, Eip712Domain, TokenType, Word};
-use alloc::{borrow::Cow, string::String, vec::Vec};
+use alloc::{borrow::Cow, vec::Vec};
 use alloy_primitives::{keccak256, B256};
 
 type TupleFor<'a, T> = <T as SolStruct>::Tuple<'a>;
@@ -43,13 +43,6 @@ pub trait SolStruct: 'static {
     /// Used in [`eip712_encode_type`][SolStruct::eip712_encode_type].
     const NAME: &'static str;
 
-    /// The field types and names. Type is a Solidity string, and must conform
-    /// to the name of the Solidty type at the same index in the associated
-    /// tuple.
-    ///
-    /// Used in [`eip712_encode_type`][SolStruct::eip712_encode_type].
-    const FIELDS: &'static [(&'static str, &'static str)];
-
     // TODO: avoid clones here
     /// Convert to the tuple type used for ABI encoding and decoding.
     fn to_rust<'a>(&self) -> <Self::Tuple<'a> as SolType>::RustType;
@@ -72,27 +65,7 @@ pub trait SolStruct: 'static {
 
     /// EIP-712 `encodeType`
     /// <https://eips.ethereum.org/EIPS/eip-712#definition-of-encodetype>
-    fn eip712_encode_type() -> Cow<'static, str> {
-        let capacity = Self::FIELDS
-            .iter()
-            .map(|(ty, name)| ty.len() + name.len() + 1)
-            .sum::<usize>()
-            + Self::NAME.len()
-            + 2;
-        let mut out = String::with_capacity(capacity);
-        out.push_str(Self::NAME);
-        out.push('(');
-        for (i, &(ty, name)) in Self::FIELDS.iter().enumerate() {
-            if i > 0 {
-                out.push(',');
-            }
-            out.push_str(ty);
-            out.push(' ');
-            out.push_str(name);
-        }
-        out.push(')');
-        out.into()
-    }
+    fn eip712_encode_type() -> Cow<'static, str>;
 
     /// EIP-712 `typeHash`
     /// <https://eips.ethereum.org/EIPS/eip-712#rationale-for-typehash>