remove snapshot_restoration

ethcore/light/src/client/snapshot/service.rs

@@ -62,7 +62,7 @@ impl ChainRestorationParams for LightClientRestorationParams {
 		let db = restoration_db_handler.open(&rest_db)?;
 		let chain = HeaderChain::new(db.clone(), self.col, &self.spec, self.cache.clone(), self.allow_hs)?;
 		let boxed = Box::new(LightChain::new(chain));
-		let restoration = engine.snapshot_restoration()
+		let restoration = engine.snapshot_components()
 			.ok_or_else(|| SnapshotError::SnapshotsUnsupported)?;
 
 		let rebuilder = restoration.rebuilder(boxed, db.clone(), &manifest)?;

ethcore/src/engines/authority_round/mod.rs

@@ -1353,14 +1353,6 @@ impl Engine<EthereumMachine> for AuthorityRound {
 	fn fork_choice(&self, new: &ExtendedHeader, current: &ExtendedHeader) -> super::ForkChoice {
 		super::total_difficulty_fork_choice(new, current)
 	}
-
-	fn snapshot_restoration(&self) -> Option<Box<::snapshot::RebuilderFactory>> {
-		if self.immediate_transitions {
-			None
-		} else {
-			Some(Box::new(::snapshot::PoaSnapshot))
-		}
-	}
 }
 
 #[cfg(test)]

ethcore/src/engines/mod.rs

@@ -47,7 +47,7 @@ use builtin::Builtin;
 use vm::{EnvInfo, Schedule, CreateContractAddress};
 use error::Error;
 use header::{Header, BlockNumber};
-use snapshot::{SnapshotComponents, RebuilderFactory};
+use snapshot::SnapshotComponents;
 use spec::CommonParams;
 use transaction::{self, UnverifiedTransaction, SignedTransaction};
 
@@ -342,15 +342,9 @@ pub trait Engine<M: Machine>: Sync + Send {
 		None
 	}
 
-	/// Create a factory for restoring from snapshot chunks.
-	/// Returning `None` indicates that this engine doesn't support restoring from a snapshot.
-	fn snapshot_restoration(&self) -> Option<Box<RebuilderFactory>> {
-		None
-	}
-
 	/// Whether this engine supports warp sync.
 	fn supports_warp(&self) -> bool {
-		self.snapshot_restoration().is_some()
+		self.snapshot_components().is_some()
 	}
 
 	/// Return a new open block header timestamp based on the parent timestamp.

ethcore/src/engines/null_engine.rs

@@ -105,10 +105,6 @@ impl<M: WithBalances + WithRewards> Engine<M> for NullEngine<M>
 		Some(Box::new(::snapshot::PowSnapshot::new(10000, 10000)))
 	}
 
-	fn snapshot_restoration(&self) -> Option<Box<::snapshot::RebuilderFactory>> {
-		Some(Box::new(::snapshot::PowSnapshot::new(10000, 10000)))
-	}
-
 	fn fork_choice(&self, new: &M::ExtendedHeader, current: &M::ExtendedHeader) -> super::ForkChoice {
 		super::total_difficulty_fork_choice(new, current)
 	}

ethcore/src/engines/tendermint/mod.rs

@@ -693,10 +693,6 @@ impl Engine<EthereumMachine> for Tendermint {
 		Some(Box::new(::snapshot::PoaSnapshot))
 	}
 
-	fn snapshot_restoration(&self) -> Option<Box<::snapshot::RebuilderFactory>> {
-		Some(Box::new(::snapshot::PoaSnapshot))
-	}
-
 	fn stop(&self) {
 		self.step_service.stop()
 	}

ethcore/src/ethereum/ethash.rs

@@ -357,10 +357,6 @@ impl Engine<EthereumMachine> for Arc<Ethash> {
 		Some(Box::new(::snapshot::PowSnapshot::new(SNAPSHOT_BLOCKS, MAX_SNAPSHOT_BLOCKS)))
 	}
 
-	fn snapshot_restoration(&self) -> Option<Box<::snapshot::RebuilderFactory>> {
-		Some(Box::new(::snapshot::PowSnapshot::new(SNAPSHOT_BLOCKS, MAX_SNAPSHOT_BLOCKS)))
-	}
-
 	fn fork_choice(&self, new: &ExtendedHeader, current: &ExtendedHeader) -> engines::ForkChoice {
 		engines::total_difficulty_fork_choice(new, current)
 	}