From 71d0e028ad9b18fabc8f9e36f802e5033e8adb11 Mon Sep 17 00:00:00 2001 From: "sm.wu" Date: Fri, 21 Apr 2023 13:01:03 +0800 Subject: [PATCH] code cosmetics --- zkevm-circuits/src/pi_circuit.rs | 6 +++--- zkevm-circuits/src/super_circuit.rs | 4 +--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/zkevm-circuits/src/pi_circuit.rs b/zkevm-circuits/src/pi_circuit.rs index b0922f7d51f..4041d48fa23 100644 --- a/zkevm-circuits/src/pi_circuit.rs +++ b/zkevm-circuits/src/pi_circuit.rs @@ -61,7 +61,7 @@ pub struct PiCircuitConfig { // The value can be one byte or multiple bytes. The order of values is pre-defined and // hardcode. can't use selector here because we need rotation q_rpi_value_start: Column, - // q_digest_field_start: mark starting of hi and low. can't use selector here because we need + // q_digest_value_start: mark starting of hi and low. can't use selector here because we need // rotation q_digest_value_start: Column, @@ -1464,7 +1464,7 @@ impl SubCircuit for PiCircuit { /// Compute the public inputs for this circuit. fn instance(&self) -> Vec> { let rpi_digest_byte_field = - get_rpi_digest_byte_field::(self.max_txs, self.max_calldata, &self.public_data) + get_rpi_digest_byte_field_le::(self.max_txs, self.max_calldata, &self.public_data) .iter() .rev() .copied() @@ -1774,7 +1774,7 @@ impl SubCircuit for PiCircuit { } /// Compute the raw_public_inputs column from the verifier's perspective. -fn get_rpi_digest_byte_field( +fn get_rpi_digest_byte_field_le( max_txs: usize, max_calldata: usize, public_data: &PublicData, diff --git a/zkevm-circuits/src/super_circuit.rs b/zkevm-circuits/src/super_circuit.rs index e23dffc3658..b5b6da6bb54 100644 --- a/zkevm-circuits/src/super_circuit.rs +++ b/zkevm-circuits/src/super_circuit.rs @@ -87,7 +87,6 @@ use std::array; pub struct SuperCircuitConfig { block_table: BlockTable, mpt_table: MptTable, - keccak_table: KeccakTable, evm_circuit: EvmCircuitConfig, state_circuit: StateCircuitConfig, tx_circuit: TxCircuitConfig, @@ -206,7 +205,7 @@ impl SubCircuitConfig for SuperCircuitConfig { bytecode_table, block_table: block_table.clone(), copy_table, - keccak_table: keccak_table.clone(), + keccak_table, exp_table, }, ); @@ -214,7 +213,6 @@ impl SubCircuitConfig for SuperCircuitConfig { Self { block_table, mpt_table, - keccak_table, evm_circuit, state_circuit, copy_circuit,