chore: fix clippy and wasm error

privacy-scaling-explorations · Jan 28, 2024 · e308fc5 · e308fc5
1 parent 1cd2ac4
commit e308fc5
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git a/circuit-benchmarks/src/super_circuit.rs b/circuit-benchmarks/src/super_circuit.rs
@@ -89,6 +89,7 @@ mod tests {
             max_bytecode: 512,
             max_evm_rows: 0,
             max_keccak_rows: 0,
+            max_vertical_circuit_rows: 0,
         };
         let (_, circuit, instance, _) =
             SuperCircuit::build(block, circuits_params, Fr::from(0x100)).unwrap();

diff --git a/integration-tests/tests/circuit_input_builder.rs b/integration-tests/tests/circuit_input_builder.rs
@@ -25,6 +25,7 @@ async fn test_circuit_input_builder_block(block_num: u64) {
             max_evm_rows: 0,
             max_exp_steps: 1000,
             max_keccak_rows: 0,
+            max_vertical_circuit_rows: 0,
         },
     )
     .await

diff --git a/zkevm-circuits/src/sig_circuit.rs b/zkevm-circuits/src/sig_circuit.rs
@@ -18,7 +18,10 @@ mod utils;
 use crate::{
     evm_circuit::{util::not, EvmCircuit},
     keccak_circuit::KeccakCircuit,
-    sig_circuit::ecdsa::ecdsa_verify_no_pubkey_check,
+    sig_circuit::{
+        ecdsa::ecdsa_verify_no_pubkey_check,
+        utils::{calc_required_advices, FpChip},
+    },
     table::{KeccakTable, SigTable},
     util::{word::Word, Challenges, Expr, SubCircuit, SubCircuitConfig},
 };
@@ -40,8 +43,6 @@ use halo2_ecc::{
         FieldChip,
     },
 };
-
-#[cfg(any(feature = "test", test, feature = "test-circuits"))]
 pub(crate) use utils::*;
 
 use halo2_proofs::{

diff --git a/zkevm-circuits/src/sig_circuit/test.rs b/zkevm-circuits/src/sig_circuit/test.rs
@@ -1,8 +1,5 @@
 use super::*;
-use eth_types::{
-    sign_types::{sign, SignData},
-    Field,
-};
+use eth_types::sign_types::{sign, SignData};
 use halo2_proofs::{
     arithmetic::Field as HaloField,
     dev::MockProver,
@@ -130,7 +127,7 @@ fn test_edge_cases() {
     log::debug!("signatures=");
     log::debug!("{:#?}", signatures);
 
-    run::<Fr>(LOG_TOTAL_NUM_ROWS as u32, 8, signatures);
+    run(LOG_TOTAL_NUM_ROWS as u32, 8, signatures);
 }
 
 #[test]
@@ -152,7 +149,7 @@ fn sign_verify_zero_msg_hash() {
     });
 
     let k = LOG_TOTAL_NUM_ROWS as u32;
-    run::<Fr>(k, 1, signatures);
+    run(k, 1, signatures);
 
     log::debug!("end of testing for msg_hash = 0");
 }
@@ -176,7 +173,7 @@ fn sign_verify_nonzero_msg_hash() {
     });
 
     let k = LOG_TOTAL_NUM_ROWS as u32;
-    run::<Fr>(k, 1, signatures);
+    run(k, 1, signatures);
 
     log::debug!("end of testing for msg_hash = 1");
 }
@@ -209,7 +206,7 @@ fn sign_verify() {
         }
 
         let k = LOG_TOTAL_NUM_ROWS as u32;
-        run::<Fr>(k, *max_sig, signatures);
+        run(k, *max_sig, signatures);
 
         log::debug!("end of testing for {} signatures", max_sig);
     }
@@ -244,7 +241,7 @@ fn sign_with_rng(
     sign(randomness, sk, msg_hash)
 }
 
-fn run<F: Field>(k: u32, max_verif: usize, signatures: Vec<SignData>) {
+fn run(k: u32, max_verif: usize, signatures: Vec<SignData>) {
     // SignVerifyChip -> ECDSAChip -> MainGate instance column
     let circuit = SigCircuit::<Fr> {
         max_verif,