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

Merge branch 'master' into temp-path

Browse Source 
Conflicts:
	util/Cargo.toml
	util/src/lib.rs
This commit is contained in:
Nikolay Volf
2016-02-19 19:11:24 +03:00
parent ab0fe65f3f 6518576a3f
commit 84e7ce2758
25 changed files with 1914 additions and 693 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ethcore/src/service.rs
View File

@@ -124,20 +124,18 @@ impl IoHandler<NetSyncMessage> for ClientIoHandler {
}
}
// TODO: rewrite into something that doesn't dependent on the testing environment having a particular port ready for use.
/*
#[cfg(test)]
mod tests {
use super::*;
use tests::helpers::*;
use util::network::*;
use devtools::*;
#[test]
fn it_can_be_started() {
let spec = get_test_spec();
let temp_path = RandomTempPath::new();
let service = ClientService::start(spec, NetworkConfiguration::new(), &temp_path.as_path());
let service = ClientService::start(spec, NetworkConfiguration::new_with_port(40456), &temp_path.as_path());
assert!(service.is_ok());
}
}
*/