From 8ad193db174bcd6da1511b71bf5d8caf06cf0e04 Mon Sep 17 00:00:00 2001
From: Nicholas Ward <npward@berkeley.edu>
Date: Mon, 14 Feb 2022 14:12:52 -0800
Subject: [PATCH] use windowed mul in GLV

---
 plonky2/src/gadgets/curve_windowed_mul.rs | 1 -
 plonky2/src/gadgets/glv.rs                | 5 ++---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/plonky2/src/gadgets/curve_windowed_mul.rs b/plonky2/src/gadgets/curve_windowed_mul.rs
index 08977dd6..2f0516dd 100644
--- a/plonky2/src/gadgets/curve_windowed_mul.rs
+++ b/plonky2/src/gadgets/curve_windowed_mul.rs
@@ -207,7 +207,6 @@ mod tests {
 
         builder.connect_affine_point(&neg_five_g_expected, &neg_five_g_actual);
 
-        println!("NUM GATES: {}", builder.num_gates());
         let data = builder.build::<C>();
         let proof = data.prove(pw).unwrap();
 
diff --git a/plonky2/src/gadgets/glv.rs b/plonky2/src/gadgets/glv.rs
index 0a4afb3c..5ac3fb93 100644
--- a/plonky2/src/gadgets/glv.rs
+++ b/plonky2/src/gadgets/glv.rs
@@ -53,9 +53,8 @@ impl<F: RichField + Extendable<D>, const D: usize> CircuitBuilder<F, D> {
             y: p.y.clone(),
         };
 
-        // TODO: replace with MSM
-        let part1 = self.curve_scalar_mul(p, &k1);
-        let part2 = self.curve_scalar_mul(&sp, &k2);
+        let part1 = self.curve_scalar_mul_windowed(p, &k1);
+        let part2 = self.curve_scalar_mul_windowed(&sp, &k2);
 
         self.curve_add(&part1, &part2)
     }