Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[FIX] table16 for ff 0.13 #77

Merged
merged 1 commit into from
Dec 5, 2023
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion halo2_gadgets/src/sha256/table16.rs
Original file line number Diff line number Diff line change
@@ -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},
Original file line number Diff line number Diff line change
@@ -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;

6 changes: 3 additions & 3 deletions halo2_gadgets/src/sha256/table16/spread_table.rs
Original file line number Diff line number Diff line change
@@ -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,
Loading