mirror of
https://github.com/pezkuwichain/pezkuwi-subxt.git
synced 2026-04-30 04:57:57 +00:00
sc-block-builder: Remove BlockBuilderProvider (#2099)
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 <>
This commit is contained in:
Bastian Köcher
@@ -27,10 +27,13 @@ use jsonrpsee::{
|
||||
types::{error::CallError, EmptyServerParams as EmptyParams},
|
||||
RpcModule,
|
||||
};
|
||||
use sc_block_builder::BlockBuilderProvider;
|
||||
use sc_block_builder::BlockBuilderBuilder;
|
||||
use sp_blockchain::HeaderBackend;
|
||||
use sp_consensus::BlockOrigin;
|
||||
use sp_runtime::SaturatedConversion;
|
||||
use sp_runtime::{
|
||||
traits::{Block as BlockT, Header as HeaderT},
|
||||
SaturatedConversion,
|
||||
};
|
||||
use std::sync::Arc;
|
||||
use substrate_test_runtime::Transfer;
|
||||
use substrate_test_runtime_client::{
|
||||
@@ -72,7 +75,12 @@ async fn archive_body() {
|
||||
assert!(res.is_none());
|
||||
|
||||
// Import a new block with an extrinsic.
|
||||
let mut builder = client.new_block(Default::default()).unwrap();
|
||||
let mut builder = BlockBuilderBuilder::new(&*client)
|
||||
.on_parent_block(client.chain_info().genesis_hash)
|
||||
.with_parent_block_number(0)
|
||||
.build()
|
||||
.unwrap();
|
||||
|
||||
builder
|
||||
.push_transfer(runtime::Transfer {
|
||||
from: AccountKeyring::Alice.into(),
|
||||
@@ -101,7 +109,12 @@ async fn archive_header() {
|
||||
assert!(res.is_none());
|
||||
|
||||
// Import a new block with an extrinsic.
|
||||
let mut builder = client.new_block(Default::default()).unwrap();
|
||||
let mut builder = BlockBuilderBuilder::new(&*client)
|
||||
.on_parent_block(client.chain_info().genesis_hash)
|
||||
.with_parent_block_number(0)
|
||||
.build()
|
||||
.unwrap();
|
||||
|
||||
builder
|
||||
.push_transfer(runtime::Transfer {
|
||||
from: AccountKeyring::Alice.into(),
|
||||
@@ -147,24 +160,57 @@ async fn archive_hash_by_height() {
|
||||
// ^^^ h = N
|
||||
// ^^^ h = N + 1
|
||||
// ^^^ h = N + 2
|
||||
let finalized = client.new_block(Default::default()).unwrap().build().unwrap().block;
|
||||
let finalized = BlockBuilderBuilder::new(&*client)
|
||||
.on_parent_block(client.chain_info().genesis_hash)
|
||||
.with_parent_block_number(0)
|
||||
.build()
|
||||
.unwrap()
|
||||
.build()
|
||||
.unwrap()
|
||||
.block;
|
||||
let finalized_hash = finalized.header.hash();
|
||||
client.import(BlockOrigin::Own, finalized.clone()).await.unwrap();
|
||||
client.finalize_block(finalized_hash, None).unwrap();
|
||||
|
||||
let block_1 = client.new_block(Default::default()).unwrap().build().unwrap().block;
|
||||
let block_1 = BlockBuilderBuilder::new(&*client)
|
||||
.on_parent_block(finalized.hash())
|
||||
.with_parent_block_number(*finalized.header().number())
|
||||
.build()
|
||||
.unwrap()
|
||||
.build()
|
||||
.unwrap()
|
||||
.block;
|
||||
let block_1_hash = block_1.header.hash();
|
||||
client.import(BlockOrigin::Own, block_1.clone()).await.unwrap();
|
||||
|
||||
let block_2 = client.new_block(Default::default()).unwrap().build().unwrap().block;
|
||||
let block_2 = BlockBuilderBuilder::new(&*client)
|
||||
.on_parent_block(block_1.hash())
|
||||
.with_parent_block_number(*block_1.header().number())
|
||||
.build()
|
||||
.unwrap()
|
||||
.build()
|
||||
.unwrap()
|
||||
.block;
|
||||
let block_2_hash = block_2.header.hash();
|
||||
client.import(BlockOrigin::Own, block_2.clone()).await.unwrap();
|
||||
let block_3 = client.new_block(Default::default()).unwrap().build().unwrap().block;
|
||||
let block_3 = BlockBuilderBuilder::new(&*client)
|
||||
.on_parent_block(block_2.hash())
|
||||
.with_parent_block_number(*block_2.header().number())
|
||||
.build()
|
||||
.unwrap()
|
||||
.build()
|
||||
.unwrap()
|
||||
.block;
|
||||
let block_3_hash = block_3.header.hash();
|
||||
client.import(BlockOrigin::Own, block_3.clone()).await.unwrap();
|
||||
|
||||
// Import block 4 fork.
|
||||
let mut block_builder = client.new_block_at(block_1_hash, Default::default(), false).unwrap();
|
||||
let mut block_builder = BlockBuilderBuilder::new(&*client)
|
||||
.on_parent_block(block_1_hash)
|
||||
.with_parent_block_number(*block_1.header().number())
|
||||
.build()
|
||||
.unwrap();
|
||||
|
||||
// This push is required as otherwise block 3 has the same hash as block 1 and won't get
|
||||
// imported
|
||||
block_builder
|
||||
@@ -238,7 +284,14 @@ async fn archive_call() {
|
||||
.unwrap();
|
||||
assert_matches!(result, MethodResult::Err(_));
|
||||
|
||||
let block_1 = client.new_block(Default::default()).unwrap().build().unwrap().block;
|
||||
let block_1 = BlockBuilderBuilder::new(&*client)
|
||||
.on_parent_block(client.chain_info().genesis_hash)
|
||||
.with_parent_block_number(0)
|
||||
.build()
|
||||
.unwrap()
|
||||
.build()
|
||||
.unwrap()
|
||||
.block;
|
||||
let block_1_hash = block_1.header.hash();
|
||||
client.import(BlockOrigin::Own, block_1.clone()).await.unwrap();
|
||||
|
||||
|
||||
@@ -806,7 +806,7 @@ impl<Block: BlockT, BE: Backend<Block>> SubscriptionsInner<Block, BE> {
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
use sc_block_builder::BlockBuilderProvider;
|
||||
use sc_block_builder::BlockBuilderBuilder;
|
||||
use sc_service::client::new_in_mem;
|
||||
use sp_consensus::BlockOrigin;
|
||||
use sp_core::{testing::TaskExecutor, H256};
|
||||
@@ -1004,8 +1004,15 @@ mod tests {
|
||||
fn subscription_check_block() {
|
||||
let (backend, mut client) = init_backend();
|
||||
|
||||
let block = client.new_block(Default::default()).unwrap().build().unwrap().block;
|
||||
let hash = block.header.hash();
|
||||
let block = BlockBuilderBuilder::new(&*client)
|
||||
.on_parent_block(client.chain_info().genesis_hash)
|
||||
.with_parent_block_number(0)
|
||||
.build()
|
||||
.unwrap()
|
||||
.build()
|
||||
.unwrap()
|
||||
.block;
|
||||
let hash = block.hash();
|
||||
futures::executor::block_on(client.import(BlockOrigin::Own, block.clone())).unwrap();
|
||||
|
||||
let mut subs =
|
||||
@@ -1034,7 +1041,14 @@ mod tests {
|
||||
#[test]
|
||||
fn subscription_ref_count() {
|
||||
let (backend, mut client) = init_backend();
|
||||
let block = client.new_block(Default::default()).unwrap().build().unwrap().block;
|
||||
let block = BlockBuilderBuilder::new(&*client)
|
||||
.on_parent_block(client.chain_info().genesis_hash)
|
||||
.with_parent_block_number(0)
|
||||
.build()
|
||||
.unwrap()
|
||||
.build()
|
||||
.unwrap()
|
||||
.block;
|
||||
let hash = block.header.hash();
|
||||
futures::executor::block_on(client.import(BlockOrigin::Own, block.clone())).unwrap();
|
||||
|
||||
@@ -1077,13 +1091,34 @@ mod tests {
|
||||
#[test]
|
||||
fn subscription_remove_subscription() {
|
||||
let (backend, mut client) = init_backend();
|
||||
let block = client.new_block(Default::default()).unwrap().build().unwrap().block;
|
||||
let block = BlockBuilderBuilder::new(&*client)
|
||||
.on_parent_block(client.chain_info().genesis_hash)
|
||||
.with_parent_block_number(0)
|
||||
.build()
|
||||
.unwrap()
|
||||
.build()
|
||||
.unwrap()
|
||||
.block;
|
||||
let hash_1 = block.header.hash();
|
||||
futures::executor::block_on(client.import(BlockOrigin::Own, block.clone())).unwrap();
|
||||
let block = client.new_block(Default::default()).unwrap().build().unwrap().block;
|
||||
let block = BlockBuilderBuilder::new(&*client)
|
||||
.on_parent_block(hash_1)
|
||||
.with_parent_block_number(1)
|
||||
.build()
|
||||
.unwrap()
|
||||
.build()
|
||||
.unwrap()
|
||||
.block;
|
||||
let hash_2 = block.header.hash();
|
||||
futures::executor::block_on(client.import(BlockOrigin::Own, block.clone())).unwrap();
|
||||
let block = client.new_block(Default::default()).unwrap().build().unwrap().block;
|
||||
let block = BlockBuilderBuilder::new(&*client)
|
||||
.on_parent_block(hash_2)
|
||||
.with_parent_block_number(2)
|
||||
.build()
|
||||
.unwrap()
|
||||
.build()
|
||||
.unwrap()
|
||||
.block;
|
||||
let hash_3 = block.header.hash();
|
||||
futures::executor::block_on(client.import(BlockOrigin::Own, block.clone())).unwrap();
|
||||
|
||||
@@ -1122,13 +1157,34 @@ mod tests {
|
||||
#[test]
|
||||
fn subscription_check_limits() {
|
||||
let (backend, mut client) = init_backend();
|
||||
let block = client.new_block(Default::default()).unwrap().build().unwrap().block;
|
||||
let block = BlockBuilderBuilder::new(&*client)
|
||||
.on_parent_block(client.chain_info().genesis_hash)
|
||||
.with_parent_block_number(0)
|
||||
.build()
|
||||
.unwrap()
|
||||
.build()
|
||||
.unwrap()
|
||||
.block;
|
||||
let hash_1 = block.header.hash();
|
||||
futures::executor::block_on(client.import(BlockOrigin::Own, block.clone())).unwrap();
|
||||
let block = client.new_block(Default::default()).unwrap().build().unwrap().block;
|
||||
let block = BlockBuilderBuilder::new(&*client)
|
||||
.on_parent_block(hash_1)
|
||||
.with_parent_block_number(1)
|
||||
.build()
|
||||
.unwrap()
|
||||
.build()
|
||||
.unwrap()
|
||||
.block;
|
||||
let hash_2 = block.header.hash();
|
||||
futures::executor::block_on(client.import(BlockOrigin::Own, block.clone())).unwrap();
|
||||
let block = client.new_block(Default::default()).unwrap().build().unwrap().block;
|
||||
let block = BlockBuilderBuilder::new(&*client)
|
||||
.on_parent_block(hash_2)
|
||||
.with_parent_block_number(2)
|
||||
.build()
|
||||
.unwrap()
|
||||
.build()
|
||||
.unwrap()
|
||||
.block;
|
||||
let hash_3 = block.header.hash();
|
||||
futures::executor::block_on(client.import(BlockOrigin::Own, block.clone())).unwrap();
|
||||
|
||||
@@ -1173,13 +1229,34 @@ mod tests {
|
||||
#[test]
|
||||
fn subscription_check_limits_with_duration() {
|
||||
let (backend, mut client) = init_backend();
|
||||
let block = client.new_block(Default::default()).unwrap().build().unwrap().block;
|
||||
let hash_1 = block.header.hash();
|
||||
let block = BlockBuilderBuilder::new(&*client)
|
||||
.on_parent_block(client.chain_info().genesis_hash)
|
||||
.with_parent_block_number(0)
|
||||
.build()
|
||||
.unwrap()
|
||||
.build()
|
||||
.unwrap()
|
||||
.block;
|
||||
let hash_1 = block.hash();
|
||||
futures::executor::block_on(client.import(BlockOrigin::Own, block.clone())).unwrap();
|
||||
let block = client.new_block(Default::default()).unwrap().build().unwrap().block;
|
||||
let block = BlockBuilderBuilder::new(&*client)
|
||||
.on_parent_block(hash_1)
|
||||
.with_parent_block_number(1)
|
||||
.build()
|
||||
.unwrap()
|
||||
.build()
|
||||
.unwrap()
|
||||
.block;
|
||||
let hash_2 = block.header.hash();
|
||||
futures::executor::block_on(client.import(BlockOrigin::Own, block.clone())).unwrap();
|
||||
let block = client.new_block(Default::default()).unwrap().build().unwrap().block;
|
||||
let block = BlockBuilderBuilder::new(&*client)
|
||||
.on_parent_block(hash_2)
|
||||
.with_parent_block_number(2)
|
||||
.build()
|
||||
.unwrap()
|
||||
.build()
|
||||
.unwrap()
|
||||
.block;
|
||||
let hash_3 = block.header.hash();
|
||||
futures::executor::block_on(client.import(BlockOrigin::Own, block.clone())).unwrap();
|
||||
|
||||
|
||||
@@ -31,7 +31,7 @@ use jsonrpsee::{
|
||||
types::{error::CallError, EmptyServerParams as EmptyParams},
|
||||
RpcModule,
|
||||
};
|
||||
use sc_block_builder::BlockBuilderProvider;
|
||||
use sc_block_builder::BlockBuilderBuilder;
|
||||
use sc_client_api::ChildInfo;
|
||||
use sc_service::client::new_in_mem;
|
||||
use sp_api::BlockT;
|
||||
@@ -125,7 +125,14 @@ async fn setup_api() -> (
|
||||
let sub_id = sub.subscription_id();
|
||||
let sub_id = serde_json::to_string(&sub_id).unwrap();
|
||||
|
||||
let block = client.new_block(Default::default()).unwrap().build().unwrap().block;
|
||||
let block = BlockBuilderBuilder::new(&*client)
|
||||
.on_parent_block(client.chain_info().genesis_hash)
|
||||
.with_parent_block_number(0)
|
||||
.build()
|
||||
.unwrap()
|
||||
.build()
|
||||
.unwrap()
|
||||
.block;
|
||||
client.import(BlockOrigin::Own, block.clone()).await.unwrap();
|
||||
|
||||
// Ensure the imported block is propagated and pinned for this subscription.
|
||||
@@ -177,7 +184,14 @@ async fn follow_subscription_produces_blocks() {
|
||||
});
|
||||
assert_eq!(event, expected);
|
||||
|
||||
let block = client.new_block(Default::default()).unwrap().build().unwrap().block;
|
||||
let block = BlockBuilderBuilder::new(&*client)
|
||||
.on_parent_block(client.chain_info().genesis_hash)
|
||||
.with_parent_block_number(0)
|
||||
.build()
|
||||
.unwrap()
|
||||
.build()
|
||||
.unwrap()
|
||||
.block;
|
||||
|
||||
let best_hash = block.header.hash();
|
||||
client.import(BlockOrigin::Own, block.clone()).await.unwrap();
|
||||
@@ -255,8 +269,15 @@ async fn follow_with_runtime() {
|
||||
|
||||
// Import a new block without runtime changes.
|
||||
// The runtime field must be None in this case.
|
||||
let block = client.new_block(Default::default()).unwrap().build().unwrap().block;
|
||||
let best_hash = block.header.hash();
|
||||
let block = BlockBuilderBuilder::new(&*client)
|
||||
.on_parent_block(client.chain_info().genesis_hash)
|
||||
.with_parent_block_number(0)
|
||||
.build()
|
||||
.unwrap()
|
||||
.build()
|
||||
.unwrap()
|
||||
.block;
|
||||
let best_hash = block.hash();
|
||||
client.import(BlockOrigin::Own, block.clone()).await.unwrap();
|
||||
|
||||
let event: FollowEvent<String> = get_next_event(&mut sub).await;
|
||||
@@ -302,7 +323,11 @@ async fn follow_with_runtime() {
|
||||
)
|
||||
.unwrap();
|
||||
|
||||
let mut builder = client.new_block(Default::default()).unwrap();
|
||||
let mut builder = BlockBuilderBuilder::new(&*client)
|
||||
.on_parent_block(best_hash)
|
||||
.with_parent_block_number(1)
|
||||
.build()
|
||||
.unwrap();
|
||||
builder.push_storage_change(CODE.to_vec(), Some(wasm)).unwrap();
|
||||
let block = builder.build().unwrap().block;
|
||||
let best_hash = block.header.hash();
|
||||
@@ -411,7 +436,11 @@ async fn get_body() {
|
||||
);
|
||||
|
||||
// Import a block with extrinsics.
|
||||
let mut builder = client.new_block(Default::default()).unwrap();
|
||||
let mut builder = BlockBuilderBuilder::new(&*client)
|
||||
.on_parent_block(block.hash())
|
||||
.with_parent_block_number(1)
|
||||
.build()
|
||||
.unwrap();
|
||||
builder
|
||||
.push_transfer(runtime::Transfer {
|
||||
from: AccountKeyring::Alice.into(),
|
||||
@@ -554,7 +583,14 @@ async fn call_runtime_without_flag() {
|
||||
let sub_id = sub.subscription_id();
|
||||
let sub_id = serde_json::to_string(&sub_id).unwrap();
|
||||
|
||||
let block = client.new_block(Default::default()).unwrap().build().unwrap().block;
|
||||
let block = BlockBuilderBuilder::new(&*client)
|
||||
.on_parent_block(client.chain_info().genesis_hash)
|
||||
.with_parent_block_number(0)
|
||||
.build()
|
||||
.unwrap()
|
||||
.build()
|
||||
.unwrap()
|
||||
.block;
|
||||
let block_hash = format!("{:?}", block.header.hash());
|
||||
client.import(BlockOrigin::Own, block.clone()).await.unwrap();
|
||||
|
||||
@@ -648,7 +684,11 @@ async fn get_storage_hash() {
|
||||
);
|
||||
|
||||
// Import a new block with storage changes.
|
||||
let mut builder = client.new_block(Default::default()).unwrap();
|
||||
let mut builder = BlockBuilderBuilder::new(&*client)
|
||||
.on_parent_block(block.hash())
|
||||
.with_parent_block_number(1)
|
||||
.build()
|
||||
.unwrap();
|
||||
builder.push_storage_change(KEY.to_vec(), Some(VALUE.to_vec())).unwrap();
|
||||
let block = builder.build().unwrap().block;
|
||||
let block_hash = format!("{:?}", block.header.hash());
|
||||
@@ -730,11 +770,15 @@ async fn get_storage_hash() {
|
||||
|
||||
#[tokio::test]
|
||||
async fn get_storage_multi_query_iter() {
|
||||
let (mut client, api, mut block_sub, sub_id, _) = setup_api().await;
|
||||
let (mut client, api, mut block_sub, sub_id, block) = setup_api().await;
|
||||
let key = hex_string(&KEY);
|
||||
|
||||
// Import a new block with storage changes.
|
||||
let mut builder = client.new_block(Default::default()).unwrap();
|
||||
let mut builder = BlockBuilderBuilder::new(&*client)
|
||||
.on_parent_block(block.hash())
|
||||
.with_parent_block_number(1)
|
||||
.build()
|
||||
.unwrap();
|
||||
builder.push_storage_change(KEY.to_vec(), Some(VALUE.to_vec())).unwrap();
|
||||
let block = builder.build().unwrap().block;
|
||||
let block_hash = format!("{:?}", block.header.hash());
|
||||
@@ -851,7 +895,7 @@ async fn get_storage_multi_query_iter() {
|
||||
#[tokio::test]
|
||||
async fn get_storage_value() {
|
||||
let (mut client, api, mut block_sub, sub_id, block) = setup_api().await;
|
||||
let block_hash = format!("{:?}", block.header.hash());
|
||||
let block_hash = format!("{:?}", block.hash());
|
||||
let invalid_hash = hex_string(&INVALID_HASH);
|
||||
let key = hex_string(&KEY);
|
||||
|
||||
@@ -908,10 +952,14 @@ async fn get_storage_value() {
|
||||
);
|
||||
|
||||
// Import a new block with storage changes.
|
||||
let mut builder = client.new_block(Default::default()).unwrap();
|
||||
let mut builder = BlockBuilderBuilder::new(&*client)
|
||||
.on_parent_block(block.hash())
|
||||
.with_parent_block_number(1)
|
||||
.build()
|
||||
.unwrap();
|
||||
builder.push_storage_change(KEY.to_vec(), Some(VALUE.to_vec())).unwrap();
|
||||
let block = builder.build().unwrap().block;
|
||||
let block_hash = format!("{:?}", block.header.hash());
|
||||
let block_hash = format!("{:?}", block.hash());
|
||||
client.import(BlockOrigin::Own, block.clone()).await.unwrap();
|
||||
|
||||
// Ensure the imported block is propagated and pinned for this subscription.
|
||||
@@ -1199,7 +1247,14 @@ async fn separate_operation_ids_for_subscriptions() {
|
||||
let sub_id_second = sub_second.subscription_id();
|
||||
let sub_id_second = serde_json::to_string(&sub_id_second).unwrap();
|
||||
|
||||
let block = client.new_block(Default::default()).unwrap().build().unwrap().block;
|
||||
let block = BlockBuilderBuilder::new(&*client)
|
||||
.on_parent_block(client.chain_info().genesis_hash)
|
||||
.with_parent_block_number(0)
|
||||
.build()
|
||||
.unwrap()
|
||||
.build()
|
||||
.unwrap()
|
||||
.block;
|
||||
client.import(BlockOrigin::Own, block.clone()).await.unwrap();
|
||||
let block_hash = format!("{:?}", block.header.hash());
|
||||
|
||||
@@ -1274,18 +1329,35 @@ async fn follow_generates_initial_blocks() {
|
||||
let finalized_hash = client.info().finalized_hash;
|
||||
|
||||
// Block tree:
|
||||
// finalized -> block 1 -> block 2 -> block 4
|
||||
// -> block 1 -> block 3
|
||||
let block_1 = client.new_block(Default::default()).unwrap().build().unwrap().block;
|
||||
// finalized -> block 1 -> block 2 -> block 3
|
||||
// -> block 1 -> block 2_f
|
||||
let block_1 = BlockBuilderBuilder::new(&*client)
|
||||
.on_parent_block(client.chain_info().genesis_hash)
|
||||
.with_parent_block_number(0)
|
||||
.build()
|
||||
.unwrap()
|
||||
.build()
|
||||
.unwrap()
|
||||
.block;
|
||||
let block_1_hash = block_1.header.hash();
|
||||
client.import(BlockOrigin::Own, block_1.clone()).await.unwrap();
|
||||
|
||||
let block_2 = client.new_block(Default::default()).unwrap().build().unwrap().block;
|
||||
let block_2 = BlockBuilderBuilder::new(&*client)
|
||||
.on_parent_block(block_1_hash)
|
||||
.with_parent_block_number(1)
|
||||
.build()
|
||||
.unwrap()
|
||||
.build()
|
||||
.unwrap()
|
||||
.block;
|
||||
let block_2_hash = block_2.header.hash();
|
||||
client.import(BlockOrigin::Own, block_2.clone()).await.unwrap();
|
||||
|
||||
let mut block_builder =
|
||||
client.new_block_at(block_1.header.hash(), Default::default(), false).unwrap();
|
||||
let mut block_builder = BlockBuilderBuilder::new(&*client)
|
||||
.on_parent_block(block_1_hash)
|
||||
.with_parent_block_number(1)
|
||||
.build()
|
||||
.unwrap();
|
||||
// This push is required as otherwise block 3 has the same hash as block 2 and won't get
|
||||
// imported
|
||||
block_builder
|
||||
@@ -1296,9 +1368,9 @@ async fn follow_generates_initial_blocks() {
|
||||
nonce: 0,
|
||||
})
|
||||
.unwrap();
|
||||
let block_3 = block_builder.build().unwrap().block;
|
||||
let block_3_hash = block_3.header.hash();
|
||||
client.import(BlockOrigin::Own, block_3.clone()).await.unwrap();
|
||||
let block_2_f = block_builder.build().unwrap().block;
|
||||
let block_2_f_hash = block_2_f.header.hash();
|
||||
client.import(BlockOrigin::Own, block_2_f.clone()).await.unwrap();
|
||||
|
||||
let mut sub = api.subscribe("chainHead_unstable_follow", [false]).await.unwrap();
|
||||
|
||||
@@ -1333,7 +1405,7 @@ async fn follow_generates_initial_blocks() {
|
||||
// Check block 3.
|
||||
let event: FollowEvent<String> = get_next_event(&mut sub).await;
|
||||
let expected = FollowEvent::NewBlock(NewBlock {
|
||||
block_hash: format!("{:?}", block_3_hash),
|
||||
block_hash: format!("{:?}", block_2_f_hash),
|
||||
parent_block_hash: format!("{:?}", block_1_hash),
|
||||
new_runtime: None,
|
||||
with_runtime: false,
|
||||
@@ -1346,14 +1418,21 @@ async fn follow_generates_initial_blocks() {
|
||||
});
|
||||
assert_eq!(event, expected);
|
||||
|
||||
// Import block 4.
|
||||
let block_4 = client.new_block(Default::default()).unwrap().build().unwrap().block;
|
||||
let block_4_hash = block_4.header.hash();
|
||||
client.import(BlockOrigin::Own, block_4.clone()).await.unwrap();
|
||||
// Import block 3.
|
||||
let block_3 = BlockBuilderBuilder::new(&*client)
|
||||
.on_parent_block(block_2_hash)
|
||||
.with_parent_block_number(2)
|
||||
.build()
|
||||
.unwrap()
|
||||
.build()
|
||||
.unwrap()
|
||||
.block;
|
||||
let block_3_hash = block_3.hash();
|
||||
client.import(BlockOrigin::Own, block_3.clone()).await.unwrap();
|
||||
|
||||
let event: FollowEvent<String> = get_next_event(&mut sub).await;
|
||||
let expected = FollowEvent::NewBlock(NewBlock {
|
||||
block_hash: format!("{:?}", block_4_hash),
|
||||
block_hash: format!("{:?}", block_3_hash),
|
||||
parent_block_hash: format!("{:?}", block_2_hash),
|
||||
new_runtime: None,
|
||||
with_runtime: false,
|
||||
@@ -1362,23 +1441,23 @@ async fn follow_generates_initial_blocks() {
|
||||
|
||||
let event: FollowEvent<String> = get_next_event(&mut sub).await;
|
||||
let expected = FollowEvent::BestBlockChanged(BestBlockChanged {
|
||||
best_block_hash: format!("{:?}", block_4_hash),
|
||||
best_block_hash: format!("{:?}", block_3_hash),
|
||||
});
|
||||
assert_eq!(event, expected);
|
||||
|
||||
// Check the finalized event:
|
||||
// - blocks 1, 2, 4 from canonical chain are finalized
|
||||
// - block 3 from the fork is pruned
|
||||
client.finalize_block(block_4_hash, None).unwrap();
|
||||
client.finalize_block(block_3_hash, None).unwrap();
|
||||
|
||||
let event: FollowEvent<String> = get_next_event(&mut sub).await;
|
||||
let expected = FollowEvent::Finalized(Finalized {
|
||||
finalized_block_hashes: vec![
|
||||
format!("{:?}", block_1_hash),
|
||||
format!("{:?}", block_2_hash),
|
||||
format!("{:?}", block_4_hash),
|
||||
format!("{:?}", block_3_hash),
|
||||
],
|
||||
pruned_block_hashes: vec![format!("{:?}", block_3_hash)],
|
||||
pruned_block_hashes: vec![format!("{:?}", block_2_f_hash)],
|
||||
});
|
||||
assert_eq!(event, expected);
|
||||
}
|
||||
@@ -1405,7 +1484,15 @@ async fn follow_exceeding_pinned_blocks() {
|
||||
|
||||
let mut sub = api.subscribe("chainHead_unstable_follow", [false]).await.unwrap();
|
||||
|
||||
let block = client.new_block(Default::default()).unwrap().build().unwrap().block;
|
||||
let block = BlockBuilderBuilder::new(&*client)
|
||||
.on_parent_block(client.chain_info().genesis_hash)
|
||||
.with_parent_block_number(0)
|
||||
.build()
|
||||
.unwrap()
|
||||
.build()
|
||||
.unwrap()
|
||||
.block;
|
||||
|
||||
client.import(BlockOrigin::Own, block.clone()).await.unwrap();
|
||||
|
||||
// Ensure the imported block is propagated and pinned for this subscription.
|
||||
@@ -1426,13 +1513,27 @@ async fn follow_exceeding_pinned_blocks() {
|
||||
// finalized_block -> block -> block2
|
||||
// The first 2 blocks are pinned into the subscription, but the block2 will exceed the limit (2
|
||||
// blocks).
|
||||
let block2 = client.new_block(Default::default()).unwrap().build().unwrap().block;
|
||||
let block2 = BlockBuilderBuilder::new(&*client)
|
||||
.on_parent_block(block.hash())
|
||||
.with_parent_block_number(1)
|
||||
.build()
|
||||
.unwrap()
|
||||
.build()
|
||||
.unwrap()
|
||||
.block;
|
||||
client.import(BlockOrigin::Own, block2.clone()).await.unwrap();
|
||||
|
||||
assert_matches!(get_next_event::<FollowEvent<String>>(&mut sub).await, FollowEvent::Stop);
|
||||
|
||||
// Subscription will not produce any more event for further blocks.
|
||||
let block3 = client.new_block(Default::default()).unwrap().build().unwrap().block;
|
||||
let block3 = BlockBuilderBuilder::new(&*client)
|
||||
.on_parent_block(block2.hash())
|
||||
.with_parent_block_number(2)
|
||||
.build()
|
||||
.unwrap()
|
||||
.build()
|
||||
.unwrap()
|
||||
.block;
|
||||
client.import(BlockOrigin::Own, block3.clone()).await.unwrap();
|
||||
|
||||
assert!(sub.next::<FollowEvent<String>>().await.is_none());
|
||||
@@ -1462,7 +1563,14 @@ async fn follow_with_unpin() {
|
||||
let sub_id = sub.subscription_id();
|
||||
let sub_id = serde_json::to_string(&sub_id).unwrap();
|
||||
|
||||
let block = client.new_block(Default::default()).unwrap().build().unwrap().block;
|
||||
let block = BlockBuilderBuilder::new(&*client)
|
||||
.on_parent_block(client.chain_info().genesis_hash)
|
||||
.with_parent_block_number(0)
|
||||
.build()
|
||||
.unwrap()
|
||||
.build()
|
||||
.unwrap()
|
||||
.block;
|
||||
let block_hash = format!("{:?}", block.header.hash());
|
||||
client.import(BlockOrigin::Own, block.clone()).await.unwrap();
|
||||
|
||||
@@ -1503,7 +1611,14 @@ async fn follow_with_unpin() {
|
||||
// Block tree:
|
||||
// finalized_block -> block -> block2
|
||||
// ^ has been unpinned
|
||||
let block2 = client.new_block(Default::default()).unwrap().build().unwrap().block;
|
||||
let block2 = BlockBuilderBuilder::new(&*client)
|
||||
.on_parent_block(block.hash())
|
||||
.with_parent_block_number(1)
|
||||
.build()
|
||||
.unwrap()
|
||||
.build()
|
||||
.unwrap()
|
||||
.block;
|
||||
client.import(BlockOrigin::Own, block2.clone()).await.unwrap();
|
||||
|
||||
assert_matches!(
|
||||
@@ -1516,7 +1631,14 @@ async fn follow_with_unpin() {
|
||||
FollowEvent::BestBlockChanged(_)
|
||||
);
|
||||
|
||||
let block3 = client.new_block(Default::default()).unwrap().build().unwrap().block;
|
||||
let block3 = BlockBuilderBuilder::new(&*client)
|
||||
.on_parent_block(block2.hash())
|
||||
.with_parent_block_number(2)
|
||||
.build()
|
||||
.unwrap()
|
||||
.build()
|
||||
.unwrap()
|
||||
.block;
|
||||
client.import(BlockOrigin::Own, block3.clone()).await.unwrap();
|
||||
|
||||
assert_matches!(get_next_event::<FollowEvent<String>>(&mut sub).await, FollowEvent::Stop);
|
||||
@@ -1560,27 +1682,52 @@ async fn follow_prune_best_block() {
|
||||
// finalized -> block 1 -> block 2
|
||||
// ^^^ best block reported
|
||||
//
|
||||
// -> block 1 -> block 3 -> block 4
|
||||
// -> block 1 -> block 2_f -> block 4
|
||||
// ^^^ finalized
|
||||
//
|
||||
// The block 4 is needed on the longest chain because we want the
|
||||
// best block 2 to be reported as pruned. Pruning is happening at
|
||||
// height (N - 1), where N is the finalized block number.
|
||||
|
||||
let block_1 = client.new_block(Default::default()).unwrap().build().unwrap().block;
|
||||
let block_1_hash = block_1.header.hash();
|
||||
let block_1 = BlockBuilderBuilder::new(&*client)
|
||||
.on_parent_block(client.chain_info().genesis_hash)
|
||||
.with_parent_block_number(0)
|
||||
.build()
|
||||
.unwrap()
|
||||
.build()
|
||||
.unwrap()
|
||||
.block;
|
||||
let block_1_hash = block_1.hash();
|
||||
client.import(BlockOrigin::Own, block_1.clone()).await.unwrap();
|
||||
|
||||
let block_3 = client.new_block(Default::default()).unwrap().build().unwrap().block;
|
||||
let block_3_hash = block_3.header.hash();
|
||||
client.import(BlockOrigin::Own, block_3.clone()).await.unwrap();
|
||||
let block_2_f = BlockBuilderBuilder::new(&*client)
|
||||
.on_parent_block(block_1_hash)
|
||||
.with_parent_block_number(1)
|
||||
.build()
|
||||
.unwrap()
|
||||
.build()
|
||||
.unwrap()
|
||||
.block;
|
||||
let block_2_f_hash = block_2_f.hash();
|
||||
client.import(BlockOrigin::Own, block_2_f.clone()).await.unwrap();
|
||||
|
||||
let block_4 = client.new_block(Default::default()).unwrap().build().unwrap().block;
|
||||
let block_4_hash = block_4.header.hash();
|
||||
let block_4 = BlockBuilderBuilder::new(&*client)
|
||||
.on_parent_block(block_2_f_hash)
|
||||
.with_parent_block_number(2)
|
||||
.build()
|
||||
.unwrap()
|
||||
.build()
|
||||
.unwrap()
|
||||
.block;
|
||||
let block_4_hash = block_4.hash();
|
||||
client.import(BlockOrigin::Own, block_4.clone()).await.unwrap();
|
||||
|
||||
// Import block 2 as best on the fork.
|
||||
let mut block_builder = client.new_block_at(block_1_hash, Default::default(), false).unwrap();
|
||||
let mut block_builder = BlockBuilderBuilder::new(&*client)
|
||||
.on_parent_block(block_1_hash)
|
||||
.with_parent_block_number(1)
|
||||
.build()
|
||||
.unwrap();
|
||||
// This push is required as otherwise block 3 has the same hash as block 2 and won't get
|
||||
// imported
|
||||
block_builder
|
||||
@@ -1613,7 +1760,7 @@ async fn follow_prune_best_block() {
|
||||
// Check block 3.
|
||||
let event: FollowEvent<String> = get_next_event(&mut sub).await;
|
||||
let expected = FollowEvent::NewBlock(NewBlock {
|
||||
block_hash: format!("{:?}", block_3_hash),
|
||||
block_hash: format!("{:?}", block_2_f_hash),
|
||||
parent_block_hash: format!("{:?}", block_1_hash),
|
||||
new_runtime: None,
|
||||
with_runtime: false,
|
||||
@@ -1621,7 +1768,7 @@ async fn follow_prune_best_block() {
|
||||
assert_eq!(event, expected);
|
||||
let event: FollowEvent<String> = get_next_event(&mut sub).await;
|
||||
let expected = FollowEvent::BestBlockChanged(BestBlockChanged {
|
||||
best_block_hash: format!("{:?}", block_3_hash),
|
||||
best_block_hash: format!("{:?}", block_2_f_hash),
|
||||
});
|
||||
assert_eq!(event, expected);
|
||||
|
||||
@@ -1629,7 +1776,7 @@ async fn follow_prune_best_block() {
|
||||
let event: FollowEvent<String> = get_next_event(&mut sub).await;
|
||||
let expected = FollowEvent::NewBlock(NewBlock {
|
||||
block_hash: format!("{:?}", block_4_hash),
|
||||
parent_block_hash: format!("{:?}", block_3_hash),
|
||||
parent_block_hash: format!("{:?}", block_2_f_hash),
|
||||
new_runtime: None,
|
||||
with_runtime: false,
|
||||
});
|
||||
@@ -1670,7 +1817,7 @@ async fn follow_prune_best_block() {
|
||||
let expected = FollowEvent::Finalized(Finalized {
|
||||
finalized_block_hashes: vec![
|
||||
format!("{:?}", block_1_hash),
|
||||
format!("{:?}", block_3_hash),
|
||||
format!("{:?}", block_2_f_hash),
|
||||
format!("{:?}", block_4_hash),
|
||||
],
|
||||
pruned_block_hashes: vec![format!("{:?}", block_2_hash)],
|
||||
@@ -1708,22 +1855,46 @@ async fn follow_forks_pruned_block() {
|
||||
//
|
||||
// finalized -> block 1 -> block 2 -> block 3
|
||||
// ^^^ finalized
|
||||
// -> block 1 -> block 4 -> block 5
|
||||
// -> block 1 -> block 2_f -> block 3_f
|
||||
//
|
||||
|
||||
let block_1 = client.new_block(Default::default()).unwrap().build().unwrap().block;
|
||||
let block_1 = BlockBuilderBuilder::new(&*client)
|
||||
.on_parent_block(client.chain_info().genesis_hash)
|
||||
.with_parent_block_number(0)
|
||||
.build()
|
||||
.unwrap()
|
||||
.build()
|
||||
.unwrap()
|
||||
.block;
|
||||
client.import(BlockOrigin::Own, block_1.clone()).await.unwrap();
|
||||
|
||||
let block_2 = client.new_block(Default::default()).unwrap().build().unwrap().block;
|
||||
let block_2 = BlockBuilderBuilder::new(&*client)
|
||||
.on_parent_block(block_1.hash())
|
||||
.with_parent_block_number(1)
|
||||
.build()
|
||||
.unwrap()
|
||||
.build()
|
||||
.unwrap()
|
||||
.block;
|
||||
client.import(BlockOrigin::Own, block_2.clone()).await.unwrap();
|
||||
|
||||
let block_3 = client.new_block(Default::default()).unwrap().build().unwrap().block;
|
||||
let block_3 = BlockBuilderBuilder::new(&*client)
|
||||
.on_parent_block(block_2.hash())
|
||||
.with_parent_block_number(2)
|
||||
.build()
|
||||
.unwrap()
|
||||
.build()
|
||||
.unwrap()
|
||||
.block;
|
||||
let block_3_hash = block_3.header.hash();
|
||||
client.import(BlockOrigin::Own, block_3.clone()).await.unwrap();
|
||||
|
||||
// Block 4 with parent Block 1 is not the best imported.
|
||||
let mut block_builder =
|
||||
client.new_block_at(block_1.header.hash(), Default::default(), false).unwrap();
|
||||
let mut block_builder = BlockBuilderBuilder::new(&*client)
|
||||
.on_parent_block(block_1.hash())
|
||||
.with_parent_block_number(1)
|
||||
.build()
|
||||
.unwrap();
|
||||
// This push is required as otherwise block 4 has the same hash as block 2 and won't get
|
||||
// imported
|
||||
block_builder
|
||||
@@ -1734,11 +1905,14 @@ async fn follow_forks_pruned_block() {
|
||||
nonce: 0,
|
||||
})
|
||||
.unwrap();
|
||||
let block_4 = block_builder.build().unwrap().block;
|
||||
client.import(BlockOrigin::Own, block_4.clone()).await.unwrap();
|
||||
let block_2_f = block_builder.build().unwrap().block;
|
||||
client.import(BlockOrigin::Own, block_2_f.clone()).await.unwrap();
|
||||
|
||||
let mut block_builder =
|
||||
client.new_block_at(block_4.header.hash(), Default::default(), false).unwrap();
|
||||
let mut block_builder = BlockBuilderBuilder::new(&*client)
|
||||
.on_parent_block(block_2_f.hash())
|
||||
.with_parent_block_number(2)
|
||||
.build()
|
||||
.unwrap();
|
||||
block_builder
|
||||
.push_transfer(Transfer {
|
||||
from: AccountKeyring::Bob.into(),
|
||||
@@ -1747,10 +1921,10 @@ async fn follow_forks_pruned_block() {
|
||||
nonce: 0,
|
||||
})
|
||||
.unwrap();
|
||||
let block_5 = block_builder.build().unwrap().block;
|
||||
client.import(BlockOrigin::Own, block_5.clone()).await.unwrap();
|
||||
let block_3_f = block_builder.build().unwrap().block;
|
||||
client.import(BlockOrigin::Own, block_3_f.clone()).await.unwrap();
|
||||
|
||||
// Block 4 and 5 are not pruned, pruning happens at height (N - 1).
|
||||
// Block 2_f and 3_f are not pruned, pruning happens at height (N - 1).
|
||||
client.finalize_block(block_3_hash, None).unwrap();
|
||||
|
||||
let mut sub = api.subscribe("chainHead_unstable_follow", [false]).await.unwrap();
|
||||
@@ -1766,22 +1940,29 @@ async fn follow_forks_pruned_block() {
|
||||
|
||||
// Block tree:
|
||||
//
|
||||
// finalized -> block 1 -> block 2 -> block 3 -> block 6
|
||||
// finalized -> block 1 -> block 2 -> block 3 -> block 4
|
||||
// ^^^ finalized
|
||||
// -> block 1 -> block 4 -> block 5
|
||||
// -> block 1 -> block 2_f -> block 3_f
|
||||
//
|
||||
// Mark block 6 as finalized to force block 4 and 5 to get pruned.
|
||||
// Mark block 4 as finalized to force block 2_f and 3_f to get pruned.
|
||||
|
||||
let block_6 = client.new_block(Default::default()).unwrap().build().unwrap().block;
|
||||
let block_6_hash = block_6.header.hash();
|
||||
client.import(BlockOrigin::Own, block_6.clone()).await.unwrap();
|
||||
let block_4 = BlockBuilderBuilder::new(&*client)
|
||||
.on_parent_block(block_3.hash())
|
||||
.with_parent_block_number(3)
|
||||
.build()
|
||||
.unwrap()
|
||||
.build()
|
||||
.unwrap()
|
||||
.block;
|
||||
let block_4_hash = block_4.hash();
|
||||
client.import(BlockOrigin::Own, block_4.clone()).await.unwrap();
|
||||
|
||||
client.finalize_block(block_6_hash, None).unwrap();
|
||||
client.finalize_block(block_4_hash, None).unwrap();
|
||||
|
||||
// Check block 6.
|
||||
let event: FollowEvent<String> = get_next_event(&mut sub).await;
|
||||
let expected = FollowEvent::NewBlock(NewBlock {
|
||||
block_hash: format!("{:?}", block_6_hash),
|
||||
block_hash: format!("{:?}", block_4_hash),
|
||||
parent_block_hash: format!("{:?}", block_3_hash),
|
||||
new_runtime: None,
|
||||
with_runtime: false,
|
||||
@@ -1789,14 +1970,14 @@ async fn follow_forks_pruned_block() {
|
||||
assert_eq!(event, expected);
|
||||
let event: FollowEvent<String> = get_next_event(&mut sub).await;
|
||||
let expected = FollowEvent::BestBlockChanged(BestBlockChanged {
|
||||
best_block_hash: format!("{:?}", block_6_hash),
|
||||
best_block_hash: format!("{:?}", block_4_hash),
|
||||
});
|
||||
assert_eq!(event, expected);
|
||||
|
||||
// Block 4 and 5 must not be reported as pruned.
|
||||
let event: FollowEvent<String> = get_next_event(&mut sub).await;
|
||||
let expected = FollowEvent::Finalized(Finalized {
|
||||
finalized_block_hashes: vec![format!("{:?}", block_6_hash)],
|
||||
finalized_block_hashes: vec![format!("{:?}", block_4_hash)],
|
||||
pruned_block_hashes: vec![],
|
||||
});
|
||||
assert_eq!(event, expected);
|
||||
@@ -1826,26 +2007,51 @@ async fn follow_report_multiple_pruned_block() {
|
||||
//
|
||||
// finalized -> block 1 -> block 2 -> block 3
|
||||
// ^^^ finalized after subscription
|
||||
// -> block 1 -> block 4 -> block 5
|
||||
// -> block 1 -> block 2_f -> block 3_f
|
||||
|
||||
let finalized_hash = client.info().finalized_hash;
|
||||
|
||||
let block_1 = client.new_block(Default::default()).unwrap().build().unwrap().block;
|
||||
let block_1_hash = block_1.header.hash();
|
||||
let block_1 = BlockBuilderBuilder::new(&*client)
|
||||
.on_parent_block(client.chain_info().genesis_hash)
|
||||
.with_parent_block_number(0)
|
||||
.build()
|
||||
.unwrap()
|
||||
.build()
|
||||
.unwrap()
|
||||
.block;
|
||||
let block_1_hash = block_1.hash();
|
||||
client.import(BlockOrigin::Own, block_1.clone()).await.unwrap();
|
||||
|
||||
let block_2 = client.new_block(Default::default()).unwrap().build().unwrap().block;
|
||||
let block_2_hash = block_2.header.hash();
|
||||
let block_2 = BlockBuilderBuilder::new(&*client)
|
||||
.on_parent_block(block_1.hash())
|
||||
.with_parent_block_number(1)
|
||||
.build()
|
||||
.unwrap()
|
||||
.build()
|
||||
.unwrap()
|
||||
.block;
|
||||
let block_2_hash = block_2.hash();
|
||||
client.import(BlockOrigin::Own, block_2.clone()).await.unwrap();
|
||||
|
||||
let block_3 = client.new_block(Default::default()).unwrap().build().unwrap().block;
|
||||
let block_3_hash = block_3.header.hash();
|
||||
let block_3 = BlockBuilderBuilder::new(&*client)
|
||||
.on_parent_block(block_2.hash())
|
||||
.with_parent_block_number(2)
|
||||
.build()
|
||||
.unwrap()
|
||||
.build()
|
||||
.unwrap()
|
||||
.block;
|
||||
let block_3_hash = block_3.hash();
|
||||
client.import(BlockOrigin::Own, block_3.clone()).await.unwrap();
|
||||
|
||||
// Block 4 with parent Block 1 is not the best imported.
|
||||
let mut block_builder =
|
||||
client.new_block_at(block_1.header.hash(), Default::default(), false).unwrap();
|
||||
// This push is required as otherwise block 4 has the same hash as block 2 and won't get
|
||||
// Block 2_f with parent Block 1 is not the best imported.
|
||||
let mut block_builder = BlockBuilderBuilder::new(&*client)
|
||||
.on_parent_block(block_1.hash())
|
||||
.with_parent_block_number(1)
|
||||
.build()
|
||||
.unwrap();
|
||||
|
||||
// This push is required as otherwise block 2_f has the same hash as block 2 and won't get
|
||||
// imported
|
||||
block_builder
|
||||
.push_transfer(Transfer {
|
||||
@@ -1855,12 +2061,16 @@ async fn follow_report_multiple_pruned_block() {
|
||||
nonce: 0,
|
||||
})
|
||||
.unwrap();
|
||||
let block_4 = block_builder.build().unwrap().block;
|
||||
let block_4_hash = block_4.header.hash();
|
||||
client.import(BlockOrigin::Own, block_4.clone()).await.unwrap();
|
||||
let block_2_f = block_builder.build().unwrap().block;
|
||||
let block_2_f_hash = block_2_f.hash();
|
||||
client.import(BlockOrigin::Own, block_2_f.clone()).await.unwrap();
|
||||
|
||||
let mut block_builder = BlockBuilderBuilder::new(&*client)
|
||||
.on_parent_block(block_2_f.hash())
|
||||
.with_parent_block_number(2)
|
||||
.build()
|
||||
.unwrap();
|
||||
|
||||
let mut block_builder =
|
||||
client.new_block_at(block_4.header.hash(), Default::default(), false).unwrap();
|
||||
block_builder
|
||||
.push_transfer(Transfer {
|
||||
from: AccountKeyring::Bob.into(),
|
||||
@@ -1869,9 +2079,9 @@ async fn follow_report_multiple_pruned_block() {
|
||||
nonce: 0,
|
||||
})
|
||||
.unwrap();
|
||||
let block_5 = block_builder.build().unwrap().block;
|
||||
let block_5_hash = block_5.header.hash();
|
||||
client.import(BlockOrigin::Own, block_5.clone()).await.unwrap();
|
||||
let block_3_f = block_builder.build().unwrap().block;
|
||||
let block_3_f_hash = block_3_f.hash();
|
||||
client.import(BlockOrigin::Own, block_3_f.clone()).await.unwrap();
|
||||
let mut sub = api.subscribe("chainHead_unstable_follow", [false]).await.unwrap();
|
||||
|
||||
// Initialized must always be reported first.
|
||||
@@ -1913,7 +2123,7 @@ async fn follow_report_multiple_pruned_block() {
|
||||
// The fork must also be reported.
|
||||
let event: FollowEvent<String> = get_next_event(&mut sub).await;
|
||||
let expected = FollowEvent::NewBlock(NewBlock {
|
||||
block_hash: format!("{:?}", block_4_hash),
|
||||
block_hash: format!("{:?}", block_2_f_hash),
|
||||
parent_block_hash: format!("{:?}", block_1_hash),
|
||||
new_runtime: None,
|
||||
with_runtime: false,
|
||||
@@ -1922,8 +2132,8 @@ async fn follow_report_multiple_pruned_block() {
|
||||
|
||||
let event: FollowEvent<String> = get_next_event(&mut sub).await;
|
||||
let expected = FollowEvent::NewBlock(NewBlock {
|
||||
block_hash: format!("{:?}", block_5_hash),
|
||||
parent_block_hash: format!("{:?}", block_4_hash),
|
||||
block_hash: format!("{:?}", block_3_f_hash),
|
||||
parent_block_hash: format!("{:?}", block_2_f_hash),
|
||||
new_runtime: None,
|
||||
with_runtime: false,
|
||||
});
|
||||
@@ -1953,22 +2163,30 @@ async fn follow_report_multiple_pruned_block() {
|
||||
|
||||
// Block tree:
|
||||
//
|
||||
// finalized -> block 1 -> block 2 -> block 3 -> block 6
|
||||
// finalized -> block 1 -> block 2 -> block 3 -> block 4
|
||||
// ^^^ finalized
|
||||
// -> block 1 -> block 4 -> block 5
|
||||
// -> block 1 -> block 2_f -> block 3_f
|
||||
//
|
||||
// Mark block 6 as finalized to force block 4 and 5 to get pruned.
|
||||
// Mark block 4 as finalized to force block 2_f and 3_f to get pruned.
|
||||
|
||||
let block_6 = client.new_block(Default::default()).unwrap().build().unwrap().block;
|
||||
let block_6_hash = block_6.header.hash();
|
||||
client.import(BlockOrigin::Own, block_6.clone()).await.unwrap();
|
||||
let block_4 = BlockBuilderBuilder::new(&*client)
|
||||
.on_parent_block(block_3.hash())
|
||||
.with_parent_block_number(3)
|
||||
.build()
|
||||
.unwrap()
|
||||
.build()
|
||||
.unwrap()
|
||||
.block;
|
||||
|
||||
client.finalize_block(block_6_hash, None).unwrap();
|
||||
let block_4_hash = block_4.hash();
|
||||
client.import(BlockOrigin::Own, block_4.clone()).await.unwrap();
|
||||
|
||||
client.finalize_block(block_4_hash, None).unwrap();
|
||||
|
||||
// Check block 6.
|
||||
let event: FollowEvent<String> = get_next_event(&mut sub).await;
|
||||
let expected = FollowEvent::NewBlock(NewBlock {
|
||||
block_hash: format!("{:?}", block_6_hash),
|
||||
block_hash: format!("{:?}", block_4_hash),
|
||||
parent_block_hash: format!("{:?}", block_3_hash),
|
||||
new_runtime: None,
|
||||
with_runtime: false,
|
||||
@@ -1976,15 +2194,15 @@ async fn follow_report_multiple_pruned_block() {
|
||||
assert_eq!(event, expected);
|
||||
let event: FollowEvent<String> = get_next_event(&mut sub).await;
|
||||
let expected = FollowEvent::BestBlockChanged(BestBlockChanged {
|
||||
best_block_hash: format!("{:?}", block_6_hash),
|
||||
best_block_hash: format!("{:?}", block_4_hash),
|
||||
});
|
||||
assert_eq!(event, expected);
|
||||
|
||||
// Block 4 and 5 be reported as pruned, not just the stale head (block 5).
|
||||
let event: FollowEvent<String> = get_next_event(&mut sub).await;
|
||||
let expected = FollowEvent::Finalized(Finalized {
|
||||
finalized_block_hashes: vec![format!("{:?}", block_6_hash)],
|
||||
pruned_block_hashes: vec![format!("{:?}", block_4_hash), format!("{:?}", block_5_hash)],
|
||||
finalized_block_hashes: vec![format!("{:?}", block_4_hash)],
|
||||
pruned_block_hashes: vec![format!("{:?}", block_2_f_hash), format!("{:?}", block_3_f_hash)],
|
||||
});
|
||||
assert_eq!(event, expected);
|
||||
}
|
||||
@@ -2052,7 +2270,14 @@ async fn pin_block_references() {
|
||||
let sub_id = sub.subscription_id();
|
||||
let sub_id = serde_json::to_string(&sub_id).unwrap();
|
||||
|
||||
let block = client.new_block(Default::default()).unwrap().build().unwrap().block;
|
||||
let block = BlockBuilderBuilder::new(&*client)
|
||||
.on_parent_block(client.chain_info().genesis_hash)
|
||||
.with_parent_block_number(0)
|
||||
.build()
|
||||
.unwrap()
|
||||
.build()
|
||||
.unwrap()
|
||||
.block;
|
||||
let hash = block.header.hash();
|
||||
let block_hash = format!("{:?}", hash);
|
||||
client.import(BlockOrigin::Own, block.clone()).await.unwrap();
|
||||
@@ -2089,8 +2314,15 @@ async fn pin_block_references() {
|
||||
// Add another 2 blocks and make sure we drop the subscription with the blocks pinned.
|
||||
let mut hashes = Vec::new();
|
||||
for _ in 0..2 {
|
||||
let block = client.new_block(Default::default()).unwrap().build().unwrap().block;
|
||||
let hash = block.header.hash();
|
||||
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;
|
||||
let hash = block.hash();
|
||||
client.import(BlockOrigin::Own, block.clone()).await.unwrap();
|
||||
|
||||
// Ensure the imported block is propagated for this subscription.
|
||||
@@ -2115,7 +2347,14 @@ async fn pin_block_references() {
|
||||
drop(sub);
|
||||
// The `chainHead` detects the subscription was terminated when it tries
|
||||
// to send another block.
|
||||
let block = client.new_block(Default::default()).unwrap().build().unwrap().block;
|
||||
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;
|
||||
client.import(BlockOrigin::Own, block.clone()).await.unwrap();
|
||||
|
||||
for hash in &hashes {
|
||||
@@ -2146,7 +2385,14 @@ async fn follow_finalized_before_new_block() {
|
||||
.into_rpc();
|
||||
|
||||
// Make sure the block is imported for it to be pinned.
|
||||
let block_1 = client.new_block(Default::default()).unwrap().build().unwrap().block;
|
||||
let block_1 = BlockBuilderBuilder::new(&*client)
|
||||
.on_parent_block(client.chain_info().genesis_hash)
|
||||
.with_parent_block_number(0)
|
||||
.build()
|
||||
.unwrap()
|
||||
.build()
|
||||
.unwrap()
|
||||
.block;
|
||||
let block_1_hash = block_1.header.hash();
|
||||
client.import(BlockOrigin::Own, block_1.clone()).await.unwrap();
|
||||
|
||||
@@ -2191,8 +2437,15 @@ async fn follow_finalized_before_new_block() {
|
||||
});
|
||||
assert_eq!(event, expected);
|
||||
|
||||
let block_2 = client.new_block(Default::default()).unwrap().build().unwrap().block;
|
||||
let block_2_hash = block_2.header.hash();
|
||||
let block_2 = BlockBuilderBuilder::new(&*client)
|
||||
.on_parent_block(block_1.hash())
|
||||
.with_parent_block_number(1)
|
||||
.build()
|
||||
.unwrap()
|
||||
.build()
|
||||
.unwrap()
|
||||
.block;
|
||||
let block_2_hash = block_2.hash();
|
||||
client.import(BlockOrigin::Own, block_2.clone()).await.unwrap();
|
||||
|
||||
// Triggering the `BlockImportNotification` notification for block 1 should have no effect
|
||||
@@ -2250,7 +2503,14 @@ async fn ensure_operation_limits_works() {
|
||||
let sub_id = sub.subscription_id();
|
||||
let sub_id = serde_json::to_string(&sub_id).unwrap();
|
||||
|
||||
let block = client.new_block(Default::default()).unwrap().build().unwrap().block;
|
||||
let block = BlockBuilderBuilder::new(&*client)
|
||||
.on_parent_block(client.chain_info().genesis_hash)
|
||||
.with_parent_block_number(0)
|
||||
.build()
|
||||
.unwrap()
|
||||
.build()
|
||||
.unwrap()
|
||||
.block;
|
||||
client.import(BlockOrigin::Own, block.clone()).await.unwrap();
|
||||
|
||||
// Ensure the imported block is propagated and pinned for this subscription.
|
||||
@@ -2349,7 +2609,11 @@ async fn check_continue_operation() {
|
||||
let sub_id = serde_json::to_string(&sub_id).unwrap();
|
||||
|
||||
// Import a new block with storage changes.
|
||||
let mut builder = client.new_block(Default::default()).unwrap();
|
||||
let mut builder = BlockBuilderBuilder::new(&*client)
|
||||
.on_parent_block(client.chain_info().genesis_hash)
|
||||
.with_parent_block_number(0)
|
||||
.build()
|
||||
.unwrap();
|
||||
builder.push_storage_change(b":m".to_vec(), Some(b"a".to_vec())).unwrap();
|
||||
builder.push_storage_change(b":mo".to_vec(), Some(b"ab".to_vec())).unwrap();
|
||||
builder.push_storage_change(b":moc".to_vec(), Some(b"abc".to_vec())).unwrap();
|
||||
@@ -2528,7 +2792,11 @@ async fn stop_storage_operation() {
|
||||
let sub_id = serde_json::to_string(&sub_id).unwrap();
|
||||
|
||||
// Import a new block with storage changes.
|
||||
let mut builder = client.new_block(Default::default()).unwrap();
|
||||
let mut builder = BlockBuilderBuilder::new(&*client)
|
||||
.on_parent_block(client.chain_info().genesis_hash)
|
||||
.with_parent_block_number(0)
|
||||
.build()
|
||||
.unwrap();
|
||||
builder.push_storage_change(b":m".to_vec(), Some(b"a".to_vec())).unwrap();
|
||||
builder.push_storage_change(b":mo".to_vec(), Some(b"ab".to_vec())).unwrap();
|
||||
let block = builder.build().unwrap().block;
|
||||
@@ -2612,7 +2880,7 @@ async fn stop_storage_operation() {
|
||||
|
||||
#[tokio::test]
|
||||
async fn storage_closest_merkle_value() {
|
||||
let (mut client, api, mut sub, sub_id, _) = setup_api().await;
|
||||
let (mut client, api, mut sub, sub_id, block) = setup_api().await;
|
||||
|
||||
/// The core of this test.
|
||||
///
|
||||
@@ -2738,7 +3006,11 @@ async fn storage_closest_merkle_value() {
|
||||
}
|
||||
|
||||
// Import a new block with storage changes.
|
||||
let mut builder = client.new_block(Default::default()).unwrap();
|
||||
let mut builder = BlockBuilderBuilder::new(&*client)
|
||||
.on_parent_block(block.hash())
|
||||
.with_parent_block_number(1)
|
||||
.build()
|
||||
.unwrap();
|
||||
builder.push_storage_change(b":AAAA".to_vec(), Some(vec![1; 64])).unwrap();
|
||||
builder.push_storage_change(b":AAAB".to_vec(), Some(vec![2; 64])).unwrap();
|
||||
let block = builder.build().unwrap().block;
|
||||
@@ -2758,7 +3030,11 @@ async fn storage_closest_merkle_value() {
|
||||
let merkle_values_lhs = expect_merkle_request(&api, &mut sub, sub_id.clone(), block_hash).await;
|
||||
|
||||
// Import a new block with and change AAAB value.
|
||||
let mut builder = client.new_block(Default::default()).unwrap();
|
||||
let mut builder = BlockBuilderBuilder::new(&*client)
|
||||
.on_parent_block(block.hash())
|
||||
.with_parent_block_number(2)
|
||||
.build()
|
||||
.unwrap();
|
||||
builder.push_storage_change(b":AAAA".to_vec(), Some(vec![1; 64])).unwrap();
|
||||
builder.push_storage_change(b":AAAB".to_vec(), Some(vec![3; 64])).unwrap();
|
||||
let block = builder.build().unwrap().block;
|
||||
|
||||
Reference in New Issue
Block a user