fix tests

Author: dknopik

testing/web3signer_tests/src/lib.rs

@@ -46,7 +46,7 @@ mod tests {
     use tokio::time::sleep;
     use types::{attestation::AttestationBase, *};
     use url::Url;
-    use validator_store::{Error as ValidatorStoreError, ValidatorStore};
+    use validator_store::{Error as ValidatorStoreError, SignBlock, ValidatorStore};
 
     /// If the we are unable to reach the Web3Signer HTTP API within this time out then we will
     /// assume it failed to start.
@@ -310,7 +310,7 @@ mod tests {
 
     /// A testing rig which holds a `ValidatorStore`.
     struct ValidatorStoreRig {
-        validator_store: Arc<LighthouseValidatorStore<TestingSlotClock>>,
+        validator_store: Arc<LighthouseValidatorStore<TestingSlotClock, E>>,
         _validator_dir: TempDir,
         runtime: Arc<tokio::runtime::Runtime>,
         _runtime_shutdown: async_channel::Sender<()>,
@@ -364,7 +364,7 @@ mod tests {
                 ..Default::default()
             };
 
-            let validator_store = LighthouseValidatorStore::<_>::new(
+            let validator_store = LighthouseValidatorStore::new(
                 initialized_validators,
                 slashing_protection,
                 Hash256::repeat_byte(42),
@@ -489,7 +489,7 @@ mod tests {
             generate_sig: F,
         ) -> Self
         where
-            F: Fn(PublicKeyBytes, Arc<LighthouseValidatorStore<TestingSlotClock>>) -> R,
+            F: Fn(PublicKeyBytes, Arc<LighthouseValidatorStore<TestingSlotClock, E>>) -> R,
             R: Future<Output = S>,
             // We use the `SignedObject` trait to white-list objects for comparison. This avoids
             // accidentally comparing something meaningless like a `()`.
@@ -524,7 +524,7 @@ mod tests {
             web3signer_should_sign: bool,
         ) -> Self
         where
-            F: Fn(PublicKeyBytes, Arc<LighthouseValidatorStore<TestingSlotClock>>) -> R,
+            F: Fn(PublicKeyBytes, Arc<LighthouseValidatorStore<TestingSlotClock, E>>) -> R,
             R: Future<Output = Result<(), lighthouse_validator_store::Error>>,
         {
             for validator_rig in &self.validator_rigs {
@@ -591,7 +591,7 @@ mod tests {
         .await
         .assert_signatures_match("randao_reveal", |pubkey, validator_store| async move {
             validator_store
-                .randao_reveal::<E>(pubkey, Epoch::new(0))
+                .randao_reveal(pubkey, Epoch::new(0))
                 .await
                 .unwrap()
         })
@@ -632,7 +632,7 @@ mod tests {
         .await
         .assert_signatures_match("selection_proof", |pubkey, validator_store| async move {
             validator_store
-                .produce_selection_proof::<E>(pubkey, Slot::new(0))
+                .produce_selection_proof(pubkey, Slot::new(0))
                 .await
                 .unwrap()
         })
@@ -642,7 +642,7 @@ mod tests {
             |pubkey, validator_store| async move {
                 let val_reg_data = get_validator_registration(pubkey);
                 validator_store
-                    .sign_validator_registration_data::<E>(val_reg_data)
+                    .sign_validator_registration_data(val_reg_data)
                     .await
                     .unwrap()
             },
@@ -682,11 +682,7 @@ mod tests {
             "sync_selection_proof",
             |pubkey, validator_store| async move {
                 validator_store
-                    .produce_sync_selection_proof::<E>(
-                        &pubkey,
-                        altair_fork_slot,
-                        SyncSubnetId::from(0),
-                    )
+                    .produce_sync_selection_proof(&pubkey, altair_fork_slot, SyncSubnetId::from(0))
                     .await
                     .unwrap()
             },
@@ -696,12 +692,7 @@ mod tests {
             "sync_committee_signature",
             |pubkey, validator_store| async move {
                 validator_store
-                    .produce_sync_committee_signature::<E>(
-                        altair_fork_slot,
-                        Hash256::zero(),
-                        0,
-                        &pubkey,
-                    )
+                    .produce_sync_committee_signature(altair_fork_slot, Hash256::zero(), 0, &pubkey)
                     .await
                     .unwrap()
             },
@@ -734,7 +725,7 @@ mod tests {
             |pubkey, validator_store| async move {
                 let val_reg_data = get_validator_registration(pubkey);
                 validator_store
-                    .sign_validator_registration_data::<E>(val_reg_data)
+                    .sign_validator_registration_data(val_reg_data)
                     .await
                     .unwrap()
             },

validator_client/http_api/src/tests.rs

@@ -43,7 +43,7 @@ type E = MainnetEthSpec;
 struct ApiTester {
     client: ValidatorClientHttpClient,
     initialized_validators: Arc<RwLock<InitializedValidators>>,
-    validator_store: Arc<LighthouseValidatorStore<TestingSlotClock>>,
+    validator_store: Arc<LighthouseValidatorStore<TestingSlotClock, E>>,
     url: SensitiveUrl,
     slot_clock: TestingSlotClock,
     _validator_dir: TempDir,
@@ -95,7 +95,7 @@ impl ApiTester {
 
         let test_runtime = TestRuntime::default();
 
-        let validator_store = Arc::new(LighthouseValidatorStore::<_>::new(
+        let validator_store = Arc::new(LighthouseValidatorStore::new(
             initialized_validators,
             slashing_protection,
             Hash256::repeat_byte(42),
@@ -108,7 +108,7 @@ impl ApiTester {
         ));
 
         validator_store
-            .register_all_in_doppelganger_protection_if_enabled::<E>()
+            .register_all_in_doppelganger_protection_if_enabled()
             .expect("Should attach doppelganger service");
 
         let initialized_validators = validator_store.initialized_validators();