Replace tempdir dependency with tempfile (#883)

* Replace tempdir with tempfile Signed-off-by: Thane Thomson <[email protected]> * Update CHANGELOG Signed-off-by: Thane Thomson <[email protected]> * Replace deprecated tempdir with tempfile in proto-compiler Signed-off-by: Thane Thomson <[email protected]> * Add .changelog entry Signed-off-by: Thane Thomson <[email protected]>
informalsystems · Jun 5, 2021 · 5475e95 · 5475e95
1 parent b032801
commit 5475e95
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 9 deletions.
diff --git a/.changelog/unreleased/improvements/851-tempdir.md b/.changelog/unreleased/improvements/851-tempdir.md
@@ -0,0 +1,4 @@
+* `[tendermint-light-client]` Replaced `tempdir` dev dependency (deprecated)
+  with `tempfile`
+  ([#851](https://github.com/informalsystems/tendermint-rs/issues/851))
+
diff --git a/light-client/Cargo.toml b/light-client/Cargo.toml
@@ -58,5 +58,5 @@ tendermint-testgen = { path = "../testgen" }
 serde_json = "1.0.51"
 gumdrop = "0.8.0"
 rand = "0.7.3"
-tempdir = "0.3.7"
+tempfile = "3.2.0"
 proptest = "0.10.1"
diff --git a/light-client/src/store/sled.rs b/light-client/src/store/sled.rs
@@ -96,7 +96,7 @@ impl LightStore for SledStore {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use tempdir::TempDir;
+    use tempfile::tempdir;
     use tendermint_testgen::{light_block::TmLightBlock as TGLightBlock, Generator, LightChain};
 
     #[test]
@@ -124,7 +124,7 @@ mod tests {
     }
 
     fn with_blocks(height: u64, f: impl FnOnce(SledStore, Vec<LightBlock>)) {
-        let tmp_dir = TempDir::new("tendermint_light_client_sled_test").unwrap();
+        let tmp_dir = tempdir().unwrap();
         let db = SledStore::open(tmp_dir).unwrap();
 
         let chain = LightChain::default_with_length(height);

diff --git a/light-client/src/store/sled/utils.rs b/light-client/src/store/sled/utils.rs
@@ -102,11 +102,11 @@ where
 #[cfg(test)]
 mod tests {
     use super::*;
-    use tempdir::TempDir;
+    use tempfile::tempdir;
 
     #[test]
     fn iter_next_returns_lowest_height() {
-        let tmp_dir = TempDir::new("tendermint_light_client_sled_utils_test").unwrap();
+        let tmp_dir = tempdir().unwrap();
         let db = sled::open(tmp_dir).unwrap();
         let kv = HeightIndexedDb::new(db.open_tree("light_store/verified").unwrap());
 
@@ -126,7 +126,7 @@ mod tests {
 
     #[test]
     fn iter_next_back_returns_highest_height() {
-        let tmp_dir = TempDir::new("tendermint_light_client_sled_utils_test").unwrap();
+        let tmp_dir = tempdir().unwrap();
         let db = sled::open(tmp_dir).unwrap();
         let kv = HeightIndexedDb::new(db.open_tree("light_store/verified").unwrap());
 

diff --git a/tools/proto-compiler/Cargo.toml b/tools/proto-compiler/Cargo.toml
@@ -9,5 +9,5 @@ publish = false
 walkdir         = { version = "2.3" }
 prost-build     = { version = "0.7" }
 git2            = { version = "0.13" }
-tempdir         = { version = "0.3" }
+tempfile        = { version = "3.2.0" }
 subtle-encoding = { version = "0.5" }
diff --git a/tools/proto-compiler/src/main.rs b/tools/proto-compiler/src/main.rs
@@ -1,6 +1,6 @@
 use std::env::var;
 use std::path::PathBuf;
-use tempdir::TempDir;
+use tempfile::tempdir;
 
 mod functions;
 use functions::{copy_files, find_proto_files, generate_tendermint_lib, get_commitish};
@@ -26,7 +26,7 @@ fn main() {
         .join("prost");
     let out_dir = var("OUT_DIR")
         .map(PathBuf::from)
-        .or_else(|_| TempDir::new("tendermint_proto_out").map(|d| d.into_path()))
+        .or_else(|_| tempdir().map(|d| d.into_path()))
         .unwrap();
     let tendermint_dir = PathBuf::from(var("TENDERMINT_DIR").unwrap_or_else(|_| {
         root.join("..")