rename dir diem-framework to framework

sonic7077 · Mar 8, 2022 · 227e208 · 227e208
1 parent cc63fe4
commit 227e208
Show file tree

Hide file tree

Showing 1,122 changed files with 264 additions and 270 deletions.
diff --git a/.gitignore b/.gitignore
@@ -59,9 +59,9 @@ build/
 
 # Do not ignore the Move build output under the releases for DPN, core, and
 # experimental -- these are the release code.
-!aptos-move/diem-framework/DPN/releases/artifacts/**
-!aptos-move/diem-framework/experimental/releases/artifacts/**
-!aptos-move/diem-framework/aptos-framework/releases/artifacts/**
+!aptos-move/framework/DPN/releases/artifacts/**
+!aptos-move/framework/experimental/releases/artifacts/**
+!aptos-move/framework/aptos-framework/releases/artifacts/**
 
 # Docker incremental build temporary files and directories
 target-out-docker

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -11,14 +11,14 @@ members = [
     "aptos-move/aptos-validator-interface",
     "aptos-move/aptos-vm",
     "aptos-move/df-cli",
-    "aptos-move/diem-framework",
-    "aptos-move/diem-framework/DPN/releases",
-    "aptos-move/diem-framework/aptos-framework/releases",
-    "aptos-move/diem-framework/experimental/releases",
-    "aptos-move/diem-framework/releases",
     "aptos-move/e2e-tests",
     "aptos-move/e2e-tests-replay",
     "aptos-move/e2e-testsuite",
+    "aptos-move/framework",
+    "aptos-move/framework/DPN/releases",
+    "aptos-move/framework/aptos-framework/releases",
+    "aptos-move/framework/experimental/releases",
+    "aptos-move/framework/releases",
     "aptos-move/genesis-viewer",
     "aptos-move/mvhashmap",
     "aptos-move/parallel-executor",
@@ -142,7 +142,7 @@ default-members = [
     "crates/aptos-faucet",
     "crates/aptos-rate-limiter",
     "crates/swiss-knife",
-    "aptos-move/diem-framework",
+    "aptos-move/framework",
     "aptos-move/transaction-builder-generator",
     "execution/db-bootstrapper",
     "execution/execution-correctness",

diff --git a/api/Cargo.toml b/api/Cargo.toml
@@ -48,7 +48,7 @@ aptos-mempool = { path = "../mempool", features = ["fuzzing"] }
 aptos-secure-storage = { path = "../secure/storage" }
 aptos-temppath = { path = "../crates/aptos-temppath" }
 aptos-genesis-tool = {path = "../config/management/genesis", features = ["testing"] }
-diem-framework-releases = { path = "../aptos-move/diem-framework/DPN/releases" }
+diem-framework-releases = { path = "../aptos-move/framework/DPN/releases" }
 aptos-sdk = { path = "../sdk" }
 vm-validator = { path = "../vm-validator" }
 aptos-vm = { path = "../aptos-move/aptos-vm" }

diff --git a/aptos-move/aptos-transaction-benchmarks/Cargo.toml b/aptos-move/aptos-transaction-benchmarks/Cargo.toml
@@ -22,7 +22,7 @@ aptos-crypto = { path = "../../crates/aptos-crypto" }
 read-write-set = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" }
 read-write-set-dynamic = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" }
 aptos-vm = { path = "../aptos-vm" }
-diem-framework-releases = { path = "../diem-framework/DPN/releases" }
+diem-framework-releases = { path = "../framework/DPN/releases" }
 
 [[bench]]
 name = "transaction_benches"

diff --git a/aptos-move/aptos-transactional-test-harness/Cargo.toml b/aptos-move/aptos-transactional-test-harness/Cargo.toml
@@ -30,7 +30,7 @@ move-command-line-common = { git = "https://github.com/diem/move", rev = "98ed29
 language-e2e-tests = { path = "../e2e-tests" }
 aptos-vm =  { path = "../aptos-vm" }
 vm-genesis= { path = "../vm-genesis" }
-diem-framework = { path = "../diem-framework" }
+framework =  { path = "../framework" }
 aptos-keygen = { path = "../aptos-keygen" }
 
 # Other Diem dependencies

diff --git a/aptos-move/aptos-transactional-test-harness/src/diem_test_harness.rs b/aptos-move/aptos-transactional-test-harness/src/diem_test_harness.rs
@@ -356,10 +356,10 @@ fn panic_missing_private_key(cmd_name: &str) -> ! {
 
 static PRECOMPILED_DIEM_FRAMEWORK: Lazy<FullyCompiledProgram> = Lazy::new(|| {
     let program_res = move_compiler::construct_pre_compiled_lib(
-        &diem_framework::dpn_files(),
+        &framework::dpn_files(),
         None,
         move_compiler::Flags::empty().set_sources_shadow_deps(false),
-        diem_framework::diem_framework_named_addresses(),
+        framework::diem_framework_named_addresses(),
     )
     .unwrap();
     match program_res {
@@ -373,10 +373,10 @@ static PRECOMPILED_DIEM_FRAMEWORK: Lazy<FullyCompiledProgram> = Lazy::new(|| {
 
 static PRECOMPILED_APTOS_FRAMEWORK: Lazy<FullyCompiledProgram> = Lazy::new(|| {
     let program_res = move_compiler::construct_pre_compiled_lib(
-        &diem_framework::aptos_files(),
+        &framework::aptos_files(),
         None,
         move_compiler::Flags::empty().set_sources_shadow_deps(false),
-        diem_framework::aptos_framework_named_addresses(),
+        framework::aptos_framework_named_addresses(),
     )
     .unwrap();
     match program_res {
@@ -798,7 +798,7 @@ impl<'a> MoveTestAdapter<'a> for DiemTestAdapter<'a> {
             None => BTreeMap::new(),
         };
 
-        let mut named_address_mapping = diem_framework::diem_framework_named_addresses();
+        let mut named_address_mapping = framework::diem_framework_named_addresses();
 
         for (name, addr) in test_only_named_addresses() {
             assert!(!named_address_mapping.contains_key(&name));

diff --git a/aptos-move/aptos-validator-interface/src/lib.rs b/aptos-move/aptos-validator-interface/src/lib.rs
@@ -35,10 +35,7 @@ pub trait AptosValidatorInterface: Sync {
         seq: u64,
     ) -> Result<Option<Version>>;
 
-    fn get_diem_framework_modules_by_version(
-        &self,
-        version: Version,
-    ) -> Result<Vec<CompiledModule>> {
+    fn get_framework_modules_by_version(&self, version: Version) -> Result<Vec<CompiledModule>> {
         let mut acc = vec![];
         for module_bytes in self
             .get_account_state_by_version(account_config::CORE_CODE_ADDRESS, version)?

diff --git a/aptos-move/aptos-vm/Cargo.toml b/aptos-move/aptos-vm/Cargo.toml
@@ -30,7 +30,7 @@ move-vm-types = { git = "https://github.com/diem/move", rev = "98ed299a7e3a92230
 move-binary-format = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" }
 move-bytecode-utils = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" }
 move-stdlib = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" }
-diem-framework = { path = "../../aptos-move/diem-framework" }
+framework =  { path = "../framework" }
 serde_json = "1.0.64"
 serde = { version = "1.0.124", default-features = false }
 read-write-set-dynamic = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860"}
@@ -42,7 +42,7 @@ aptos-parallel-executor = {path = "../parallel-executor" }
 proptest = "1.0.0"
 
 aptos-types = { path = "../../types", features = ["fuzzing"] }
-diem-framework-releases = { path = "../../aptos-move/diem-framework/DPN/releases" }
+diem-framework-releases = { path = "../framework/DPN/releases" }
 
 [features]
 default = []

diff --git a/aptos-move/aptos-vm/README.md b/aptos-move/aptos-vm/README.md
@@ -21,7 +21,7 @@ a given version (i.e., block height). At the time of startup, the runtime
 does not have any code or data loaded. It is effectively *“empty”*.
 
 Every transaction executes within the context of a [Diem
-account](../diem-framework/modules/diem_account.mvir)---specifically the transaction
+account](../framework/modules/diem_account.mvir)---specifically the transaction
 submitter's account.  The execution of every transaction consists of three
 parts: the account prologue, the transaction itself, and the account
 epilogue. This is the only transaction flow known to the runtime, and it is
@@ -31,7 +31,7 @@ individual transaction from the block and execute the transaction flow:
 1. ***Transaction Prologue*** - in verification mode the runtime runs the
    bytecode verifier over the transaction script and executes the
    prologue defined in the [Diem account
-   module](../diem-framework/modules/diem_account.mvir). The prologue is responsible
+   module](../framework/modules/diem_account.mvir). The prologue is responsible
    for checking the structure of the transaction and
    rejecting obviously bad transactions. In verification mode, the runtime
    returns a status of either `success` or `failure` depending upon the
@@ -49,7 +49,7 @@ individual transaction from the block and execute the transaction flow:
    blockchain state by the VM---this is the responsibility of the
    [execution module](../../../execution/).
 3. ***Transaction Epilogue*** - in execution mode the epilogue defined in
-   the [Diem account module](../diem-framework/modules/diem_account.mvir) is
+   the [Diem account module](../framework/modules/diem_account.mvir) is
    executed to perform actions based upon the result of the execution of
    the user-submitted transaction. One example of such an action is
    debiting the gas fee for the transaction from the submitting account's

diff --git a/aptos-move/aptos-vm/src/natives.rs b/aptos-move/aptos-vm/src/natives.rs
@@ -7,6 +7,6 @@ use move_vm_runtime::native_functions::NativeFunctionTable;
 pub fn aptos_natives() -> NativeFunctionTable {
     move_stdlib::natives::all_natives(CORE_CODE_ADDRESS)
         .into_iter()
-        .chain(diem_framework::natives::all_natives(CORE_CODE_ADDRESS))
+        .chain(framework::natives::all_natives(CORE_CODE_ADDRESS))
         .collect()
 }
diff --git a/aptos-move/df-cli/Cargo.toml b/aptos-move/df-cli/Cargo.toml
@@ -18,7 +18,7 @@ aptos-workspace-hack = { path = "../../crates/aptos-workspace-hack" }
 move-core-types = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" }
 move-cli = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" }
 aptos-vm = { path = "../aptos-vm" }
-diem-framework-releases = { path = "../../aptos-move/diem-framework/DPN/releases" }
+diem-framework-releases = { path = "../framework/DPN/releases" }
 
 [dev-dependencies]
 datatest-stable = "0.1.1"

diff --git a/aptos-move/df-cli/tests/testsuite/aptos_read_write_set_smoke/Move.toml b/aptos-move/df-cli/tests/testsuite/aptos_read_write_set_smoke/Move.toml
@@ -3,4 +3,4 @@ name = "diem_read_write_set_smoke"
 version = "0.0.0"
 
 [dependencies]
-DPNFramework = { local = "../../../../diem-framework/DPN" }
+DPNFramework = { local = "../../../../framework/DPN" }
diff --git a/aptos-move/df-cli/tests/testsuite/aptos_smoke/Move.toml b/aptos-move/df-cli/tests/testsuite/aptos_smoke/Move.toml
@@ -3,4 +3,4 @@ name = "diem_smoke"
 version = "0.0.0"
 
 [dependencies]
-DPNFramework = { local = "../../../../diem-framework/DPN" }
+DPNFramework = { local = "../../../../framework/DPN" }
diff --git a/aptos-move/df-cli/tests/testsuite/compare_smoke/Move.toml b/aptos-move/df-cli/tests/testsuite/compare_smoke/Move.toml
@@ -3,5 +3,5 @@ name = "compare_smoke"
 version = "0.0.0"
 
 [dependencies]
-DPNFramework = { local = "../../../../diem-framework/DPN" }
-MoveNursery = { local = "../../../../diem-framework/move-stdlib/nursery" }
+DPNFramework = { local = "../../../../framework/DPN" }
+MoveNursery = { local = "../../../../framework/move-stdlib/nursery" }
diff --git a/aptos-move/df-cli/tests/testsuite/concretize_read_write_set_smoke/Move.toml b/aptos-move/df-cli/tests/testsuite/concretize_read_write_set_smoke/Move.toml
@@ -3,4 +3,4 @@ name = "concretize_read_write_set_smoke"
 version = "0.0.0"
 
 [dependencies]
-DPNFramework = { local = "../../../../diem-framework/DPN" }
+DPNFramework = { local = "../../../../framework/DPN" }
diff --git a/...ramework/DPN/releases/artifacts/current/build/DPNFramework/source_maps/DiemTimestamp.mvsm b/...ramework/DPN/releases/artifacts/current/build/DPNFramework/source_maps/DiemTimestamp.mvsm
diff --git a/...amework/releases/artifacts/current/build/DiemCoreFramework/source_maps/DiemTimestamp.mvsm b/...amework/releases/artifacts/current/build/DiemCoreFramework/source_maps/DiemTimestamp.mvsm
diff --git a/...imental/releases/artifacts/current/build/DiemCoreFramework/source_maps/DiemTimestamp.mvsm b/...imental/releases/artifacts/current/build/DiemCoreFramework/source_maps/DiemTimestamp.mvsm
diff --git a/...releases/artifacts/current/build/DiemExperimental/source_maps/AccountCreationScripts.mvsm b/...releases/artifacts/current/build/DiemExperimental/source_maps/AccountCreationScripts.mvsm
diff --git a/aptos-move/e2e-tests-replay/Cargo.toml b/aptos-move/e2e-tests-replay/Cargo.toml
@@ -16,7 +16,7 @@ walkdir = "2.3.1"
 aptos-workspace-hack = { path = "../../crates/aptos-workspace-hack" }
 move-stackless-bytecode-interpreter = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" }
 aptos-types = { path = "../../types", features = ["fuzzing"] }
-diem-framework = { path = "../../aptos-move/diem-framework" }
+framework =  { path = "../framework" }
 aptos-vm = { path = "../../aptos-move/aptos-vm" }
 language-e2e-tests = { path = "../e2e-tests" }
 move-binary-format = { git = "https://github.com/diem/move", rev = "98ed299a7e3a9223019c9bdf4dd92fea9faef860" }

diff --git a/aptos-move/e2e-tests-replay/src/main.rs b/aptos-move/e2e-tests-replay/src/main.rs
@@ -6,7 +6,7 @@ use std::collections::{BTreeMap, BTreeSet};
 use structopt::StructOpt;
 
 use aptos_types::on_chain_config::{DiemVersion, DIEM_MAX_KNOWN_VERSION};
-use diem_framework::dpn_files;
+use framework::dpn_files;
 use move_model::run_model_builder;
 use move_stackless_bytecode_interpreter::{
     concrete::settings::InterpreterSettings, StacklessBytecodeInterpreter,