Skip to content

Commit

Permalink
tmp fix stdlib errors
Browse files Browse the repository at this point in the history
  • Loading branch information
nkysg committed Oct 9, 2024
1 parent 718de60 commit fea5f6d
Show file tree
Hide file tree
Showing 5 changed files with 25 additions and 9 deletions.
22 changes: 18 additions & 4 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -522,7 +522,7 @@ starcoin-crypto = { git = "https://github.com/starcoinorg/starcoin-crypto", rev
starcoin-decrypt = { path = "commons/decrypt" }
starcoin-dev = { path = "vm/dev" }
starcoin-executor = { path = "executor" }
#starcoin-framework = { git = "https://github.com/starcoinorg/starcoin-framework", rev = "94bcd77e80232b169cf95754ef4e87775645afcd" }
starcoin-framework-legacy = { git = "https://github.com/starcoinorg/starcoin-framework", rev = "94bcd77e80232b169cf95754ef4e87775645afcd" , package = "starcoin-framework" }
starcoin-framework = { path = "vm/framework" }
starcoin-sdk-builder = { path = "vm/starcoin-sdk-builder" }
starcoin-genesis = { path = "genesis" }
Expand Down
1 change: 1 addition & 0 deletions vm/stdlib/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ starcoin-move-compiler = { workspace = true }
starcoin-vm-types = { workspace = true }
tempfile = { workspace = true }
walkdir = { workspace = true }
starcoin-framework-legacy = { workspace = true }

[dev-dependencies]
datatest-stable = { workspace = true }
Expand Down
7 changes: 4 additions & 3 deletions vm/stdlib/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ use std::{

mod compat;
pub use compat::*;
pub use starcoin_framework::SourceFiles;
pub use starcoin_framework_legacy::SourceFiles;
pub use starcoin_move_compiler::utils::iterate_directory;

pub const NO_USE_COMPILED: &str = "MOVE_NO_USE_COMPILED";
Expand All @@ -58,7 +58,8 @@ pub const ERROR_DESC_EXTENSION: &str = "errmap";
pub const ERROR_DESCRIPTIONS: &[u8] =
std::include_bytes!("../compiled/latest/error_descriptions/error_descriptions.errmap");

pub const STDLIB_DIR: Dir = starcoin_framework::SOURCES_DIR;
// XXX FIXME YSG need to remove
pub const STDLIB_DIR: Dir = starcoin_framework_legacy::SOURCES_DIR;

// The current stdlib that is freshly built. This will never be used in deployment so we don't need
// to pull the same trick here in order to include this in the Rust binary.
Expand Down Expand Up @@ -104,7 +105,7 @@ pub static G_COMPILED_STDLIB: Lazy<HashMap<StdlibVersion, Vec<Vec<u8>>>> = Lazy:

pub const SCRIPT_HASH_LENGTH: usize = HashValue::LENGTH;

pub use starcoin_framework::STARCOIN_FRAMEWORK_SOURCES;
pub use starcoin_framework_legacy::STARCOIN_FRAMEWORK_SOURCES;

/// Return all versions of stdlib, include latest.
pub fn stdlib_versions() -> Vec<StdlibVersion> {
Expand Down
2 changes: 1 addition & 1 deletion vm/stdlib/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ use itertools::Itertools;
use log::LevelFilter;
use simplelog::{Config, SimpleLogger};
use starcoin_crypto::hash::PlainCryptoHash;
use starcoin_framework::STARCOIN_FRAMEWORK_SOURCES;
use starcoin_framework_legacy::STARCOIN_FRAMEWORK_SOURCES;
use starcoin_move_compiler::check_compiled_module_compat;
use starcoin_vm_types::account_config::core_code_address;
use starcoin_vm_types::file_format::CompiledModule;
Expand Down

0 comments on commit fea5f6d

Please sign in to comment.