using serde derive feature instead of separate crate

master
Vladimir Komendantskiy 6 years ago committed by Andreas Fackler
parent 784c815fe7
commit fb2ad369f9
  1. 2
      .travis.yml
  2. 6
      Cargo.toml
  3. 2
      examples/basic_pkc.rs
  4. 2
      src/lib.rs
  5. 2
      src/poly.rs
  6. 3
      src/serde_impl.rs

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

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

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

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

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

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

Loading…
Cancel
Save