Merge branch 'release-v7.0.0' into v7-backmerge

validator_client/http_api/src/tests/keystores.rs

@@ -92,7 +92,7 @@ fn keystore_pubkey(keystore: &Keystore) -> PublicKeyBytes {
 }
 
 fn all_with_status<T: Clone>(count: usize, status: T) -> impl Iterator<Item = T> {
-    std::iter::repeat(status).take(count)
+    std::iter::repeat_n(status, count)
 }
 
 fn all_imported(count: usize) -> impl Iterator<Item = ImportKeystoreStatus> {
@@ -1059,7 +1059,7 @@ async fn migrate_some_extra_slashing_protection() {
 /// - `first_vc_attestations`: attestations to sign on the first VC as `(validator_idx, att)`
 /// - `delete_indices`: validators to delete from the first VC
 /// - `slashing_protection_indices`: validators to transfer slashing protection data for. It should
-///    be a subset of `delete_indices` or the test will panic.
+///   be a subset of `delete_indices` or the test will panic.
 /// - `import_indices`: validators to transfer. It needn't be a subset of `delete_indices`.
 /// - `second_vc_attestations`: attestations to sign on the second VC after the transfer. The bool
 ///   indicates whether the signing should be successful.

validator_client/validator_store/src/lib.rs

@@ -263,9 +263,9 @@ impl<T: SlotClock + 'static, E: EthSpec> ValidatorStore<T, E> {
     /// are two primary functions used here:
     ///
     /// - `DoppelgangerStatus::only_safe`: only returns pubkeys which have passed doppelganger
-    ///     protection and are safe-enough to sign messages.
+    ///   protection and are safe-enough to sign messages.
     /// - `DoppelgangerStatus::ignored`: returns all the pubkeys from `only_safe` *plus* those still
-    ///     undergoing protection. This is useful for collecting duties or other non-signing tasks.
+    ///   undergoing protection. This is useful for collecting duties or other non-signing tasks.
     #[allow(clippy::needless_collect)] // Collect is required to avoid holding a lock.
     pub fn voting_pubkeys<I, F>(&self, filter_func: F) -> I
     where