Allow blacklisting blocks from being finalized again after block revert (#6301)

* Allow blacklisting blocks from being finalized again after block revert

* Use BlockRules for storing unfinalized and add have_state_at in revert

* Move finalization_check in finalize_block upward

* Directly mark finalization blacklist as badblocks

* Remove obselete comment
This commit is contained in:
Wei Tang
2020-07-31 14:32:13 +02:00
committed by GitHub
parent 7db19db948
commit 3c5cbb00aa
9 changed files with 105 additions and 50 deletions
@@ -34,10 +34,10 @@ where
let reverted = backend.revert(blocks, false)?;
let info = client.usage_info().chain;
if reverted.is_zero() {
if reverted.0.is_zero() {
info!("There aren't any non-finalized blocks to revert.");
} else {
info!("Reverted {} blocks. Best: #{} ({})", reverted, info.best_number, info.best_hash);
info!("Reverted {} blocks. Best: #{} ({})", reverted.0, info.best_number, info.best_hash);
}
Ok(())
}