pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-05-31 00:31:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

do not panic if pallet is not yet initialized (#937)

Browse Source
This commit is contained in:
Svyatoslav Nikolsky
2021-04-28 13:55:58 +03:00
committed by Bastian Köcher
parent 982a50df66
commit ebf9ae7546
1 changed files with 21 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bridges/modules/grandpa/src/lib.rs
+21 -6
View File
@@ -42,7 +42,7 @@ use bp_header_chain::justification::GrandpaJustification;
use bp_header_chain::InitializationData; use bp_header_chain::InitializationData;
use bp_runtime::{BlockNumberOf, Chain, HashOf, HasherOf, HeaderOf}; use bp_runtime::{BlockNumberOf, Chain, HashOf, HasherOf, HeaderOf};
use finality_grandpa::voter_set::VoterSet; use finality_grandpa::voter_set::VoterSet;
use frame_support::ensure; use frame_support::{ensure, fail};
use frame_system::{ensure_signed, RawOrigin}; use frame_system::{ensure_signed, RawOrigin};
use sp_finality_grandpa::{ConsensusLog, GRANDPA_ENGINE_ID}; use sp_finality_grandpa::{ConsensusLog, GRANDPA_ENGINE_ID};
use sp_runtime::traits::{BadOrigin, Header as HeaderT, Zero}; use sp_runtime::traits::{BadOrigin, Header as HeaderT, Zero};
@@ -143,11 +143,17 @@ pub mod pallet {
let (hash, number) = (finality_target.hash(), finality_target.number()); let (hash, number) = (finality_target.hash(), finality_target.number());
log::trace!(target: "runtime::bridge-grandpa", "Going to try and finalize header {:?}", finality_target); log::trace!(target: "runtime::bridge-grandpa", "Going to try and finalize header {:?}", finality_target);
let best_finalized = <ImportedHeaders<T, I>>::get(<BestFinalized<T, I>>::get()).expect( let best_finalized = match <ImportedHeaders<T, I>>::get(<BestFinalized<T, I>>::get()) {
"In order to reach this point the bridge must have been initialized. Afterwards, Some(best_finalized) => best_finalized,
every time `BestFinalized` is updated `ImportedHeaders` is also updated. Therefore None => {
`ImportedHeaders` must contain an entry for `BestFinalized`.", log::error!(
); target: "runtime::bridge-grandpa",
"Cannot finalize header {:?} because pallet is not yet initialized",
finality_target,
);
fail!(<Error<T, I>>::NotInitialized);
}
};
// We do a quick check here to ensure that our header chain is making progress and isn't // We do a quick check here to ensure that our header chain is making progress and isn't
// "travelling back in time" (which could be indicative of something bad, e.g a hard-fork). // "travelling back in time" (which could be indicative of something bad, e.g a hard-fork).
@@ -334,6 +340,8 @@ pub mod pallet {
/// ///
/// This is the case for non-standard (e.g forced) authority set changes. /// This is the case for non-standard (e.g forced) authority set changes.
UnsupportedScheduledChange, UnsupportedScheduledChange,
/// The pallet is not yet initialized.
NotInitialized,
/// The pallet has already been initialized. /// The pallet has already been initialized.
AlreadyInitialized, AlreadyInitialized,
/// All pallet operations are halted. /// All pallet operations are halted.
@@ -767,6 +775,13 @@ mod tests {
}) })
} }
#[test]
fn pallet_rejects_header_if_not_initialized_yet() {
run_test(|| {
assert_noop!(submit_finality_proof(1), Error::<TestRuntime>::NotInitialized);
});
}
#[test] #[test]
fn succesfully_imports_header_with_valid_finality() { fn succesfully_imports_header_with_valid_finality() {
run_test(|| { run_test(|| {