diff --git a/.travis.yml b/.travis.yml index 56cad2f..d910557 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,24 +10,10 @@ env: - TEST_COMMAND=test EXTRA_FLAGS='' FEATURES='serde' - TEST_COMMAND=test EXTRA_FLAGS='' FEATURES='nightly' - TEST_COMMAND=test EXTRA_FLAGS='' FEATURES='yolocrypto nightly' - - TEST_COMMAND=bench EXTRA_FLAGS='' FEATURES='nightly' - - TEST_COMMAND=bench EXTRA_FLAGS='' FEATURES='yolocrypto nightly' - TEST_COMMAND=build EXTRA_FLAGS=--no-default-features FEATURES='' matrix: exclude: - # We can probably remove this, as we reasonably expect dalek to work on - # stable and beta, but currently we require "test" feature in order to - # run benchmarks, which causes dalek not to build on stable. See - # https://github.com/isislovecruft/curve25519-dalek/pull/38#issuecomment-286027562 - - rust: stable - env: TEST_COMMAND=bench EXTRA_FLAGS='' FEATURES='nightly' - - rust: beta - env: TEST_COMMAND=bench EXTRA_FLAGS='' FEATURES='nightly' - - rust: stable - env: TEST_COMMAND=bench EXTRA_FLAGS='' FEATURES='yolocrypto nightly' - - rust: beta - env: TEST_COMMAND=bench EXTRA_FLAGS='' FEATURES='yolocrypto nightly' # Test nightly features, such as radix_51, only on nightly. - rust: stable env: TEST_COMMAND=test EXTRA_FLAGS='' FEATURES='nightly' diff --git a/benches/dalek_benchmarks.rs b/benches/dalek_benchmarks.rs index 81c9056..353f4bf 100644 --- a/benches/dalek_benchmarks.rs +++ b/benches/dalek_benchmarks.rs @@ -13,6 +13,7 @@ extern crate curve25519_dalek; use curve25519_dalek::constants; use curve25519_dalek::scalar::Scalar; +static BATCH_SIZES: [usize; 5] = [1, 2, 4, 8, 16]; static MULTISCALAR_SIZES: [usize; 13] = [1, 2, 4, 8, 16, 32, 64, 128, 256, 384, 512, 768, 1024]; mod edwards_benches { @@ -133,7 +134,7 @@ mod ristretto_benches { .collect(); b.iter(|| RistrettoPoint::double_and_compress_batch(&points)); }, - &MULTISCALAR_SIZES, + &BATCH_SIZES, ); } @@ -186,7 +187,7 @@ mod scalar_benches { Scalar::batch_invert(&mut s); }); }, - &MULTISCALAR_SIZES, + &BATCH_SIZES, ); }