mirror of
https://github.com/pezkuwichain/pezkuwi-subxt.git
synced 2026-05-01 10:07:56 +00:00
ca5f10567a
The `BlockBuilderProvider` was a trait that was defined in `sc-block-builder`. The trait was implemented for `Client`. This basically meant that you needed to import `sc-block-builder` any way to have access to the block builder. So, this trait was not providing any real value. This pull request is removing the said trait. Instead of the trait it introduces a builder for creating a `BlockBuilder`. The builder currently has the quite fabulous name `BlockBuilderBuilder` (I'm open to any better name 😅). The rest of the pull request is about replacing the old trait with the new builder. # Downstream code changes If you used `new_block` or `new_block_at` before you now need to switch it over to the new `BlockBuilderBuilder` pattern: ```rust // `new` requires a type that implements `CallApiAt`. let mut block_builder = BlockBuilderBuilder::new(client) // Then you need to specify the hash of the parent block the block will be build on top of .on_parent_block(at) // The block builder also needs the block number of the parent block. // Here it is fetched from the given `client` using the `HeaderBackend` // However, there also exists `with_parent_block_number` for directly passing the number .fetch_parent_block_number(client) .unwrap() // Enable proof recording if required. This call is optional. .enable_proof_recording() // Pass the digests. This call is optional. .with_inherent_digests(digests) .build() .expect("Creates new block builder"); ``` --------- Co-authored-by: Sebastian Kunert <skunert49@gmail.com> Co-authored-by: command-bot <>
135 lines
3.6 KiB
Rust
135 lines
3.6 KiB
Rust
// This file is part of Substrate.
|
|
|
|
// Copyright (C) Parity Technologies (UK) Ltd.
|
|
// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
|
|
|
|
// This program is free software: you can redistribute it and/or modify
|
|
// it under the terms of the GNU General Public License as published by
|
|
// the Free Software Foundation, either version 3 of the License, or
|
|
// (at your option) any later version.
|
|
|
|
// This program is distributed in the hope that it will be useful,
|
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
// GNU General Public License for more details.
|
|
|
|
// You should have received a copy of the GNU General Public License
|
|
// along with this program. If not, see <https://www.gnu.org/licenses/>.
|
|
|
|
//! Testing block import logic.
|
|
|
|
use super::*;
|
|
use futures::executor::block_on;
|
|
use sc_consensus::{
|
|
import_single_block, BasicQueue, BlockImportError, BlockImportStatus, ImportedAux,
|
|
IncomingBlock,
|
|
};
|
|
use sp_consensus::BlockOrigin;
|
|
use substrate_test_runtime_client::{
|
|
self,
|
|
prelude::*,
|
|
runtime::{Block, Hash},
|
|
};
|
|
|
|
fn prepare_good_block() -> (TestClient, Hash, u64, PeerId, IncomingBlock<Block>) {
|
|
let mut client = substrate_test_runtime_client::new();
|
|
let block = BlockBuilderBuilder::new(&client)
|
|
.on_parent_block(client.chain_info().best_hash)
|
|
.with_parent_block_number(client.chain_info().best_number)
|
|
.build()
|
|
.unwrap()
|
|
.build()
|
|
.unwrap()
|
|
.block;
|
|
block_on(client.import(BlockOrigin::File, block)).unwrap();
|
|
|
|
let (hash, number) = (client.block_hash(1).unwrap().unwrap(), 1);
|
|
let header = client.header(hash).unwrap();
|
|
let justifications = client.justifications(hash).unwrap();
|
|
let peer_id = PeerId::random();
|
|
(
|
|
client,
|
|
hash,
|
|
number,
|
|
peer_id,
|
|
IncomingBlock {
|
|
hash,
|
|
header,
|
|
body: Some(Vec::new()),
|
|
indexed_body: None,
|
|
justifications,
|
|
origin: Some(peer_id),
|
|
allow_missing_state: false,
|
|
import_existing: false,
|
|
state: None,
|
|
skip_execution: false,
|
|
},
|
|
)
|
|
}
|
|
|
|
#[test]
|
|
fn import_single_good_block_works() {
|
|
let (_, _hash, number, peer_id, block) = prepare_good_block();
|
|
|
|
let mut expected_aux = ImportedAux::default();
|
|
expected_aux.is_new_best = true;
|
|
|
|
match block_on(import_single_block(
|
|
&mut substrate_test_runtime_client::new(),
|
|
BlockOrigin::File,
|
|
block,
|
|
&mut PassThroughVerifier::new(true),
|
|
)) {
|
|
Ok(BlockImportStatus::ImportedUnknown(ref num, ref aux, ref org))
|
|
if *num == number && *aux == expected_aux && *org == Some(peer_id) => {},
|
|
r @ _ => panic!("{:?}", r),
|
|
}
|
|
}
|
|
|
|
#[test]
|
|
fn import_single_good_known_block_is_ignored() {
|
|
let (mut client, _hash, number, _, block) = prepare_good_block();
|
|
match block_on(import_single_block(
|
|
&mut client,
|
|
BlockOrigin::File,
|
|
block,
|
|
&mut PassThroughVerifier::new(true),
|
|
)) {
|
|
Ok(BlockImportStatus::ImportedKnown(ref n, _)) if *n == number => {},
|
|
_ => panic!(),
|
|
}
|
|
}
|
|
|
|
#[test]
|
|
fn import_single_good_block_without_header_fails() {
|
|
let (_, _, _, peer_id, mut block) = prepare_good_block();
|
|
block.header = None;
|
|
match block_on(import_single_block(
|
|
&mut substrate_test_runtime_client::new(),
|
|
BlockOrigin::File,
|
|
block,
|
|
&mut PassThroughVerifier::new(true),
|
|
)) {
|
|
Err(BlockImportError::IncompleteHeader(ref org)) if *org == Some(peer_id) => {},
|
|
_ => panic!(),
|
|
}
|
|
}
|
|
|
|
#[test]
|
|
fn async_import_queue_drops() {
|
|
let executor = sp_core::testing::TaskExecutor::new();
|
|
// Perform this test multiple times since it exhibits non-deterministic behavior.
|
|
for _ in 0..100 {
|
|
let verifier = PassThroughVerifier::new(true);
|
|
|
|
let queue = BasicQueue::new(
|
|
verifier,
|
|
Box::new(substrate_test_runtime_client::new()),
|
|
None,
|
|
&executor,
|
|
None,
|
|
);
|
|
drop(queue);
|
|
}
|
|
}
|