Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bench-utils -> ark-std #16

Merged
merged 1 commit into from
Apr 8, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions bw6/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@ ark-bw6-761 = { git = "https://github.com/arkworks-rs/curves", default-features
ark-std = { git = "https://github.com/arkworks-rs/utils", default-features = false }
ark-poly = { git = "https://github.com/arkworks-rs/algebra", default-features = false }

bench-utils = { git = "https://github.com/arkworks-rs/utils", default-features = false }

rand = "0.7"
merlin = "2.0.0"

Expand All @@ -29,4 +27,4 @@ name = "bench"
harness = false

[features]
print-trace = [ "bench-utils/print-trace" ]
print-trace = [ "ark-std/print-trace" ]
2 changes: 1 addition & 1 deletion bw6/src/constraints.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ use ark_bls12_377::{G1Affine, Fq};

use ark_std::io::{Read, Write};
use ark_serialize::{CanonicalSerialize, CanonicalDeserialize, SerializationError};
use bench_utils::{end_timer, start_timer};
use ark_std::{end_timer, start_timer};

use crate::domains::Domains;
use crate::{Bitmask, point_in_g1_complement, utils, ExtendedRegisterCommitments, BasicRegisterCommitments, RegisterCommitments};
Expand Down
2 changes: 1 addition & 1 deletion bw6/src/kzg/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ use ark_ff::{One, PrimeField, UniformRand, Zero};
use ark_poly::UVPolynomial;
use ark_std::{format, marker::PhantomData, ops::Div, vec};

use bench_utils::{end_timer, start_timer};
use ark_std::{end_timer, start_timer};

use crate::utils;

Expand Down
2 changes: 1 addition & 1 deletion bw6/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ fn point_in_g1_complement() -> ark_bls12_377::G1Affine {
#[cfg(test)]
mod tests {
use super::*;
use bench_utils::{end_timer, start_timer};
use ark_std::{end_timer, start_timer};
use merlin::Transcript;
use ark_std::convert::TryInto;
use ark_std::test_rng;
Expand Down
2 changes: 1 addition & 1 deletion bw6/src/verifier.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use ark_poly::{Radix2EvaluationDomain, EvaluationDomain};
use ark_bw6_761::{BW6_761, Fr};
use ark_ec::ProjectiveCurve;
use bench_utils::{end_timer, start_timer};
use ark_std::{end_timer, start_timer};
use merlin::Transcript;

use crate::{endo, Proof, utils, KZG_BW6, point_in_g1_complement, Bitmask, RegisterCommitments};
Expand Down
4 changes: 1 addition & 3 deletions mipp/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,9 @@ ark-ff = { git = "https://github.com/arkworks-rs/algebra", default-features = fa
ark-ec = { git = "https://github.com/arkworks-rs/algebra", default-features = false }
ark-bls12-381 = { git = "https://github.com/arkworks-rs/curves", features = [ "curve" ] }

bench-utils = { git = "https://github.com/arkworks-rs/utils", default-features = false }

blake2 = { version = "0.9" }
rand = "0.7"

[features]
print-trace = [ "bench-utils/print-trace" ]
print-trace = [ "ark-std/print-trace" ]
parallel = [ "ark-ff/parallel", "ark-ec/parallel" ]
2 changes: 1 addition & 1 deletion mipp/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ mod tests {
use ark_ip_proofs::tipa::TIPA;
use ark_ip_proofs::tipa::structured_scalar_message::TIPAWithSSM;

use bench_utils::{end_timer, start_timer};
use ark_std::{end_timer, start_timer};
use ark_std::{UniformRand, test_rng};
use rand::Rng;
use blake2::Blake2b;
Expand Down