From 99a04b8d40c1e4739b2f014636c1bd584d161a5b Mon Sep 17 00:00:00 2001 From: Zach Langley Date: Wed, 6 Nov 2024 14:04:02 -0500 Subject: [PATCH] missed stuff --- lib/recursion/src/halo2/tests/multi_field32.rs | 4 ++-- lib/recursion/src/halo2/tests/outer_poseidon2.rs | 4 ++-- toolchain/native-compiler/src/constraints/halo2/baby_bear.rs | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/recursion/src/halo2/tests/multi_field32.rs b/lib/recursion/src/halo2/tests/multi_field32.rs index 03cf871b4d..90385f88dd 100644 --- a/lib/recursion/src/halo2/tests/multi_field32.rs +++ b/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); diff --git a/lib/recursion/src/halo2/tests/outer_poseidon2.rs b/lib/recursion/src/halo2/tests/outer_poseidon2.rs index 82700264f6..49dd10032b 100644 --- a/lib/recursion/src/halo2/tests/outer_poseidon2.rs +++ 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::::default(); diff --git a/toolchain/native-compiler/src/constraints/halo2/baby_bear.rs b/toolchain/native-compiler/src/constraints/halo2/baby_bear.rs index 0655134bb3..5f1b3e7a74 100644 --- a/toolchain/native-compiler/src/constraints/halo2/baby_bear.rs +++ b/toolchain/native-compiler/src/constraints/halo2/baby_bear.rs @@ -403,7 +403,7 @@ impl BabyBearExt4Chip { } let w = self .base - .load_constant(ctx, >::w()); + .load_constant(ctx, >::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);