grassrootseconomics/openethereum
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

review fixes

Browse Source
This commit is contained in:
NikVolf 2016-07-16 18:51:06 +02:00
parent a74b72faa2
commit 8e26977693
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ipc/codegen/src/codegen.rs
View File

@ -19,7 +19,6 @@ use syntax::ast::{
MetaItem, MetaItem,
Item, Item,
ImplItemKind, ImplItemKind,
ImplItem,
MethodSig, MethodSig,
Arg, Arg,
PatKind, PatKind,

17
parity/sync/main.rs
View File

@ -30,14 +30,14 @@ extern crate ethcore_util as util;
use std::sync::Arc; use std::sync::Arc;
use hypervisor::{HypervisorServiceClient, SYNC_MODULE_ID, HYPERVISOR_IPC_URL}; use hypervisor::{HypervisorServiceClient, SYNC_MODULE_ID, HYPERVISOR_IPC_URL};
use ctrlc::CtrlC; use ctrlc::CtrlC;
use std::sync::atomic::*; use std::sync::atomic::{AtomicBool, Ordering};
use docopt::Docopt; use docopt::Docopt;
use ethcore::client::{RemoteClient, ChainNotify}; use ethcore::client::{RemoteClient, ChainNotify};
use nanoipc::*;
use ethsync::{SyncProvider, SyncConfig, EthSync, ManageNetwork, NetworkConfiguration}; use ethsync::{SyncProvider, SyncConfig, EthSync, ManageNetwork, NetworkConfiguration};
use std::thread; use std::thread;
use util::numbers::*; use util::numbers::{U256, H256};
use std::str::FromStr; use std::str::FromStr;
use nanoipc::IpcInterface;
const USAGE: &'static str = " const USAGE: &'static str = "
Ethcore sync service Ethcore sync service
@ -92,11 +92,10 @@ impl Args {
} }
} }
fn run_service<T: ?Sized + Send + Sync + 'static>(addr: &str, stop_guard: Arc<AtomicBool>, service: &Arc<T>) where Arc<T>: IpcInterface<T> { fn run_service<T: ?Sized + Send + Sync + 'static>(addr: &str, stop_guard: Arc<AtomicBool>, service: Arc<T>) where Arc<T>: IpcInterface<T> {
let socket_url = addr.to_owned(); let socket_url = addr.to_owned();
let service_spawn = service.clone();
std::thread::spawn(move || { std::thread::spawn(move || {
let mut worker = nanoipc::Worker::<T>::new(&service_spawn); let mut worker = nanoipc::Worker::<T>::new(&service);
worker.add_reqrep(&socket_url).unwrap(); worker.add_reqrep(&socket_url).unwrap();
while !stop_guard.load(Ordering::Relaxed) { while !stop_guard.load(Ordering::Relaxed) {
@ -117,9 +116,9 @@ fn main() {
let stop = Arc::new(AtomicBool::new(false)); let stop = Arc::new(AtomicBool::new(false));
let sync = EthSync::new(sync_config, remote_client.clone(), network_config).unwrap(); let sync = EthSync::new(sync_config, remote_client.clone(), network_config).unwrap();
run_service("ipc:///tmp/parity-sync.ipc", stop.clone(), &(sync.clone() as Arc<SyncProvider>)); run_service("ipc:///tmp/parity-sync.ipc", stop.clone(), sync.clone() as Arc<SyncProvider>);
run_service("ipc:///tmp/parity-manage-net.ipc", stop.clone(), &(sync.clone() as Arc<ManageNetwork>)); run_service("ipc:///tmp/parity-manage-net.ipc", stop.clone(), sync.clone() as Arc<ManageNetwork>);
run_service("ipc:///tmp/parity-sync-notify.ipc", stop.clone(), &(sync.clone() as Arc<ChainNotify>)); run_service("ipc:///tmp/parity-sync-notify.ipc", stop.clone(), sync.clone() as Arc<ChainNotify>);
let hypervisor_client = nanoipc::init_client::<HypervisorServiceClient<_>>(HYPERVISOR_IPC_URL).unwrap(); let hypervisor_client = nanoipc::init_client::<HypervisorServiceClient<_>>(HYPERVISOR_IPC_URL).unwrap();
hypervisor_client.handshake().unwrap(); hypervisor_client.handshake().unwrap();