Merge remote-tracking branch 'origin/master' into v0.6.1

This commit is contained in:
Michael Sproul
2019-06-03 16:31:34 +10:00
7 changed files with 10 additions and 10 deletions

View File

@@ -1,8 +1,8 @@
extern crate rand;
use super::BLS_SECRET_KEY_BYTE_SIZE;
use bls_aggregates::SecretKey as RawSecretKey;
use hex::encode as hex_encode;
use milagro_bls::SecretKey as RawSecretKey;
use serde::de::{Deserialize, Deserializer};
use serde::ser::{Serialize, Serializer};
use serde_hex::HexVisitor;