fix merge error

scroll-tech · Oct 9, 2024 · 54207ec · 54207ec
1 parent 748ec0b
commit 54207ec
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/eth-types/src/sign_types.rs b/eth-types/src/sign_types.rs
@@ -18,7 +18,7 @@ use halo2curves::{
     ff::FromUniformBytes,
     //group::{ff::PrimeField, prime::PrimeCurveAffine, Curve},
     group::{
-        ff::{prime::PrimeCurveAffine, Curve, Field as GroupField, PrimeField},
+        ff::{Field as GroupField, PrimeField},
         prime::PrimeCurveAffine,
         Curve, GroupEncoding,
     },

diff --git a/zkevm-circuits/src/witness/block.rs b/zkevm-circuits/src/witness/block.rs
@@ -22,7 +22,7 @@ use bus_mapping::{
 use eth_types::{
     sign_types::SignData,
     state_db::{CodeDB, StateDB},
-    Address, Address, ToLittleEndian, ToLittleEndian, Word, Word, H256, H256, U256, U256,
+    Address, ToLittleEndian, Word, H256, U256,
 };
 use halo2_proofs::halo2curves::{
     secp256k1::{self, Secp256k1Affine},