mirror of https://github.com/poanetwork/hbbft.git
Implemented `Rand` for `SecretKey`.
This commit is contained in:
parent
38178af124
commit
5e8b26cfc3
|
@ -16,7 +16,7 @@ use clear_on_drop::ClearOnDrop;
|
|||
use init_with::InitWith;
|
||||
use pairing::bls12_381::{Bls12, Fr, FrRepr, G1, G1Affine, G2, G2Affine};
|
||||
use pairing::{CurveAffine, CurveProjective, Engine, Field, PrimeField};
|
||||
use rand::{ChaChaRng, OsRng, Rng, SeedableRng};
|
||||
use rand::{ChaChaRng, OsRng, Rand, Rng, SeedableRng};
|
||||
use ring::digest;
|
||||
|
||||
use self::error::{ErrorKind, Result};
|
||||
|
@ -129,12 +129,14 @@ impl Default for SecretKey {
|
|||
}
|
||||
}
|
||||
|
||||
impl SecretKey {
|
||||
/// Creates a new secret key.
|
||||
pub fn new<R: Rng>(rng: &mut R) -> Self {
|
||||
impl Rand for SecretKey {
|
||||
fn rand<R: Rng>(rng: &mut R) -> Self {
|
||||
SecretKey(rng.gen())
|
||||
}
|
||||
}
|
||||
|
||||
impl SecretKey {
|
||||
/// Creates a secret key from an existing value
|
||||
pub fn from_value(f: Fr) -> Self {
|
||||
SecretKey(f)
|
||||
}
|
||||
|
@ -405,13 +407,12 @@ mod tests {
|
|||
|
||||
use std::collections::BTreeMap;
|
||||
|
||||
use rand;
|
||||
use rand::{self, random};
|
||||
|
||||
#[test]
|
||||
fn test_simple_sig() {
|
||||
let mut rng = rand::thread_rng();
|
||||
let sk0 = SecretKey::new(&mut rng);
|
||||
let sk1 = SecretKey::new(&mut rng);
|
||||
let sk0: SecretKey = random();
|
||||
let sk1: SecretKey = random();
|
||||
let pk0 = sk0.public_key();
|
||||
let msg0 = b"Real news";
|
||||
let msg1 = b"Fake news";
|
||||
|
@ -464,9 +465,8 @@ mod tests {
|
|||
|
||||
#[test]
|
||||
fn test_simple_enc() {
|
||||
let mut rng = rand::thread_rng();
|
||||
let sk_bob = SecretKey::new(&mut rng);
|
||||
let sk_eve = SecretKey::new(&mut rng);
|
||||
let sk_bob: SecretKey = random();
|
||||
let sk_eve: SecretKey = random();
|
||||
let pk_bob = sk_bob.public_key();
|
||||
let msg = b"Muffins in the canteen today! Don't tell Eve!";
|
||||
let ciphertext = pk_bob.encrypt(&msg[..]);
|
||||
|
@ -566,8 +566,7 @@ mod tests {
|
|||
fn test_serde() {
|
||||
use bincode;
|
||||
|
||||
let mut rng = rand::thread_rng();
|
||||
let sk = SecretKey::new(&mut rng);
|
||||
let sk: SecretKey = random();
|
||||
let sig = sk.sign("Please sign here: ______");
|
||||
let pk = sk.public_key();
|
||||
let ser_pk = bincode::serialize(&pk).expect("serialize public key");
|
||||
|
|
|
@ -11,10 +11,8 @@ use hbbft::crypto::{PublicKey, SecretKey};
|
|||
use hbbft::sync_key_gen::SyncKeyGen;
|
||||
|
||||
fn test_sync_key_gen_with(threshold: usize, node_num: usize) {
|
||||
let mut rng = rand::thread_rng();
|
||||
|
||||
// Generate individual key pairs for encryption. These are not suitable for threshold schemes.
|
||||
let sec_keys: Vec<SecretKey> = (0..node_num).map(|_| SecretKey::new(&mut rng)).collect();
|
||||
let sec_keys: Vec<SecretKey> = (0..node_num).map(|_| rand::random()).collect();
|
||||
let pub_keys: BTreeMap<usize, PublicKey> = sec_keys
|
||||
.iter()
|
||||
.map(|sk| sk.public_key())
|
||||
|
@ -37,8 +35,7 @@ fn test_sync_key_gen_with(threshold: usize, node_num: usize) {
|
|||
let mut accepts = Vec::new();
|
||||
for (sender_id, proposal) in proposals[..=threshold].iter().enumerate() {
|
||||
for (node_id, node) in nodes.iter_mut().enumerate() {
|
||||
let accept = node
|
||||
.handle_propose(&sender_id, proposal.clone().expect("proposal"))
|
||||
let accept = node.handle_propose(&sender_id, proposal.clone().expect("proposal"))
|
||||
.expect("valid proposal");
|
||||
// Only the first `threshold + 1` manage to commit their `Accept`s.
|
||||
if node_id <= 2 * threshold {
|
||||
|
|
Loading…
Reference in New Issue