rpc test working

ethcore/src/tests/rpc.rs

@@ -18,26 +18,25 @@
 
 use nanoipc;
 use std::sync::Arc;
-use std::io::Write;
 use std::sync::atomic::{Ordering, AtomicBool};
-use client::{BlockChainClient, MiningBlockChainClient, Client, ClientConfig, BlockID, RemoteClient};
-use block::IsBlock;
+use client::{Client, ClientConfig, RemoteClient};
 use tests::helpers::*;
-use common::*;
 use devtools::*;
 use miner::Miner;
 use crossbeam;
+use common::IoChannel;
 
 pub fn run_test_worker(scope: &crossbeam::Scope, stop: Arc<AtomicBool>, socket_path: &str) {
 	let socket_path = socket_path.to_owned();
 	scope.spawn(move || {
+		let temp = RandomTempPath::create_dir();
 		let client = Client::new(
 			ClientConfig::default(),
 			get_test_spec(),
-			dir.as_path(),
+			temp.as_path(),
 			Arc::new(Miner::with_spec(get_test_spec())),
 			IoChannel::disconnected()).unwrap();
-		let mut worker = nanoipc::Worker::new(&Arc::new(client));
+		let mut worker = nanoipc::Worker::new(&client);
 		worker.add_reqrep(&socket_path).unwrap();
 		while !stop.load(Ordering::Relaxed) {
 			worker.poll();
@@ -46,15 +45,13 @@ pub fn run_test_worker(scope: &crossbeam::Scope, stop: Arc<AtomicBool>, socket_p
 }
 
 #[test]
-fn can_be_created() {
+fn can_handshake() {
 	crossbeam::scope(|scope| {
 		let stop_guard = StopGuard::new();
 		let socket_path = "ipc:///tmp/parity-client-rpc-10.ipc";
 		run_test_worker(scope, stop_guard.share(), socket_path);
 		let remote_client = nanoipc::init_client::<RemoteClient<_>>(socket_path).unwrap();
 
-    	let non_existant = remote_client.block_header(BlockID::Number(188));
-
-		assert!(non_existant.is_none());
+		assert!(remote_client.handshake().is_ok());
 	})
 }