Update to latest interop keypair spec

This commit is contained in:
Paul Hauner
2019-08-30 13:30:07 +10:00
parent 2e11faf763
commit 25f2e212c3
6 changed files with 121 additions and 112 deletions

View File

@@ -1,5 +1,5 @@
use crate::*;
use eth2_interop_keypairs::be_private_key;
use eth2_interop_keypairs::keypair;
use log::debug;
use rayon::prelude::*;
@@ -15,8 +15,8 @@ pub fn generate_deterministic_keypairs(validator_count: usize) -> Vec<Keypair> {
let keypairs: Vec<Keypair> = (0..validator_count)
.collect::<Vec<usize>>()
.par_iter()
.map(|&i| generate_deterministic_keypair(i))
.into_par_iter()
.map(generate_deterministic_keypair)
.collect();
keypairs
@@ -26,8 +26,9 @@ pub fn generate_deterministic_keypairs(validator_count: usize) -> Vec<Keypair> {
///
/// This is used for testing only, and not to be used in production!
pub fn generate_deterministic_keypair(validator_index: usize) -> Keypair {
let sk = SecretKey::from_bytes(&be_private_key(validator_index))
.expect("be_private_key always returns valid keys");
let pk = PublicKey::from_secret_key(&sk);
Keypair { sk, pk }
let raw = keypair(validator_index);
Keypair {
pk: PublicKey::from_raw(raw.pk),
sk: SecretKey::from_raw(raw.sk),
}
}