fix table16 for ff 0.13

scroll-tech · Dec 5, 2023 · 2552a05 · 2552a05
1 parent 8deec99
commit 2552a05
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/halo2_gadgets/src/sha256/table16.rs b/halo2_gadgets/src/sha256/table16.rs
@@ -1,4 +1,4 @@
-use halo2_proofs::arithmetic::FieldExt as Field;
+use halo2_proofs::halo2curves::group::ff::PrimeField as Field;
 use halo2_proofs::{
     circuit::{AssignedCell, Chip, Layouter, Region, Value},
     plonk::{Advice, Any, Assigned, Column, ConstraintSystem, Error},

diff --git a/halo2_gadgets/src/sha256/table16/compression/compression_gates.rs b/halo2_gadgets/src/sha256/table16/compression/compression_gates.rs
@@ -1,6 +1,6 @@
 use super::super::{util::*, Gate};
-use ff::PrimeField;
 use crate::utilities::range_check;
+use ff::PrimeField;
 use halo2_proofs::plonk::{Constraint, Constraints, Expression};
 use std::marker::PhantomData;
 

diff --git a/halo2_gadgets/src/sha256/table16/spread_table.rs b/halo2_gadgets/src/sha256/table16/spread_table.rs
@@ -1,4 +1,4 @@
-use super::{util::*, AssignedBits, Field};
+use super::{util::*, AssignedBits};
 use ff::PrimeField;
 use halo2_proofs::{
     arithmetic::Field,
@@ -65,13 +65,13 @@ impl<const DENSE: usize, const SPREAD: usize> SpreadWord<DENSE, SPREAD> {
 
 /// A variable stored in advice columns corresponding to a row of [`SpreadTableConfig`].
 #[derive(Clone, Debug)]
-pub(super) struct SpreadVar<F: Field, const DENSE: usize, const SPREAD: usize> {
+pub(super) struct SpreadVar<F: PrimeField, const DENSE: usize, const SPREAD: usize> {
     pub tag: Value<u8>,
     pub dense: AssignedBits<F, DENSE>,
     pub spread: AssignedBits<F, SPREAD>,
 }
 
-impl<F: Field, const DENSE: usize, const SPREAD: usize> SpreadVar<F, DENSE, SPREAD> {
+impl<F: PrimeField, const DENSE: usize, const SPREAD: usize> SpreadVar<F, DENSE, SPREAD> {
     pub(super) fn with_lookup(
         region: &mut Region<'_, F>,
         cols: &SpreadInputs,