Ensure time and genesis validators root match

Author: michaelsproul

validator_client/http_api/src/test_utils.rs

@@ -71,12 +71,17 @@ impl ApiTester {
     }
 
     pub async fn new_with_http_config(http_config: HttpConfig) -> Self {
+        let slot_clock =
+            TestingSlotClock::new(Slot::new(0), Duration::from_secs(0), Duration::from_secs(1));
+        let genesis_validators_root = Hash256::repeat_byte(42);
         let spec = Arc::new(E::default_spec());
-        Self::new_with_http_config_and_spec(http_config, spec).await
+        Self::new_with_options(http_config, slot_clock, genesis_validators_root, spec).await
     }
 
-    pub async fn new_with_http_config_and_spec(
+    pub async fn new_with_options(
         http_config: HttpConfig,
+        slot_clock: TestingSlotClock,
+        genesis_validators_root: Hash256,
         spec: Arc<ChainSpec>,
     ) -> Self {
         let log = test_logger();
@@ -106,15 +111,12 @@ impl ApiTester {
         let slashing_db_path = validator_dir.path().join(SLASHING_PROTECTION_FILENAME);
         let slashing_protection = SlashingDatabase::open_or_create(&slashing_db_path).unwrap();
 
-        let slot_clock =
-            TestingSlotClock::new(Slot::new(0), Duration::from_secs(0), Duration::from_secs(1));
-
         let test_runtime = TestRuntime::default();
 
         let validator_store = Arc::new(ValidatorStore::<_, E>::new(
             initialized_validators,
             slashing_protection,
-            Hash256::repeat_byte(42),
+            genesis_validators_root,
             spec.clone(),
             Some(Arc::new(DoppelgangerService::new(log.clone()))),
             slot_clock.clone(),

validator_client/signing_method/src/lib.rs

@@ -96,6 +96,7 @@ pub enum SigningMethod {
 
 /// The additional information used to construct a signature. Mostly used for protection from replay
 /// attacks.
+#[derive(Debug)]
 pub struct SigningContext {
     pub domain: Domain,
     pub epoch: Epoch,

validator_manager/src/exit_validators.rs

@@ -229,11 +229,22 @@ mod test {
         }
 
         async fn with_validators(mut self, index_of_validators_to_exit: usize) -> Self {
-            let mut builder = ImportTestBuilder::new_with_http_config_and_spec(
+            // Ensure genesis validators root matches the beacon node.
+            let genesis_validators_root = self
+                .beacon_node
+                .harness
+                .get_current_state()
+                .genesis_validators_root();
+            // And use a single slot clock for BN and VC to keep things simple.
+            let slot_clock = self.beacon_node.harness.chain.slot_clock.clone();
+            let vc = ApiTester::new_with_options(
                 self.http_config.clone(),
+                slot_clock,
+                genesis_validators_root,
                 self.spec.clone(),
             )
             .await;
+            let mut builder = ImportTestBuilder::new_with_vc(vc).await;
 
             println!("Validator client spec: {:?}", builder.vc.spec);
 

validator_manager/src/import_validators.rs

@@ -385,14 +385,11 @@ pub mod tests {
     use std::{
         fs::{self, File},
         str::FromStr,
-        sync::Arc,
     };
     use tempfile::{tempdir, TempDir};
     use types::*;
     use validator_http_api::{test_utils::ApiTester, Config as HttpConfig};
 
-    type E = MainnetEthSpec;
-
     const VC_TOKEN_FILE_NAME: &str = "vc_token.json";
 
     pub struct TestBuilder {
@@ -410,15 +407,12 @@ pub mod tests {
         }
 
         pub async fn new_with_http_config(http_config: HttpConfig) -> Self {
-            Self::new_with_http_config_and_spec(http_config, Arc::new(E::default_spec())).await
+            let vc = ApiTester::new_with_http_config(http_config).await;
+            Self::new_with_vc(vc).await
         }
 
-        pub async fn new_with_http_config_and_spec(
-            http_config: HttpConfig,
-            spec: Arc<ChainSpec>,
-        ) -> Self {
+        pub async fn new_with_vc(vc: ApiTester) -> Self {
             let dir = tempdir().unwrap();
-            let vc = ApiTester::new_with_http_config_and_spec(http_config, spec).await;
             let vc_token_path = dir.path().join(VC_TOKEN_FILE_NAME);
             fs::write(&vc_token_path, &vc.api_token).unwrap();