saymrwulf/curve25519-dalek-source
1
0
Fork 0
mirror of https://github.com/saymrwulf/curve25519-dalek-source.git synced 2026-09-07 20:50:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixup serde and ed25519 trait errors in tests/benches.

Browse source
This commit is contained in:
Isis Lovecruft 2020-07-13 23:16:30 +00:00
parent 84047448da
commit 3a9435df94
No known key found for this signature in database
GPG key ID: AB41313533E8E812
3 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Cargo.toml
View file

@ -24,7 +24,7 @@ features = ["nightly", "batch"]
[dependencies] [dependencies]
curve25519-dalek = { version = "2", default-features = false } curve25519-dalek = { version = "2", default-features = false }
ed25519 = { version = "1", default-features = false } ed25519 = { version = "1", default-features = false }
merlin = { version = "1", default-features = false, optional = true, git = "https://github.com/isislovecruft/merlin", branch = "develop" } merlin = { version = "2", default-features = false, optional = true }
rand = { version = "0.7", default-features = false, optional = true } rand = { version = "0.7", default-features = false, optional = true }
rand_core = { version = "0.5", default-features = false, optional = true } rand_core = { version = "0.5", default-features = false, optional = true }
serde_crate = { package = "serde", version = "1.0", default-features = false, optional = true } serde_crate = { package = "serde", version = "1.0", default-features = false, optional = true }
@ -36,6 +36,7 @@ hex = "^0.4"
bincode = "^0.9" bincode = "^0.9"
criterion = "0.3" criterion = "0.3"
rand = "0.7" rand = "0.7"
serde_crate = { package = "serde", version = "1.0", features = ["derive"] }
[[bench]] [[bench]]
name = "ed25519_benchmarks" name = "ed25519_benchmarks"

1
benches/ed25519_benchmarks.rs
View file

@ -20,6 +20,7 @@ mod ed25519_benches {
use ed25519_dalek::Keypair; use ed25519_dalek::Keypair;
use ed25519_dalek::PublicKey; use ed25519_dalek::PublicKey;
use ed25519_dalek::Signature; use ed25519_dalek::Signature;
use ed25519_dalek::Signer;
use ed25519_dalek::verify_batch; use ed25519_dalek::verify_batch;
use rand::thread_rng; use rand::thread_rng;
use rand::prelude::ThreadRng; use rand::prelude::ThreadRng;

4
tests/ed25519.rs
View file

@ -16,7 +16,7 @@ extern crate hex;
extern crate sha2; extern crate sha2;
extern crate rand; extern crate rand;
#[cfg(all(test, feature = "serde"))] #[cfg(all(test, feature = "serde"))]
extern crate serde; extern crate serde_crate;
#[cfg(all(test, feature = "serde"))] #[cfg(all(test, feature = "serde"))]
extern crate toml; extern crate toml;
@ -219,8 +219,10 @@ mod integrations {
} }
} }
#[cfg(all(test, feature = "serde"))]
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
#[cfg(all(test, feature = "serde"))]
#[derive(Debug, Serialize, Deserialize)] #[derive(Debug, Serialize, Deserialize)]
struct Demo { struct Demo {
keypair: Keypair keypair: Keypair