Simplify WitnessGenerationArtifact enum

matter-labs · Aug 14, 2024 · de4b511 · de4b511
1 parent d7fd754
commit de4b511
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 16 deletions.
diff --git a/src/tests/complex_tests/mod.rs b/src/tests/complex_tests/mod.rs
@@ -269,11 +269,12 @@ pub(crate) fn generate_base_layer(
                 .map(|x| ZkSyncBaseLayerStorage::from_inner(a as u8, x))
                 .collect(),
         )),
-        WitnessGenerationArtifact::UnsortedMemoryQueueWitness(witnesses) => {
-            unsorted_memory_queue_witnesses.push(witnesses)
-        }
-        WitnessGenerationArtifact::SortedMemoryQueueWitness(witnesses) => {
-            sorted_memory_queue_witnesses.push(witnesses)
+        WitnessGenerationArtifact::MemoryQueueWitness((witnesses, sorted)) => {
+            if sorted {
+                sorted_memory_queue_witnesses.push(witnesses);
+            } else {
+                unsorted_memory_queue_witnesses.push(witnesses);
+            }
         }
     };
 

diff --git a/src/tests/run_manually.rs b/src/tests/run_manually.rs
@@ -271,11 +271,12 @@ pub(crate) fn run_with_options(entry_point_bytecode: Vec<[u8; 32]>, options: Opt
 
     let artifacts_callback = |artifact: WitnessGenerationArtifact| match artifact {
         WitnessGenerationArtifact::BaseLayerCircuit(circuit) => basic_block_circuits.push(circuit),
-        WitnessGenerationArtifact::UnsortedMemoryQueueWitness(witnesses) => {
-            unsorted_memory_queue_witnesses.push(witnesses)
-        }
-        WitnessGenerationArtifact::SortedMemoryQueueWitness(witnesses) => {
-            sorted_memory_queue_witnesses.push(witnesses)
+        WitnessGenerationArtifact::MemoryQueueWitness((witnesses, sorted)) => {
+            if sorted {
+                sorted_memory_queue_witnesses.push(witnesses)
+            } else {
+                unsorted_memory_queue_witnesses.push(witnesses)
+            }
         }
         _ => {}
     };

diff --git a/src/witness/oracle.rs b/src/witness/oracle.rs
@@ -892,9 +892,10 @@ fn simulate_memory_queue(
 
                 // send to storage
                 channel_sender
-                    .send(WitnessGenerationArtifact::UnsortedMemoryQueueWitness(
+                    .send(WitnessGenerationArtifact::MemoryQueueWitness((
                         unsorted_witnesses_for_circuit,
-                    ))
+                        false, // unsorted
+                    )))
                     .unwrap();
             }
 
@@ -1063,9 +1064,10 @@ fn simulate_sorted_memory_queue(
 
                 // send to storage
                 channel_sender
-                    .send(WitnessGenerationArtifact::SortedMemoryQueueWitness(
+                    .send(WitnessGenerationArtifact::MemoryQueueWitness((
                         sorted_witnesses_for_circuit,
-                    ))
+                        true, // sorted
+                    )))
                     .unwrap();
             }
         }
@@ -1398,8 +1400,7 @@ pub enum WitnessGenerationArtifact {
             Vec<ClosedFormInputCompactFormWitness<GoldilocksField>>,
         ),
     ),
-    SortedMemoryQueueWitness(MemoryQueueStateWitnesses<GoldilocksField>),
-    UnsortedMemoryQueueWitness(MemoryQueueStateWitnesses<GoldilocksField>),
+    MemoryQueueWitness((MemoryQueueStateWitnesses<GoldilocksField>, bool)), // sorted/unsorted
 }
 
 /// Make basic circuits instances and witnesses,