some fixes

Author: sai-deng

circuit/src/builder/compiler/non_primitive_lowerer.rs

@@ -210,10 +210,7 @@ mod tests {
         // Test MmcsVerify with mock config (simplest case: 1 leaf + 1 index + 1 root)
         let mock_config = MmcsVerifyConfig::mock_config();
         assert_eq!(mock_config.ext_field_digest_elems, 1);
-        assert_eq!(
-            mock_config.input_size(),
-            mock_config.ext_field_digest_elems + 1
-        );
+        assert_eq!(mock_config.input_size(), 2 * mock_config.ext_field_digest_elems + 1);
 
         let mut config = BuilderConfig::new();
         config.enable_mmcs(&mock_config);
@@ -253,7 +250,7 @@ mod tests {
         assert_eq!(babybear_config.ext_field_digest_elems, 8);
         assert_eq!(
             babybear_config.input_size(),
-            babybear_config.ext_field_digest_elems + 1
+            2 * babybear_config.ext_field_digest_elems + 1
         );
 
         let mut config = BuilderConfig::new();

circuit/src/ops/mmcs.rs

@@ -27,15 +27,15 @@ pub struct MmcsVerifyConfig {
 }
 
 impl MmcsVerifyConfig {
-    /// Returns the number of inputs (witness elements) received.
+    /// Returns the total number of witness elements consumed by the op.
+    /// Layout: leaf (ext) + index (1) + root (ext)
     pub const fn input_size(&self) -> usize {
-        // `ext_field_digest_elems` for the leaf and 1 for the index
-        self.ext_field_digest_elems + 1
+        2 * self.ext_field_digest_elems + 1
     }
 
+    /// MMCS verify is an assert-only op and does not produce outputs.
     pub const fn output_size(&self) -> usize {
-        // `ext_field_digest_elems` for the root
-        self.ext_field_digest_elems
+        0
     }
 
     /// Convert a digest represented as extension field elements into base field elements.
@@ -225,7 +225,7 @@ where
         let mut inputs = vec![];
         inputs.extend(leaf_expr);
         inputs.push(*index_expr);
-        // Include root exprs as outputs for the non-primitive op lowering to map
+        // Include root exprs as inputs for the non-primitive op; they are asserted
         inputs.extend(root_expr);
 
         Ok(self.push_non_primitive_op(NonPrimitiveOpType::MmcsVerify, inputs, "mmcs_verify"))

circuit/src/tables/runner.rs

@@ -74,16 +74,14 @@ impl<F: CircuitField> CircuitRunner<F> {
         // Validate that the private data matches the operation type (if any)
         if let Op::NonPrimitiveOpWithExecutor { executor, .. } =
             &self.circuit.non_primitive_ops[op_id.0 as usize]
-        {
-            if let (
+            && let (
                 crate::op::NonPrimitiveOpType::MmcsVerify,
                 NonPrimitiveOpPrivateData::MmcsVerify(_),
             ) = (executor.op_type(), &private_data)
-            {
-                // ok
-            }
-            // Other ops currently don't expect private data
+        {
+            // ok
         }
+        // Other ops currently don't expect private data
 
         // Store private data for this operation
         self.non_primitive_op_private_data[op_id.0 as usize] = Some(private_data);