Check queue to determine major importing (#2763)

* simplify major sync detection

* fix typos

* fix merge

* more realistic EthTester

* add new synced state

* remove Blocks synced state

* move is_major_importing to rpc crate and check queue

* add tests

ethcore/src/client/client.rs

@@ -46,7 +46,7 @@ use transaction::{LocalizedTransaction, SignedTransaction, Action};
 use blockchain::extras::TransactionAddress;
 use types::filter::Filter;
 use log_entry::LocalizedLogEntry;
-use verification::queue::{BlockQueue, QueueInfo as BlockQueueInfo};
+use verification::queue::BlockQueue;
 use blockchain::{BlockChain, BlockProvider, TreeRoute, ImportRoute};
 use client::{
 	BlockID, TransactionID, UncleID, TraceId, ClientConfig, BlockChainClient,
@@ -71,6 +71,7 @@ use state_db::StateDB;
 pub use types::blockchain_info::BlockChainInfo;
 pub use types::block_status::BlockStatus;
 pub use blockchain::CacheSize as BlockChainCacheSize;
+pub use verification::queue::QueueInfo as BlockQueueInfo;
 
 const MAX_TX_QUEUE_SIZE: usize = 4096;
 const MAX_QUEUE_SIZE_TO_SLEEP_ON: usize = 2;

ethcore/src/snapshot/watcher.rs

@@ -30,7 +30,7 @@ use std::sync::Arc;
 trait Oracle: Send + Sync {
 	fn to_number(&self, hash: H256) -> Option<u64>;
 
-	fn is_major_syncing(&self) -> bool;
+	fn is_major_importing(&self) -> bool;
 }
 
 struct StandardOracle<F> where F: 'static + Send + Sync + Fn() -> bool {
@@ -45,7 +45,7 @@ impl<F> Oracle for StandardOracle<F>
 		self.client.block_header(BlockID::Hash(hash)).map(|h| HeaderView::new(&h).number())
 	}
 
-	fn is_major_syncing(&self) -> bool {
+	fn is_major_importing(&self) -> bool {
 		(self.sync_status)()
 	}
 }
@@ -108,7 +108,7 @@ impl ChainNotify for Watcher {
 		_: Vec<H256>,
 		_duration: u64)
 	{
-		if self.oracle.is_major_syncing() { return }
+		if self.oracle.is_major_importing() { return }
 
 		trace!(target: "snapshot_watcher", "{} imported", imported.len());
 
@@ -143,7 +143,7 @@ mod tests {
 			self.0.get(&hash).cloned()
 		}
 
-		fn is_major_syncing(&self) -> bool { false }
+		fn is_major_importing(&self) -> bool { false }
 	}
 
 	struct TestBroadcast(Option<u64>);