diff --git a/src/fri/recursive_verifier.rs b/src/fri/recursive_verifier.rs index 4cfd837a..eb6cdcaa 100644 --- a/src/fri/recursive_verifier.rs +++ b/src/fri/recursive_verifier.rs @@ -380,7 +380,7 @@ impl, const D: usize> CircuitBuilder { "evaluate final polynomial", proof.final_poly.eval_scalar(self, subgroup_x) ); - self.assert_equal_extension(eval, old_eval); + self.connect_extension(eval, old_eval); } } diff --git a/src/gadgets/arithmetic_extension.rs b/src/gadgets/arithmetic_extension.rs index def6b4b8..9f5d7141 100644 --- a/src/gadgets/arithmetic_extension.rs +++ b/src/gadgets/arithmetic_extension.rs @@ -421,7 +421,7 @@ impl, const D: usize> CircuitBuilder { // Enforce that x times its purported inverse equals 1. let y_inv = self.mul_extension(y, inv); - self.assert_equal_extension(y_inv, one); + self.connect_extension(y_inv, one); self.mul_add_extension(x, inv, z) } @@ -535,8 +535,8 @@ mod tests { }; let mul2 = builder.constant_extension(vs.into_iter().product()); - builder.assert_equal_extension(mul0, mul1); - builder.assert_equal_extension(mul1, mul2); + builder.connect_extension(mul0, mul1); + builder.connect_extension(mul1, mul2); let data = builder.build(); let proof = data.prove(pw)?; @@ -563,8 +563,8 @@ mod tests { let zt = builder.constant_extension(z); let comp_zt = builder.div_extension(xt, yt); let comp_zt_unsafe = builder.div_extension(xt, yt); - builder.assert_equal_extension(zt, comp_zt); - builder.assert_equal_extension(zt, comp_zt_unsafe); + builder.connect_extension(zt, comp_zt); + builder.connect_extension(zt, comp_zt_unsafe); let data = builder.build(); let proof = data.prove(pw)?; @@ -594,7 +594,7 @@ mod tests { let zt = builder.constant_ext_algebra(za); let comp_zt = builder.mul_ext_algebra(xt, yt); for i in 0..D { - builder.assert_equal_extension(zt.0[i], comp_zt.0[i]); + builder.connect_extension(zt.0[i], comp_zt.0[i]); } let data = builder.build(); diff --git a/src/gadgets/interpolation.rs b/src/gadgets/interpolation.rs index f346f2f2..3ee0afe6 100644 --- a/src/gadgets/interpolation.rs +++ b/src/gadgets/interpolation.rs @@ -76,7 +76,7 @@ mod tests { let eval = builder.interpolate(&points_target, zt); let true_eval_target = builder.constant_extension(true_eval); - builder.assert_equal_extension(eval, true_eval_target); + builder.connect_extension(eval, true_eval_target); let data = builder.build(); let proof = data.prove(pw)?; diff --git a/src/gadgets/select.rs b/src/gadgets/select.rs index a888d105..c5edbe28 100644 --- a/src/gadgets/select.rs +++ b/src/gadgets/select.rs @@ -68,8 +68,8 @@ mod tests { let should_be_x = builder.select_ext(truet, xt, yt); let should_be_y = builder.select_ext(falset, xt, yt); - builder.assert_equal_extension(should_be_x, xt); - builder.assert_equal_extension(should_be_y, yt); + builder.connect_extension(should_be_x, xt); + builder.connect_extension(should_be_y, yt); let data = builder.build(); let proof = data.prove(pw)?; diff --git a/src/plonk/circuit_builder.rs b/src/plonk/circuit_builder.rs index 67dc97e5..6e73de75 100644 --- a/src/plonk/circuit_builder.rs +++ b/src/plonk/circuit_builder.rs @@ -210,7 +210,7 @@ impl, const D: usize> CircuitBuilder { .push(CopyConstraint::new((x, y), self.context_log.open_stack())); } - /// Same as `assert_equal` for a named copy constraint. + /// Same as connect` for a named copy constraint. pub fn named_connect(&mut self, x: Target, y: Target, name: String) { assert!( x.is_routable(&self.config), @@ -231,24 +231,6 @@ impl, const D: usize> CircuitBuilder { self.connect(x, zero); } - pub fn assert_equal_extension(&mut self, x: ExtensionTarget, y: ExtensionTarget) { - for i in 0..D { - self.connect(x.0[i], y.0[i]); - } - } - - pub fn named_assert_equal_extension( - &mut self, - x: ExtensionTarget, - y: ExtensionTarget, - name: String, - ) { - for i in 0..D { - self.connect(x.0[i], y.0[i]); - self.named_connect(x.0[i], y.0[i], format!("{}: limb {}", name, i)); - } - } - pub fn add_generators(&mut self, generators: Vec>>) { self.generators.extend(generators); } diff --git a/src/plonk/recursive_verifier.rs b/src/plonk/recursive_verifier.rs index 14a60df3..e90bf786 100644 --- a/src/plonk/recursive_verifier.rs +++ b/src/plonk/recursive_verifier.rs @@ -94,7 +94,7 @@ impl, const D: usize> CircuitBuilder { { let recombined_quotient = scale.reduce(chunk, self); let computed_vanishing_poly = self.mul_extension(z_h_zeta, recombined_quotient); - self.named_assert_equal_extension( + self.named_connect_extension( vanishing_polys_zeta[i], computed_vanishing_poly, format!("Vanishing polynomial == Z_H * quotient, challenge {}", i), diff --git a/src/util/reducing.rs b/src/util/reducing.rs index cb232939..40e52e01 100644 --- a/src/util/reducing.rs +++ b/src/util/reducing.rs @@ -213,7 +213,7 @@ mod tests { let vs_t = vs.iter().map(|&v| builder.constant(v)).collect::>(); let circuit_reduce = alpha_t.reduce_base(&vs_t, &mut builder); - builder.assert_equal_extension(manual_reduce, circuit_reduce); + builder.connect_extension(manual_reduce, circuit_reduce); let data = builder.build(); let proof = data.prove(pw)?; @@ -244,7 +244,7 @@ mod tests { .collect::>(); let circuit_reduce = alpha_t.reduce(&vs_t, &mut builder); - builder.assert_equal_extension(manual_reduce, circuit_reduce); + builder.connect_extension(manual_reduce, circuit_reduce); let data = builder.build(); let proof = data.prove(pw)?;