Babe VRF Signing in keystore

client/consensus/babe/rpc/src/lib.rs

@@ -142,6 +142,7 @@ impl<B, C, SC> BabeApi for BabeRpcHandler<B, C, SC>
 					}
 				})
 				.collect::<Vec<_>>();
+			drop(ks);
 
 			for slot_number in epoch_start..epoch_end {
 				if let Some((claim, key)) =

client/consensus/babe/src/authorship.rs

@@ -146,7 +146,6 @@ fn claim_secondary_slot(
 		*randomness,
 	)?;
 
-	let ks = keystore.read();
 	for (authority_id, authority_index) in keys {
 		if authority_id == expected_author {
 			let pre_digest = if author_secondary_vrf {
@@ -155,7 +154,7 @@ fn claim_secondary_slot(
 					slot_number,
 					*epoch_index
 				);
-				let result = ks.sr25519_vrf_sign(
+				let result = keystore.read().sr25519_vrf_sign(
 					AuthorityId::ID,
 					authority_id.as_ref(),
 					transcript_data,
@@ -244,7 +243,6 @@ fn claim_primary_slot(
 ) -> Option<(PreDigest, AuthorityId)> {
 	let Epoch { authorities, randomness, epoch_index, .. } = epoch;
 
-	let ks = keystore.read();
 	for (authority_id, authority_index) in keys {
 		let transcript = super::authorship::make_transcript(
 			randomness,
@@ -262,7 +260,7 @@ fn claim_primary_slot(
 		// be empty.  Therefore, this division in `calculate_threshold` is safe.
 		let threshold = super::authorship::calculate_primary_threshold(c, authorities, *authority_index);
 
-		let result = ks.sr25519_vrf_sign(
+		let result = keystore.read().sr25519_vrf_sign(
 			AuthorityId::ID,
 			authority_id.as_ref(),
 			transcript_data,