using serde derive feature instead of separate crate

This commit is contained in:
Vladimir Komendantskiy 2019-04-01 12:52:46 +01:00 committed by Andreas Fackler
parent 784c815fe7
commit fb2ad369f9
6 changed files with 7 additions and 10 deletions

View File

@ -1,6 +1,6 @@
language: rust
rust:
- 1.31.0
- 1.33.0
cache:
cargo: true
timeout: 1200

View File

@ -27,17 +27,15 @@ lazy_static = "1.1.0"
log = "0.4.6"
memsec = "0.5.4"
pairing = { version = "0.14.2", features = ["u128-support"] }
rand = "0.6.4"
rand = "0.6.5"
rand04_compat = "0.1.1"
rand_chacha = "0.1.1"
serde = "1.0.84"
serde_derive = "1.0.84"
serde = { version = "1.0.89", features = ["derive"] }
tiny-keccak = "1.4.2"
[dev-dependencies]
bincode = "1.0.1"
criterion = "0.2.7"
serde_derive = "1.0.84"
rand_xorshift = "0.1.1"
[[bench]]

View File

@ -1,5 +1,5 @@
use bincode::{deserialize, serialize};
use serde_derive::{Deserialize, Serialize};
use serde::{Deserialize, Serialize};
use threshold_crypto::{PublicKey, SecretKey, Signature};
#[derive(Deserialize, Serialize)]

View File

@ -33,7 +33,7 @@ use rand::distributions::{Distribution, Standard};
use rand::{rngs::OsRng, Rng, SeedableRng};
use rand04_compat::RngExt;
use rand_chacha::ChaChaRng;
use serde_derive::{Deserialize, Serialize};
use serde::{Deserialize, Serialize};
use tiny_keccak::sha3_256;
use crate::cmp_pairing::cmp_projective;

View File

@ -26,7 +26,7 @@ use std::{cmp, iter, ops};
use pairing::{CurveAffine, CurveProjective, Field};
use rand::Rng;
use rand04_compat::RngExt;
use serde_derive::{Deserialize, Serialize};
use serde::{Deserialize, Serialize};
use crate::cmp_pairing::cmp_projective;
use crate::error::{Error, Result};

View File

@ -8,7 +8,6 @@ use std::ops::Deref;
use crate::G1;
use serde::de::Error as DeserializeError;
use serde::{Deserialize, Deserializer, Serialize, Serializer};
use serde_derive::{Deserialize, Serialize};
use crate::poly::{coeff_pos, BivarCommitment};
use crate::serde_impl::serialize_secret_internal::SerializeSecret;
@ -322,7 +321,7 @@ mod tests {
use bincode;
use rand;
use rand04_compat::RngExt;
use serde_derive::{Deserialize, Serialize};
use serde::{Deserialize, Serialize};
use crate::poly::BivarPoly;
use crate::{Fr, G1};