logos-storage/plonky2
1
0
Fork 0
mirror of https://github.com/logos-storage/plonky2.git synced 2026-01-07 00:03:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

ignoring where appropriate (for izip), fixing elsewhere

Browse Source
This commit is contained in:
Nicholas Ward 2023-07-05 17:40:48 -07:00
parent b0568a793a
commit 96fbecd9c7
5 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
evm/src/cpu/gas.rs
View File

@ -60,6 +60,7 @@ const SIMPLE_OPCODES: OpsColumnsView<Option<u32>> = OpsColumnsView {
exception: None,
};
#[allow(clippy::useless_conversion)] // For izip! macro.
fn eval_packed_accumulate<P: PackedField>(
lv: &CpuColumnsView<P>,
nv: &CpuColumnsView<P>,
@ -118,6 +119,7 @@ pub fn eval_packed<P: PackedField>(
eval_packed_init(lv, nv, yield_constr);
}
#[allow(clippy::useless_conversion)] // For izip! macro.
fn eval_ext_circuit_accumulate<F: RichField + Extendable<D>, const D: usize>(
builder: &mut plonky2::plonk::circuit_builder::CircuitBuilder<F, D>,
lv: &CpuColumnsView<ExtensionTarget<D>>,

2
evm/src/cpu/memio.rs
View File

@ -40,6 +40,7 @@ fn eval_packed_load<P: PackedField>(
}
}
#[allow(clippy::tuple_array_conversions)] // For izip! macro.
fn eval_ext_circuit_load<F: RichField + Extendable<D>, const D: usize>(
builder: &mut plonky2::plonk::circuit_builder::CircuitBuilder<F, D>,
lv: &CpuColumnsView<ExtensionTarget<D>>,
@ -109,6 +110,7 @@ fn eval_packed_store<P: PackedField>(
}
}
#[allow(clippy::tuple_array_conversions)] // For izip! macro.
fn eval_ext_circuit_store<F: RichField + Extendable<D>, const D: usize>(
builder: &mut plonky2::plonk::circuit_builder::CircuitBuilder<F, D>,
lv: &CpuColumnsView<ExtensionTarget<D>>,

2
evm/src/cpu/stack.rs
View File

@ -187,6 +187,7 @@ fn eval_packed_one<P: PackedField>(
}
}
#[allow(clippy::useless_conversion)] // For izip! macro.
pub fn eval_packed<P: PackedField>(
lv: &CpuColumnsView<P>,
yield_constr: &mut ConstraintConsumer<P>,
@ -301,6 +302,7 @@ fn eval_ext_circuit_one<F: RichField + Extendable<D>, const D: usize>(
}
}
#[allow(clippy::useless_conversion)] // For izip! macro.
pub fn eval_ext_circuit<F: RichField + Extendable<D>, const D: usize>(
builder: &mut plonky2::plonk::circuit_builder::CircuitBuilder<F, D>,
lv: &CpuColumnsView<ExtensionTarget<D>>,

2
evm/src/recursive_verifier.rs
View File

@ -188,7 +188,7 @@ where
let circuit = buffer.read_circuit_data(gate_serializer, generator_serializer)?;
let target_vec = buffer.read_target_vec()?;
let init_challenger_state_target =
<C::Hasher as AlgebraicHasher<F>>::AlgebraicPermutation::new(target_vec.into_iter());
<C::Hasher as AlgebraicHasher<F>>::AlgebraicPermutation::new(target_vec);
let zero_target = buffer.read_target()?;
let stark_proof_target = StarkProofTarget::from_buffer(buffer)?;
let ctl_challenges_target = GrandProductChallengeSet::from_buffer(buffer)?;

4
plonky2/src/iop/challenger.rs
View File

@ -332,8 +332,8 @@ mod tests {
// These are mostly arbitrary, but we want to test some rounds with enough inputs/outputs to
// trigger multiple absorptions/squeezes.
let num_inputs_per_round = vec![2, 5, 3];
let num_outputs_per_round = vec![1, 2, 4];
let num_inputs_per_round = [2, 5, 3];
let num_outputs_per_round = [1, 2, 4];
// Generate random input messages.
let inputs_per_round: Vec<Vec<F>> = num_inputs_per_round