Skip to content

Commit 6a96d29

Browse files
Merge branch 'feat/edwards-curve-new-execution' into feat/eddsa
2 parents fda3406 + 29c9c70 commit 6a96d29

File tree

3 files changed

+6
-3
lines changed

3 files changed

+6
-3
lines changed

extensions/ecc/circuit/src/edwards_chip/add.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ pub struct TeAddChip<F: PrimeField32, const BLOCKS: usize, const BLOCK_SIZE: usi
6161
pub EdwardsChip<F, 2, BLOCKS, BLOCK_SIZE>,
6262
);
6363

64+
#[allow(clippy::too_many_arguments)]
6465
impl<F: PrimeField32, const BLOCKS: usize, const BLOCK_SIZE: usize>
6566
TeAddChip<F, BLOCKS, BLOCK_SIZE>
6667
{

extensions/ecc/circuit/src/edwards_chip/tests.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ use super::TeAddChip;
1919
const NUM_LIMBS: usize = 32;
2020
const LIMB_BITS: usize = 8;
2121
const BLOCK_SIZE: usize = 32;
22+
const MAX_INS_CAPACITY: usize = 128;
2223
type F = BabyBear;
2324

2425
lazy_static::lazy_static! {
@@ -124,6 +125,7 @@ fn test_add() {
124125
Edwards25519_A.clone(),
125126
Edwards25519_D.clone(),
126127
);
128+
chip.0.set_trace_buffer_height(MAX_INS_CAPACITY);
127129

128130
assert_eq!(chip.0.step.expr.builder.num_variables, 12);
129131

guest-libs/pairing/tests/lib.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ mod bn254 {
1414
use openvm_circuit::utils::{
1515
air_test, air_test_impl, air_test_with_min_segments, test_system_config_with_continuations,
1616
};
17-
use openvm_ecc_circuit::{CurveConfig, EccExtension, Rv32EccConfig};
17+
use openvm_ecc_circuit::{CurveConfig, EccExtension, Rv32EccConfig, SwCurveCoeffs};
1818
use openvm_ecc_guest::{
1919
algebra::{field::FieldExtension, IntMod},
2020
AffinePoint,
@@ -518,8 +518,8 @@ mod bls12_381 {
518518
}
519519

520520
#[cfg(test)]
521-
fn test_rv32weierstrass_config(curves: Vec<CurveConfig>) -> Rv32WeierstrassConfig {
522-
let mut config = Rv32WeierstrassConfig::new(curves);
521+
fn test_rv32ecc_config(sw_curves: Vec<CurveConfig<SwCurveCoeffs>>) -> Rv32EccConfig {
522+
let mut config = Rv32EccConfig::new(sw_curves, vec![]);
523523
config.system = test_system_config_with_continuations();
524524
config
525525
}

0 commit comments

Comments
 (0)