Test: use new expression structures

kimchi/src/folding/test.rs

@@ -1,10 +1,7 @@
 use crate::{
-    circuits::{
-        expr::Variable,
-        gate::CurrOrNext::{self, Curr},
-    },
+    circuits::gate::CurrOrNext::{self, Curr},
     folding::{
-        expressions::{extract_terms, ExtendedFoldingColumn, FoldingColumnTrait, FoldingExp},
+        expressions::{extract_terms, FoldingColumnTrait},
         FoldingConfig, FoldingEnv, Instance, Sponge, Witness,
     },
 };
@@ -100,12 +97,14 @@ impl FoldingConfig for TestConfig {
 #[test]
 //not testing much right now, just to observe what quadraticization does
 fn test_term_separation() {
-    use FoldingExp::*;
-    let col = |col| Cell(ExtendedFoldingColumn::Inner(Variable { col, row: Curr }));
+    use crate::circuits::expr::Variable;
+    use crate::folding::expressions::ExtendedFoldingColumn;
+    use crate::folding::expressions::FoldingExp;
+    let col = |col| FoldingExp::Atom(ExtendedFoldingColumn::Inner(Variable { col, row: Curr }));
     let t1: FoldingExp<TestConfig> = (col(0) + col(1)) * (col(2) + col(3));
     let t2 = col(1).double()
         - (col(2)
-            + Cell(ExtendedFoldingColumn::Constant(
+            + FoldingExp::Atom(ExtendedFoldingColumn::Constant(
                 <<Pallas as AffineCurve>::ScalarField>::zero(),
             )));
     let test_exp = t1 + t2;