Preprocessed Columns Validation Through Permutation

Author: Gali-StarkWare

crates/prover/src/constraint_framework/component.rs

@@ -96,13 +96,17 @@ impl TraceLocationAllocator {
         &self.preprocessed_columns
     }
 
-    // validates that `self.preprocessed_columns` is consistent with
+    // Validates that `self.preprocessed_columns` is a permutation of
     // `preprocessed_columns`.
-    // I.e. preprocessed_columns[i] == self.preprocessed_columns[i].
-    // TODO(Gali): Change to only validating that this is a permutation (not necessarily the same
-    // order).
     pub fn validate_preprocessed_columns(&self, preprocessed_columns: &[PreProcessedColumnId]) {
-        assert_eq!(self.preprocessed_columns, preprocessed_columns);
+        let mut self_columns = self.preprocessed_columns.clone();
+        let mut input_columns = preprocessed_columns.to_vec();
+        self_columns.sort_by_key(|col| col.id.clone());
+        input_columns.sort_by_key(|col| col.id.clone());
+        assert_eq!(
+            self_columns, input_columns,
+            "Preprocessed columns are not a permutation."
+        );
     }
 }