From ff17174cf1e04f9ee3e6717d79f539dc34aa2468 Mon Sep 17 00:00:00 2001 From: Robert Habermeier Date: Thu, 8 Sep 2016 12:31:12 +0200 Subject: [PATCH] also test abort_restore --- ethcore/src/snapshot/service.rs | 8 +------- ethcore/src/snapshot/tests/service.rs | 12 +++++++----- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/ethcore/src/snapshot/service.rs b/ethcore/src/snapshot/service.rs index d7f42919b..acde28de3 100644 --- a/ethcore/src/snapshot/service.rs +++ b/ethcore/src/snapshot/service.rs @@ -296,7 +296,7 @@ impl Service { fn replace_client_db(&self) -> Result<(), Error> { let our_db = self.restoration_db(); - try!(self.db_restore.restore_db(our_db.to_string_lossy())); + try!(self.db_restore.restore_db(&*our_db.to_string_lossy())); Ok(()) } @@ -517,12 +517,6 @@ impl SnapshotService for Service { fn abort_restore(&self) { *self.restoration.lock() = None; *self.status.lock() = RestorationStatus::Inactive; - if let Err(e) = fs::remove_dir_all(&self.restoration_dir()) { - match e.kind() { - ErrorKind::NotFound => {}, - _ => warn!("encountered error {} while deleting snapshot restoration dir.", e), - } - } } fn restore_state_chunk(&self, hash: H256, chunk: Bytes) { diff --git a/ethcore/src/snapshot/tests/service.rs b/ethcore/src/snapshot/tests/service.rs index 268f7b842..002b465b1 100644 --- a/ethcore/src/snapshot/tests/service.rs +++ b/ethcore/src/snapshot/tests/service.rs @@ -129,13 +129,15 @@ fn guards_delete_folders() { state_root: Default::default(), }; - service.init_restore(manifest).unwrap(); + service.init_restore(manifest.clone()).unwrap(); + assert!(path.exists()); + service.abort_restore(); + assert!(!path.exists()); + + service.init_restore(manifest.clone()).unwrap(); assert!(path.exists()); drop(service); - assert!(!path.exists()); -} - -#[test] +} \ No newline at end of file