From 4e848c77dbb7eb1cfde60c79f0fdd8dd95defd9c Mon Sep 17 00:00:00 2001
From: wborgeaud <williamborgeaud@gmail.com>
Date: Thu, 9 Jun 2022 18:13:41 +0200
Subject: [PATCH] Merge conflicts

---
 evm/src/all_stark.rs          | 14 ++++++++------
 evm/src/cross_table_lookup.rs |  7 +++++--
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/evm/src/all_stark.rs b/evm/src/all_stark.rs
index c3c9653c..b2306850 100644
--- a/evm/src/all_stark.rs
+++ b/evm/src/all_stark.rs
@@ -63,7 +63,7 @@ mod tests {
     use crate::config::StarkConfig;
     use crate::cpu;
     use crate::cpu::cpu_stark::CpuStark;
-    use crate::cross_table_lookup::CrossTableLookup;
+    use crate::cross_table_lookup::{CrossTableLookup, TableWithColumns};
     use crate::keccak::keccak_stark::{KeccakStark, INPUT_LIMBS, NUM_ROUNDS};
     use crate::proof::AllProof;
     use crate::prover::prove;
@@ -116,11 +116,13 @@ mod tests {
 
         // TODO: temporary until cross-table-lookup filters are implemented
         let cross_table_lookups = vec![CrossTableLookup::new(
-            vec![Table::Cpu],
-            vec![vec![cpu::columns::OPCODE]],
-            Table::Keccak,
-            vec![keccak_looked_col],
-            default,
+            vec![TableWithColumns::new(
+                Table::Cpu,
+                vec![cpu::columns::OPCODE],
+                vec![],
+            )],
+            TableWithColumns::new(Table::Keccak, vec![keccak_looked_col], vec![]),
+            Some(default),
         )];
 
         let all_stark = AllStark {
diff --git a/evm/src/cross_table_lookup.rs b/evm/src/cross_table_lookup.rs
index 3cc38beb..50d5dbd1 100644
--- a/evm/src/cross_table_lookup.rs
+++ b/evm/src/cross_table_lookup.rs
@@ -68,9 +68,12 @@ impl<F: Field> CrossTableLookup<F> {
                 .iter()
                 .all(|twc| twc.filter_columns.is_empty())
                 == default.is_some()
-                && default.is_some() == looked_table.filter_columns.is_empty()
+                && default.is_some() == looked_table.filter_columns.is_empty(),
+            "Default values should be provided iff there are no filter columns."
         );
-        assert!(default.len() == looked_columns.len());
+        if let Some(default) = &default {
+            assert_eq!(default.len(), looked_table.columns.len());
+        }
         Self {
             looking_tables,
             looked_table,