add debug info

starcoinorg · Dec 9, 2024 · 990a1fc · 990a1fc
1 parent 4e76c52
commit 990a1fc
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 9 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/contrib-contracts/src/merkle_distributor_test.rs b/contrib-contracts/src/merkle_distributor_test.rs
@@ -10,7 +10,8 @@ use starcoin_vm_types::token::stc::stc_type_tag;
 use starcoin_vm_types::transaction::{EntryFunction, Package, TransactionPayload};
 use starcoin_vm_types::value::MoveValue;
 use test_helper::executor::{
-    association_execute, association_execute_should_success, compile_modules_with_address, compile_modules_with_address_internal, move_abort_code, prepare_genesis
+    association_execute, association_execute_should_success, compile_modules_with_address,
+    compile_modules_with_address_internal, move_abort_code, prepare_genesis,
 };
 
 #[derive(Serialize, Deserialize, Clone, Debug)]
@@ -43,7 +44,8 @@ fn test_merkle_distributor() -> Result<()> {
 
         println!("YSG source_files: {:?}", source_files);
 
-        let modules = compile_modules_with_address_internal(association_address(), source, &source_files);
+        let modules =
+            compile_modules_with_address_internal(association_address(), source, &source_files);
 
         let package = Package::new(modules, None)?;
         association_execute_should_success(

diff --git a/test-helper/src/executor.rs b/test-helper/src/executor.rs
@@ -109,10 +109,13 @@ pub fn get_balance<S: ChainStateReader>(address: AccountAddress, chain_state: &S
         .expect("read balance resource should ok")
 }
 
-pub fn compile_modules_with_address_internal(address: AccountAddress, code: &str, libs: &Vec<String>)-> Vec<Module> {
+pub fn compile_modules_with_address_internal(
+    address: AccountAddress,
+    code: &str,
+    libs: &Vec<String>,
+) -> Vec<Module> {
     let (_, compiled_result) =
-        starcoin_move_compiler::compile_source_string(code, libs, address)
-            .expect("compile fail");
+        starcoin_move_compiler::compile_source_string(code, libs, address).expect("compile fail");
 
     compiled_result
         .into_iter()
@@ -121,7 +124,7 @@ pub fn compile_modules_with_address_internal(address: AccountAddress, code: &str
 }
 
 pub fn compile_modules_with_address(address: AccountAddress, code: &str) -> Vec<Module> {
-    compile_modules_with_address_internal(address,code, &stdlib_files())
+    compile_modules_with_address_internal(address, code, &stdlib_files())
 }
 
 pub fn compile_script(code: impl AsRef<str>) -> Result<Vec<u8>> {

diff --git a/vm/compiler/src/lib.rs b/vm/compiler/src/lib.rs
@@ -16,6 +16,7 @@ use move_compiler::shared::known_attributes::KnownAttribute;
 use move_compiler::shared::{Flags, NumericalAddress};
 use once_cell::sync::Lazy;
 use regex::{Captures, Regex};
+use starcoin_logger::prelude::info;
 use starcoin_vm_types::account_address::AccountAddress;
 use starcoin_vm_types::compatibility::Compatibility;
 use starcoin_vm_types::file_format::CompiledModule;
@@ -25,7 +26,6 @@ use std::collections::{BTreeMap, HashMap};
 use std::fs::OpenOptions;
 use std::io::Read;
 use std::path::{Path, PathBuf};
-use starcoin_logger::prelude::info;
 
 pub mod bytecode_transpose;
 

diff --git a/vm/framework/move-stdlib/Cargo.toml b/vm/framework/move-stdlib/Cargo.toml
@@ -22,6 +22,7 @@ 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,16 +7,18 @@
 
 use include_dir::{include_dir, Dir};
 use once_cell::sync::Lazy;
+use starcoin_logger::prelude::*;
 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");
-    println!("restore move-stdlib sources in: {:?}", sources_dir);
+
     MOVE_STDLIB_SOURCES_DIR
         .extract(sources_dir.as_path())
         .expect("extract should success");
+    info!("restore move-stdlib sources in: {:?}", sources_dir);
     MOVE_STDLIB_SOURCES_DIR
         .files()
         .iter()
@@ -41,10 +43,10 @@ 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");
-    println!("restore starcoin-stdlib sources in: {:?}", sources_dir);
     STARCOIN_STDLIB_SOURCES_DIR
         .extract(sources_dir.as_path())
         .expect("extract should success");
+    info!("restore starcoin-stdlib sources in: {:?}", sources_dir);
     STARCOIN_STDLIB_SOURCES_DIR
         .files()
         .iter()