From 180d771fba0a47c1fb4df8bc2948bf3979fdf843 Mon Sep 17 00:00:00 2001 From: swasilyev Date: Thu, 8 Apr 2021 17:52:12 +0300 Subject: [PATCH] bench-utils -> ark-std --- bw6/Cargo.toml | 4 +--- bw6/src/constraints.rs | 2 +- bw6/src/kzg/mod.rs | 2 +- bw6/src/lib.rs | 2 +- bw6/src/verifier.rs | 2 +- mipp/Cargo.toml | 4 +--- mipp/src/lib.rs | 2 +- 7 files changed, 7 insertions(+), 11 deletions(-) diff --git a/bw6/Cargo.toml b/bw6/Cargo.toml index 7688572..edc3220 100644 --- a/bw6/Cargo.toml +++ b/bw6/Cargo.toml @@ -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" @@ -29,4 +27,4 @@ name = "bench" harness = false [features] -print-trace = [ "bench-utils/print-trace" ] \ No newline at end of file +print-trace = [ "ark-std/print-trace" ] \ No newline at end of file diff --git a/bw6/src/constraints.rs b/bw6/src/constraints.rs index 547863a..87de08d 100644 --- a/bw6/src/constraints.rs +++ b/bw6/src/constraints.rs @@ -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}; diff --git a/bw6/src/kzg/mod.rs b/bw6/src/kzg/mod.rs index bac5313..c3640c1 100644 --- a/bw6/src/kzg/mod.rs +++ b/bw6/src/kzg/mod.rs @@ -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; diff --git a/bw6/src/lib.rs b/bw6/src/lib.rs index c330cbd..9301465 100644 --- a/bw6/src/lib.rs +++ b/bw6/src/lib.rs @@ -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; diff --git a/bw6/src/verifier.rs b/bw6/src/verifier.rs index cab7f66..9ce5cb0 100644 --- a/bw6/src/verifier.rs +++ b/bw6/src/verifier.rs @@ -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}; diff --git a/mipp/Cargo.toml b/mipp/Cargo.toml index 2d305a8..ac1e355 100644 --- a/mipp/Cargo.toml +++ b/mipp/Cargo.toml @@ -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" ] \ No newline at end of file diff --git a/mipp/src/lib.rs b/mipp/src/lib.rs index 01408d5..10dd75e 100644 --- a/mipp/src/lib.rs +++ b/mipp/src/lib.rs @@ -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;