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

start import queue in chain_ops as well

Browse Source
This commit is contained in:
Robert Habermeier
2018-10-17 16:09:05 -07:00
parent e7a50ff52a
commit fa62c8e9df
2 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
substrate/core/service/src/chain_ops.rs
+10 -2
View File
@@ -23,7 +23,7 @@ use serde_json;
use client::BlockOrigin;
use runtime_primitives::generic::{SignedBlock, BlockId};
use runtime_primitives::traits::{As, Block, Header};
use network::import_queue::{ImportQueue, BlockData};
use network::import_queue::{ImportQueue, Link, BlockData};
use network::message;
use components::{self, Components, ServiceFactory, FactoryFullConfiguration, FactoryBlockNumber, RuntimeGenesis};
use new_client;
@@ -87,8 +87,16 @@ pub fn export_blocks<F, E, W>(config: FactoryFullConfiguration<F>, exit: E, mut
pub fn import_blocks<F, E, R>(config: FactoryFullConfiguration<F>, exit: E, mut input: R) -> error::Result<()>
where F: ServiceFactory, E: Future<Item=(),Error=()> + Send + 'static, R: Read,
{
use network::ClientHandle;
struct DummyLink<T>(::std::sync::Arc<T>);
impl<B: Block, T: ClientHandle<B>> Link<B> for DummyLink<T> {
fn chain(&self) -> &ClientHandle<B> { &*self.0 }
}
let client = new_client::<F>(&config)?;
let queue = components::FullComponents::<F>::build_import_queue(&config, client.clone())?;
queue.start(DummyLink(client.clone()))?;
let (exit_send, exit_recv) = std::sync::mpsc::channel();
::std::thread::spawn(move || {
@@ -98,7 +106,7 @@ pub fn import_blocks<F, E, R>(config: FactoryFullConfiguration<F>, exit: E, mut
let count: u32 = Decode::decode(&mut input).ok_or("Error reading file")?;
info!("Importing {} blocks", count);
let mut block_count = 0;
let mut block_count = 0;
for b in 0 .. count {
if exit_recv.try_recv().is_ok() {
break;