From 10dbf705e4ce9c43e5263f2e1c5227e02d2d20f7 Mon Sep 17 00:00:00 2001 From: Vladimir Komendantskiy Date: Mon, 1 Apr 2019 13:37:14 +0100 Subject: [PATCH] using serde derive feature --- .travis.yml | 2 +- Cargo.toml | 26 +++++++++++++------------- examples/simulation.rs | 4 +--- src/binary_agreement/bool_set.rs | 2 +- src/binary_agreement/mod.rs | 2 +- src/binary_agreement/sbv_broadcast.rs | 2 +- src/broadcast/merkle.rs | 2 +- src/broadcast/message.rs | 2 +- src/dynamic_honey_badger/change.rs | 2 +- src/dynamic_honey_badger/mod.rs | 2 +- src/dynamic_honey_badger/votes.rs | 3 +-- src/honey_badger/epoch_state.rs | 3 +-- src/honey_badger/honey_badger.rs | 3 +-- src/honey_badger/message.rs | 2 +- src/honey_badger/params.rs | 2 +- src/sender_queue/message.rs | 2 +- src/subset/message.rs | 2 +- src/subset/subset.rs | 2 +- src/sync_key_gen.rs | 2 +- src/threshold_decrypt.rs | 2 +- src/threshold_sign.rs | 2 +- 21 files changed, 33 insertions(+), 38 deletions(-) diff --git a/.travis.yml b/.travis.yml index 989fc07..7909718 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 dbcad4d..e587cd2 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "hbbft" -version = "0.1.0" +version = "0.1.1" authors = [ "Vladimir Komendantskiy ", "Andreas Fackler ", @@ -21,20 +21,20 @@ edition = "2018" travis-ci = { repository = "poanetwork/hbbft" } [dependencies] -bincode = "1.0.0" -byteorder = "1.2.3" -derivative = "1.0.1" -env_logger = "0.6.0" -failure = "0.1" +bincode = "1.1.2" +byteorder = "1.3.1" +derivative = "1.0.2" +env_logger = "0.6.1" +failure = "0.1.5" hex_fmt = "0.3" init_with = "1.1.0" -log = "0.4.1" -rand = "0.6.1" +log = "0.4.6" +rand = "0.6.5" rand_derive = "0.5.0" reed-solomon-erasure = "3.1.1" -serde = "1.0.82" -serde_derive = "1.0.82" -threshold_crypto = "0.3.0" +serde = { version = "1.0.89", features = ["derive"] } +# FIXME: update to threshold_crypto = "0.3.1" as soon as that is uploaded to crates.io +threshold_crypto = { git = "https://github.com/poanetwork/threshold_crypto.git", branch = "vk-serde-derive-feature" } tiny-keccak = "1.4" [dev-dependencies] @@ -43,10 +43,10 @@ crossbeam = "0.6" crossbeam-channel = "0.3" docopt = "1.0" itertools = "0.8.0" -rand_xorshift = "0.1.0" +rand_xorshift = "0.1.1" signifix = "0.9" proptest = "0.8.7" -integer-sqrt = "0.1.1" +integer-sqrt = "0.1.2" [[example]] name = "consensus-node" diff --git a/examples/simulation.rs b/examples/simulation.rs index fea1e9a..4afbb32 100644 --- a/examples/simulation.rs +++ b/examples/simulation.rs @@ -7,9 +7,7 @@ use docopt::Docopt; use itertools::Itertools; use rand::{distributions::Standard, rngs::OsRng, seq::SliceRandom, Rng}; use rand_derive::Rand; -use serde::de::DeserializeOwned; -use serde::Serialize; -use serde_derive::{Deserialize, Serialize}; +use serde::{de::DeserializeOwned, Deserialize, Serialize}; use signifix::{metric, TryFrom}; use hbbft::dynamic_honey_badger::DynamicHoneyBadger; diff --git a/src/binary_agreement/bool_set.rs b/src/binary_agreement/bool_set.rs index 9d24076..4c506c2 100644 --- a/src/binary_agreement/bool_set.rs +++ b/src/binary_agreement/bool_set.rs @@ -1,7 +1,7 @@ //! A single-byte representation of a set of boolean values. use rand_derive::Rand; -use serde_derive::{Deserialize, Serialize}; +use serde::{Deserialize, Serialize}; /// The empty set of boolean values. pub const NONE: BoolSet = BoolSet(0b00); diff --git a/src/binary_agreement/mod.rs b/src/binary_agreement/mod.rs index e80030e..772980b 100644 --- a/src/binary_agreement/mod.rs +++ b/src/binary_agreement/mod.rs @@ -73,7 +73,7 @@ use failure::Fail; use rand::distributions::{Distribution, Standard}; use rand::{seq::SliceRandom, Rng}; use rand_derive::Rand; -use serde_derive::{Deserialize, Serialize}; +use serde::{Deserialize, Serialize}; use self::bool_set::BoolSet; use crate::threshold_sign; diff --git a/src/binary_agreement/sbv_broadcast.rs b/src/binary_agreement/sbv_broadcast.rs index f88250c..bea5571 100644 --- a/src/binary_agreement/sbv_broadcast.rs +++ b/src/binary_agreement/sbv_broadcast.rs @@ -13,7 +13,7 @@ use std::sync::Arc; use rand::distributions::{Distribution, Standard}; use rand::{seq::SliceRandom, Rng}; -use serde_derive::{Deserialize, Serialize}; +use serde::{Deserialize, Serialize}; use super::bool_multimap::BoolMultimap; use super::bool_set::{self, BoolSet}; diff --git a/src/broadcast/merkle.rs b/src/broadcast/merkle.rs index 3d79d77..5db7937 100644 --- a/src/broadcast/merkle.rs +++ b/src/broadcast/merkle.rs @@ -1,6 +1,6 @@ use std::mem; -use serde_derive::{Deserialize, Serialize}; +use serde::{Deserialize, Serialize}; use tiny_keccak::sha3_256; pub type Digest = [u8; 32]; diff --git a/src/broadcast/message.rs b/src/broadcast/message.rs index 40e67ae..808b736 100644 --- a/src/broadcast/message.rs +++ b/src/broadcast/message.rs @@ -3,7 +3,7 @@ use std::fmt::{self, Debug}; use hex_fmt::HexFmt; use rand::distributions::{Distribution, Standard}; use rand::{self, seq::SliceRandom, Rng}; -use serde_derive::{Deserialize, Serialize}; +use serde::{Deserialize, Serialize}; use super::merkle::{Digest, MerkleTree, Proof}; diff --git a/src/dynamic_honey_badger/change.rs b/src/dynamic_honey_badger/change.rs index 2cf3cf5..54103ba 100644 --- a/src/dynamic_honey_badger/change.rs +++ b/src/dynamic_honey_badger/change.rs @@ -1,7 +1,7 @@ use std::collections::BTreeMap; use crate::crypto::PublicKey; -use serde_derive::{Deserialize, Serialize}; +use serde::{Deserialize, Serialize}; use super::EncryptionSchedule; diff --git a/src/dynamic_honey_badger/mod.rs b/src/dynamic_honey_badger/mod.rs index 830f75e..b0357c5 100644 --- a/src/dynamic_honey_badger/mod.rs +++ b/src/dynamic_honey_badger/mod.rs @@ -75,7 +75,7 @@ mod votes; use std::collections::BTreeMap; use crate::crypto::{PublicKey, PublicKeySet, Signature}; -use serde_derive::{Deserialize, Serialize}; +use serde::{Deserialize, Serialize}; use self::votes::{SignedVote, VoteCounter}; use crate::honey_badger::{EncryptionSchedule, Message as HbMessage, Params}; diff --git a/src/dynamic_honey_badger/votes.rs b/src/dynamic_honey_badger/votes.rs index 3727183..97039ff 100644 --- a/src/dynamic_honey_badger/votes.rs +++ b/src/dynamic_honey_badger/votes.rs @@ -3,8 +3,7 @@ use std::sync::Arc; use crate::crypto::Signature; use bincode; -use serde::Serialize; -use serde_derive::{Deserialize, Serialize}; +use serde::{Deserialize, Serialize}; use super::{Change, Error, FaultKind, Result}; use crate::fault_log; diff --git a/src/honey_badger/epoch_state.rs b/src/honey_badger/epoch_state.rs index d6ffbef..b2027cb 100644 --- a/src/honey_badger/epoch_state.rs +++ b/src/honey_badger/epoch_state.rs @@ -10,8 +10,7 @@ use crate::crypto::Ciphertext; use bincode; use log::error; use rand::Rng; -use serde::{de::DeserializeOwned, Serialize}; -use serde_derive::{Deserialize, Serialize}; +use serde::{de::DeserializeOwned, Deserialize, Serialize}; use super::{Batch, Error, FaultKind, FaultLog, MessageContent, Result, Step}; use crate::fault_log::Fault; diff --git a/src/honey_badger/honey_badger.rs b/src/honey_badger/honey_badger.rs index 6bf5270..b9d1ed3 100644 --- a/src/honey_badger/honey_badger.rs +++ b/src/honey_badger/honey_badger.rs @@ -4,8 +4,7 @@ use std::sync::Arc; use derivative::Derivative; use rand::Rng; -use serde::{de::DeserializeOwned, Serialize}; -use serde_derive::{Deserialize, Serialize}; +use serde::{de::DeserializeOwned, Deserialize, Serialize}; use super::epoch_state::EpochState; use super::{Batch, Error, FaultKind, HoneyBadgerBuilder, Message, Result}; diff --git a/src/honey_badger/message.rs b/src/honey_badger/message.rs index 395a8c3..451970d 100644 --- a/src/honey_badger/message.rs +++ b/src/honey_badger/message.rs @@ -3,7 +3,7 @@ use rand::distributions::{Distribution, Standard}; use rand::{seq::SliceRandom, Rng}; -use serde_derive::{Deserialize, Serialize}; +use serde::{Deserialize, Serialize}; use crate::subset; use crate::threshold_decrypt; diff --git a/src/honey_badger/params.rs b/src/honey_badger/params.rs index 1ab4568..ffc14de 100644 --- a/src/honey_badger/params.rs +++ b/src/honey_badger/params.rs @@ -1,4 +1,4 @@ -use serde_derive::{Deserialize, Serialize}; +use serde::{Deserialize, Serialize}; use super::{EncryptionSchedule, SubsetHandlingStrategy}; diff --git a/src/sender_queue/message.rs b/src/sender_queue/message.rs index 46bd974..7b8e652 100644 --- a/src/sender_queue/message.rs +++ b/src/sender_queue/message.rs @@ -1,6 +1,6 @@ use rand::distributions::{Distribution, Standard}; use rand::{seq::SliceRandom, Rng}; -use serde_derive::{Deserialize, Serialize}; +use serde::{Deserialize, Serialize}; use super::SenderQueueableMessage; diff --git a/src/subset/message.rs b/src/subset/message.rs index a4785c7..c6df829 100644 --- a/src/subset/message.rs +++ b/src/subset/message.rs @@ -1,7 +1,7 @@ use rand::distributions::{Distribution, Standard}; use rand::Rng; use rand_derive::Rand; -use serde_derive::{Deserialize, Serialize}; +use serde::{Deserialize, Serialize}; use crate::binary_agreement; use crate::broadcast; diff --git a/src/subset/subset.rs b/src/subset/subset.rs index e85b803..b8fa164 100644 --- a/src/subset/subset.rs +++ b/src/subset/subset.rs @@ -5,7 +5,7 @@ use std::{fmt, result}; use derivative::Derivative; use hex_fmt::HexFmt; use log::debug; -use serde_derive::Serialize; +use serde::Serialize; use super::proposal_state::{ProposalState, Step as ProposalStep}; use super::{Error, FaultKind, Message, MessageContent, Result}; diff --git a/src/sync_key_gen.rs b/src/sync_key_gen.rs index 01b902e..0590177 100644 --- a/src/sync_key_gen.rs +++ b/src/sync_key_gen.rs @@ -187,7 +187,7 @@ use crate::pairing::{CurveAffine, Field}; use bincode; use failure::Fail; use rand; -use serde_derive::{Deserialize, Serialize}; +use serde::{Deserialize, Serialize}; use crate::{NetworkInfo, NodeIdT}; diff --git a/src/threshold_decrypt.rs b/src/threshold_decrypt.rs index 8aac065..a16dada 100644 --- a/src/threshold_decrypt.rs +++ b/src/threshold_decrypt.rs @@ -18,7 +18,7 @@ use crate::crypto::{self, Ciphertext, DecryptionShare}; use failure::Fail; use rand::Rng; use rand_derive::Rand; -use serde_derive::{Deserialize, Serialize}; +use serde::{Deserialize, Serialize}; use crate::fault_log::{self, Fault}; use crate::{ConsensusProtocol, NetworkInfo, NodeIdT, Target}; diff --git a/src/threshold_sign.rs b/src/threshold_sign.rs index 3422238..dbf6ee0 100644 --- a/src/threshold_sign.rs +++ b/src/threshold_sign.rs @@ -24,7 +24,7 @@ use failure::Fail; use log::debug; use rand::Rng; use rand_derive::Rand; -use serde_derive::{Deserialize, Serialize}; +use serde::{Deserialize, Serialize}; use crate::fault_log::{Fault, FaultLog}; use crate::{ConsensusProtocol, NetworkInfo, NodeIdT, Target};