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

chore: reducing codec times (#11688)

Browse Source
This commit is contained in:
yjh
2022-06-18 06:14:50 +08:00
committed by GitHub
parent 1988c4ac1d
commit 3f549bad6c
2 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
substrate/client/basic-authorship/src/basic_authorship.rs
+1 -5
View File
@@ -20,7 +20,7 @@
// FIXME #1021 move this into sp-consensus
use codec::{Decode, Encode};
use codec::Encode;
use futures::{
channel::oneshot,
future,
@@ -536,10 +536,6 @@ where
"hash" => ?<Block as BlockT>::Hash::from(block.header().hash()),
);
if Decode::decode(&mut block.encode().as_slice()).as_ref() != Ok(&block) {
error!("Failed to verify block encoding/decoding");
}
if let Err(err) =
evaluation::evaluate_initial(&block, &self.parent_hash, self.parent_number)
{
substrate/primitives/consensus/common/src/evaluation.rs
+10 -5
View File
@@ -30,6 +30,8 @@ pub type Result<T> = std::result::Result<T, Error>;
/// Error type.
#[derive(Debug, thiserror::Error)]
pub enum Error {
#[error("Failed to verify block encoding/decoding")]
BadBlockCodec,
/// Proposal provided not a block.
#[error("Proposal provided not a block: decoding error: {0}")]
BadProposalFormat(#[from] codec::Error),
@@ -49,19 +51,22 @@ pub fn evaluate_initial<Block: BlockT>(
parent_number: <<Block as BlockT>::Header as HeaderT>::Number,
) -> Result<()> {
let encoded = Encode::encode(proposal);
let proposal = Block::decode(&mut &encoded[..]).map_err(Error::BadProposalFormat)?;
let block = Block::decode(&mut &encoded[..]).map_err(Error::BadProposalFormat)?;
if &block != proposal {
return Err(Error::BadBlockCodec)
}
if *parent_hash != *proposal.header().parent_hash() {
if *parent_hash != *block.header().parent_hash() {
return Err(Error::WrongParentHash {
expected: format!("{:?}", *parent_hash),
got: format!("{:?}", proposal.header().parent_hash()),
got: format!("{:?}", block.header().parent_hash()),
})
}
if parent_number + One::one() != *proposal.header().number() {
if parent_number + One::one() != *block.header().number() {
return Err(Error::WrongNumber {
expected: parent_number.checked_into::<u128>().map(|x| x + 1),
got: (*proposal.header().number()).checked_into::<u128>(),
got: (*block.header().number()).checked_into::<u128>(),
})
}