Skip to content
This repository was archived by the owner on Nov 15, 2023. It is now read-only.

babe: minor rpc nits #5974

Merged
merged 3 commits into from
May 12, 2020
Merged

babe: minor rpc nits #5974

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
354d3ca
babe: fix formatting
andresilva May 11, 2020
c106fdb
babe: re-use same epoch data in epoch_authorship rpc method
andresilva May 11, 2020
3d70c36
Merge branch 'master' into andre/babe-rpc-nits
andresilva May 12, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 9 additions & 6 deletions client/consensus/babe/rpc/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,15 +118,18 @@ impl<B, C, SC> BabeApi for BabeRPCHandler<B, C, SC>

let key_pairs = {
let keystore = keystore.read();
epoch.authorities.iter().enumerate()
.flat_map(|(i, a)| {
keystore.key_pair::<sp_consensus_babe::AuthorityPair>(&a.0).ok().map(|kp| (kp, i))
})
.collect::<Vec<_>>()
epoch.authorities.iter()
.enumerate()
.flat_map(|(i, a)| {
keystore
.key_pair::<sp_consensus_babe::AuthorityPair>(&a.0)
.ok()
.map(|kp| (kp, i))
})
.collect::<Vec<_>>()
};

for slot_number in epoch_start..epoch_end {
let epoch = epoch_data(&shared_epoch, &client, &babe_config, slot_number, &select_chain)?;
Copy link
Contributor Author

@andresilva andresilva May 11, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This call was unnecessary. We're checking all the slots for the given epoch so the returned epoch should always be the same.

if let Some((claim, key)) =
authorship::claim_slot_using_key_pairs(slot_number, &epoch, &key_pairs)
{
Expand Down