Adapt to new CryptoStore api

companion PR for paritytech/substrate#8619

node/network/availability-distribution/src/runtime.rs

@@ -185,13 +185,11 @@ impl Runtime {
 	///
 	/// Returns: None if we are not a validator.
 	async fn get_our_index(&self, validators: &[ValidatorId]) -> Option<ValidatorIndex> {
-		for (i, v) in validators.iter().enumerate() {
-			if CryptoStore::has_keys(&*self.keystore, &[(v.to_raw_vec(), ValidatorId::ID)])
-				.await
-			{
-				return Some(ValidatorIndex(i as u32));
-			}
-		}
+		let keys: Vec<_> = validators.iter().map(|v| (v.to_raw_vec(), ValidatorId::ID)).collect();
+		CryptoStore::has_keys(&*self.keystore, &keys).await.into_found().next().and_then(|i| {
+			return Some(ValidatorIndex(i as u32));
+		});
+
 		None
 	}
 }

node/network/availability-distribution/src/session_cache.rs

@@ -284,13 +284,11 @@ impl SessionCache {
 	///
 	/// Returns: None if we are not a validator.
 	async fn get_our_index(&self, validators: Vec<ValidatorId>) -> Option<ValidatorIndex> {
-		for (i, v) in validators.iter().enumerate() {
-			if CryptoStore::has_keys(&*self.keystore, &[(v.to_raw_vec(), ValidatorId::ID)])
-				.await
-			{
-				return Some(ValidatorIndex(i as u32));
-			}
-		}
+		let keys: Vec<_> = validators.iter().map(|v| (v.to_raw_vec(), ValidatorId::ID)).collect();
+		CryptoStore::has_keys(&*self.keystore, &keys).await.into_found().next().and_then(|i| {
+			return Some(ValidatorIndex(i as u32));
+		});
+
 		None
 	}
 }

node/network/gossip-support/src/lib.rs

@@ -113,13 +113,12 @@ async fn ensure_i_am_an_authority(
 	keystore: &SyncCryptoStorePtr,
 	authorities: &[AuthorityDiscoveryId],
 ) -> Result<(), util::Error> {
-	for v in authorities {
-		if CryptoStore::has_keys(&**keystore, &[(v.to_raw_vec(), AuthorityDiscoveryId::ID)])
-			.await
-		{
-			return Ok(());
-		}
+	let keys: Vec<_> = authorities.iter().map(|v| (v.to_raw_vec(), AuthorityDiscoveryId::ID)).collect();
+	if CryptoStore::has_keys(&**keystore, &keys).await.found_any()
+	{
+		return Ok(());
 	}
+
 	Err(util::Error::NotAValidator)
 }
 

node/subsystem-util/src/lib.rs

@@ -191,11 +191,11 @@ pub async fn signing_key(validators: &[ValidatorId], keystore: &SyncCryptoStoreP
 pub async fn signing_key_and_index(validators: &[ValidatorId], keystore: &SyncCryptoStorePtr)
 	-> Option<(ValidatorId, ValidatorIndex)>
 {
-	for (i, v) in validators.iter().enumerate() {
-		if CryptoStore::has_keys(&**keystore, &[(v.to_raw_vec(), ValidatorId::ID)]).await {
-			return Some((v.clone(), ValidatorIndex(i as _)));
-		}
-	}
+	let keys: Vec<_> = validators.iter().map(|v| (v.to_raw_vec(), ValidatorId::ID)).collect();
+	CryptoStore::has_keys(&**keystore, &keys).await.into_found().next().and_then(|i| {
+		return Some((validators[i].clone(), ValidatorIndex(i as _)));
+	});
+
 	None
 }