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

BlockId removal: BlockBuilderProvider::new_block_at (#13401)

Browse Source 
* `BlockId` removal: `BlockBuilderProvider::new_block_at`

It changes the arguments of `BlockBuilderProvider::new_block_at` from:
`BlockId<Block>` to: `Block::Hash`

* fmt

* fix

* more fixes
This commit is contained in:
Michal Kucharczyk
2023-02-21 19:36:00 +01:00
committed by GitHub
parent cd299d2b45
commit 5ef88dd398
15 changed files with 175 additions and 196 deletions
Download Patch File Download Diff File Expand all files Collapse all files
substrate/client/network/src/service/tests/chain_sync.rs
+2 -5
View File
@@ -34,10 +34,7 @@ use sc_network_common::{
};
use sc_network_sync::{mock::MockChainSync, service::mock::MockChainSyncInterface, ChainSync};
use sp_core::H256;
use sp_runtime::{
generic::BlockId,
traits::{Block as BlockT, Header as _},
};
use sp_runtime::traits::{Block as BlockT, Header as _};
use std::{
sync::{Arc, RwLock},
task::Poll,
@@ -188,7 +185,7 @@ async fn on_block_finalized() {
let at = client.header(client.info().best_hash).unwrap().unwrap().hash();
let block = client
.new_block_at(&BlockId::Hash(at), Default::default(), false)
.new_block_at(at, Default::default(), false)
.unwrap()
.build()
.unwrap()
substrate/client/network/sync/src/lib.rs
+2 -5
View File
@@ -3212,7 +3212,6 @@ mod test {
};
use sp_blockchain::HeaderBackend;
use sp_consensus::block_validation::DefaultBlockAnnounceValidator;
use sp_runtime::generic::BlockId;
use substrate_test_runtime_client::{
runtime::{Block, Hash, Header},
BlockBuilderExt, ClientBlockImportExt, ClientExt, DefaultTestClientBuilderExt, TestClient,
@@ -3449,8 +3448,7 @@ mod test {
fn build_block(client: &mut Arc<TestClient>, at: Option<Hash>, fork: bool) -> Block {
let at = at.unwrap_or_else(|| client.info().best_hash);
let mut block_builder =
client.new_block_at(&BlockId::Hash(at), Default::default(), false).unwrap();
let mut block_builder = client.new_block_at(at, Default::default(), false).unwrap();
if fork {
block_builder.push_storage_change(vec![1, 2, 3], Some(vec![4, 5, 6])).unwrap();
@@ -3503,8 +3501,7 @@ mod test {
let mut client2 = client.clone();
let mut build_block_at = |at, import| {
let mut block_builder =
client2.new_block_at(&BlockId::Hash(at), Default::default(), false).unwrap();
let mut block_builder = client2.new_block_at(at, Default::default(), false).unwrap();
// Make sure we generate a different block as fork
block_builder.push_storage_change(vec![1, 2, 3], Some(vec![4, 5, 6])).unwrap();
substrate/client/network/test/src/lib.rs
+1 -2
View File
@@ -377,8 +377,7 @@ where
let full_client = self.client.as_client();
let mut at = full_client.block_hash_from_id(&at).unwrap().unwrap();
for _ in 0..count {
let builder =
full_client.new_block_at(&BlockId::Hash(at), Default::default(), false).unwrap();
let builder = full_client.new_block_at(at, Default::default(), false).unwrap();
let block = edit_block(builder);
let hash = block.header.hash();
trace!(