Skip to content

Commit 27328b2

Browse files
tonyfloatersutonyfloatersu
committed
clean up prior tests and prior codes
1 parent 12cf2a7 commit 27328b2

File tree

6 files changed

+116
-282
lines changed

6 files changed

+116
-282
lines changed

‎pcs/benches/orion.rs

+21-35
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@ use arith::{Field, FieldSerde, SimdField};
44
use ark_std::test_rng;
55
use criterion::{criterion_group, criterion_main, BenchmarkId, Criterion};
66
use gf2::{GF2x128, GF2x64, GF2x8, GF2};
7-
use gf2_128::{GF2_128x8, GF2_128};
7+
use gf2_128::GF2_128;
88
use pcs::{OrionPCS, OrionPCSSetup, PolynomialCommitmentScheme, ORION_CODE_PARAMETER_INSTANCE};
99
use polynomials::MultiLinearPoly;
1010
use transcript::{BytesHashTranscript, Keccak256hasher, Transcript};
1111
use tynm::type_name;
1212

13-
fn committing_benchmark_helper<F, EvalF, ComPackF, IPPackF, IPPackEvalF, T>(
13+
fn committing_benchmark_helper<F, EvalF, ComPackF, IPPackF, T>(
1414
c: &mut Criterion,
1515
lowest_num_vars: usize,
1616
highest_num_vars: usize,
@@ -19,7 +19,6 @@ fn committing_benchmark_helper<F, EvalF, ComPackF, IPPackF, IPPackEvalF, T>(
1919
EvalF: Field + FieldSerde + From<F> + Mul<F, Output = EvalF>,
2020
ComPackF: SimdField<Scalar = F>,
2121
IPPackF: SimdField<Scalar = F>,
22-
IPPackEvalF: SimdField<Scalar = EvalF> + Mul<IPPackF, Output = IPPackEvalF>,
2322
T: Transcript<EvalF>,
2423
{
2524
let mut group = c.benchmark_group(format!(
@@ -33,7 +32,7 @@ fn committing_benchmark_helper<F, EvalF, ComPackF, IPPackF, IPPackEvalF, T>(
3332
for num_vars in lowest_num_vars..=highest_num_vars {
3433
let random_poly = MultiLinearPoly::<F>::random(num_vars, &mut rng);
3534

36-
let orion_pp = OrionPCS::<F, EvalF, ComPackF, IPPackF, IPPackEvalF, T>::gen_srs_for_testing(
35+
let orion_pp = OrionPCS::<F, EvalF, ComPackF, IPPackF, T>::gen_srs_for_testing(
3736
&mut rng,
3837
&OrionPCSSetup {
3938
num_vars,
@@ -46,12 +45,10 @@ fn committing_benchmark_helper<F, EvalF, ComPackF, IPPackF, IPPackEvalF, T>(
4645
BenchmarkId::new(format!("{num_vars} variables"), num_vars),
4746
|b| {
4847
b.iter(|| {
49-
_ = black_box(
50-
OrionPCS::<F, EvalF, ComPackF, IPPackF, IPPackEvalF, T>::commit(
51-
&orion_pp,
52-
&random_poly,
53-
),
54-
)
48+
_ = black_box(OrionPCS::<F, EvalF, ComPackF, IPPackF, T>::commit(
49+
&orion_pp,
50+
&random_poly,
51+
))
5552
})
5653
},
5754
)
@@ -65,12 +62,11 @@ fn orion_committing_benchmark(c: &mut Criterion) {
6562
GF2_128,
6663
GF2x128,
6764
GF2x8,
68-
GF2_128x8,
6965
BytesHashTranscript<_, Keccak256hasher>,
7066
>(c, 19, 30);
7167
}
7268

73-
fn opening_benchmark_helper<F, EvalF, ComPackF, IPPackF, IPPackEvalF, T>(
69+
fn opening_benchmark_helper<F, EvalF, ComPackF, IPPackF, T>(
7470
c: &mut Criterion,
7571
lowest_num_vars: usize,
7672
highest_num_vars: usize,
@@ -79,7 +75,6 @@ fn opening_benchmark_helper<F, EvalF, ComPackF, IPPackF, IPPackEvalF, T>(
7975
EvalF: Field + FieldSerde + From<F> + Mul<F, Output = EvalF>,
8076
ComPackF: SimdField<Scalar = F>,
8177
IPPackF: SimdField<Scalar = F>,
82-
IPPackEvalF: SimdField<Scalar = EvalF> + Mul<IPPackF, Output = IPPackEvalF>,
8378
T: Transcript<EvalF>,
8479
{
8580
let mut group = c.benchmark_group(format!(
@@ -98,33 +93,29 @@ fn opening_benchmark_helper<F, EvalF, ComPackF, IPPackF, IPPackEvalF, T>(
9893
.map(|_| EvalF::random_unsafe(&mut rng))
9994
.collect();
10095

101-
let orion_pp = OrionPCS::<F, EvalF, ComPackF, IPPackF, IPPackEvalF, T>::gen_srs_for_testing(
96+
let orion_pp = OrionPCS::<F, EvalF, ComPackF, IPPackF, T>::gen_srs_for_testing(
10297
&mut rng,
10398
&OrionPCSSetup {
10499
num_vars,
105100
code_parameter: ORION_CODE_PARAMETER_INSTANCE,
106101
},
107102
);
108103

109-
let commitment_with_data = OrionPCS::<F, EvalF, ComPackF, IPPackF, IPPackEvalF, T>::commit(
110-
&orion_pp,
111-
&random_poly,
112-
);
104+
let commitment_with_data =
105+
OrionPCS::<F, EvalF, ComPackF, IPPackF, T>::commit(&orion_pp, &random_poly);
113106

114107
group
115108
.bench_function(
116109
BenchmarkId::new(format!("{num_vars} variables"), num_vars),
117110
|b| {
118111
b.iter(|| {
119-
_ = black_box(
120-
OrionPCS::<F, EvalF, ComPackF, IPPackF, IPPackEvalF, T>::open(
121-
&orion_pp,
122-
&random_poly,
123-
&random_point,
124-
&commitment_with_data,
125-
&mut transcript,
126-
),
127-
)
112+
_ = black_box(OrionPCS::<F, EvalF, ComPackF, IPPackF, T>::open(
113+
&orion_pp,
114+
&random_poly,
115+
&random_point,
116+
&commitment_with_data,
117+
&mut transcript,
118+
))
128119
})
129120
},
130121
)
@@ -133,14 +124,9 @@ fn opening_benchmark_helper<F, EvalF, ComPackF, IPPackF, IPPackEvalF, T>(
133124
}
134125

135126
fn orion_opening_benchmark(c: &mut Criterion) {
136-
opening_benchmark_helper::<
137-
GF2,
138-
GF2_128,
139-
GF2x64,
140-
GF2x8,
141-
GF2_128x8,
142-
BytesHashTranscript<_, Keccak256hasher>,
143-
>(c, 19, 30);
127+
opening_benchmark_helper::<GF2, GF2_128, GF2x64, GF2x8, BytesHashTranscript<_, Keccak256hasher>>(
128+
c, 19, 30,
129+
);
144130
}
145131

146132
criterion_group!(bench, orion_committing_benchmark, orion_opening_benchmark);

‎pcs/src/orion.rs

+9-12
Original file line numberDiff line numberDiff line change
@@ -25,20 +25,18 @@ mod tests;
2525
* POLYNOMIAL COMMITMENT TRAIT ALIGNMENT FOR ORION *
2626
***************************************************/
2727

28-
pub struct OrionPCS<F, EvalF, ComPackF, IPPackF, IPPackEvalF, T>
28+
pub struct OrionPCS<F, EvalF, ComPackF, OpenPackF, T>
2929
where
3030
F: Field + FieldSerde,
3131
EvalF: Field + FieldSerde + From<F> + Mul<F, Output = EvalF>,
3232
ComPackF: SimdField<Scalar = F>,
33-
IPPackF: SimdField<Scalar = F>,
34-
IPPackEvalF: SimdField<Scalar = EvalF> + Mul<IPPackF, Output = IPPackEvalF>,
33+
OpenPackF: SimdField<Scalar = F>,
3534
T: Transcript<EvalF>,
3635
{
3736
_marker_f: PhantomData<F>,
38-
_marker_pack_f: PhantomData<ComPackF>,
3937
_marker_eval_f: PhantomData<EvalF>,
40-
_marker_pack_f0: PhantomData<IPPackF>,
41-
_marker_pack_eval_f: PhantomData<IPPackEvalF>,
38+
_marker_commit_pack_f: PhantomData<ComPackF>,
39+
_marker_open_pack_f: PhantomData<OpenPackF>,
4240
_marker_t: PhantomData<T>,
4341
}
4442

@@ -48,14 +46,13 @@ pub struct OrionPCSSetup {
4846
pub code_parameter: OrionCodeParameter,
4947
}
5048

51-
impl<F, EvalF, ComPackF, IPPackF, IPPackEvalF, T> PolynomialCommitmentScheme
52-
for OrionPCS<F, EvalF, ComPackF, IPPackF, IPPackEvalF, T>
49+
impl<F, EvalF, ComPackF, OpenPackF, T> PolynomialCommitmentScheme
50+
for OrionPCS<F, EvalF, ComPackF, OpenPackF, T>
5351
where
5452
F: Field + FieldSerde,
5553
EvalF: Field + FieldSerde + From<F> + Mul<F, Output = EvalF>,
5654
ComPackF: SimdField<Scalar = F>,
57-
IPPackF: SimdField<Scalar = F>,
58-
IPPackEvalF: SimdField<Scalar = EvalF> + Mul<IPPackF, Output = IPPackEvalF>,
55+
OpenPackF: SimdField<Scalar = F>,
5956
T: Transcript<EvalF>,
6057
{
6158
type PublicParams = OrionPCSSetup;
@@ -90,7 +87,7 @@ where
9087
commitment_with_data: &Self::CommitmentWithData,
9188
transcript: &mut Self::FiatShamirTranscript,
9289
) -> (Self::Eval, Self::OpeningProof) {
93-
proving_key.open::<F, EvalF, ComPackF, IPPackF, IPPackEvalF, T>(
90+
proving_key.open::<F, EvalF, ComPackF, OpenPackF, T>(
9491
poly,
9592
commitment_with_data,
9693
opening_point,
@@ -106,7 +103,7 @@ where
106103
opening_proof: &Self::OpeningProof,
107104
transcript: &mut Self::FiatShamirTranscript,
108105
) -> bool {
109-
verifying_key.verify::<F, ComPackF, EvalF, IPPackF, IPPackEvalF, T>(
106+
verifying_key.verify::<F, EvalF, ComPackF, OpenPackF, T>(
110107
commitment,
111108
opening_point,
112109
evaluation,

0 commit comments

Comments
 (0)