chore: remove input from AssertSortedAir and into generate_trace (#61)

openvm-org · Jun 12, 2024 · e0d4e48 · e0d4e48
1 parent 56db928
commit e0d4e48
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 16 deletions.
diff --git a/chips/src/assert_sorted/mod.rs b/chips/src/assert_sorted/mod.rs
@@ -15,9 +15,6 @@ pub mod trace;
 pub struct AssertSortedAir {
     #[getset(get = "pub")]
     is_less_than_tuple_air: IsLessThanTupleAir,
-    /// The keys to check for sortedness
-    #[getset(get = "pub")]
-    keys: Vec<Vec<u32>>,
 }
 
 /// This chip constrains that consecutive rows are sorted lexicographically.
@@ -40,15 +37,13 @@ impl AssertSortedChip {
         range_max: u32,
         limb_bits: Vec<usize>,
         decomp: usize,
-        keys: Vec<Vec<u32>>,
         range_checker: Arc<RangeCheckerGateChip>,
     ) -> Self {
         Self {
             air: AssertSortedAir {
                 is_less_than_tuple_air: IsLessThanTupleAir::new(
                     bus_index, range_max, limb_bits, decomp,
                 ),
-                keys,
             },
             range_checker,
         }

diff --git a/chips/src/assert_sorted/tests/mod.rs b/chips/src/assert_sorted/tests/mod.rs
@@ -53,12 +53,12 @@ fn test_assert_sorted_chip_small_positive() {
         range_max,
         limb_bits,
         decomp,
-        requests.clone(),
         range_checker.clone(),
     );
     let range_checker_chip = assert_sorted_chip.range_checker.as_ref();
 
-    let assert_sorted_chip_trace: DenseMatrix<BabyBear> = assert_sorted_chip.generate_trace();
+    let assert_sorted_chip_trace: DenseMatrix<BabyBear> =
+        assert_sorted_chip.generate_trace(requests.clone());
     let range_checker_trace = assert_sorted_chip.range_checker.generate_trace();
 
     run_simple_test_no_pis(
@@ -91,12 +91,12 @@ fn test_assert_sorted_chip_large_positive() {
         range_max,
         limb_bits,
         decomp,
-        requests.clone(),
         range_checker.clone(),
     );
     let range_checker_chip = assert_sorted_chip.range_checker.as_ref();
 
-    let assert_sorted_chip_trace: DenseMatrix<BabyBear> = assert_sorted_chip.generate_trace();
+    let assert_sorted_chip_trace: DenseMatrix<BabyBear> =
+        assert_sorted_chip.generate_trace(requests.clone());
     let range_checker_trace = assert_sorted_chip.range_checker.generate_trace();
 
     run_simple_test_no_pis(
@@ -130,12 +130,12 @@ fn test_assert_sorted_chip_unsorted_negative() {
         range_max,
         limb_bits,
         decomp,
-        requests.clone(),
         range_checker.clone(),
     );
     let range_checker_chip = assert_sorted_chip.range_checker.as_ref();
 
-    let assert_sorted_chip_trace: DenseMatrix<BabyBear> = assert_sorted_chip.generate_trace();
+    let assert_sorted_chip_trace: DenseMatrix<BabyBear> =
+        assert_sorted_chip.generate_trace(requests.clone());
     let range_checker_trace = assert_sorted_chip.range_checker.generate_trace();
 
     USE_DEBUG_BUILDER.with(|debug| {

diff --git a/chips/src/assert_sorted/trace.rs b/chips/src/assert_sorted/trace.rs
@@ -6,20 +6,20 @@ use crate::sub_chip::LocalTraceInstructions;
 use super::{columns::AssertSortedCols, AssertSortedChip};
 
 impl AssertSortedChip {
-    pub fn generate_trace<F: PrimeField64>(&self) -> RowMajorMatrix<F> {
+    pub fn generate_trace<F: PrimeField64>(&self, keys: Vec<Vec<u32>>) -> RowMajorMatrix<F> {
         let num_cols: usize = AssertSortedCols::<F>::get_width(
             self.air.is_less_than_tuple_air().limb_bits().clone(),
             self.air.is_less_than_tuple_air().decomp(),
             self.air.is_less_than_tuple_air().tuple_len(),
         );
 
         let mut rows: Vec<F> = vec![];
-        for i in 0..self.air.keys().len() {
-            let key = self.air.keys()[i].clone();
-            let next_key: Vec<u32> = if i == self.air.keys().len() - 1 {
+        for i in 0..keys.len() {
+            let key = keys[i].clone();
+            let next_key: Vec<u32> = if i == keys.len() - 1 {
                 vec![0; self.air.is_less_than_tuple_air().tuple_len()]
             } else {
-                self.air.keys()[i + 1].clone()
+                keys[i + 1].clone()
             };
 
             let is_less_than_tuple_trace = LocalTraceInstructions::generate_trace_row(