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

grandpa: don't error if best block and finality target are inconsistent #13364

Merged
bkchr merged 4 commits into from
Feb 12, 2023
Merged

grandpa: don't error if best block and finality target are inconsistent #13364

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5758370
grandpa: don't error if best block and finality target are inconsistent
andresilva Feb 11, 2023
cc75f6b
grandpa: add test for best block override
andresilva Feb 11, 2023
5763f08
grandpa: make clippy happy
andresilva Feb 11, 2023
220f6ee
grandpa: log selectchain override as debug instead of warn
andresilva Feb 11, 2023
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
Prev Previous commit
Next Next commit
grandpa: make clippy happy
  • Loading branch information
@andresilva
andresilva committed Feb 11, 2023
commit 5763f087cdfc078de7504a91853de6cf86516a80
4 changes: 2 additions & 2 deletions client/finality-grandpa/src/tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1641,8 +1641,8 @@ async fn grandpa_environment_checks_if_best_block_is_descendent_of_finality_targ
ForkChoiceStrategy::LongestChain,
);

let hashof5_b = fork.first().unwrap().clone();
let hashof10_b = fork.last().unwrap().clone();
let hashof5_b = *fork.first().unwrap();
let hashof10_b = *fork.last().unwrap();

// returning a finality target that's higher than the best block is inconsistent,
// therefore the best block should be set to be the same block as the target
Expand Down