mirror of https://github.com/zcash/halo2.git
utilities::lookup_range_check: Derive Copy for LookupRangeCheckConfig.
This commit is contained in:
parent
4fe6fb8bf2
commit
2ec480ef6b
|
@ -236,7 +236,7 @@ impl plonk::Circuit<pallas::Base> for Circuit {
|
|||
|
||||
// Configuration for curve point operations.
|
||||
// This uses 10 advice columns and spans the whole circuit.
|
||||
let ecc_config = EccChip::configure(meta, advices, lagrange_coeffs, range_check.clone());
|
||||
let ecc_config = EccChip::configure(meta, advices, lagrange_coeffs, range_check);
|
||||
|
||||
// Configuration for the Poseidon hash.
|
||||
let poseidon_config = PoseidonChip::configure(
|
||||
|
@ -261,7 +261,7 @@ impl plonk::Circuit<pallas::Base> for Circuit {
|
|||
advices[6],
|
||||
lagrange_coeffs[0],
|
||||
lookup,
|
||||
range_check.clone(),
|
||||
range_check,
|
||||
);
|
||||
let merkle_config_1 = MerkleChip::configure(meta, sinsemilla_config_1.clone());
|
||||
|
||||
|
|
|
@ -28,7 +28,7 @@ impl From<&EccConfig> for Config {
|
|||
fn from(ecc_config: &EccConfig) -> Self {
|
||||
Self {
|
||||
q_mul_overflow: ecc_config.q_mul_overflow,
|
||||
lookup_config: ecc_config.lookup_config.clone(),
|
||||
lookup_config: ecc_config.lookup_config,
|
||||
// Use advice columns that don't conflict with the either the incomplete
|
||||
// additions in fixed-base scalar mul, or the lookup range checks.
|
||||
advices: [
|
||||
|
|
|
@ -33,7 +33,7 @@ impl From<&EccConfig> for Config {
|
|||
q_mul_fixed_running_sum: config.q_mul_fixed_running_sum,
|
||||
q_mul_fixed_base_field: config.q_mul_fixed_base_field,
|
||||
canon_advices: [config.advices[6], config.advices[7], config.advices[8]],
|
||||
lookup_config: config.lookup_config.clone(),
|
||||
lookup_config: config.lookup_config,
|
||||
running_sum_config: config.running_sum_config.clone(),
|
||||
super_config: config.into(),
|
||||
};
|
||||
|
|
|
@ -487,8 +487,7 @@ mod tests {
|
|||
|
||||
let range_check = LookupRangeCheckConfig::configure(meta, advices[9], table_idx);
|
||||
|
||||
let ecc_config =
|
||||
EccChip::configure(meta, advices, lagrange_coeffs, range_check.clone());
|
||||
let ecc_config = EccChip::configure(meta, advices, lagrange_coeffs, range_check);
|
||||
|
||||
let config1 = SinsemillaChip::configure(
|
||||
meta,
|
||||
|
@ -496,7 +495,7 @@ mod tests {
|
|||
advices[2],
|
||||
lagrange_coeffs[0],
|
||||
lookup,
|
||||
range_check.clone(),
|
||||
range_check,
|
||||
);
|
||||
let config2 = SinsemillaChip::configure(
|
||||
meta,
|
||||
|
|
|
@ -722,7 +722,7 @@ mod tests {
|
|||
advices[2],
|
||||
lagrange_coeffs[0],
|
||||
lookup,
|
||||
range_check.clone(),
|
||||
range_check,
|
||||
);
|
||||
|
||||
let commit_ivk_config =
|
||||
|
|
|
@ -210,7 +210,7 @@ pub mod tests {
|
|||
advices[7],
|
||||
fixed_y_q_1,
|
||||
lookup,
|
||||
range_check.clone(),
|
||||
range_check,
|
||||
);
|
||||
let config1 = MerkleChip::configure(meta, sinsemilla_config_1);
|
||||
|
||||
|
|
|
@ -1528,7 +1528,7 @@ mod tests {
|
|||
advices[2],
|
||||
lagrange_coeffs[0],
|
||||
lookup,
|
||||
range_check.clone(),
|
||||
range_check,
|
||||
);
|
||||
let note_commit_config =
|
||||
NoteCommitConfig::configure(meta, advices, sinsemilla_config);
|
||||
|
|
|
@ -23,7 +23,7 @@ impl<F: FieldExt + PrimeFieldBits> std::ops::Deref for RunningSum<F> {
|
|||
}
|
||||
}
|
||||
|
||||
#[derive(Eq, PartialEq, Debug, Clone)]
|
||||
#[derive(Eq, PartialEq, Debug, Clone, Copy)]
|
||||
pub struct LookupRangeCheckConfig<F: FieldExt + PrimeFieldBits, const K: usize> {
|
||||
pub q_lookup: Selector,
|
||||
pub q_running: Selector,
|
||||
|
|
Loading…
Reference in New Issue