missed stuff

lib/recursion/src/halo2/tests/multi_field32.rs

@@ -59,7 +59,7 @@ fn test_challenger_sample_ext() {
     let a = BabyBear::from_canonical_usize(1);
     let b = BabyBear::from_canonical_usize(2);
     let c = BabyBear::from_canonical_usize(3);
-    let hash = Hash::from([Bn254Fr::two(); OUTER_DIGEST_SIZE]);
+    let hash = Hash::from([Bn254Fr::TWO; OUTER_DIGEST_SIZE]);
     challenger.observe(hash);
     challenger.observe(a);
     challenger.observe(b);
@@ -76,7 +76,7 @@ fn test_challenger_sample_ext() {
     let a = builder.eval(a);
     let b = builder.eval(b);
     let c = builder.eval(c);
-    let hash = builder.eval(Bn254Fr::two());
+    let hash = builder.eval(Bn254Fr::TWO);
     challenger.observe_commitment(&mut builder, [hash]);
     challenger.observe(&mut builder, a);
     challenger.observe(&mut builder, b);

lib/recursion/src/halo2/tests/outer_poseidon2.rs

@@ -71,8 +71,8 @@ fn test_p2_compress() {
     let perm = outer_perm();
     let compressor = OuterCompress::new(perm.clone());
 
-    let a: [Bn254Fr; 1] = [Bn254Fr::two()];
-    let b: [Bn254Fr; 1] = [Bn254Fr::two()];
+    let a: [Bn254Fr; 1] = [Bn254Fr::TWO];
+    let b: [Bn254Fr; 1] = [Bn254Fr::TWO];
     let gt = compressor.compress([a, b]);
 
     let mut builder = Builder::<OuterConfig>::default();

toolchain/native-compiler/src/constraints/halo2/baby_bear.rs

@@ -403,7 +403,7 @@ impl BabyBearExt4Chip {
         }
         let w = self
             .base
-            .load_constant(ctx, <BabyBear as BinomiallyExtendable<4>>::w());
+            .load_constant(ctx, <BabyBear as BinomiallyExtendable<4>>::W);
         for i in 4..7 {
             let tmp = self.base.mul(ctx, coeffs[i], w);
             coeffs[i - 4] = self.base.add(ctx, coeffs[i - 4], tmp);