mirror of https://github.com/zcash/orchard.git
ecc::chip: Remove chip-level permutation.
We have now refactored away from the impl From<EccConfig> pattern so that each sub-config can equality-enable the columns they need.
This commit is contained in:
parent
c00ee1707e
commit
a09173a331
|
@ -143,9 +143,6 @@ pub struct EccConfig {
|
||||||
/// Variable-base scalar multiplication
|
/// Variable-base scalar multiplication
|
||||||
mul: mul::Config,
|
mul: mul::Config,
|
||||||
|
|
||||||
/// TODO: Remove this.
|
|
||||||
pub mul_fixed: mul_fixed::Config,
|
|
||||||
|
|
||||||
/// Fixed-base full-width scalar multiplication
|
/// Fixed-base full-width scalar multiplication
|
||||||
mul_fixed_full: mul_fixed::full_width::Config,
|
mul_fixed_full: mul_fixed::full_width::Config,
|
||||||
/// Fixed-base signed short scalar multiplication
|
/// Fixed-base signed short scalar multiplication
|
||||||
|
@ -198,12 +195,6 @@ impl EccChip {
|
||||||
lagrange_coeffs: [Column<Fixed>; 8],
|
lagrange_coeffs: [Column<Fixed>; 8],
|
||||||
range_check: LookupRangeCheckConfig<pallas::Base, { sinsemilla::K }>,
|
range_check: LookupRangeCheckConfig<pallas::Base, { sinsemilla::K }>,
|
||||||
) -> <Self as Chip<pallas::Base>>::Config {
|
) -> <Self as Chip<pallas::Base>>::Config {
|
||||||
// TODO: Refactor away from `impl From<EccConfig> for _` so that sub-configs can
|
|
||||||
// equality-enable the columns they need to.
|
|
||||||
for column in &advices {
|
|
||||||
meta.enable_equality((*column).into());
|
|
||||||
}
|
|
||||||
|
|
||||||
// Create witness point gate
|
// Create witness point gate
|
||||||
let witness_point = witness_point::Config::configure(meta, advices[0], advices[1]);
|
let witness_point = witness_point::Config::configure(meta, advices[0], advices[1]);
|
||||||
// Create incomplete point addition gate
|
// Create incomplete point addition gate
|
||||||
|
@ -246,20 +237,17 @@ impl EccChip {
|
||||||
mul_fixed,
|
mul_fixed,
|
||||||
);
|
);
|
||||||
|
|
||||||
let config = EccConfig {
|
EccConfig {
|
||||||
advices,
|
advices,
|
||||||
add_incomplete,
|
add_incomplete,
|
||||||
add,
|
add,
|
||||||
mul,
|
mul,
|
||||||
mul_fixed,
|
|
||||||
mul_fixed_full,
|
mul_fixed_full,
|
||||||
mul_fixed_short,
|
mul_fixed_short,
|
||||||
mul_fixed_base_field,
|
mul_fixed_base_field,
|
||||||
witness_point,
|
witness_point,
|
||||||
lookup_config: range_check,
|
lookup_config: range_check,
|
||||||
};
|
}
|
||||||
|
|
||||||
config
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue