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

Improve efficiency with manual YAML operations

Browse Source
This commit is contained in:
Paul Hauner
2019-05-15 17:14:28 +10:00
parent 63ee179def
commit c6fa1602de
3 changed files with 51 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
tests/ef_tests/src/doc.rs
View File

@@ -2,7 +2,7 @@ use crate::case_result::CaseResult;
use crate::cases::*;
use crate::doc_header::DocHeader;
use crate::eth_specs::{MainnetEthSpec, MinimalEthSpec};
use crate::yaml_decode::{extract_yaml_by_key, YamlDecode};
use crate::yaml_decode::{extract_yaml_by_key, yaml_split_header_and_cases, YamlDecode};
use crate::EfTest;
use serde_derive::Deserialize;
use std::{fs::File, io::prelude::*, path::PathBuf};
@@ -10,7 +10,8 @@ use types::EthSpec;
#[derive(Debug, Deserialize)]
pub struct Doc {
pub yaml: String,
pub header_yaml: String,
pub cases_yaml: String,
pub path: PathBuf,
}
@@ -21,20 +22,26 @@ impl Doc {
let mut yaml = String::new();
file.read_to_string(&mut yaml).unwrap();
Self { yaml, path }
let (header_yaml, cases_yaml) = yaml_split_header_and_cases(yaml.clone());
Self {
header_yaml,
cases_yaml,
path,
}
}
pub fn test_results(&self) -> Vec<CaseResult> {
let header: DocHeader = serde_yaml::from_str(&self.yaml.as_str()).unwrap();
let header: DocHeader = serde_yaml::from_str(&self.header_yaml.as_str()).unwrap();
match (
header.runner.as_ref(),
header.handler.as_ref(),
header.config.as_ref(),
) {
("ssz", "uint", _) => run_test::<SszGeneric, MainnetEthSpec>(&self.yaml),
("ssz", "static", "minimal") => run_test::<SszStatic, MinimalEthSpec>(&self.yaml),
("ssz", "static", "mainnet") => run_test::<SszStatic, MainnetEthSpec>(&self.yaml),
("ssz", "uint", _) => run_test::<SszGeneric, MainnetEthSpec>(&self),
("ssz", "static", "minimal") => run_test::<SszStatic, MinimalEthSpec>(&self),
("ssz", "static", "mainnet") => run_test::<SszStatic, MainnetEthSpec>(&self),
(runner, handler, config) => panic!(
"No implementation for runner: \"{}\", handler: \"{}\", config: \"{}\"",
runner, handler, config
@@ -55,21 +62,21 @@ impl Doc {
}
}
pub fn run_test<T, E: EthSpec>(test_doc_yaml: &String) -> Vec<CaseResult>
pub fn run_test<T, E: EthSpec>(doc: &Doc) -> Vec<CaseResult>
where
Cases<T>: EfTest + YamlDecode,
{
// Extract only the "test_cases" YAML as a stand-alone string.
let test_cases_yaml = extract_yaml_by_key(test_doc_yaml, "test_cases");
//let test_cases_yaml = extract_yaml_by_key(self., "test_cases");
// Pass only the "test_cases" YAML string to `yaml_decode`.
let test_cases: Cases<T> = Cases::yaml_decode(&test_cases_yaml.to_string()).unwrap();
let test_cases: Cases<T> = Cases::yaml_decode(&doc.cases_yaml).unwrap();
test_cases.test_results::<E>()
}
pub fn print_failures(doc: &Doc, results: &[CaseResult]) {
let header: DocHeader = serde_yaml::from_str(&doc.yaml).unwrap();
let header: DocHeader = serde_yaml::from_str(&doc.header_yaml).unwrap();
let failures: Vec<&CaseResult> = results.iter().filter(|r| r.result.is_err()).collect();
println!("--------------------------------------------------");