Merge 902aa3d into 163c3a6

Author: fcarreiro

barretenberg/cpp/src/barretenberg/vm/avm/generated/circuit_builder.cpp

@@ -742,9 +742,14 @@ bool AvmCircuitBuilder::check_circuit() const
 
     std::string errors;
     std::mutex m;
+    const bool verbose_errors = std::getenv("AVM_VERBOSE_ERRORS") != nullptr;
     auto signal_error = [&](const std::string& error) {
         std::lock_guard<std::mutex> lock(m);
-        errors += error + "\n";
+        if (verbose_errors) {
+            errors += error + "\n";
+        } else if (errors.empty()) {
+            errors = "Circuit check failed. Use AVM_VERBOSE_ERRORS=1 to see more details.";
+        }
     };
     bb::parallel_for(checks.size(), [&](size_t i) { checks[i](signal_error); });
     if (!errors.empty()) {

barretenberg/cpp/src/barretenberg/vm/avm/tests/helpers.test.cpp

@@ -41,6 +41,7 @@ void validate_trace(std::vector<Row>&& trace,
                     bool with_proof,
                     bool expect_proof_failure)
 {
+    setenv("AVM_VERBOSE_ERRORS", "1", 1);
     auto circuit_builder = AvmCircuitBuilder();
     circuit_builder.set_trace(std::move(trace));
     EXPECT_TRUE(circuit_builder.check_circuit());

bb-pilcom/bb-pil-backend/templates/circuit_builder.cpp.hbs

@@ -106,9 +106,14 @@ bool {{name}}CircuitBuilder::check_circuit() const {
 
     std::string errors;
     std::mutex m;
+    const bool verbose_errors = std::getenv("AVM_VERBOSE_ERRORS") != nullptr;
     auto signal_error = [&](const std::string& error) {
         std::lock_guard<std::mutex> lock(m);
-        errors += error + "\n";
+        if (verbose_errors) {
+            errors += error + "\n";
+        } else if (errors.empty()) {
+            errors = "Circuit check failed. Use AVM_VERBOSE_ERRORS=1 to see more details.";
+        }
     };
     bb::parallel_for(checks.size(), [&](size_t i) { checks[i](signal_error); });
     if (!errors.empty()) {