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

fix block body fetch for availability pruning (#539)

Browse Source
This commit is contained in:
Robert Habermeier
2018-08-10 16:02:07 +02:00
committed by Gav Wood
parent a330f2e058
commit c2b20fe5b0
1 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
substrate/polkadot/consensus/src/service.rs
+14 -8
View File
@@ -103,7 +103,8 @@ fn prune_unneeded_availability<C>(client: Arc<C>, extrinsic_store: ExtrinsicStor
use polkadot_runtime::CheckedBlock; use polkadot_runtime::CheckedBlock;
enum NotifyError { enum NotifyError {
NoBody(::client::error::Error), NoBody,
BodyFetch(::client::error::Error),
UnexpectedFormat, UnexpectedFormat,
ExtrinsicsWrong, ExtrinsicsWrong,
} }
@@ -111,29 +112,34 @@ fn prune_unneeded_availability<C>(client: Arc<C>, extrinsic_store: ExtrinsicStor
impl NotifyError { impl NotifyError {
fn log(&self, hash: &::polkadot_primitives::Hash) { fn log(&self, hash: &::polkadot_primitives::Hash) {
match *self { match *self {
NotifyError::NoBody(ref err) => warn!("Failed to fetch block body for imported block {:?}: {:?}", hash, err), NotifyError::NoBody => warn!("No block body for imported block {:?}", hash),
NotifyError::BodyFetch(ref err) => warn!("Failed to fetch block body for imported block {:?}: {:?}", hash, err),
NotifyError::UnexpectedFormat => warn!("Consensus outdated: Block {:?} has unexpected body format", hash), NotifyError::UnexpectedFormat => warn!("Consensus outdated: Block {:?} has unexpected body format", hash),
NotifyError::ExtrinsicsWrong => warn!("Consensus outdated: Failed to fetch block body for imported block {:?}", hash), NotifyError::ExtrinsicsWrong => warn!("Consensus outdated: Extrinsics cannot be decoded for {:?}", hash),
} }
} }
} }
client.import_notification_stream() client.import_notification_stream()
.for_each(move |notification| { .for_each(move |notification| {
let checked_block = client.block_body(&BlockId::hash(notification.hash)) let hash = notification.hash;
.map_err(NotifyError::NoBody) let parent_hash = notification.header.parent_hash;
.map(|b| ::polkadot_runtime::Block::decode(&mut b.encode().as_slice())) let checked_block = client.block_body(&BlockId::hash(hash))
.map_err(NotifyError::BodyFetch)
.and_then(|maybe_body| maybe_body.ok_or(NotifyError::NoBody))
.map(|extrinsics| Block { header: notification.header, extrinsics })
.map(|b: Block| ::polkadot_runtime::Block::decode(&mut b.encode().as_slice()))
.and_then(|maybe_block| maybe_block.ok_or(NotifyError::UnexpectedFormat)) .and_then(|maybe_block| maybe_block.ok_or(NotifyError::UnexpectedFormat))
.and_then(|block| CheckedBlock::new(block).map_err(|_| NotifyError::ExtrinsicsWrong)); .and_then(|block| CheckedBlock::new(block).map_err(|_| NotifyError::ExtrinsicsWrong));
match checked_block { match checked_block {
Ok(block) => { Ok(block) => {
let candidate_hashes = block.parachain_heads().iter().map(|c| c.hash()).collect(); let candidate_hashes = block.parachain_heads().iter().map(|c| c.hash()).collect();
if let Err(e) = extrinsic_store.candidates_finalized(notification.header.parent_hash, candidate_hashes) { if let Err(e) = extrinsic_store.candidates_finalized(parent_hash, candidate_hashes) {
warn!(target: "consensus", "Failed to prune unneeded available data: {:?}", e); warn!(target: "consensus", "Failed to prune unneeded available data: {:?}", e);
} }
} }
Err(e) => e.log(&notification.hash) Err(e) => e.log(&hash)
} }
Ok(()) Ok(())