From 037d63a8afc3f0ef6ad6c34f9ab61c3a407b86c8 Mon Sep 17 00:00:00 2001 From: Marek Kotewicz Date: Fri, 20 Oct 2017 12:11:34 +0200 Subject: [PATCH] util crates use tempdir crate instead of devtools to create temp path (#6807) * use tempdir instead of devtools in kvdb-rocksdb * use tempdir instead of devtools in migration * use tempdir instead of devtools in ethcore-network * fixed wrong merge --- Cargo.toml | 8 +++++--- src/lib.rs | 27 ++++++++++++++------------- 2 files changed, 19 insertions(+), 16 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 0f1809d..e055c85 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -4,12 +4,14 @@ version = "0.1.0" authors = ["Parity Technologies "] [dependencies] -log = "0.3" elastic-array = "0.9" ethcore-bigint = { path = "../bigint" } -ethcore-devtools = { path = "../../devtools" } +kvdb = { path = "../kvdb" } +log = "0.3" parking_lot = "0.4" regex = "0.2" rlp = { path = "../rlp" } rocksdb = { git = "https://github.com/paritytech/rust-rocksdb" } -kvdb = { path = "../kvdb" } + +[dev-dependencies] +tempdir = "0.3" diff --git a/src/lib.rs b/src/lib.rs index 45461a6..d08c8ec 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -23,7 +23,6 @@ extern crate regex; extern crate rocksdb; extern crate ethcore_bigint as bigint; -extern crate ethcore_devtools as devtools; extern crate kvdb; extern crate rlp; @@ -679,14 +678,16 @@ impl Drop for Database { #[cfg(test)] mod tests { + extern crate tempdir; + + use std::str::FromStr; + use self::tempdir::TempDir; use bigint::hash::H256; use super::*; - use devtools::*; - use std::str::FromStr; fn test_db(config: &DatabaseConfig) { - let path = RandomTempPath::create_dir(); - let db = Database::open(config, path.as_path().to_str().unwrap()).unwrap(); + let tempdir = TempDir::new("").unwrap(); + let db = Database::open(config, tempdir.path().to_str().unwrap()).unwrap(); let key1 = H256::from_str("02c69be41d0b7e40352fc85be1cd65eb03d40ef8427a0ca4596b1ead9a00e9fc").unwrap(); let key2 = H256::from_str("03c69be41d0b7e40352fc85be1cd65eb03d40ef8427a0ca4596b1ead9a00e9fc").unwrap(); let key3 = H256::from_str("01c69be41d0b7e40352fc85be1cd65eb03d40ef8427a0ca4596b1ead9a00e9fc").unwrap(); @@ -739,8 +740,8 @@ mod tests { #[test] fn kvdb() { - let path = RandomTempPath::create_dir(); - let _ = Database::open_default(path.as_path().to_str().unwrap()).unwrap(); + let tempdir = TempDir::new("").unwrap(); + let _ = Database::open_default(tempdir.path().to_str().unwrap()).unwrap(); test_db(&DatabaseConfig::default()); } @@ -759,11 +760,11 @@ mod tests { let config = DatabaseConfig::default(); let config_5 = DatabaseConfig::with_columns(Some(5)); - let path = RandomTempPath::create_dir(); + let tempdir = TempDir::new("").unwrap(); // open empty, add 5. { - let db = Database::open(&config, path.as_path().to_str().unwrap()).unwrap(); + let db = Database::open(&config, tempdir.path().to_str().unwrap()).unwrap(); assert_eq!(db.num_columns(), 0); for i in 0..5 { @@ -774,7 +775,7 @@ mod tests { // reopen as 5. { - let db = Database::open(&config_5, path.as_path().to_str().unwrap()).unwrap(); + let db = Database::open(&config_5, tempdir.path().to_str().unwrap()).unwrap(); assert_eq!(db.num_columns(), 5); } } @@ -784,11 +785,11 @@ mod tests { let config = DatabaseConfig::default(); let config_5 = DatabaseConfig::with_columns(Some(5)); - let path = RandomTempPath::create_dir(); + let tempdir = TempDir::new("").unwrap(); // open 5, remove all. { - let db = Database::open(&config_5, path.as_path().to_str().unwrap()).unwrap(); + let db = Database::open(&config_5, tempdir.path().to_str().unwrap()).unwrap(); assert_eq!(db.num_columns(), 5); for i in (0..5).rev() { @@ -799,7 +800,7 @@ mod tests { // reopen as 0. { - let db = Database::open(&config, path.as_path().to_str().unwrap()).unwrap(); + let db = Database::open(&config, tempdir.path().to_str().unwrap()).unwrap(); assert_eq!(db.num_columns(), 0); } }