Skip to content
This repository has been archived by the owner on May 3, 2024. It is now read-only.

Commit

Permalink
saving progress
Browse files Browse the repository at this point in the history
  • Loading branch information
ggkitsas committed Aug 31, 2023
1 parent c7ba031 commit ec0b6c1
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 12 deletions.
14 changes: 6 additions & 8 deletions zkevm-circuits/src/taiko_pi_circuit.rs
Original file line number Diff line number Diff line change
Expand Up @@ -685,8 +685,6 @@ impl<F: Field> SubCircuitConfig<F> for TaikoPiCircuitConfig<F> {
.collect::<Vec<_>>()
});

let offset = TOTAL_BLOCK_TABLE_LEN + EXTRA_LEN;

// Block hash checks in three parts:
// 1. RLP checks
// 2. RLC calculation
Expand Down Expand Up @@ -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);
Expand All @@ -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;
Expand All @@ -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;
Expand All @@ -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;
Expand All @@ -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;
Expand All @@ -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;
Expand Down
5 changes: 1 addition & 4 deletions zkevm-circuits/src/test_util.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit ec0b6c1

Please sign in to comment.