use relative path

starcoinorg · Dec 9, 2024 · ef40ab1 · ef40ab1
1 parent a9189f1
commit ef40ab1
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 29 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/vm/framework/move-stdlib/Cargo.toml b/vm/framework/move-stdlib/Cargo.toml
@@ -21,8 +21,6 @@ sha3 = "0.9.1"
 smallvec = "1.6.1"
 include_dir = { workspace = true }
 once_cell = { workspace = true }
-tempfile = { workspace = true }
-starcoin-logger = { workspace = true }
 
 [dev-dependencies]
 dir-diff = "0.3.2"

diff --git a/vm/framework/move-stdlib/src/lib.rs b/vm/framework/move-stdlib/src/lib.rs
@@ -7,39 +7,29 @@
 
 use include_dir::{include_dir, Dir};
 use once_cell::sync::Lazy;
-use starcoin_logger::prelude::*;
+use std::env;
 pub const MOVE_STDLIB_SOURCES_DIR: Dir = include_dir!("sources");
 
 pub static MOVE_STDLIB_SOURCE_FILES: Lazy<Vec<String>> = Lazy::new(|| {
-    let tempdir = tempfile::tempdir().expect("local dir should be created");
-    let sources_dir = tempdir.path().join("move-stdlib").join("sources");
-    std::fs::create_dir_all(sources_dir.as_path()).expect("create dir should success");
-
+    let current_dir = env::current_dir().expect("Failed to get current directory");
     MOVE_STDLIB_SOURCES_DIR
-        .extract(sources_dir.as_path())
-        .expect("extract should success");
-    info!("restore move-stdlib sources in: {:?}", sources_dir);
-    let files: Vec<String> = MOVE_STDLIB_SOURCES_DIR
         .files()
         .iter()
         .filter_map(|file| {
             let ext = file.path().extension();
             if let Some(ext) = ext {
                 if ext == "move" {
-                    Some(sources_dir.join(file.path()).display().to_string())
+                    Some(current_dir.join(file.path()).display().to_string())
                 } else {
                     None
                 }
             } else {
                 None
             }
         })
-        .collect();
-    files
-        .iter()
         .filter_map(|file| {
             if !file.ends_with("spec.move") {
-                Some(file.clone())
+                Some(file)
             } else {
                 None
             }
@@ -50,34 +40,25 @@ pub static MOVE_STDLIB_SOURCE_FILES: Lazy<Vec<String>> = Lazy::new(|| {
 pub const STARCOIN_STDLIB_SOURCES_DIR: Dir = include_dir!("../starcoin-stdlib/sources");
 
 pub static STARCOIN_STDLIB_SOURCE_FILES: Lazy<Vec<String>> = Lazy::new(|| {
-    let tempdir = tempfile::tempdir().expect("local dir should be created");
-    let sources_dir = tempdir.path().join("starcoin-stdlib").join("sources");
-    std::fs::create_dir_all(sources_dir.as_path()).expect("create dir should success");
+    let current_dir = env::current_dir().expect("Failed to get current directory");
     STARCOIN_STDLIB_SOURCES_DIR
-        .extract(sources_dir.as_path())
-        .expect("extract should success");
-    info!("restore starcoin-stdlib sources in: {:?}", sources_dir);
-    let files: Vec<String> = STARCOIN_STDLIB_SOURCES_DIR
         .files()
         .iter()
         .filter_map(|file| {
             let ext = file.path().extension();
             if let Some(ext) = ext {
                 if ext == "move" {
-                    Some(sources_dir.join(file.path()).display().to_string())
+                    Some(current_dir.join(file.path()).display().to_string())
                 } else {
                     None
                 }
             } else {
                 None
             }
         })
-        .collect();
-    files
-        .iter()
         .filter_map(|file| {
             if !file.ends_with("spec.move") {
-                Some(file.clone())
+                Some(file)
             } else {
                 None
             }