[crates] Rename crates E through H inclusive

Cargo.toml

@@ -238,15 +238,14 @@ aptos-consensus-notifications = { path = "state-sync/inter-component/consensus-n
 aptos-consensus-types = { path = "consensus/consensus-types" }
 aptos-crash-handler = { path = "crates/crash-handler" }
 aptos-data-streaming-service = { path = "state-sync/state-sync-v2/data-streaming-service" }
-event-notifications = { path = "state-sync/inter-component/event-notifications" }
-executor = { path = "execution/executor" }
-executor-test-helpers = { path = "execution/executor-test-helpers" }
-executor-types = { path = "execution/executor-types" }
-fallible = { path = "crates/fallible" }
-forge = { path = "testsuite/forge" }
-framework = { path = "aptos-move/framework" }
-gas-algebra-ext = { path = "aptos-move/gas-algebra-ext" }
-handlebars = "4.2.2"
+aptos-event-notifications = { path = "state-sync/inter-component/event-notifications" }
+aptos-executor = { path = "execution/executor" }
+aptos-executor-test-helpers = { path = "execution/executor-test-helpers" }
+aptos-executor-types = { path = "execution/executor-types" }
+aptos-fallible = { path = "crates/fallible" }
+aptos-forge = { path = "testsuite/forge" }
+aptos-framework = { path = "aptos-move/framework" }
+aptos-gas-algebra-ext = { path = "aptos-move/gas-algebra-ext" }
 inspection-service = { path = "crates/inspection-service" }
 language-e2e-tests = { path = "aptos-move/e2e-tests" }
 mempool-notifications = { path = "state-sync/inter-component/mempool-notifications" }
@@ -335,6 +334,7 @@ futures-util = "0.3.21"
 gcp-bigquery-client = "0.13.0"
 get_if_addrs = "0.5.3"
 goldenfile = "1.1.0"
+handlebars = "4.2.2"
 heck = "0.3.2"
 hex = "0.4.3"
 hkdf = "0.10.0"

api/test-context/Cargo.toml

@@ -19,6 +19,8 @@ aptos-api-types = { workspace = true }
 aptos-cached-packages = { workspace = true }
 aptos-config = { workspace = true }
 aptos-crypto = { workspace = true }
+aptos-executor = { workspace = true }
+aptos-executor-types = { workspace = true }
 aptos-genesis = { workspace = true }
 aptos-mempool = { workspace = true, features = ["fuzzing"] }
 aptos-sdk = { workspace = true }
@@ -27,8 +29,6 @@ aptos-types = { workspace = true }
 aptos-vm = { workspace = true }
 aptosdb = { workspace = true, features = ["fuzzing"] }
 bytes = { workspace = true }
-executor = { workspace = true }
-executor-types = { workspace = true }
 goldenfile = { workspace = true }
 hyper = { workspace = true }
 mempool-notifications = { workspace = true }

api/test-context/src/test_context.rs

@@ -12,6 +12,8 @@ use aptos_config::config::{
     DEFAULT_MAX_NUM_NODES_PER_LRU_CACHE_SHARD, NO_OP_STORAGE_PRUNER_CONFIG,
 };
 use aptos_crypto::{hash::HashValue, SigningKey};
+use aptos_executor::{block_executor::BlockExecutor, db_bootstrapper};
+use aptos_executor_types::BlockExecutorTrait;
 use aptos_mempool::mocks::MockSharedMempool;
 use aptos_sdk::{
     transaction_builder::TransactionFactory,
@@ -32,8 +34,6 @@ use aptos_types::{
 use aptos_vm::AptosVM;
 use aptosdb::AptosDB;
 use bytes::Bytes;
-use executor::{block_executor::BlockExecutor, db_bootstrapper};
-use executor_types::BlockExecutorTrait;
 use hyper::{HeaderMap, Response};
 use mempool_notifications::MempoolNotificationSender;
 use storage_interface::DbReaderWriter;

aptos-move/aptos-gas/Cargo.toml

@@ -14,12 +14,12 @@ rust-version = { workspace = true }
 
 [dependencies]
 anyhow = { workspace = true }
+aptos-framework = { workspace = true }
+aptos-gas-algebra-ext = { workspace = true }
 aptos-global-constants = { workspace = true }
 aptos-types = { workspace = true }
 bcs = { workspace = true }
 clap = { workspace = true }
-framework = { workspace = true }
-gas-algebra-ext = { workspace = true }
 move-binary-format = { workspace = true }
 move-core-types = { workspace = true }
 move-model = { workspace = true }

aptos-move/aptos-gas/src/algebra.rs

@@ -3,7 +3,7 @@
 
 use move_core_types::gas_algebra::{GasQuantity, InternalGasUnit, UnitDiv};
 
-pub use gas_algebra_ext::{
+pub use aptos_gas_algebra_ext::{
     AbstractValueSize, AbstractValueSizePerArg, AbstractValueUnit, InternalGasPerAbstractValueUnit,
 };
 

aptos-move/aptos-gas/src/aptos_framework.rs

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use crate::gas_meter::EXECUTION_GAS_MULTIPLIER as MUL;
-use framework::natives::GasParameters;
+use aptos_framework::natives::GasParameters;
 
 crate::natives::define_gas_parameters_for_natives!(GasParameters, "aptos_framework", [
     [.account.create_address.base, "account.create_address.base", 300 * MUL],

aptos-move/aptos-gas/src/gas_meter.rs

@@ -71,7 +71,7 @@ pub trait InitialGasSchedule: Sized {
 #[derive(Debug, Clone)]
 pub struct NativeGasParameters {
     pub move_stdlib: move_stdlib::natives::GasParameters,
-    pub aptos_framework: framework::natives::GasParameters,
+    pub aptos_framework: aptos_framework::natives::GasParameters,
     pub table: move_table_extension::GasParameters,
 }
 
@@ -98,7 +98,7 @@ impl NativeGasParameters {
     pub fn zeros() -> Self {
         Self {
             move_stdlib: move_stdlib::natives::GasParameters::zeros(),
-            aptos_framework: framework::natives::GasParameters::zeros(),
+            aptos_framework: aptos_framework::natives::GasParameters::zeros(),
             table: move_table_extension::GasParameters::zeros(),
         }
     }

aptos-move/aptos-gas/tests/gen_tests.rs

@@ -1,8 +1,8 @@
 // Copyright (c) Aptos
 // SPDX-License-Identifier: Apache-2.0
 
+use aptos_framework::{BuildOptions, BuiltPackage};
 use aptos_gas::gen::{generate_update_proposal, GenArgs};
-use framework::{BuildOptions, BuiltPackage};
 
 #[test]
 fn can_generate_and_build_update_proposal() {

aptos-move/aptos-sdk-builder/Cargo.toml

@@ -28,7 +28,7 @@ textwrap = { workspace = true }
 
 [dev-dependencies]
 aptos-cached-packages = { workspace = true }
-framework = { workspace = true }
+aptos-framework = { workspace = true }
 tempfile = { workspace = true }
 which = { workspace = true }
 

aptos-move/aptos-sdk-builder/examples/rust/script_fun_demo.rs

@@ -1,8 +1,8 @@
 // Copyright (c) Aptos
 // SPDX-License-Identifier: Apache-2.0
 
+use aptos_framework::{aptos_coin_transfer, EntryFunctionCall};
 use aptos_types::AccountAddress;
-use framework::{aptos_coin_transfer, EntryFunctionCall};
 
 fn demo_p2p_entry_function() {
     let payee = AccountAddress([

aptos-move/aptos-transactional-test-harness/Cargo.toml

@@ -17,13 +17,13 @@ anyhow = { workspace = true }
 aptos-api-types = { workspace = true }
 aptos-cached-packages = { workspace = true }
 aptos-crypto = { workspace = true }
+aptos-framework = { workspace = true }
 aptos-gas = { workspace = true }
 aptos-state-view = { workspace = true }
 aptos-types = { workspace = true }
 aptos-vm = { workspace = true }
 bcs = { workspace = true }
 clap = { workspace = true }
-framework = { workspace = true }
 hex = { workspace = true }
 language-e2e-tests = { workspace = true }
 move-binary-format = { workspace = true, features = [ "fuzzing" ] }

aptos-move/aptos-transactional-test-harness/src/aptos_test_harness.rs

@@ -288,7 +288,7 @@ static PRECOMPILED_APTOS_FRAMEWORK: Lazy<FullyCompiledProgram> = Lazy::new(|| {
         paths: aptos_cached_packages::head_release_bundle()
             .files()
             .unwrap(),
-        named_address_map: framework::named_addresses().clone(),
+        named_address_map: aptos_framework::named_addresses().clone(),
     }];
     let program_res = move_compiler::construct_pre_compiled_lib(
         deps,
@@ -566,7 +566,7 @@ impl<'a> MoveTestAdapter<'a> for AptosTestAdapter<'a> {
             None => BTreeMap::new(),
         };
 
-        let mut named_address_mapping = framework::named_addresses().clone();
+        let mut named_address_mapping = aptos_framework::named_addresses().clone();
 
         for (name, addr) in additional_named_address_mapping.clone() {
             if named_address_mapping.contains_key(&name) {

aptos-move/aptos-vm/Cargo.toml

@@ -18,6 +18,7 @@ aptos-aggregator = { workspace = true }
 aptos-block-executor = { workspace = true }
 aptos-crypto = { workspace = true }
 aptos-crypto-derive = { workspace = true }
+aptos-framework =  { workspace = true }
 aptos-gas = { workspace = true }
 aptos-logger = { workspace = true }
 aptos-metrics-core = { workspace = true }
@@ -27,7 +28,6 @@ aptos-types = { workspace = true }
 bcs = { workspace = true }
 dashmap = { workspace = true }
 fail = { workspace = true }
-framework =  { workspace = true }
 move-binary-format = { workspace = true }
 move-bytecode-utils = { workspace = true }
 move-bytecode-verifier = { workspace = true }
@@ -55,6 +55,6 @@ proptest = { workspace = true }
 [features]
 default = []
 mirai-contracts = []
-fuzzing = ["move-core-types/fuzzing", "move-binary-format/fuzzing", "move-vm-types/fuzzing", "framework/fuzzing"]
+fuzzing = ["move-core-types/fuzzing", "move-binary-format/fuzzing", "move-vm-types/fuzzing", "aptos-framework/fuzzing"]
 failpoints = ["fail/failpoints", "move-vm-runtime/failpoints"]
-testing = ["move-unit-test", "framework/testing"]
+testing = ["move-unit-test", "aptos-framework/testing"]

aptos-move/aptos-vm/src/aptos_vm.rs

@@ -25,6 +25,7 @@ use aptos_aggregator::{
     transaction::{ChangeSetExt, TransactionOutputExt},
 };
 use aptos_crypto::HashValue;
+use aptos_framework::natives::code::PublishRequest;
 use aptos_gas::AptosGasMeter;
 use aptos_logger::prelude::*;
 use aptos_module_verifier::module_init::verify_module_init_function;
@@ -43,7 +44,6 @@ use aptos_types::{
     write_set::WriteSet,
 };
 use fail::fail_point;
-use framework::natives::code::PublishRequest;
 use move_binary_format::{
     access::ModuleAccess,
     errors::{verification_error, Location, PartialVMError, VMError, VMResult},

aptos-move/aptos-vm/src/aptos_vm_impl.rs

@@ -11,6 +11,7 @@ use crate::{
     transaction_metadata::TransactionMetadata,
 };
 use aptos_aggregator::transaction::TransactionOutputExt;
+use aptos_framework::{RuntimeModuleMetadata, APTOS_METADATA_KEY};
 use aptos_gas::{
     AbstractValueSizeGasParameters, AptosGasParameters, FromOnChainGasSchedule, Gas,
     NativeGasParameters, StorageGasParameters,
@@ -31,7 +32,6 @@ use aptos_types::{
 };
 use dashmap::DashMap;
 use fail::fail_point;
-use framework::{RuntimeModuleMetadata, APTOS_METADATA_KEY};
 use move_binary_format::{errors::VMResult, CompiledModule};
 use move_core_types::{
     language_storage::ModuleId,

aptos-move/aptos-vm/src/data_cache.rs

@@ -6,6 +6,7 @@ use crate::{counters::CRITICAL_ERRORS, create_access_path, logging::AdapterLogSc
 #[allow(unused_imports)]
 use anyhow::format_err;
 use anyhow::Error;
+use aptos_framework::natives::state_storage::StateStorageUsageResolver;
 use aptos_logger::prelude::*;
 use aptos_state_view::{StateView, StateViewId};
 use aptos_types::state_store::state_storage_usage::StateStorageUsage;
@@ -14,7 +15,6 @@ use aptos_types::{
     vm_status::StatusCode, write_set::WriteOp,
 };
 use fail::fail_point;
-use framework::natives::state_storage::StateStorageUsageResolver;
 use move_binary_format::errors::*;
 use move_core_types::{
     account_address::AccountAddress,

aptos-move/aptos-vm/src/move_vm_ext/resolver.rs

@@ -1,7 +1,7 @@
 // Copyright (c) Aptos
 // SPDX-License-Identifier: Apache-2.0
 
-use framework::natives::state_storage::StateStorageUsageResolver;
+use aptos_framework::natives::state_storage::StateStorageUsageResolver;
 use move_core_types::resolver::MoveResolver;
 use move_table_extension::TableResolver;
 use std::fmt::Debug;

aptos-move/aptos-vm/src/move_vm_ext/session.rs

@@ -12,17 +12,17 @@ use aptos_aggregator::{
 };
 use aptos_crypto::{hash::CryptoHash, HashValue};
 use aptos_crypto_derive::{BCSCryptoHash, CryptoHasher};
+use aptos_framework::natives::{
+    aggregator_natives::{AggregatorChange, AggregatorChangeSet, NativeAggregatorContext},
+    code::{NativeCodeContext, PublishRequest},
+};
 use aptos_types::{
     block_metadata::BlockMetadata,
     contract_event::ContractEvent,
     state_store::{state_key::StateKey, table::TableHandle},
     transaction::{ChangeSet, SignatureCheckedTransaction},
     write_set::{WriteOp, WriteSetMut},
 };
-use framework::natives::{
-    aggregator_natives::{AggregatorChange, AggregatorChangeSet, NativeAggregatorContext},
-    code::{NativeCodeContext, PublishRequest},
-};
 use move_binary_format::errors::{Location, VMResult};
 use move_core_types::{
     account_address::AccountAddress,

aptos-move/aptos-vm/src/move_vm_ext/vm.rs

@@ -5,12 +5,12 @@ use crate::{
     move_vm_ext::{MoveResolverExt, SessionExt, SessionId},
     natives::aptos_natives,
 };
-use aptos_gas::{AbstractValueSizeGasParameters, NativeGasParameters};
-use framework::natives::{
+use aptos_framework::natives::{
     aggregator_natives::NativeAggregatorContext, code::NativeCodeContext,
     cryptography::ristretto255_point::NativeRistrettoPointContext,
     state_storage::NativeStateStorageContext, transaction_context::NativeTransactionContext,
 };
+use aptos_gas::{AbstractValueSizeGasParameters, NativeGasParameters};
 use move_binary_format::errors::VMResult;
 use move_bytecode_verifier::VerifierConfig;
 use move_table_extension::NativeTableContext;

aptos-move/aptos-vm/src/natives.rs

@@ -9,7 +9,7 @@ use move_vm_runtime::native_functions::NativeFunctionTable;
 use aptos_types::chain_id::ChainId;
 #[cfg(feature = "testing")]
 use {
-    framework::natives::{
+    aptos_framework::natives::{
         aggregator_natives::NativeAggregatorContext, code::NativeCodeContext,
         cryptography::ristretto255_point::NativeRistrettoPointContext,
         transaction_context::NativeTransactionContext,
@@ -30,7 +30,7 @@ pub fn aptos_natives(
     move_stdlib::natives::all_natives(CORE_CODE_ADDRESS, gas_params.move_stdlib)
         .into_iter()
         .filter(|(_, name, _, _)| name.as_str() != "vector")
-        .chain(framework::natives::all_natives(
+        .chain(aptos_framework::natives::all_natives(
             CORE_CODE_ADDRESS,
             gas_params.aptos_framework,
             move |val| abs_val_size_gas_params.abstract_value_size(val, feature_version),

aptos-move/e2e-move-tests/Cargo.toml

@@ -18,6 +18,7 @@ aptos = { workspace = true }
 aptos-block-executor = { workspace = true }
 aptos-cached-packages = { workspace = true }
 aptos-crypto = { workspace = true }
+aptos-framework = { workspace = true }
 aptos-gas = { workspace = true, features = ["testing"] }
 aptos-keygen = { workspace = true }
 aptos-logger = { workspace = true }
@@ -26,7 +27,6 @@ aptos-types = { workspace = true }
 aptos-vm = { workspace = true }
 aptos-writeset-generator = { workspace = true }
 bcs = { workspace = true }
-framework = { workspace = true }
 hex = { workspace = true }
 itertools = { workspace = true }
 language-e2e-tests = { workspace = true }

aptos-move/e2e-move-tests/src/harness.rs

@@ -6,6 +6,8 @@ use aptos::move_tool::MemberId;
 use aptos_cached_packages::aptos_stdlib;
 use aptos_crypto::ed25519::Ed25519PrivateKey;
 use aptos_crypto::{PrivateKey, Uniform};
+use aptos_framework::natives::code::PackageMetadata;
+use aptos_framework::{BuildOptions, BuiltPackage};
 use aptos_gas::{AptosGasParameters, InitialGasSchedule, ToOnChainGasSchedule};
 use aptos_types::contract_event::ContractEvent;
 use aptos_types::on_chain_config::{FeatureFlag, GasScheduleV2};
@@ -17,8 +19,6 @@ use aptos_types::{
     state_store::state_key::StateKey,
     transaction::{EntryFunction, SignedTransaction, TransactionPayload, TransactionStatus},
 };
-use framework::natives::code::PackageMetadata;
-use framework::{BuildOptions, BuiltPackage};
 use language_e2e_tests::{
     account::{Account, AccountData},
     executor::FakeExecutor,

aptos-move/e2e-move-tests/src/lib.rs

@@ -6,7 +6,7 @@ pub mod harness;
 pub mod stake;
 
 use anyhow::bail;
-use framework::UPGRADE_POLICY_CUSTOM_FIELD;
+use aptos_framework::UPGRADE_POLICY_CUSTOM_FIELD;
 pub use harness::*;
 use move_package::package_hooks::PackageHooks;
 use move_package::source_package::parsed_manifest::CustomDepInfo;

aptos-move/e2e-move-tests/src/tests/code_publishing.rs

@@ -2,9 +2,9 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use crate::{assert_abort, assert_success, assert_vm_status, tests::common, MoveHarness};
+use aptos_framework::natives::code::{PackageRegistry, UpgradePolicy};
 use aptos_types::account_address::{create_resource_address, AccountAddress};
 use aptos_types::on_chain_config::FeatureFlag;
-use framework::natives::code::{PackageRegistry, UpgradePolicy};
 use move_core_types::parser::parse_struct_tag;
 use move_core_types::vm_status::StatusCode;
 use package_builder::PackageBuilder;
@@ -220,9 +220,9 @@ fn code_publishing_using_resource_account() {
         &format!("module 0x{}::m {{ public fun f() {{}} }}", module_address),
     );
     let pack_dir = pack.write_to_temp().unwrap();
-    let package = framework::BuiltPackage::build(
+    let package = aptos_framework::BuiltPackage::build(
         pack_dir.path().to_owned(),
-        framework::BuildOptions::default(),
+        aptos_framework::BuildOptions::default(),
     )
     .expect("building package must succeed");
 

aptos-move/e2e-move-tests/src/tests/error_map.rs

@@ -4,9 +4,9 @@
 extern crate core;
 
 use crate::{assert_success, tests::common, MoveHarness};
+use aptos_framework::BuildOptions;
 use aptos_types::account_address::AccountAddress;
 use aptos_types::transaction::{ExecutionStatus, TransactionStatus};
-use framework::BuildOptions;
 use move_core_types::value::MoveValue;
 use serde::{Deserialize, Serialize};