[fix] chain id len for tests

Author: zhenfeizhang

aggregator/src/tests/aggregator_e2e.rs

@@ -53,7 +53,7 @@ fn test_e2e() {
     // Proof for test circuit
     let circuits = chunks
         .iter()
-        .map(|&chunk| MockChunkCircuit { chunk })
+        .map(|&chunk| MockChunkCircuit { chain_id: 0, chunk })
         .collect_vec();
     let layer_0_snarks = circuits
         .iter()

aggregator/src/tests/mock_chunk.rs

@@ -16,6 +16,7 @@ mod config;
 /// - data hash
 /// - public input hash
 pub struct MockChunkCircuit {
+    pub(crate) chain_id: u64,
     pub(crate) chunk: ChunkHash,
 }
 

aggregator/src/tests/mock_chunk/circuit.rs

@@ -16,6 +16,7 @@ use super::{
 impl MockChunkCircuit {
     pub(crate) fn random<R: rand::RngCore>(r: &mut R) -> Self {
         Self {
+            chain_id: 0,
             chunk: ChunkHash::mock_chunk_hash(r),
         }
     }

aggregator/src/tests/mock_chunk/circuit_ext.rs

@@ -13,15 +13,17 @@ impl CircuitExt<Fr> for MockChunkCircuit {
 
     /// return vec![data hash | public input hash]
     fn instances(&self) -> Vec<Vec<Fr>> {
-        vec![
-            self.chain_id.to_le_bytes().iter().zip(
-            
-            self
-            .chunk
-            .data_hash
-            .as_bytes()
+        vec![self
+            .chain_id
+            .to_le_bytes()
             .iter()
-            .chain(self.chunk.public_input_hash().as_bytes().iter()))
+            .chain(
+                self.chunk
+                    .data_hash
+                    .as_bytes()
+                    .iter()
+                    .chain(self.chunk.public_input_hash().as_bytes().iter()),
+            )
             .map(|&x| Fr::from(x as u64))
             .collect()]
     }

aggregator/src/tests/mock_chunk/config.rs

@@ -14,7 +14,7 @@ use zkevm_circuits::{
 
 use crate::{
     util::{capacity, get_indices},
-    LOG_DEGREE,
+    CHAIN_ID_LEN, LOG_DEGREE,
 };
 
 /// Config for MockChunkCircuit
@@ -152,9 +152,9 @@ impl MockChunkCircuitConfig {
         // chunk's data hash
         for i in 0..32 {
             layouter.constrain_instance(
-                hash_input_cells[i + 100].cell(),
+                hash_input_cells[i + 96 + CHAIN_ID_LEN].cell(),
                 self.hash_digest_column,
-                i,
+                i + CHAIN_ID_LEN,
             )?;
         }
         // chunk's public_input_hash
@@ -164,10 +164,15 @@ impl MockChunkCircuitConfig {
                 layouter.constrain_instance(
                     hash_output_cells[(3 - i) * 8 + j].cell(),
                     self.hash_digest_column,
-                    i * 8 + j + 32,
+                    i * 8 + j + 32 + CHAIN_ID_LEN,
                 )?;
             }
         }
+        // chain id
+        for i in 0..CHAIN_ID_LEN {
+            layouter.constrain_instance(hash_input_cells[i].cell(), self.hash_digest_column, i)?;
+        }
+
         Ok(hash_output_cells)
     }
 }

aggregator/src/tests/proof_aggregation.rs

@@ -43,7 +43,7 @@ fn test_aggregation_circuit() {
     // Proof for test circuit
     let circuits = chunks
         .iter()
-        .map(|&chunk| MockChunkCircuit { chunk })
+        .map(|&chunk| MockChunkCircuit { chain_id: 0, chunk })
         .collect_vec();
     let layer_0_snarks = circuits
         .iter()

aggregator/tests.sh

@@ -4,7 +4,7 @@ RUST_LOG=trace MODE=greeter cargo test --release --features=print-trace test_moc
 
 
 # the following 3 tests takes super long time
-# RUST_LOG=trace MODE=greeter cargo test --release --features=print-trace test_mock_chunk_prover -- --nocapture 2>&1 | tee mock_chunk.log
+# RUST_LOG=trace MODE=greeter cargo test --release --features=print-trace test_proof_compression -- --nocapture 2>&1 | tee mock_chunk.log
 # RUST_LOG=trace MODE=greeter cargo test --release --features=print-trace test_two_layer_proof_compression -- --ignored --nocapture 2>&1 | tee compression2.log
 # RUST_LOG=trace MODE=greeter cargo test --release --features=print-trace test_aggregation_circuit -- --ignored --nocapture 2>&1 | tee aggregation.log
 # RUST_LOG=trace MODE=greeter cargo test --release --features=print-trace test_e2e -- --ignored --nocapture 2>&1 | tee aggregation.log