From 54207ec20765eb996ae0cebb6cfe6b582029c920 Mon Sep 17 00:00:00 2001 From: Dream Wu Date: Wed, 9 Oct 2024 16:57:38 +0800 Subject: [PATCH] fix merge error --- eth-types/src/sign_types.rs | 2 +- zkevm-circuits/src/witness/block.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/eth-types/src/sign_types.rs b/eth-types/src/sign_types.rs index 67f56a4324..882333397c 100644 --- 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 index 40f4d7659d..2e6e691e60 100644 --- 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},