Add all change for backup

Author: welbon

vm/e2e-tests/src/on_chain_configs.rs

@@ -1,15 +1,15 @@
 // Copyright (c) Starcoin
 // SPDX-License-Identifier: Apache-2.0
 
+use crate::account::Account;
+use crate::executor::FakeExecutor;
 use move_core_types::transaction_argument::{convert_txn_args, TransactionArgument};
 use move_ir_compiler::Compiler;
 use starcoin_vm_runtime::starcoin_vm::StarcoinVM;
-use starcoin_vm_types::genesis_config::StdlibVersion::Latest;
-use crate::executor::FakeExecutor;
+use starcoin_vm_types::genesis_config::StdlibVersion;
 use starcoin_vm_types::on_chain_config::Version;
 use starcoin_vm_types::transaction::Script;
 use stdlib::{stdlib_compiled_modules, StdLibOptions};
-use crate::account::Account;
 
 pub fn set_starcoin_version(executor: &mut FakeExecutor, version: Version) {
     let account =
@@ -39,23 +39,26 @@ main(account: signer, language_version: u8) {
 }
 "#;
 
+        let modules = stdlib_compiled_modules(StdLibOptions::Compiled(StdlibVersion::Latest));
         let compiler = Compiler {
-            deps: stdlib_compiled_modules(StdLibOptions::Compiled(Latest))
-                .iter()
-                .collect(),
+            deps: modules.iter().collect(),
         };
         compiler.into_script_blob(code).expect("Failed to compile")
     };
     // let account = Account::new_starcoin_root();
     let txn = account
         .transaction()
-        .script(Script::new(script_body, vec![], convert_txn_args(&vec![TransactionArgument::U64(version.major)])))
+        .script(Script::new(
+            script_body,
+            vec![],
+            convert_txn_args(&vec![TransactionArgument::U64(version.major)]),
+        ))
         .sequence_number(0)
         .sign();
 
     executor.new_block();
     executor.execute_and_apply(txn);
 
     let new_vm = StarcoinVM::new(None);
-    assert_eq!(new_vm.internals().version().unwrap(), version);
+    assert_eq!(new_vm.get_version().unwrap(), version);
 }

vm/e2e-tests/src/versioning.rs

@@ -3,15 +3,13 @@
 
 #![forbid(unsafe_code)]
 
-use starcoin_vm_types::genesis_config::StdlibVersion;
 use crate::{account::Account, executor::FakeExecutor, utils};
 
 /// The current version numbers that e2e tests should be run against.
 // pub const CURRENT_RELEASE_VERSIONS: std::ops::RangeInclusive<u64> =
 //     STARCOIN_MAX_KNOWN_VERSION.major..=STARCOIN_MAX_KNOWN_VERSION.major;
 
-pub const CURRENT_RELEASE_VERSIONS: std::ops::RangeInclusive<u64> =
-    1..=StdlibVersion::Latest;
+pub const CURRENT_RELEASE_VERSIONS: std::ops::RangeInclusive<u64> = 1..=12;
 
 #[derive(Debug)]
 pub struct VersionedTestEnv {

vm/e2e-testsuite/Cargo.toml

@@ -33,6 +33,8 @@ starcoin-vm-runtime = { workspace = true }
 starcoin-vm-types = { workspace = true }
 starcoin-types = { workspace = true }
 starcoin-crypto = { workspace = true }
+
+
 #diem-keygen = { path = "../diem-keygen" }
 #starcoin-vm = { path = "../starcoin-vm" }
 #diem-framework-releases = { path = "../diem-framework/DPN/releases" }

vm/e2e-testsuite/src/tests/create_account.rs

@@ -6,7 +6,6 @@ use starcoin_language_e2e_tests::account::Account;
 use starcoin_language_e2e_tests::common_transactions::create_account_txn;
 use starcoin_language_e2e_tests::current_function_name;
 use starcoin_language_e2e_tests::executor::FakeExecutor;
-use starcoin_types::account_config;
 use starcoin_vm_types::transaction::TransactionStatus;
 
 #[test]

vm/e2e-testsuite/src/tests/experimental.rs

@@ -1,12 +1,6 @@
 // Copyright (c) The Diem Core Contributors
 // SPDX-License-Identifier: Apache-2.0
 
-// use diem_transaction_builder::experimental_stdlib::encode_create_account_script_function;
-// use diem_types::vm_status::StatusCode;
-// use starcoin_language_e2e_tests::{
-//     account::Account, current_function_name, executor::FakeExecutor,
-// };
-
 use move_core_types::vm_status::StatusCode;
 use starcoin_language_e2e_tests::account::Account;
 use starcoin_language_e2e_tests::current_function_name;

vm/parallel-executor/src/scheduler.rs

@@ -10,7 +10,6 @@ use std::{
         atomic::{AtomicBool, AtomicUsize, Ordering},
         Arc, Condvar,
     },
-    thread,
 };
 
 // Type aliases.