This repository has been archived by the owner on Nov 15, 2023. It is now read-only.
dispute-coordinator: Cleanup + Bug fixes #5323
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
eskimor
added
A0-please_review
eskimor
commented
Apr 13, 2022
| @@ -118,7 +118,7 @@ impl JfyiError { | |||
| pub fn log(self) { | |||
| match self { | |||
| // don't spam the log with spurious errors | |||
| Self::Runtime(_) | Self::Oneshot(_) | Self::DisputeImportOneshotSend => { | |||
There was a problem hiding this comment.
We can warn again, because senders who don't care will pass in None now for pending_confirmation
eskimor
commented
Apr 13, 2022
| @@ -84,14 +76,12 @@ pub struct Initialized { | |||
| highest_session: SessionIndex, | |||
| spam_slots: SpamSlots, | |||
| participation: Participation, | |||
| ordering_provider: OrderingProvider, | |||
| scraper: ChainScraper, | |||
There was a problem hiding this comment.
scraper now also takes care of on chain vote scraping.
eskimor
commented
Apr 13, 2022
| /// the first place. | ||
| #[derive(Copy, Clone)] | ||
| #[cfg_attr(test, derive(Debug))] | ||
| struct CandidateComparator { |
There was a problem hiding this comment.
This got moved here, because scraper no longer cares about the actual comparator. All it does, is provide info on whether a candidate has been included anywhere.
eskimor
commented
Apr 13, 2022
| /// | ||
| /// Returns: On chain vote for the leaf and any ancestors we might not yet have seen. | ||
| #[must_use] | ||
| pub async fn process_active_leaves_update<Sender: SubsystemSender>( |
There was a problem hiding this comment.
return value is scraped votes, for further processing.
eskimor
commented
Apr 13, 2022
| @@ -376,60 +319,17 @@ impl Initialized { | |||
|
|
|||
| /// Scrapes on-chain votes (backing votes and concluded disputes) for a active leaf of the | |||
| /// relay chain. | |||
| async fn scrape_on_chain_votes( | |||
| async fn process_on_chain_votes( | |||
There was a problem hiding this comment.
Actual scraping is now done by scraper, we only need to process the votes.
eskimor
commented
Apr 13, 2022
| .await?; | ||
| let is_included = comparator.is_some(); | ||
|
|
||
| let is_included = self.scraper.is_candidate_included(&candidate_receipt.hash()); |
There was a problem hiding this comment.
scraper tells us whether or not a candidate has been seen included.
eskimor
commented
Apr 13, 2022
| @@ -927,13 +829,14 @@ impl Initialized { | |||
| // Participate in dispute if the imported vote was not local, we did not vote before either | |||
| // and we actually have keys to issue a local vote. | |||
| if !is_local && !voted_already && is_disputed && !controlled_indices.is_empty() { | |||
| let priority = ParticipationPriority::with_priority_if(is_included); | |||
There was a problem hiding this comment.
If it is included - make it priority.
tdimitrov
approved these changes
Apr 14, 2022
| @@ -0,0 +1,300 @@ | |||
| // Copyright 2021 Parity Technologies (UK) Ltd. | |||
29 tasks
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
First batch of dispute-coordinator improvements, mostly cleanup + one bug fix. Signature check from on chain vote import would not actually succeed previously, as the wrong relay parent was used.
Next up: Some more metrics to better understand where time is spent.