Small refactor to component log sizes (#72)

shaharsamocha7 · web-flow · commit 92e018ee95a9 · 2025-03-02T17:51:24.000+02:00
diff --git a/crates/prover/src/components/add_mul_imm_opcode/component.rs b/crates/prover/src/components/add_mul_imm_opcode/component.rs
@@ -167,13 +167,9 @@ impl Claim {
     }
 
     pub fn log_sizes(&self) -> TreeVec<Vec<u32>> {
-        let interaction_1_log_sizes = vec![self.log_size; N_TRACE_COLUMNS];
-        let interaction_2_log_sizes = vec![self.log_size; SECURE_EXTENSION_DEGREE * 3];
-        TreeVec::new(vec![
-            vec![],
-            interaction_1_log_sizes,
-            interaction_2_log_sizes,
-        ])
+        let trace = vec![self.log_size; N_TRACE_COLUMNS];
+        let interaction_trace = vec![self.log_size; SECURE_EXTENSION_DEGREE * 3];
+        TreeVec::new(vec![vec![], trace, interaction_trace])
     }
 }
 
diff --git a/crates/prover/src/components/add_mul_opcode/component.rs b/crates/prover/src/components/add_mul_opcode/component.rs
@@ -167,13 +167,9 @@ impl Claim {
     }
 
     pub fn log_sizes(&self) -> TreeVec<Vec<u32>> {
-        let interaction_1_log_sizes = vec![self.log_size; N_TRACE_COLUMNS];
-        let interaction_2_log_sizes = vec![self.log_size; SECURE_EXTENSION_DEGREE * 3];
-        TreeVec::new(vec![
-            vec![],
-            interaction_1_log_sizes,
-            interaction_2_log_sizes,
-        ])
+        let trace = vec![self.log_size; N_TRACE_COLUMNS];
+        let interaction_trace = vec![self.log_size; SECURE_EXTENSION_DEGREE * 3];
+        TreeVec::new(vec![vec![], trace, interaction_trace])
     }
 }
 
diff --git a/crates/prover/src/components/addap_jmpabs_jmprel_opcode/component.rs b/crates/prover/src/components/addap_jmpabs_jmprel_opcode/component.rs
@@ -105,10 +105,9 @@ pub struct Claim {
 
 impl Claim {
     pub fn log_sizes(&self) -> TreeVec<Vec<u32>> {
-        let trace_log_sizes = vec![self.log_size; N_TRACE_CELLS];
-        let interaction_log_sizes =
-            vec![self.log_size; SECURE_EXTENSION_DEGREE * 3_usize.div_ceil(2)];
-        TreeVec::new(vec![vec![], trace_log_sizes, interaction_log_sizes])
+        let trace = vec![self.log_size; N_TRACE_CELLS];
+        let interaction_trace = vec![self.log_size; SECURE_EXTENSION_DEGREE * 3_usize.div_ceil(2)];
+        TreeVec::new(vec![vec![], trace, interaction_trace])
     }
 
     pub fn mix_into(&self, channel: &mut impl Channel) {
diff --git a/crates/prover/src/components/range_check/range_check_15/component.rs b/crates/prover/src/components/range_check/range_check_15/component.rs
@@ -74,14 +74,9 @@ impl Claim {
     }
 
     pub fn log_sizes(&self) -> TreeVec<Vec<u32>> {
-        let preprocessed_log_sizes = vec![self.log_size];
-        let trace_log_sizes = vec![self.log_size; N_TRACE_COLUMNS];
-        let interaction_log_sizes = vec![self.log_size; SECURE_EXTENSION_DEGREE];
-        TreeVec::new(vec![
-            preprocessed_log_sizes,
-            trace_log_sizes,
-            interaction_log_sizes,
-        ])
+        let trace = vec![self.log_size; N_TRACE_COLUMNS];
+        let interaction_trace = vec![self.log_size; SECURE_EXTENSION_DEGREE];
+        TreeVec::new(vec![vec![], trace, interaction_trace])
     }
 }
 
diff --git a/crates/prover/src/components/range_check/range_check_16/component.rs b/crates/prover/src/components/range_check/range_check_16/component.rs
@@ -74,14 +74,9 @@ impl Claim {
     }
 
     pub fn log_sizes(&self) -> TreeVec<Vec<u32>> {
-        let preprocessed_log_sizes = vec![self.log_size];
-        let trace_log_sizes = vec![self.log_size; N_TRACE_COLUMNS];
-        let interaction_log_sizes = vec![self.log_size; SECURE_EXTENSION_DEGREE];
-        TreeVec::new(vec![
-            preprocessed_log_sizes,
-            trace_log_sizes,
-            interaction_log_sizes,
-        ])
+        let trace = vec![self.log_size; N_TRACE_COLUMNS];
+        let interaction_trace = vec![self.log_size; SECURE_EXTENSION_DEGREE];
+        TreeVec::new(vec![vec![], trace, interaction_trace])
     }
 }
 
diff --git a/crates/prover/src/components/ret_opcode/component.rs b/crates/prover/src/components/ret_opcode/component.rs
@@ -93,13 +93,9 @@ impl Claim {
     }
 
     pub fn log_sizes(&self) -> TreeVec<Vec<u32>> {
-        let interaction_0_log_sizes = vec![self.log_size; RET_N_TRACE_CELLS];
-        let interaction_1_log_sizes = vec![self.log_size; SECURE_EXTENSION_DEGREE * 3];
-        TreeVec::new(vec![
-            vec![],
-            interaction_0_log_sizes,
-            interaction_1_log_sizes,
-        ])
+        let trace = vec![self.log_size; RET_N_TRACE_CELLS];
+        let interaction_trace = vec![self.log_size; SECURE_EXTENSION_DEGREE * 3];
+        TreeVec::new(vec![vec![], trace, interaction_trace])
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -167,13 +167,9 @@ impl Claim {`
`167`	`167`	`}`
`168`	`168`
`169`	`169`	`pub fn log_sizes(&self) -> TreeVec<Vec<u32>> {`
`170`		`- let interaction_1_log_sizes = vec![self.log_size; N_TRACE_COLUMNS];`
`171`		`- let interaction_2_log_sizes = vec![self.log_size; SECURE_EXTENSION_DEGREE * 3];`
`172`		`- TreeVec::new(vec![`
`173`		`- vec![],`
`174`		`- interaction_1_log_sizes,`
`175`		`- interaction_2_log_sizes,`
`176`		`- ])`
	`170`	`+ let trace = vec![self.log_size; N_TRACE_COLUMNS];`
	`171`	`+ let interaction_trace = vec![self.log_size; SECURE_EXTENSION_DEGREE * 3];`
	`172`	`+ TreeVec::new(vec![vec![], trace, interaction_trace])`
`177`	`173`	`}`
`178`	`174`	`}`
`179`	`175`
Original file line number	Diff line number	Diff line change
`@@ -74,14 +74,9 @@ impl Claim {`
`74`	`74`	`}`
`75`	`75`
`76`	`76`	`pub fn log_sizes(&self) -> TreeVec<Vec<u32>> {`
`77`		`- let preprocessed_log_sizes = vec![self.log_size];`
`78`		`- let trace_log_sizes = vec![self.log_size; N_TRACE_COLUMNS];`
`79`		`- let interaction_log_sizes = vec![self.log_size; SECURE_EXTENSION_DEGREE];`
`80`		`- TreeVec::new(vec![`
`81`		`- preprocessed_log_sizes,`
`82`		`- trace_log_sizes,`
`83`		`- interaction_log_sizes,`
`84`		`- ])`
	`77`	`+ let trace = vec![self.log_size; N_TRACE_COLUMNS];`
	`78`	`+ let interaction_trace = vec![self.log_size; SECURE_EXTENSION_DEGREE];`
	`79`	`+ TreeVec::new(vec![vec![], trace, interaction_trace])`
`85`	`80`	`}`
`86`	`81`	`}`
`87`	`82`
Original file line number	Diff line number	Diff line change
`@@ -93,13 +93,9 @@ impl Claim {`
`93`	`93`	`}`
`94`	`94`
`95`	`95`	`pub fn log_sizes(&self) -> TreeVec<Vec<u32>> {`
`96`		`- let interaction_0_log_sizes = vec![self.log_size; RET_N_TRACE_CELLS];`
`97`		`- let interaction_1_log_sizes = vec![self.log_size; SECURE_EXTENSION_DEGREE * 3];`
`98`		`- TreeVec::new(vec![`
`99`		`- vec![],`
`100`		`- interaction_0_log_sizes,`
`101`		`- interaction_1_log_sizes,`
`102`		`- ])`
	`96`	`+ let trace = vec![self.log_size; RET_N_TRACE_CELLS];`
	`97`	`+ let interaction_trace = vec![self.log_size; SECURE_EXTENSION_DEGREE * 3];`
	`98`	`+ TreeVec::new(vec![vec![], trace, interaction_trace])`
`103`	`99`	`}`
`104`	`100`	`}`
`105`	`101`