diff --git a/ethcore/src/client/client.rs b/ethcore/src/client/client.rs index e8707d6eb..573fd1f93 100644 --- a/ethcore/src/client/client.rs +++ b/ethcore/src/client/client.rs @@ -1391,7 +1391,7 @@ impl ImportBlock for Client { bail!(BlockImportErrorKind::Import(ImportErrorKind::AlreadyInChain)); } let status = self.block_status(BlockId::Hash(unverified.parent_hash())); - if status == BlockStatus::Unknown || status == BlockStatus::Pending { + if status == BlockStatus::Unknown { bail!(BlockImportErrorKind::Block(BlockError::UnknownParent(unverified.parent_hash()))); } @@ -2082,7 +2082,7 @@ impl IoClient for Client { let is_parent_pending = self.queued_ancient_blocks.read().0.contains(&parent_hash); if !is_parent_pending { let status = self.block_status(BlockId::Hash(parent_hash)); - if status == BlockStatus::Unknown || status == BlockStatus::Pending { + if status == BlockStatus::Unknown { bail!(BlockImportErrorKind::Block(BlockError::UnknownParent(parent_hash))); } } diff --git a/ethcore/sync/src/block_sync.rs b/ethcore/sync/src/block_sync.rs index 5dd1bdac2..55b23cba4 100644 --- a/ethcore/sync/src/block_sync.rs +++ b/ethcore/sync/src/block_sync.rs @@ -266,7 +266,7 @@ impl BlockDownloader { BlockStatus::Bad => { return Err(BlockDownloaderImportError::Invalid); }, - BlockStatus::Unknown | BlockStatus::Pending => { + BlockStatus::Unknown => { headers.push(info); hashes.push(hash); } diff --git a/ethcore/sync/src/chain/handler.rs b/ethcore/sync/src/chain/handler.rs index c30c60a7c..15f234fbb 100644 --- a/ethcore/sync/src/chain/handler.rs +++ b/ethcore/sync/src/chain/handler.rs @@ -261,7 +261,7 @@ impl SyncHandler { BlockStatus::Queued => { trace!(target: "sync", "New hash block already queued {:?}", hash); }, - BlockStatus::Unknown | BlockStatus::Pending => { + BlockStatus::Unknown => { new_hashes.push(hash.clone()); if number > max_height { trace!(target: "sync", "New unknown block hash {:?}", hash); diff --git a/ethcore/types/src/block_status.rs b/ethcore/types/src/block_status.rs index 5455f1d40..460fdc297 100644 --- a/ethcore/types/src/block_status.rs +++ b/ethcore/types/src/block_status.rs @@ -23,8 +23,6 @@ pub enum BlockStatus { Queued, /// Known as bad. Bad, - /// Pending block. - Pending, /// Unknown. Unknown, }