Improve DX for loading validator keys from file

eth2/state_processing/benches/bench_block_processing.rs

@@ -9,19 +9,14 @@ use state_processing::{
         verify_block_signature,
     },
 };
-use std::path::Path;
 use types::test_utils::{TestingBeaconBlockBuilder, TestingBeaconStateBuilder};
 use types::*;
 
 /// Run the benchmarking suite on a foundation spec with 16,384 validators.
-pub fn bench_block_processing_n_validators(
-    c: &mut Criterion,
-    validator_count: usize,
-    keypair_file: Option<&Path>,
-) {
+pub fn bench_block_processing_n_validators(c: &mut Criterion, validator_count: usize) {
     let spec = ChainSpec::foundation();
 
-    let (mut state, keypairs) = build_state(validator_count, keypair_file, &spec);
+    let (mut state, keypairs) = build_state(validator_count, &spec);
     let block = build_block(&mut state, &keypairs, &spec);
 
     assert_eq!(
@@ -84,12 +79,9 @@ pub fn bench_block_processing_n_validators(
     );
 }
 
-fn build_state(
-    validator_count: usize,
-    keypair_file: Option<&Path>,
-    spec: &ChainSpec,
-) -> (BeaconState, Vec<Keypair>) {
-    let mut builder = TestingBeaconStateBuilder::new(validator_count, keypair_file, &spec);
+fn build_state(validator_count: usize, spec: &ChainSpec) -> (BeaconState, Vec<Keypair>) {
+    let mut builder =
+        TestingBeaconStateBuilder::from_default_keypairs_file_if_exists(validator_count, &spec);
 
     // Set the state to be just before an epoch transition.
     let target_slot = (spec.genesis_epoch + 4).end_slot(spec.slots_per_epoch);

eth2/state_processing/benches/bench_epoch_processing.rs

@@ -10,7 +10,6 @@ use state_processing::{
         update_latest_slashed_balances,
     },
 };
-use std::path::Path;
 use types::test_utils::TestingBeaconStateBuilder;
 use types::{validator_registry::get_active_validator_indices, *};
 
@@ -18,14 +17,11 @@ pub const BENCHING_SAMPLE_SIZE: usize = 10;
 pub const SMALL_BENCHING_SAMPLE_SIZE: usize = 10;
 
 /// Run the benchmarking suite on a foundation spec with 16,384 validators.
-pub fn bench_epoch_processing_n_validators(
-    c: &mut Criterion,
-    validator_count: usize,
-    keypair_file: Option<&Path>,
-) {
+pub fn bench_epoch_processing_n_validators(c: &mut Criterion, validator_count: usize) {
     let spec = ChainSpec::foundation();
 
-    let mut builder = TestingBeaconStateBuilder::new(validator_count, keypair_file, &spec);
+    let mut builder =
+        TestingBeaconStateBuilder::from_default_keypairs_file_if_exists(validator_count, &spec);
 
     // Set the state to be just before an epoch transition.
     let target_slot = (spec.genesis_epoch + 4).end_slot(spec.slots_per_epoch);

eth2/state_processing/benches/benches.rs

@@ -1,7 +1,6 @@
 use criterion::Benchmark;
 use criterion::Criterion;
 use criterion::{criterion_group, criterion_main};
-use std::path::Path;
 use types::test_utils::TestingBeaconStateBuilder;
 use types::*;
 
@@ -11,8 +10,8 @@ mod bench_epoch_processing;
 pub const VALIDATOR_COUNT: usize = 300_032;
 
 pub fn state_processing(c: &mut Criterion) {
-    bench_block_processing::bench_block_processing_n_validators(c, VALIDATOR_COUNT, None);
-    bench_epoch_processing::bench_epoch_processing_n_validators(c, VALIDATOR_COUNT, None);
+    bench_block_processing::bench_block_processing_n_validators(c, VALIDATOR_COUNT);
+    bench_epoch_processing::bench_epoch_processing_n_validators(c, VALIDATOR_COUNT);
 }
 
 pub fn key_loading(c: &mut Criterion) {
@@ -23,7 +22,12 @@ pub fn key_loading(c: &mut Criterion) {
         Benchmark::new("generated", move |b| {
             b.iter_batched(
                 || (),
-                |_| TestingBeaconStateBuilder::new(validator_count, None, &ChainSpec::foundation()),
+                |_| {
+                    TestingBeaconStateBuilder::from_deterministic_keypairs(
+                        validator_count,
+                        &ChainSpec::foundation(),
+                    )
+                },
                 criterion::BatchSize::SmallInput,
             )
         })
@@ -31,17 +35,14 @@ pub fn key_loading(c: &mut Criterion) {
     );
 
     // Note: path needs to be relative to where cargo is executed from.
-    let keypair_file =
-        Path::new("../../beacon_node/beacon_chain/test_harness/keypairs.raw_keypairs");
     c.bench(
         &format!("{}_validators", validator_count),
         Benchmark::new("from_file", move |b| {
             b.iter_batched(
                 || (),
                 |_| {
-                    TestingBeaconStateBuilder::new(
+                    TestingBeaconStateBuilder::from_default_keypairs_file_if_exists(
                         validator_count,
-                        Some(&keypair_file),
                         &ChainSpec::foundation(),
                     )
                 },

eth2/state_processing/src/per_epoch_processing/tests.rs

@@ -10,7 +10,7 @@ fn runs_without_error() {
 
     let spec = ChainSpec::few_validators();
 
-    let mut builder = TestingBeaconStateBuilder::new(8, None, &spec);
+    let mut builder = TestingBeaconStateBuilder::from_deterministic_keypairs(8, &spec);
 
     let target_slot = (spec.genesis_epoch + 4).end_slot(spec.slots_per_epoch);
     builder.teleport_to_slot(target_slot, &spec);