From fb2ad369f9e7e281097fd3b94e65be39f84bf17f Mon Sep 17 00:00:00 2001
From: Vladimir Komendantskiy <komendantsky@gmail.com>
Date: Mon, 1 Apr 2019 12:52:46 +0100
Subject: [PATCH] using serde derive feature instead of separate crate

---
 .travis.yml           | 2 +-
 Cargo.toml            | 6 ++----
 examples/basic_pkc.rs | 2 +-
 src/lib.rs            | 2 +-
 src/poly.rs           | 2 +-
 src/serde_impl.rs     | 3 +--
 6 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 628a360..e0fc164 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,6 @@
 language: rust
 rust:
-    - 1.31.0
+    - 1.33.0
 cache:
   cargo: true
   timeout: 1200
diff --git a/Cargo.toml b/Cargo.toml
index f69e7ec..405b274 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -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]]
diff --git a/examples/basic_pkc.rs b/examples/basic_pkc.rs
index 84e499e..ef63703 100644
--- a/examples/basic_pkc.rs
+++ b/examples/basic_pkc.rs
@@ -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)]
diff --git a/src/lib.rs b/src/lib.rs
index 83a9bed..b4651cb 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -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;
diff --git a/src/poly.rs b/src/poly.rs
index a37758f..f0d24a4 100644
--- a/src/poly.rs
+++ b/src/poly.rs
@@ -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};
diff --git a/src/serde_impl.rs b/src/serde_impl.rs
index 6da3877..f267662 100644
--- a/src/serde_impl.rs
+++ b/src/serde_impl.rs
@@ -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};