rpc: fix detection of major importing state

Author: andresilva

parity/informant.rs

@@ -35,7 +35,7 @@ use io::{TimerToken, IoContext, IoHandler};
 use light::Cache as LightDataCache;
 use light::client::{LightChainClient, LightChainNotify};
 use number_prefix::{binary_prefix, Standalone, Prefixed};
-use parity_rpc::is_major_importing_or_waiting;
+use parity_rpc::is_major_importing;
 use parity_rpc::informant::RpcStats;
 use ethereum_types::H256;
 use bytes::Bytes;
@@ -128,7 +128,7 @@ impl InformantData for FullNodeInformantData {
 
 	fn is_major_importing(&self) -> bool {
 		let state = self.sync.as_ref().map(|sync| sync.status().state);
-		is_major_importing_or_waiting(state, self.client.queue_info(), false)
+		is_major_importing(state, self.client.queue_info())
 	}
 
 	fn report(&self) -> Report {

rpc/src/lib.rs

@@ -118,7 +118,7 @@ pub use http::{
 };
 
 pub use v1::{NetworkSettings, Metadata, Origin, informant, dispatch, signer};
-pub use v1::block_import::{is_major_importing, is_major_importing_or_waiting};
+pub use v1::block_import::is_major_importing;
 pub use v1::extractors::{RpcExtractor, WsExtractor, WsStats, WsDispatcher};
 pub use authcodes::{AuthCodes, TimeProvider};
 pub use http_common::HttpMetaExtractor;

rpc/src/v1/helpers/block_import.rs

@@ -19,23 +19,16 @@
 use ethcore::client::BlockQueueInfo;
 use sync::SyncState;
 
-/// Check if client is during major sync or during block import and allows defining whether 'waiting for peers' should
-/// be considered a syncing state.
-pub fn is_major_importing_or_waiting(sync_state: Option<SyncState>, queue_info: BlockQueueInfo, waiting_is_syncing_state: bool) -> bool {
+/// Check if client is during major sync or during block import.
+pub fn is_major_importing(sync_state: Option<SyncState>, queue_info: BlockQueueInfo) -> bool {
 	let is_syncing_state = sync_state.map_or(false, |s| match s {
 		SyncState::Idle | SyncState::NewBlocks => false,
-		SyncState::WaitingPeers if !waiting_is_syncing_state => false,
 		_ => true,
 	});
 	let is_verifying = queue_info.unverified_queue_size + queue_info.verified_queue_size > 3;
 	is_verifying || is_syncing_state
 }
 
-/// Check if client is during major sync or during block import.
-pub fn is_major_importing(sync_state: Option<SyncState>, queue_info: BlockQueueInfo) -> bool {
-	is_major_importing_or_waiting(sync_state, queue_info, true)
-}
-
 #[cfg(test)]
 mod tests {
 	use ethcore::client::BlockQueueInfo;