From ec0b6c1fb8aca732ab6bb6aca2b19aaa51fff7c7 Mon Sep 17 00:00:00 2001 From: Georgios Gkitsas Date: Thu, 31 Aug 2023 14:16:14 +0100 Subject: [PATCH] saving progress --- zkevm-circuits/src/taiko_pi_circuit.rs | 14 ++++++-------- zkevm-circuits/src/test_util.rs | 5 +---- 2 files changed, 7 insertions(+), 12 deletions(-) diff --git a/zkevm-circuits/src/taiko_pi_circuit.rs b/zkevm-circuits/src/taiko_pi_circuit.rs index 13def5552c..775f4fcaa1 100644 --- a/zkevm-circuits/src/taiko_pi_circuit.rs +++ b/zkevm-circuits/src/taiko_pi_circuit.rs @@ -685,8 +685,6 @@ impl SubCircuitConfig for TaikoPiCircuitConfig { .collect::>() }); - let offset = TOTAL_BLOCK_TABLE_LEN + EXTRA_LEN; - // Block hash checks in three parts: // 1. RLP checks // 2. RLC calculation @@ -3015,7 +3013,7 @@ mod taiko_pi_circuit_test { const MAX_CALLDATA: usize = 200; let k = 18; - let (mut block, prover, previous_blocks, previous_blocks_rlp) = default_test_block(); + let (mut block, _, previous_blocks, previous_blocks_rlp) = default_test_block(); block.context.number = U256::from(0x100); let mut public_data = PublicData::new(&block); @@ -3031,7 +3029,7 @@ mod taiko_pi_circuit_test { const MAX_CALLDATA: usize = 200; let k = 18; - let (mut block, prover, previous_blocks, previous_blocks_rlp) = default_test_block(); + let (mut block, _, previous_blocks, previous_blocks_rlp) = default_test_block(); block.context.number = U256::from(0x100); block.context.gas_limit = 0x76; block.protocol_instance.gas_used = 0x77; @@ -3051,7 +3049,7 @@ mod taiko_pi_circuit_test { const MAX_CALLDATA: usize = 200; let k = 18; - let (mut block, prover, previous_blocks, previous_blocks_rlp) = default_test_block(); + let (mut block, _, previous_blocks, previous_blocks_rlp) = default_test_block(); block.context.number = U256::from(0x100); block.context.gas_limit = RLP_HDR_NOT_SHORT; block.protocol_instance.gas_used = RLP_HDR_NOT_SHORT as u32; @@ -3071,7 +3069,7 @@ mod taiko_pi_circuit_test { const MAX_CALLDATA: usize = 200; let k = 18; - let (mut block, prover, previous_blocks, previous_blocks_rlp) = default_test_block(); + let (mut block, _, previous_blocks, previous_blocks_rlp) = default_test_block(); block.context.number = U256::from(0x100); block.context.gas_limit = 0xFF; block.protocol_instance.gas_used = 0xff; @@ -3091,7 +3089,7 @@ mod taiko_pi_circuit_test { const MAX_CALLDATA: usize = 200; let k = 18; - let (mut block, prover, previous_blocks, previous_blocks_rlp) = default_test_block(); + let (mut block, _, previous_blocks, previous_blocks_rlp) = default_test_block(); block.context.number = U256::from(0x100); block.context.gas_limit = 0x0000919191919191; block.protocol_instance.gas_used = 0x92 << 2 * 8; @@ -3111,7 +3109,7 @@ mod taiko_pi_circuit_test { const MAX_CALLDATA: usize = 200; let k = 18; - let (mut block, prover, previous_blocks, previous_blocks_rlp) = default_test_block(); + let (mut block, _, previous_blocks, previous_blocks_rlp) = default_test_block(); block.context.number = U256::from(0x100); block.context.gas_limit = 0x9191919191919191; diff --git a/zkevm-circuits/src/test_util.rs b/zkevm-circuits/src/test_util.rs index e0ae4b23e6..f6faaa1efa 100644 --- a/zkevm-circuits/src/test_util.rs +++ b/zkevm-circuits/src/test_util.rs @@ -6,10 +6,7 @@ use crate::{ witness::{Block, Rw}, }; use bus_mapping::{circuit_input_builder::CircuitsParams, mock::BlockData}; -use eth_types::geth_types::{GethData, Transaction}; -use ethers_core::types::{NameOrAddress, TransactionRequest}; -use ethers_signers::LocalWallet; -use rand::{CryptoRng, Rng}; +use eth_types::geth_types::GethData; use std::cmp; use crate::util::log2_ceil;