Skip to content

Commit efd381d

Browse files
fix lint
1 parent d4a9c83 commit efd381d

File tree

5 files changed

+13
-23
lines changed

5 files changed

+13
-23
lines changed

benchmarks/execute/benches/execute.rs

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,7 @@ use openvm_continuations::{
2222
verifier::{common::types::VmVerifierPvs, leaf::types::LeafVmVerifierInput},
2323
SC,
2424
};
25-
use openvm_ecc_circuit::{
26-
EccCpuProverExt, EccExtension, EccExtensionExecutor, EccExtensionPeriphery,
27-
};
25+
use openvm_ecc_circuit::{EccCpuProverExt, EccExtension, EccExtensionExecutor};
2826
use openvm_ecc_transpiler::EccTranspilerExtension;
2927
use openvm_keccak256_circuit::{Keccak256, Keccak256CpuProverExt, Keccak256Executor};
3028
use openvm_keccak256_transpiler::Keccak256TranspilerExtension;
@@ -181,11 +179,7 @@ where
181179
inventory,
182180
)?;
183181
VmProverExtension::<E, _, _>::extend_prover(&AlgebraCpuProverExt, &config.fp2, inventory)?;
184-
VmProverExtension::<E, _, _>::extend_prover(
185-
&EccCpuProverExt,
186-
&config.weierstrass,
187-
inventory,
188-
)?;
182+
VmProverExtension::<E, _, _>::extend_prover(&EccCpuProverExt, &config.ecc, inventory)?;
189183
VmProverExtension::<E, _, _>::extend_prover(&PairingProverExt, &config.pairing, inventory)?;
190184
Ok(chip_complex)
191185
}

extensions/ecc/circuit/src/ecc_extension.rs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -560,9 +560,11 @@ lazy_static! {
560560
));
561561
}
562562
// little-endian
563-
const P256_A: [u8; 32] = hex!("fcffffffffffffffffffffff00000000000000000000000001000000ffffffff");
563+
pub const P256_A: [u8; 32] =
564+
hex!("fcffffffffffffffffffffff00000000000000000000000001000000ffffffff");
564565
// little-endian
565-
const P256_B: [u8; 32] = hex!("4b60d2273e3cce3bf6b053ccb0061d65bc86987655bdebb3e7933aaad835c65a");
566+
pub const P256_B: [u8; 32] =
567+
hex!("4b60d2273e3cce3bf6b053ccb0061d65bc86987655bdebb3e7933aaad835c65a");
566568

567569
pub const SECP256K1_ECC_STRUCT_NAME: &str = "Secp256k1Point";
568570
pub const P256_ECC_STRUCT_NAME: &str = "P256Point";

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,7 @@ fn gen_base_expr(
9696
(expr, local_opcode_idx)
9797
}
9898

99+
#[allow(clippy::too_many_arguments)]
99100
pub fn get_te_add_air<const BLOCKS: usize, const BLOCK_SIZE: usize>(
100101
exec_bridge: ExecutionBridge,
101102
mem_bridge: MemoryBridge,
@@ -287,7 +288,6 @@ impl<F: PrimeField32, const BLOCKS: usize, const BLOCK_SIZE: usize> Executor<F>
287288
{ TeCurveType::ED25519 as u8 },
288289
false,
289290
>),
290-
_ => panic!("Unsupported curve type"),
291291
}
292292
} else if is_setup {
293293
Ok(execute_e12_impl::<_, _, BLOCKS, BLOCK_SIZE, { u8::MAX }, true>)
@@ -337,7 +337,6 @@ impl<F: PrimeField32, const BLOCKS: usize, const BLOCK_SIZE: usize> MeteredExecu
337337
(false, TeCurveType::ED25519) => {
338338
Ok(execute_e2_impl::<_, _, BLOCKS, BLOCK_SIZE, { TeCurveType::ED25519 as u8 }>)
339339
}
340-
_ => panic!("Unsupported curve type"),
341340
}
342341
} else if is_setup {
343342
Ok(execute_e2_setup_impl::<_, _, BLOCKS, BLOCK_SIZE, { u8::MAX }>)
@@ -390,7 +389,7 @@ unsafe fn execute_e2_setup_impl<
390389
std::mem::size_of::<TeAddPreCompute>(),
391390
)
392391
};
393-
execute_e12_impl::<_, _, BLOCKS, BLOCK_SIZE, CURVE_TYPE, true>(&pre_compute, vm_state);
392+
execute_e12_impl::<_, _, BLOCKS, BLOCK_SIZE, CURVE_TYPE, true>(pre_compute, vm_state);
394393
}
395394

396395
unsafe fn execute_e12_impl<

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

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
use std::{str::FromStr, sync::Arc};
22

33
use num_bigint::BigUint;
4-
use num_traits::{FromPrimitive, Num, Zero};
4+
use num_traits::FromPrimitive;
55
use openvm_circuit::arch::{
66
testing::{TestChipHarness, VmChipTestBuilder, BITWISE_OP_LOOKUP_BUS},
77
MatrixRecordArena,
88
};
99
use openvm_circuit_primitives::{
10-
bigint::utils::{big_uint_to_limbs, secp256k1_coord_prime, secp256r1_coord_prime},
10+
bigint::utils::big_uint_to_limbs,
1111
bitwise_op_lookup::{
1212
BitwiseOperationLookupAir, BitwiseOperationLookupBus, BitwiseOperationLookupChip,
1313
SharedBitwiseOperationLookupChip,
1414
},
1515
};
16-
use openvm_ecc_transpiler::{Rv32EdwardsOpcode, Rv32WeierstrassOpcode};
16+
use openvm_ecc_transpiler::Rv32EdwardsOpcode;
1717
use openvm_instructions::{riscv::RV32_CELL_BITS, LocalOpcode};
18-
use openvm_mod_circuit_builder::{test_utils::biguint_to_limbs, ExprBuilderConfig, FieldExpr};
18+
use openvm_mod_circuit_builder::{test_utils::biguint_to_limbs, ExprBuilderConfig};
1919
use openvm_rv32_adapters::rv32_write_heap_default;
2020
use openvm_stark_backend::p3_field::FieldAlgebra;
2121
use openvm_stark_sdk::p3_baby_bear::BabyBear;
@@ -172,10 +172,6 @@ fn test_add() {
172172
num_limbs: NUM_LIMBS,
173173
limb_bits: LIMB_BITS,
174174
};
175-
let bitwise_bus = BitwiseOperationLookupBus::new(BITWISE_OP_LOOKUP_BUS);
176-
let bitwise_chip = Arc::new(BitwiseOperationLookupChip::<RV32_CELL_BITS>::new(
177-
bitwise_bus,
178-
));
179175

180176
let (mut harness, bitwise) = create_test_chip(
181177
&tester,

guest-libs/p256/tests/lib.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,8 +97,7 @@ mod guest_tests {
9797
system::SystemChipInventory,
9898
};
9999
use openvm_ecc_circuit::{
100-
CurveConfig, EccExtension, EccExtensionExecutor, Rv32EccConfig, Rv32EccConfigExecutor,
101-
Rv32EccCpuBuilder, SwCurveCoeffs,
100+
CurveConfig, Rv32EccConfig, Rv32EccConfigExecutor, Rv32EccCpuBuilder, SwCurveCoeffs,
102101
};
103102
use openvm_sha256_circuit::{Sha256, Sha256Executor, Sha2CpuProverExt};
104103
use openvm_stark_backend::{

0 commit comments

Comments
 (0)