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

Companion for Substrate#5860 (#1061)

Browse Source 
* Companion for Substrate#5860

* Update Substrate
This commit is contained in:
Bastian Köcher
2020-05-04 20:20:06 +02:00
committed by GitHub
parent 626a4aeccf
commit 054a64af7e
4 changed files with 215 additions and 211 deletions
Download Patch File Download Diff File Expand all files Collapse all files
polkadot/Cargo.lock
Generated
+209 -195
View File
File diff suppressed because it is too large Load Diff
polkadot/network/test/src/block_import.rs
+2 -4
View File
@@ -88,14 +88,12 @@ fn import_single_good_block_without_header_fails() {
#[test] #[test]
fn async_import_queue_drops() { fn async_import_queue_drops() {
let executor = sp_core::testing::SpawnBlockingExecutor::new();
// Perform this test multiple times since it exhibits non-deterministic behavior. // Perform this test multiple times since it exhibits non-deterministic behavior.
for _ in 0..100 { for _ in 0..100 {
let verifier = PassThroughVerifier(true); let verifier = PassThroughVerifier(true);
let threads_pool = futures::executor::ThreadPool::new().unwrap(); let queue = BasicQueue::new(verifier, Box::new(polkadot_test_runtime_client::new()), None, None, &executor);
let spawner = |future| threads_pool.spawn_ok(future);
let queue = BasicQueue::new(verifier, Box::new(polkadot_test_runtime_client::new()), None, None, spawner);
drop(queue); drop(queue);
} }
} }
polkadot/network/test/src/lib.rs
+2 -8
View File
@@ -570,15 +570,12 @@ pub trait TestNetFactory: Sized {
); );
let verifier = VerifierAdapter::new(Arc::new(Mutex::new(Box::new(verifier) as Box<_>))); let verifier = VerifierAdapter::new(Arc::new(Mutex::new(Box::new(verifier) as Box<_>)));
let threads_pool = futures::executor::ThreadPool::new().unwrap();
let spawner = |future| threads_pool.spawn_ok(future);
let import_queue = Box::new(BasicQueue::new( let import_queue = Box::new(BasicQueue::new(
verifier.clone(), verifier.clone(),
Box::new(block_import.clone()), Box::new(block_import.clone()),
justification_import, justification_import,
finality_proof_import, finality_proof_import,
spawner, &sp_core::testing::SpawnBlockingExecutor::new(),
)); ));
let listen_addr = build_multiaddr![Memory(rand::random::<u64>())]; let listen_addr = build_multiaddr![Memory(rand::random::<u64>())];
@@ -649,15 +646,12 @@ pub trait TestNetFactory: Sized {
); );
let verifier = VerifierAdapter::new(Arc::new(Mutex::new(Box::new(verifier) as Box<_>))); let verifier = VerifierAdapter::new(Arc::new(Mutex::new(Box::new(verifier) as Box<_>)));
let threads_pool = futures::executor::ThreadPool::new().unwrap();
let spawner = |future| threads_pool.spawn_ok(future);
let import_queue = Box::new(BasicQueue::new( let import_queue = Box::new(BasicQueue::new(
verifier.clone(), verifier.clone(),
Box::new(block_import.clone()), Box::new(block_import.clone()),
justification_import, justification_import,
finality_proof_import, finality_proof_import,
spawner, &sp_core::testing::SpawnBlockingExecutor::new(),
)); ));
let listen_addr = build_multiaddr![Memory(rand::random::<u64>())]; let listen_addr = build_multiaddr![Memory(rand::random::<u64>())];
polkadot/service/src/lib.rs
+2 -4
View File
@@ -189,7 +189,6 @@ macro_rules! new_full_start {
client.clone(), client.clone(),
)?; )?;
let spawner = |future| spawn_task_handle.spawn_blocking("import-queue-worker", future);
let import_queue = babe::import_queue( let import_queue = babe::import_queue(
babe_link.clone(), babe_link.clone(),
block_import.clone(), block_import.clone(),
@@ -197,7 +196,7 @@ macro_rules! new_full_start {
None, None,
client, client,
inherent_data_providers.clone(), inherent_data_providers.clone(),
spawner, spawn_task_handle,
)?; )?;
import_setup = Some((block_import, grandpa_link, babe_link)); import_setup = Some((block_import, grandpa_link, babe_link));
@@ -528,7 +527,6 @@ macro_rules! new_light {
client.clone(), client.clone(),
)?; )?;
let spawner = |future| spawn_task_handle.spawn_blocking("importe-queue-worker", future);
// FIXME: pruning task isn't started since light client doesn't do `AuthoritySetup`. // FIXME: pruning task isn't started since light client doesn't do `AuthoritySetup`.
let import_queue = babe::import_queue( let import_queue = babe::import_queue(
babe_link, babe_link,
@@ -537,7 +535,7 @@ macro_rules! new_light {
Some(Box::new(finality_proof_import)), Some(Box::new(finality_proof_import)),
client, client,
inherent_data_providers.clone(), inherent_data_providers.clone(),
spawner, spawn_task_handle,
)?; )?;
Ok((import_queue, finality_proof_request_builder)) Ok((import_queue, finality_proof_request_builder))