small refactor

Author: kashbrti

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

@@ -179,14 +179,10 @@ void process_call_data_operations(Builder& builder,
             BB_ASSERT_EQ(op.access_type, 0);
             field_ct value = poly_to_field_ct(op.value, builder);
             field_ct index = poly_to_field_ct(op.index, builder);
-            fr w_value = 0;
-            if (has_valid_witness_assignments) {
-                // If witness are assigned, we use the correct value for w
-                w_value = index.get_value();
+            value.assert_equal(calldata_array[index]);
+            if (!has_valid_witness_assignments) {
+                index.is_zero();
             }
-            field_ct w = field_ct::from_witness(&builder, w_value);
-            value.assert_equal(calldata_array[w]);
-            w.assert_equal(index);
         }
     };
 

barretenberg/cpp/src/barretenberg/stdlib/primitives/databus/databus.cpp

@@ -53,7 +53,7 @@ field_t<Builder> databus<Builder>::bus_vector::operator[](const field_pt& index)
     if (index.is_constant()) {
         index_witness_idx = context->put_constant_variable(index.get_value());
     } else {
-        index_witness_idx = index.normalize().get_witness_index();
+        index_witness_idx = index.get_normalized_witness_index();
     }
 
     // Read from the bus vector at the specified index. Creates a single read gate