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

Fixing clippy warnings (#1660)

Browse Source
This commit is contained in:
Tomasz Drwięga
2016-07-19 09:25:51 +02:00
committed by Gav Wood
parent 340f0b6f58
commit 038862fa9d
9 changed files with 31 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
parity/main.rs
View File

@@ -581,7 +581,7 @@ fn wait_for_exit(
// Wait for signal
let mutex = Mutex::new(());
let _ = exit.wait(&mut mutex.lock());
exit.wait(&mut mutex.lock());
info!("Finishing work, please wait...");
}

8
parity/modules.rs
View File

@@ -19,12 +19,14 @@ use std::sync::Arc;
use ethcore::client::{ChainNotify, BlockChainClient};
use ethcore;
pub type Modules = (Arc<SyncProvider>, Arc<ManageNetwork>, Arc<ChainNotify>);
#[cfg(feature="ipc")]
pub fn sync(
sync_cfg: SyncConfig,
net_cfg: NetworkConfiguration,
client: Arc<BlockChainClient>)
-> Result<(Arc<SyncProvider>, Arc<ManageNetwork>, Arc<ChainNotify>), ethcore::error::Error>
-> Result<Modules, ethcore::error::Error>
{
}
@@ -33,8 +35,8 @@ pub fn sync(
sync_cfg: SyncConfig,
net_cfg: NetworkConfiguration,
client: Arc<BlockChainClient>)
-> Result<(Arc<SyncProvider>, Arc<ManageNetwork>, Arc<ChainNotify>), ethcore::error::Error>
-> Result<Modules, ethcore::error::Error>
{
let eth_sync = try!(EthSync::new(sync_cfg, client, net_cfg).map_err(|e| ethcore::error::Error::Util(e)));
let eth_sync = try!(EthSync::new(sync_cfg, client, net_cfg).map_err(ethcore::error::Error::Util));
Ok((eth_sync.clone() as Arc<SyncProvider>, eth_sync.clone() as Arc<ManageNetwork>, eth_sync.clone() as Arc<ChainNotify>))
}