From 81bffd48e89be4d4d2745f69f00c006743fdd2ab Mon Sep 17 00:00:00 2001
From: Nikolay Volf <nikvolf@gmail.com>
Date: Tue, 26 Jan 2016 17:33:22 +0400
Subject: [PATCH] basic client tests working

---
 src/block.rs        |  2 +-
 src/block_queue.rs  |  2 +-
 src/tests/client.rs | 92 ++++++++++++++++++++++++++++++++++++++-------
 3 files changed, 80 insertions(+), 16 deletions(-)

diff --git a/src/block.rs b/src/block.rs
index 1ff326430..0e928e9b0 100644
--- a/src/block.rs
+++ b/src/block.rs
@@ -85,7 +85,7 @@ impl IsBlock for Block {
 ///
 /// It's a bit like a Vec<Transaction>, eccept that whenever a transaction is pushed, we execute it and
 /// maintain the system `state()`. We also archive execution receipts in preparation for later block creation.
-pub struct OpenBlock<'x, 'y> {
+	pub struct OpenBlock<'x, 'y> {
 	block: Block,
 	engine: &'x Engine,
 	last_hashes: &'y LastHashes,
diff --git a/src/block_queue.rs b/src/block_queue.rs
index fa091d0c4..c45a86a8b 100644
--- a/src/block_queue.rs
+++ b/src/block_queue.rs
@@ -191,7 +191,7 @@ impl BlockQueue {
 	/// Wait for queue to be empty
 	pub fn flush(&mut self) {
 		let mut verification = self.verification.lock().unwrap();
-		while !verification.unverified.is_empty() && !verification.verifying.is_empty() {
+		while !verification.unverified.is_empty() || !verification.verifying.is_empty() {
 			verification = self.empty.wait(verification).unwrap();
 		}
 	}
diff --git a/src/tests/client.rs b/src/tests/client.rs
index c0f202edd..c14f2e2f0 100644
--- a/src/tests/client.rs
+++ b/src/tests/client.rs
@@ -1,21 +1,85 @@
-use ethereum;
-use client::{BlockChainClient,Client};
+	use client::{BlockChainClient,Client};
 use std::env;
-use pod_state::*;
 use super::test_common::*;
+use std::path::PathBuf;
+use spec::*;
+
+#[cfg(test)]
+fn get_random_temp_dir() -> PathBuf {
+	let mut dir = env::temp_dir();
+	dir.push(H32::random().hex());
+	dir
+}
+
+#[cfg(test)]
+fn get_test_spec() -> Spec {
+	Spec::new_test()
+}
+
+#[cfg(test)]
+fn get_good_dummy_block() -> Bytes {
+	let mut block_header = Header::new();
+	let test_spec = get_test_spec();
+	let test_engine = test_spec.to_engine().unwrap();
+	block_header.gas_limit = decode(test_engine.spec().engine_params.get("minGasLimit").unwrap());
+	block_header.difficulty = decode(test_engine.spec().engine_params.get("minimumDifficulty").unwrap());
+	block_header.timestamp = 40;
+	block_header.number = 1;
+	block_header.parent_hash = test_engine.spec().genesis_header().hash();
+	block_header.state_root = test_engine.spec().genesis_header().state_root;
+
+	create_test_block(&block_header)
+}
+
+#[cfg(test)]
+fn create_test_block(header: &Header) -> Bytes {
+	let mut rlp = RlpStream::new_list(3);
+	rlp.append(header);
+	rlp.append_raw(&rlp::EMPTY_LIST_RLP, 1);
+	rlp.append_raw(&rlp::EMPTY_LIST_RLP, 1);
+	rlp.out()
+}
 
 
 #[test]
-fn test_client_is_created() {
-
-	let mut spec = ethereum::new_frontier_like_test();
-	spec.set_genesis_state(PodState::from_json(test.find("pre").unwrap()));
-	spec.overwrite_genesis(test.find("genesisBlockHeader").unwrap());
-
-	let mut dir = env::temp_dir();
-	dir.push(H32::random().hex());
-
-	let client_result = Client::new(spec, &dir, IOChannel::disconnected());
-
+fn created() {
+	let client_result = Client::new(get_test_spec(), &get_random_temp_dir(), IoChannel::disconnected());
 	assert!(client_result.is_ok());
+}
+
+#[test]
+fn imports_from_empty() {
+	let client = Client::new(get_test_spec(), &get_random_temp_dir(), IoChannel::disconnected()).unwrap();
+	client.import_verified_blocks(&IoChannel::disconnected());
+	client.flush_queue();
+}
+
+#[test]
+fn imports_good_block() {
+
+	::env_logger::init().ok();
+
+	let client = Client::new(get_test_spec(), &get_random_temp_dir(), IoChannel::disconnected()).unwrap();
+
+	let good_block = get_good_dummy_block();
+	if let Err(_) = client.import_block(good_block) {
+		panic!("error importing block being good by definition");
+	}
+
+	client.flush_queue();
+
+	client.import_verified_blocks(&IoChannel::disconnected());
+
+	let block = client.block_header_at(1).unwrap();
+
+	assert!(!block.is_empty());
+}
+
+#[test]
+fn query_none_block() {
+	let client = Client::new(get_test_spec(), &get_random_temp_dir(), IoChannel::disconnected()).unwrap();
+
+    let non_existant = client.block_header_at(188);
+
+	assert!(non_existant == Option::None);
 }
\ No newline at end of file