mirror of
https://github.com/pezkuwichain/pezkuwi-subxt.git
synced 2026-06-26 17:01:07 +00:00
0d6884b919
* primitives/runtime: initial changes on supporting multiple Justifications * primitives/runtime: make Justifications strongly typed * Encode/decode Justifications * primitives/runtime: add Justification type * backend: apply_finality and finalize_block takes a single Justification * manual-seal: create engine id and let rpc take encoded justification * backend: skeleton functions for appending justifications * backend: initial implementation append_justification Initial implementation of append_justification on the Backend trait, and also remove unused skeleton functions for append_justificaton on Finaziler trait. k * backend: guard against duplicate consensus engine id * client/db: add check for block finality * client/api: add append_justification to in_mem db * client/light: add no-op append_justification * network: fix decode call for Justification * network: only send a single Justification in BlockData * network: minor comment update * protocol: update field names to distinguish single justification * client: further field renames to plural * client: update function names to plural justifications * client/db: upgrade existing database for new format * network: remove dependency on grandpa crate * db: fix check for finalized block * grandpa: check for multiple grandpa justifications hwne importing * backend: update Finalizer trait to take multiple Justifications * db: remove debugging statements in migration code * manual-seal: update note about engine id * db: fix check for finalized block * client: update variable name to reflect it is now plural * grandpa: fix incorrect empty Justications in test * primitives: make Justifications opaque to avoid being empty * network: fix detecting empty Justification * runtime: doc strings for Justifications functions * runtime: add into_justifications * primitives: check for duplicates in when adding to Justifications * network/test: use real grandpa engine id in test * client: fix reviewer comments * primitives: rename Justifications::push to append * backend: revert changes to Finalizer trait * backend: revert mark_finalized * backend: revert changes to finalize_block * backend: revert finalized_blocks * db: add a quick early return for performance * client: minor reviewer comments * service/test: use local ConsensusEngineId * network: add link to issue for sending multiple Justifications * Apply suggestions from code review Co-authored-by: Pierre Krieger <pierre.krieger1708@gmail.com> * Apply suggestions from code review Co-authored-by: Pierre Krieger <pierre.krieger1708@gmail.com> * network: tweaks to review suggestions * network: revert change to BlockData for backwards compatibility * Apply suggestion from code review Co-authored-by: Pierre Krieger <pierre.krieger1708@gmail.com> * Apply suggestions from code review Co-authored-by: André Silva <123550+andresilva@users.noreply.github.com> * primitives: update doc comment for Justifications * client/db/upgrade: avoid grandpa crate dependency * consensus: revert to single Justification for import_justification * primitives: improve justifications docs * style cleanups * use and_then * client: rename JUSTIFICATIONS db column * network: revert to using FRNK in network-test Co-authored-by: Pierre Krieger <pierre.krieger1708@gmail.com> Co-authored-by: André Silva <123550+andresilva@users.noreply.github.com> Co-authored-by: André Silva <andrerfosilva@gmail.com>
182 lines
6.3 KiB
Rust
182 lines
6.3 KiB
Rust
// This file is part of Substrate.
|
|
|
|
// Copyright (C) 2018-2021 Parity Technologies (UK) Ltd.
|
|
// SPDX-License-Identifier: Apache-2.0
|
|
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
//
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
|
|
//! Client extension for tests.
|
|
|
|
use sc_service::client::Client;
|
|
use sc_client_api::backend::Finalizer;
|
|
use sc_client_api::client::BlockBackend;
|
|
use sp_consensus::{
|
|
BlockImportParams, BlockImport, BlockOrigin, Error as ConsensusError,
|
|
ForkChoiceStrategy,
|
|
};
|
|
use sp_runtime::{Justification, Justifications};
|
|
use sp_runtime::traits::{Block as BlockT};
|
|
use sp_runtime::generic::BlockId;
|
|
use codec::alloc::collections::hash_map::HashMap;
|
|
|
|
/// Extension trait for a test client.
|
|
pub trait ClientExt<Block: BlockT>: Sized {
|
|
/// Finalize a block.
|
|
fn finalize_block(
|
|
&self,
|
|
id: BlockId<Block>,
|
|
justification: Option<Justification>,
|
|
) -> sp_blockchain::Result<()>;
|
|
|
|
/// Returns hash of the genesis block.
|
|
fn genesis_hash(&self) -> <Block as BlockT>::Hash;
|
|
}
|
|
|
|
/// Extension trait for a test client around block importing.
|
|
pub trait ClientBlockImportExt<Block: BlockT>: Sized {
|
|
/// Import block to the chain. No finality.
|
|
fn import(&mut self, origin: BlockOrigin, block: Block) -> Result<(), ConsensusError>;
|
|
|
|
/// Import a block and make it our best block if possible.
|
|
fn import_as_best(&mut self, origin: BlockOrigin, block: Block) -> Result<(), ConsensusError>;
|
|
|
|
/// Import a block and finalize it.
|
|
fn import_as_final(&mut self, origin: BlockOrigin, block: Block) -> Result<(), ConsensusError>;
|
|
|
|
/// Import block with justification(s), finalizes block.
|
|
fn import_justified(
|
|
&mut self,
|
|
origin: BlockOrigin,
|
|
block: Block,
|
|
justifications: Justifications,
|
|
) -> Result<(), ConsensusError>;
|
|
}
|
|
|
|
impl<B, E, RA, Block> ClientExt<Block> for Client<B, E, Block, RA>
|
|
where
|
|
B: sc_client_api::backend::Backend<Block>,
|
|
E: sc_client_api::CallExecutor<Block> + 'static,
|
|
Self: BlockImport<Block, Error = ConsensusError>,
|
|
Block: BlockT,
|
|
{
|
|
fn finalize_block(
|
|
&self,
|
|
id: BlockId<Block>,
|
|
justification: Option<Justification>,
|
|
) -> sp_blockchain::Result<()> {
|
|
Finalizer::finalize_block(self, id, justification, true)
|
|
}
|
|
|
|
fn genesis_hash(&self) -> <Block as BlockT>::Hash {
|
|
self.block_hash(0u32.into()).unwrap().unwrap()
|
|
}
|
|
}
|
|
|
|
/// This implementation is required, because of the weird api requirements around `BlockImport`.
|
|
impl<Block: BlockT, T, Transaction> ClientBlockImportExt<Block> for std::sync::Arc<T>
|
|
where for<'r> &'r T: BlockImport<Block, Error = ConsensusError, Transaction = Transaction>
|
|
{
|
|
fn import(&mut self, origin: BlockOrigin, block: Block) -> Result<(), ConsensusError> {
|
|
let (header, extrinsics) = block.deconstruct();
|
|
let mut import = BlockImportParams::new(origin, header);
|
|
import.body = Some(extrinsics);
|
|
import.fork_choice = Some(ForkChoiceStrategy::LongestChain);
|
|
|
|
BlockImport::import_block(self, import, HashMap::new()).map(|_| ())
|
|
}
|
|
|
|
fn import_as_best(&mut self, origin: BlockOrigin, block: Block) -> Result<(), ConsensusError> {
|
|
let (header, extrinsics) = block.deconstruct();
|
|
let mut import = BlockImportParams::new(origin, header);
|
|
import.body = Some(extrinsics);
|
|
import.fork_choice = Some(ForkChoiceStrategy::Custom(true));
|
|
|
|
BlockImport::import_block(self, import, HashMap::new()).map(|_| ())
|
|
}
|
|
|
|
fn import_as_final(&mut self, origin: BlockOrigin, block: Block) -> Result<(), ConsensusError> {
|
|
let (header, extrinsics) = block.deconstruct();
|
|
let mut import = BlockImportParams::new(origin, header);
|
|
import.body = Some(extrinsics);
|
|
import.finalized = true;
|
|
import.fork_choice = Some(ForkChoiceStrategy::Custom(true));
|
|
|
|
BlockImport::import_block(self, import, HashMap::new()).map(|_| ())
|
|
}
|
|
|
|
fn import_justified(
|
|
&mut self,
|
|
origin: BlockOrigin,
|
|
block: Block,
|
|
justifications: Justifications,
|
|
) -> Result<(), ConsensusError> {
|
|
let (header, extrinsics) = block.deconstruct();
|
|
let mut import = BlockImportParams::new(origin, header);
|
|
import.justifications = Some(justifications);
|
|
import.body = Some(extrinsics);
|
|
import.finalized = true;
|
|
import.fork_choice = Some(ForkChoiceStrategy::LongestChain);
|
|
|
|
BlockImport::import_block(self, import, HashMap::new()).map(|_| ())
|
|
}
|
|
}
|
|
|
|
impl<B, E, RA, Block: BlockT> ClientBlockImportExt<Block> for Client<B, E, Block, RA>
|
|
where
|
|
Self: BlockImport<Block, Error = ConsensusError>,
|
|
{
|
|
fn import(&mut self, origin: BlockOrigin, block: Block) -> Result<(), ConsensusError> {
|
|
let (header, extrinsics) = block.deconstruct();
|
|
let mut import = BlockImportParams::new(origin, header);
|
|
import.body = Some(extrinsics);
|
|
import.fork_choice = Some(ForkChoiceStrategy::LongestChain);
|
|
|
|
BlockImport::import_block(self, import, HashMap::new()).map(|_| ())
|
|
}
|
|
|
|
fn import_as_best(&mut self, origin: BlockOrigin, block: Block) -> Result<(), ConsensusError> {
|
|
let (header, extrinsics) = block.deconstruct();
|
|
let mut import = BlockImportParams::new(origin, header);
|
|
import.body = Some(extrinsics);
|
|
import.fork_choice = Some(ForkChoiceStrategy::Custom(true));
|
|
|
|
BlockImport::import_block(self, import, HashMap::new()).map(|_| ())
|
|
}
|
|
|
|
fn import_as_final(&mut self, origin: BlockOrigin, block: Block) -> Result<(), ConsensusError> {
|
|
let (header, extrinsics) = block.deconstruct();
|
|
let mut import = BlockImportParams::new(origin, header);
|
|
import.body = Some(extrinsics);
|
|
import.finalized = true;
|
|
import.fork_choice = Some(ForkChoiceStrategy::Custom(true));
|
|
|
|
BlockImport::import_block(self, import, HashMap::new()).map(|_| ())
|
|
}
|
|
|
|
fn import_justified(
|
|
&mut self,
|
|
origin: BlockOrigin,
|
|
block: Block,
|
|
justifications: Justifications,
|
|
) -> Result<(), ConsensusError> {
|
|
let (header, extrinsics) = block.deconstruct();
|
|
let mut import = BlockImportParams::new(origin, header);
|
|
import.justifications = Some(justifications);
|
|
import.body = Some(extrinsics);
|
|
import.finalized = true;
|
|
import.fork_choice = Some(ForkChoiceStrategy::LongestChain);
|
|
|
|
BlockImport::import_block(self, import, HashMap::new()).map(|_| ())
|
|
}
|
|
}
|