From 025c4466494a1d5e9d9be2afe6f898c8e2420e21 Mon Sep 17 00:00:00 2001
From: schaeff <thibaut@schaeff.fr>
Date: Thu, 18 May 2023 15:03:13 +0200
Subject: [PATCH] remove wrapping behavior

---
 executor/src/witgen/generator.rs | 14 ++++++--------
 executor/src/witgen/mod.rs       |  6 ------
 2 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/executor/src/witgen/generator.rs b/executor/src/witgen/generator.rs
index fb8584f400..6c462aa71e 100644
--- a/executor/src/witgen/generator.rs
+++ b/executor/src/witgen/generator.rs
@@ -114,15 +114,13 @@ where
                     .into()
                 });
 
-                if result.is_err() {
-                    identity_failed = true;
-                }
-
                 match &result {
-                    Ok(e) if e.is_complete() => {
-                        *complete = true;
+                    Ok(e) => {
+                        *complete = e.is_complete();
+                    }
+                    Err(_) => {
+                        identity_failed = true;
                     }
-                    _ => {}
                 };
 
                 self.handle_eval_result(result);
@@ -150,7 +148,7 @@ where
         }
         // Identity check failure on the first row is not fatal. We will proceed with
         // "unknown", report zero and re-check the wrap-around against the zero values at the end.
-        if identity_failed && next_row != 0 {
+        if identity_failed {
             log::error!(
                 "\nError: Row {next_row}: Identity check failed or unable to derive values for some witness columns.");
             log::debug!(
diff --git a/executor/src/witgen/mod.rs b/executor/src/witgen/mod.rs
index e1cda420dd..c8a90811c5 100644
--- a/executor/src/witgen/mod.rs
+++ b/executor/src/witgen/mod.rs
@@ -118,12 +118,6 @@ pub fn generate<'a, T: FieldElement>(
             values[col].1.push(v);
         }
     }
-    for (col, v) in generator.compute_next_row(0).into_iter().enumerate() {
-        if v != values[col].1[0] {
-            eprintln!("Wrap-around value for column {} does not match: {} (wrap-around) vs. {} (first row).",
-            witness_cols[col].poly, v, values[col].1[0]);
-        }
-    }
     for (name, data) in generator.machine_witness_col_values() {
         let (_, col) = values.iter_mut().find(|(n, _)| *n == name).unwrap();
         *col = data;