fix: patch up rebase I messed up lol

alloy-rs · May 2, 2023 · 8b4a610 · 8b4a610
1 parent 052010c
commit 8b4a610
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 12 deletions.
diff --git a/abi/sol-type-parser/src/struct.rs b/abi/sol-type-parser/src/struct.rs
@@ -162,7 +162,7 @@ impl SolStructDef {
 
             #[allow(non_snake_case)]
             const _: () = {
-                use ::ethers_abi_enc::{SolDataType, keccak256, no_std_prelude::*};
+                use ::ethers_abi_enc::{SolDataType, no_std_prelude::*};
 
                 #convert
 

diff --git a/abi/src/eip712.rs b/abi/src/eip712.rs
@@ -1,8 +1,6 @@
 use crate::{
     no_std_prelude::{Cow, String, Vec},
-    sol_data,
-    util::keccak256,
-    SolType,
+    sol_data, SolType,
 };
 use ethers_primitives::{keccak256, Address, B256, U256};
 

diff --git a/abi/src/lib.rs b/abi/src/lib.rs
@@ -259,6 +259,9 @@ mod sol_types;
 pub use sol_types::{sol_data, SolDataType, SolError, SolStruct, SolType};
 
 mod util;
+
+#[doc(hidden)]
+pub use ethers_primitives::keccak256;
 #[doc(hidden)]
 pub use util::just_ok;
 

diff --git a/abi/src/sol_types/sol_data.rs b/abi/src/sol_types/sol_data.rs
@@ -1,13 +1,13 @@
 use alloc::borrow::Cow;
 use core::marker::PhantomData;
-use ethers_primitives::{B160, I256, U256};
+use ethers_primitives::{keccak256, Address as RustAddress, I256, U256};
 
 #[cfg(not(feature = "std"))]
 use crate::no_std_prelude::{Borrow, String as RustString, ToOwned, Vec};
 #[cfg(feature = "std")]
 use std::{borrow::Borrow, string::String as RustString};
 
-use crate::{keccak256, token::*, util, AbiResult, SolType, Word};
+use crate::{token::*, util, AbiResult, SolType, Word};
 
 /// This trait describes types that exist in normal Solidity operation
 /// (i.e. NOT events, errors, function calls)
@@ -43,7 +43,7 @@ pub trait SolDataType: SolType {
 pub struct Address;
 
 impl SolType for Address {
-    type RustType = B160;
+    type RustType = RustAddress;
     type TokenType = WordToken;
 
     fn sol_type_name() -> Cow<'static, str> {
@@ -56,7 +56,7 @@ impl SolType for Address {
 
     fn detokenize(token: Self::TokenType) -> AbiResult<Self::RustType> {
         let sli = &token.as_slice()[12..];
-        Ok(B160::from_slice(sli))
+        Ok(RustAddress::from_slice(sli))
     }
 
     fn tokenize<B>(rust: B) -> Self::TokenType

diff --git a/abi/src/sol_types/sol_struct.rs b/abi/src/sol_types/sol_struct.rs
@@ -3,10 +3,7 @@
 
 use ethers_primitives::{keccak256, B256};
 
-use crate::token::TokenSeq;
-use crate::{util::keccak256, SolDataType, Word};
-
-use crate::{no_std_prelude::*, Eip712Domain};
+use crate::{no_std_prelude::*, token::TokenSeq, Eip712Domain, SolDataType, Word};
 
 use super::SolType;