chore: merge fixes for merge train

Author: MirandaWood

barretenberg/cpp/src/barretenberg/dsl/acir_format/acir_to_constraint_buf.cpp

@@ -821,10 +821,11 @@ void add_memory_op_to_block_constraint(Acir::Opcode::MemoryOp const& mem_op, Blo
         block.type = BlockType::RAM;
     }
 
-    WitnessOrConstant<bb::fr> index = WitnessOrConstant<bb::fr>::from_index(mem_op.op.index.value);
-    WitnessOrConstant<bb::fr> value = WitnessOrConstant<bb::fr>::from_index(mem_op.op.value.value);
-
-    MemOp acir_mem_op = MemOp{ .access_type = access_type, .index = index, .value = value };
+    MemOp acir_mem_op = MemOp{
+        .access_type = access_type,
+        .index = mem_op.op.index.value,
+        .value = mem_op.op.value.value,
+    };
     block.trace.push_back(acir_mem_op);
 }
 

barretenberg/cpp/src/barretenberg/dsl/acir_format/block_constraint.test.cpp

@@ -38,21 +38,21 @@ TEST(BlockConstraintMemOpEncoding, ReadFlagFalseDecodesAsRead)
 
     ASSERT_EQ(block.trace.size(), 1);
     EXPECT_EQ(block.trace[0].access_type, AccessType::Read);
-    EXPECT_EQ(block.trace[0].index.index, 1);
-    EXPECT_EQ(block.trace[0].value.index, 2);
+    EXPECT_EQ(block.trace[0].index, 1);
+    EXPECT_EQ(block.trace[0].value, 2);
 }
 
 TEST(BlockConstraintMemOpEncoding, AccessTypeEncodesToReadFlag)
 {
     const MemOp read_op{
         .access_type = AccessType::Read,
-        .index = WitnessOrConstant<bb::fr>::from_index(1),
-        .value = WitnessOrConstant<bb::fr>::from_index(2),
+        .index = 1,
+        .value = 2,
     };
     const MemOp write_op{
         .access_type = AccessType::Write,
-        .index = WitnessOrConstant<bb::fr>::from_index(3),
-        .value = WitnessOrConstant<bb::fr>::from_index(4),
+        .index = 3,
+        .value = 4,
     };
 
     EXPECT_FALSE(mem_op_to_acir_mem_op(read_op).read);

barretenberg/cpp/src/barretenberg/dsl/acir_format/test_class.hpp

@@ -72,13 +72,11 @@ inline Acir::Expression witness_or_constant_to_expression(const WitnessOrConstan
  */
 inline Acir::MemOp mem_op_to_acir_mem_op(const MemOp& mem_op)
 {
-    BB_ASSERT(!mem_op.index.is_constant, "Acir::MemOp::index must be a witness");
-    BB_ASSERT(!mem_op.value.is_constant, "Acir::MemOp::value must be a witness");
     return Acir::MemOp{
         // Acir::MemOp::read is the serialized MemOpKind bool: false = Read, true = Write.
         .read = (mem_op.access_type == AccessType::Write),
-        .index = Acir::Witness{ .value = mem_op.index.index },
-        .value = Acir::Witness{ .value = mem_op.value.index },
+        .index = Acir::Witness{ .value = mem_op.index },
+        .value = Acir::Witness{ .value = mem_op.value },
     };
 }