gnosis/lighthouse
1
0
Fork 0
mirror of https://github.com/sigp/lighthouse.git synced 2026-04-20 14:28:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Finalise bls spec tests

Browse Source
This commit is contained in:
Kirk Baird
2019-05-21 12:46:22 +10:00
parent 6bab62e629
commit 7a96ad130e
10 changed files with 295 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
tests/ef_tests/src/cases/bls_aggregate_pubkeys.rs
View File

@@ -1,10 +1,7 @@
use super::*;
use crate::case_result::compare_result;
use bls::{AggregatePublicKey, PublicKey};
use ethereum_types::{U128, U256};
use serde_derive::Deserialize;
use ssz::Decode;
use std::fmt::Debug;
use types::EthSpec;
#[derive(Debug, Clone, Deserialize)]
@@ -25,7 +22,7 @@ impl EfTest for Cases<BlsAggregatePubkeys> {
.iter()
.enumerate()
.map(|(i, tc)| {
let result = bls_add_aggregates::<AggregatePublicKey>(&tc.input, &tc.output);
let result = bls_add_pubkeys(&tc.input, &tc.output);
CaseResult::new(i, tc, result)
})
@@ -34,20 +31,20 @@ impl EfTest for Cases<BlsAggregatePubkeys> {
}
/// Execute a `aggregate_pubkeys` test case.
fn bls_add_aggregates<T>(
inputs: &[String],
output: &String,
) -> Result<(), Error> {
fn bls_add_pubkeys(inputs: &[String], output: &String) -> Result<(), Error> {
let mut aggregate_pubkey = AggregatePublicKey::new();
for key_str in inputs {
let key = hex::decode(&key_str[2..]).map_err(|e| Error::FailedToParseTest(format!("{:?}", e)))?;
let key = PublicKey::from_bytes(&key).map_err(|e| Error::FailedToParseTest(format!("{:?}", e)))?;
let key =
hex::decode(&key_str[2..]).map_err(|e| Error::FailedToParseTest(format!("{:?}", e)))?;
let key = PublicKey::from_bytes(&key)
.map_err(|e| Error::FailedToParseTest(format!("{:?}", e)))?;
aggregate_pubkey.add(&key);
}
let output_bytes = Some(hex::decode(&output[2..]).map_err(|e| Error::FailedToParseTest(format!("{:?}", e)))?);
let output_bytes =
Some(hex::decode(&output[2..]).map_err(|e| Error::FailedToParseTest(format!("{:?}", e)))?);
let aggregate_pubkey = Ok(aggregate_pubkey.as_raw().as_bytes());
compare_result::<Vec<u8>, Vec<u8>>(&aggregate_pubkey, &output_bytes)