update force-deploy pkg path

starcoinorg · Apr 14, 2024 · c5ac4ee · c5ac4ee
1 parent 6b57cc2
commit c5ac4ee
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/chain/force-upgrade/Cargo.toml b/chain/force-upgrade/Cargo.toml
@@ -27,6 +27,7 @@ starcoin-types = { workspace = true }
 starcoin-vm-types = { workspace = true }
 starcoin-vm-runtime = { workspace = true }
 starcoin-move-compiler = { workspace = true }
+stdlib = { workspace = true }
 include_dir = { workspace = true }
 
 [dev-dependencies]

diff --git a/chain/force-upgrade/src/lib.rs b/chain/force-upgrade/src/lib.rs
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: Apache-2
 
 use anyhow::format_err;
-use include_dir::{include_dir, Dir};
 use starcoin_types::account::DEFAULT_EXPIRATION_TIME;
 use starcoin_types::identifier::Identifier;
 use starcoin_types::language_storage::ModuleId;
@@ -17,8 +16,7 @@ use starcoin_vm_types::{
     genesis_config::ChainId,
     transaction::{Package, RawUserTransaction, TransactionPayload},
 };
-
-pub const FORCE_UPGRADE_PACKAGE: Dir = include_dir!("../../vm/stdlib/compiled/12/11-12");
+use stdlib::COMPILED_MOVE_CODE_DIR;
 
 pub struct ForceUpgrade;
 
@@ -31,8 +29,8 @@ impl ForceUpgrade {
         block_timestamp: u64,
         chain_id: &ChainId,
     ) -> anyhow::Result<SignedUserTransaction> {
-        let package_file = "stdlib.blob".to_string();
-        let package = FORCE_UPGRADE_PACKAGE
+        let package_file = "12/11-12/stdlib.blob".to_string();
+        let package = COMPILED_MOVE_CODE_DIR
             .get_file(package_file.clone())
             .map(|file| {
                 bcs_ext::from_bytes::<Package>(file.contents())