From f3aed42dd6575c6431f9c5112430e4fc155934c1 Mon Sep 17 00:00:00 2001
From: Nicolas Gotchac <ngotchac@gmail.com>
Date: Mon, 10 Sep 2018 15:26:52 +0200
Subject: [PATCH] Don't error when Snapshot is aborted (#9492)

* Don't error when Snapshot is aborted

* PR Grumble

* PR grumble
---
 ethcore/src/snapshot/service.rs | 38 ++++++++++++++-------------------
 1 file changed, 16 insertions(+), 22 deletions(-)

diff --git a/ethcore/src/snapshot/service.rs b/ethcore/src/snapshot/service.rs
index 2e76153cf..97fc516b8 100644
--- a/ethcore/src/snapshot/service.rs
+++ b/ethcore/src/snapshot/service.rs
@@ -29,7 +29,8 @@ use super::io::{SnapshotReader, LooseReader, SnapshotWriter, LooseWriter};
 use blockchain::{BlockChain, BlockChainDB, BlockChainDBHandler};
 use client::{Client, ChainInfo, ClientIoMessage};
 use engines::EthEngine;
-use error::Error;
+use error::{Error, ErrorKind as SnapshotErrorKind};
+use snapshot::{Error as SnapshotError};
 use hash::keccak;
 use ids::BlockId;
 
@@ -583,11 +584,20 @@ impl Service {
 		Ok(())
 	}
 
-	/// Feed a chunk of either kind. no-op if no restoration or status is wrong.
-	fn feed_chunk(&self, hash: H256, chunk: &[u8], is_state: bool) -> Result<(), Error> {
+	/// Feed a chunk of either kind (block or state). no-op if no restoration or status is wrong.
+	fn feed_chunk(&self, hash: H256, chunk: &[u8], is_state: bool) {
 		// TODO: be able to process block chunks and state chunks at same time?
 		let mut restoration = self.restoration.lock();
-		self.feed_chunk_with_restoration(&mut restoration, hash, chunk, is_state)
+		match self.feed_chunk_with_restoration(&mut restoration, hash, chunk, is_state) {
+			Ok(()) |
+			Err(Error(SnapshotErrorKind::Snapshot(SnapshotError::RestorationAborted), _)) => (),
+			Err(e) => {
+				warn!("Encountered error during snapshot restoration: {}", e);
+				*self.restoration.lock() = None;
+				*self.status.lock() = RestorationStatus::Failed;
+				let _ = fs::remove_dir_all(self.restoration_dir());
+			}
+		}
 	}
 
 	/// Feed a chunk with the Restoration
@@ -641,28 +651,12 @@ impl Service {
 
 	/// Feed a state chunk to be processed synchronously.
 	pub fn feed_state_chunk(&self, hash: H256, chunk: &[u8]) {
-		match self.feed_chunk(hash, chunk, true) {
-			Ok(()) => (),
-			Err(e) => {
-				warn!("Encountered error during state restoration: {}", e);
-				*self.restoration.lock() = None;
-				*self.status.lock() = RestorationStatus::Failed;
-				let _ = fs::remove_dir_all(self.restoration_dir());
-			}
-		}
+		self.feed_chunk(hash, chunk, true);
 	}
 
 	/// Feed a block chunk to be processed synchronously.
 	pub fn feed_block_chunk(&self, hash: H256, chunk: &[u8]) {
-		match self.feed_chunk(hash, chunk, false) {
-			Ok(()) => (),
-			Err(e) => {
-				warn!("Encountered error during block restoration: {}", e);
-				*self.restoration.lock() = None;
-				*self.status.lock() = RestorationStatus::Failed;
-				let _ = fs::remove_dir_all(self.restoration_dir());
-			}
-		}
+		self.feed_chunk(hash, chunk, false);
 	}
 }