pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-06-16 10:51:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve Substrate pallet logs (#650)

Browse Source
This commit is contained in:
Svyatoslav Nikolsky
2021-01-15 18:52:31 +03:00
committed by Bastian Köcher
parent 0f7a096d55
commit 0280400e30
3 changed files with 37 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bridges/modules/substrate/src/fork_tests.rs
+6 -2
View File
@@ -397,7 +397,9 @@ where
} }
// Try and import into storage // Try and import into storage
let res = verifier.import_header(header.clone()).map_err(TestError::Import); let res = verifier
.import_header(header.hash(), header.clone())
.map_err(TestError::Import);
assert_eq!( assert_eq!(
res, *expected_result, res, *expected_result,
"Expected {:?} while importing header ({}, {}), got {:?}", "Expected {:?} while importing header ({}, {}), got {:?}",
@@ -427,7 +429,9 @@ where
header.digest = change_log(*delay); header.digest = change_log(*delay);
} }
let res = verifier.import_header(header.clone()).map_err(TestError::Import); let res = verifier
.import_header(header.hash(), header.clone())
.map_err(TestError::Import);
assert_eq!( assert_eq!(
res, *expected_result, res, *expected_result,
"Expected {:?} while importing header ({}, {}), got {:?}", "Expected {:?} while importing header ({}, {}), got {:?}",
bridges/modules/substrate/src/lib.rs
+16 -5
View File
@@ -172,15 +172,21 @@ decl_module! {
) -> DispatchResult { ) -> DispatchResult {
ensure_operational::<T>()?; ensure_operational::<T>()?;
let _ = ensure_signed(origin)?; let _ = ensure_signed(origin)?;
frame_support::debug::trace!("Got header {:?}", header); let hash = header.hash();
frame_support::debug::trace!("Going to import header {:?}: {:?}", hash, header);
let mut verifier = verifier::Verifier { let mut verifier = verifier::Verifier {
storage: PalletStorage::<T>::new(), storage: PalletStorage::<T>::new(),
}; };
let _ = verifier let _ = verifier
.import_header(header) .import_header(hash, header)
.map_err(|_| <Error<T>>::InvalidHeader)?; .map_err(|e| {
frame_support::debug::error!("Failed to import header {:?}: {:?}", hash, e);
<Error<T>>::InvalidHeader
})?;
frame_support::debug::trace!("Successfully imported header: {:?}", hash);
Ok(()) Ok(())
} }
@@ -199,7 +205,7 @@ decl_module! {
) -> DispatchResult { ) -> DispatchResult {
ensure_operational::<T>()?; ensure_operational::<T>()?;
let _ = ensure_signed(origin)?; let _ = ensure_signed(origin)?;
frame_support::debug::trace!("Got header hash {:?}", hash); frame_support::debug::trace!("Going to finalize header: {:?}", hash);
let mut verifier = verifier::Verifier { let mut verifier = verifier::Verifier {
storage: PalletStorage::<T>::new(), storage: PalletStorage::<T>::new(),
@@ -207,7 +213,12 @@ decl_module! {
let _ = verifier let _ = verifier
.import_finality_proof(hash, finality_proof.into()) .import_finality_proof(hash, finality_proof.into())
.map_err(|_| <Error<T>>::UnfinalizedHeader)?; .map_err(|e| {
frame_support::debug::error!("Failed to finalize header {:?}: {:?}", hash, e);
<Error<T>>::UnfinalizedHeader
})?;
frame_support::debug::trace!("Successfully finalized header: {:?}", hash);
Ok(()) Ok(())
} }
bridges/modules/substrate/src/verifier.rs
+15 -13
View File
@@ -112,8 +112,7 @@ where
/// ///
/// Will perform some basic checks to make sure that this header doesn't break any assumptions /// Will perform some basic checks to make sure that this header doesn't break any assumptions
/// such as being on a different finalized fork. /// such as being on a different finalized fork.
pub fn import_header(&mut self, header: H) -> Result<(), ImportError> { pub fn import_header(&mut self, hash: H::Hash, header: H) -> Result<(), ImportError> {
let hash = header.hash();
let best_finalized = self.storage.best_finalized_header(); let best_finalized = self.storage.best_finalized_header();
if header.number() <= best_finalized.number() { if header.number() <= best_finalized.number() {
@@ -424,7 +423,7 @@ mod tests {
let header = test_header(1); let header = test_header(1);
let mut verifier = Verifier { storage }; let mut verifier = Verifier { storage };
assert_err!(verifier.import_header(header), ImportError::OldHeader); assert_err!(verifier.import_header(header.hash(), header), ImportError::OldHeader);
}) })
} }
@@ -440,7 +439,10 @@ mod tests {
let header = TestHeader::new_from_number(2); let header = TestHeader::new_from_number(2);
let mut verifier = Verifier { storage }; let mut verifier = Verifier { storage };
assert_err!(verifier.import_header(header), ImportError::MissingParent); assert_err!(
verifier.import_header(header.hash(), header),
ImportError::MissingParent
);
}) })
} }
@@ -460,7 +462,7 @@ mod tests {
<ImportedHeaders<TestRuntime>>::insert(header.hash(), &imported_header); <ImportedHeaders<TestRuntime>>::insert(header.hash(), &imported_header);
let mut verifier = Verifier { storage }; let mut verifier = Verifier { storage };
assert_err!(verifier.import_header(header), ImportError::OldHeader); assert_err!(verifier.import_header(header.hash(), header), ImportError::OldHeader);
}) })
} }
@@ -484,7 +486,7 @@ mod tests {
let mut verifier = Verifier { let mut verifier = Verifier {
storage: storage.clone(), storage: storage.clone(),
}; };
assert_ok!(verifier.import_header(header.clone())); assert_ok!(verifier.import_header(header.hash(), header.clone()));
let stored_header = storage let stored_header = storage
.header_by_hash(header.hash()) .header_by_hash(header.hash())
@@ -514,8 +516,8 @@ mod tests {
}; };
// It should be fine to import both // It should be fine to import both
assert_ok!(verifier.import_header(header_on_fork1.clone())); assert_ok!(verifier.import_header(header_on_fork1.hash(), header_on_fork1.clone()));
assert_ok!(verifier.import_header(header_on_fork2.clone())); assert_ok!(verifier.import_header(header_on_fork2.hash(), header_on_fork2.clone()));
// We should have two headers marked as being the best since they're // We should have two headers marked as being the best since they're
// both at the same height // both at the same height
@@ -559,7 +561,7 @@ mod tests {
let mut verifier = Verifier { let mut verifier = Verifier {
storage: storage.clone(), storage: storage.clone(),
}; };
assert_ok!(verifier.import_header(better_header.clone())); assert_ok!(verifier.import_header(better_header.hash(), better_header.clone()));
// Since `better_header` is the only one at height = 2 we should only have // Since `better_header` is the only one at height = 2 we should only have
// a single "best header" now. // a single "best header" now.
@@ -668,7 +670,7 @@ mod tests {
let mut verifier = Verifier { storage }; let mut verifier = Verifier { storage };
assert_eq!( assert_eq!(
verifier.import_header(header).unwrap_err(), verifier.import_header(header.hash(), header).unwrap_err(),
ImportError::InvalidAuthoritySet ImportError::InvalidAuthoritySet
); );
}) })
@@ -697,7 +699,7 @@ mod tests {
storage: storage.clone(), storage: storage.clone(),
}; };
assert_ok!(verifier.import_header(header.clone())); assert_ok!(verifier.import_header(header.hash(), header.clone()));
assert_ok!(verifier.import_finality_proof(header.hash(), justification.into())); assert_ok!(verifier.import_finality_proof(header.hash(), justification.into()));
assert_eq!(storage.best_finalized_header().header, header); assert_eq!(storage.best_finalized_header().header, header);
}) })
@@ -724,7 +726,7 @@ mod tests {
let mut verifier = Verifier { let mut verifier = Verifier {
storage: storage.clone(), storage: storage.clone(),
}; };
assert!(verifier.import_header(header.clone()).is_ok()); assert!(verifier.import_header(header.hash(), header.clone()).is_ok());
assert!(verifier assert!(verifier
.import_finality_proof(header.hash(), justification.into()) .import_finality_proof(header.hash(), justification.into())
.is_ok()); .is_ok());
@@ -776,7 +778,7 @@ mod tests {
storage: storage.clone(), storage: storage.clone(),
}; };
assert_ok!(verifier.import_header(header.clone())); assert_ok!(verifier.import_header(header.hash(), header.clone()));
assert_eq!(storage.missing_justifications().len(), 1); assert_eq!(storage.missing_justifications().len(), 1);
assert_eq!(storage.missing_justifications()[0].hash, header.hash()); assert_eq!(storage.missing_justifications()[0].hash, header.hash());