[Cargo] Final crate rename.

0xOutOfGas · Dec 11, 2022 · b9120f2 · b9120f2
1 parent 1eee052
commit b9120f2
Show file tree

Hide file tree

Showing 279 changed files with 1,064 additions and 1,060 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -188,6 +188,8 @@ aptos-crypto = { path = "crates/aptos-crypto" }
 aptos-crypto-derive = { path = "crates/aptos-crypto-derive" }
 aptos-data-client = { path = "state-sync/aptos-data-client" }
 aptos-data-streaming-service = { path = "state-sync/state-sync-v2/data-streaming-service" }
+aptos-db = { path = "storage/aptosdb" }
+aptos-db-indexer = { path = "storage/indexer" }
 aptos-debugger = { path = "aptos-move/aptos-debugger" }
 aptos-event-notifications = { path = "state-sync/inter-component/event-notifications" }
 aptos-executor = { path = "execution/executor" }
@@ -213,14 +215,27 @@ aptos-language-e2e-tests = { path = "aptos-move/e2e-tests" }
 aptos-log-derive = { path = "crates/aptos-log-derive" }
 aptos-logger = { path = "crates/aptos-logger" }
 aptos-mempool = { path = "mempool" }
+aptos-mempool-notifications = { path = "state-sync/inter-component/mempool-notifications" }
+aptos-memsocket = { path = "network/memsocket" }
 aptos-metrics-core = { path = "crates/aptos-metrics-core" }
 aptos-module-verifier = { path = "aptos-move/aptos-module-verifier" }
+aptos-move-examples = { path = "aptos-move/move-examples" }
+aptos-mvhashmap = { path = "aptos-move/mvhashmap" }
+aptos-netcore = { path = "network/netcore" }
+aptos-network = { path = "network" }
+aptos-network-builder = { path = "network/builder" }
 aptos-network-checker = { path = "crates/aptos-network-checker" }
+aptos-network-discovery = { path = "network/discovery" }
 aptos-node = { path = "aptos-node" }
 aptos-node-checker = { path = "ecosystem/node-checker" }
+aptos-node-resource-metrics = { path = "crates/node-resource-metrics" }
+aptos-num-variants = { path = "crates/num-variants" }
 aptos-openapi = { path = "crates/aptos-openapi" }
+aptos-package-builder = { path = "aptos-move/package-builder" }
+aptos-peer-monitoring-service-types = { path = "network/peer-monitoring-service/types" }
 aptos-proptest-helpers = { path = "crates/aptos-proptest-helpers" }
 aptos-protos = { path = "crates/aptos-protos" }
+aptos-proxy = { path = "crates/proxy" }
 aptos-push-metrics = { path = "crates/aptos-push-metrics" }
 aptos-rate-limiter = { path = "crates/aptos-rate-limiter" }
 aptos-release-builder = { path = "aptos-move/aptos-release-builder" }
@@ -229,6 +244,8 @@ aptos-rest-client = { path = "crates/aptos-rest-client" }
 aptos-retrier = { path = "crates/aptos-retrier" }
 aptos-rocksdb-options = { path = "storage/rocksdb-options" }
 aptos-rosetta = { path = "crates/aptos-rosetta" }
+aptos-safety-rules = { path = "consensus/safety-rules" }
+aptos-schemadb = { path = "storage/schemadb" }
 aptos-scratchpad = { path = "storage/scratchpad" }
 aptos-sdk = { path = "sdk" }
 aptos-sdk-builder = { path = "aptos-move/aptos-sdk-builder" }
@@ -256,24 +273,7 @@ aptos-vm-genesis = { path = "aptos-move/vm-genesis" }
 aptos-vm-validator = { path = "vm-validator" }
 aptos-warp-webserver = { path = "crates/aptos-warp-webserver" }
 aptos-writeset-generator = { path = "aptos-move/writeset-transaction-generator" }
-aptosdb = { path = "storage/aptosdb" }
-aptosdb-indexer = { path = "storage/indexer" }
 channel = { path = "crates/channel" }
-mempool-notifications = { path = "state-sync/inter-component/mempool-notifications" }
-memsocket = { path = "network/memsocket" }
-move-examples = { path = "aptos-move/move-examples" }
-mvhashmap = { path = "aptos-move/mvhashmap" }
-netcore = { path = "network/netcore" }
-network = { path = "network" }
-network-builder = { path = "network/builder" }
-network-discovery = { path = "network/discovery" }
-node-resource-metrics = { path = "crates/node-resource-metrics" }
-num-variants = { path = "crates/num-variants" }
-package-builder = { path = "aptos-move/package-builder" }
-peer-monitoring-service-types = { path = "network/peer-monitoring-service/types" }
-proxy = { path = "crates/proxy" }
-safety-rules = { path = "consensus/safety-rules" }
-schemadb = { path = "storage/schemadb" }
 
 # External crate dependencies.
 # Please do not add any test features here: they should be declared by the individual crate.

diff --git a/api/test-context/Cargo.toml b/api/test-context/Cargo.toml
@@ -19,21 +19,21 @@ aptos-api-types = { workspace = true }
 aptos-cached-packages = { workspace = true }
 aptos-config = { workspace = true }
 aptos-crypto = { workspace = true }
+aptos-db = { workspace = true, features = ["fuzzing"] }
 aptos-executor = { workspace = true }
 aptos-executor-types = { workspace = true }
 aptos-genesis = { workspace = true }
 aptos-mempool = { workspace = true, features = ["fuzzing"] }
+aptos-mempool-notifications = { workspace = true }
 aptos-sdk = { workspace = true }
 aptos-storage-interface = { workspace = true }
 aptos-temppath = { workspace = true }
 aptos-types = { workspace = true }
 aptos-vm = { workspace = true }
 aptos-vm-validator = { workspace = true }
-aptosdb = { workspace = true, features = ["fuzzing"] }
 bytes = { workspace = true }
 goldenfile = { workspace = true }
 hyper = { workspace = true }
-mempool-notifications = { workspace = true }
 poem = { workspace = true }
 poem-openapi = { workspace = true }
 proptest = { workspace = true }

diff --git a/api/test-context/src/test_context.rs b/api/test-context/src/test_context.rs
@@ -12,9 +12,11 @@ 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_db::AptosDB;
 use aptos_executor::{block_executor::BlockExecutor, db_bootstrapper};
 use aptos_executor_types::BlockExecutorTrait;
 use aptos_mempool::mocks::MockSharedMempool;
+use aptos_mempool_notifications::MempoolNotificationSender;
 use aptos_sdk::{
     transaction_builder::TransactionFactory,
     types::{
@@ -33,10 +35,8 @@ use aptos_types::{
     transaction::{Transaction, TransactionStatus},
 };
 use aptos_vm::AptosVM;
-use aptosdb::AptosDB;
 use bytes::Bytes;
 use hyper::{HeaderMap, Response};
-use mempool_notifications::MempoolNotificationSender;
 
 use aptos_config::keys::ConfigKey;
 use aptos_crypto::ed25519::Ed25519PrivateKey;

diff --git a/aptos-move/aptos-gas/Cargo.toml b/aptos-move/aptos-gas/Cargo.toml
@@ -17,6 +17,7 @@ anyhow = { workspace = true }
 aptos-framework = { workspace = true }
 aptos-gas-algebra-ext = { workspace = true }
 aptos-global-constants = { workspace = true }
+aptos-package-builder = { workspace = true }
 aptos-types = { workspace = true }
 bcs = { workspace = true }
 clap = { workspace = true }
@@ -26,7 +27,6 @@ move-model = { workspace = true }
 move-stdlib = { workspace = true }
 move-table-extension = { workspace = true }
 move-vm-types = { workspace = true }
-package-builder = { workspace = true }
 
 [dev-dependencies]
 tempfile = { workspace = true }

diff --git a/aptos-move/aptos-gas/src/gen.rs b/aptos-move/aptos-gas/src/gen.rs
@@ -5,11 +5,11 @@ use crate::gas_meter::{
     AptosGasParameters, InitialGasSchedule, ToOnChainGasSchedule, LATEST_GAS_FEATURE_VERSION,
 };
 use anyhow::Result;
+use aptos_package_builder::PackageBuilder;
 use aptos_types::on_chain_config::GasScheduleV2;
 use clap::Parser;
 use move_core_types::account_address::AccountAddress;
 use move_model::{code_writer::CodeWriter, emit, emitln, model::Loc};
-use package_builder::PackageBuilder;
 use std::path::{Path, PathBuf};
 
 pub fn current_gas_schedule() -> GasScheduleV2 {

diff --git a/aptos-move/aptos-validator-interface/Cargo.toml b/aptos-move/aptos-validator-interface/Cargo.toml
@@ -16,11 +16,11 @@ rust-version = { workspace = true }
 anyhow = { workspace = true }
 aptos-api-types = { workspace = true }
 aptos-config = { workspace = true }
+aptos-db = { workspace = true }
 aptos-rest-client = { workspace = true }
 aptos-state-view = { workspace = true }
 aptos-storage-interface = { workspace = true }
 aptos-types = { workspace = true }
-aptosdb = { workspace = true }
 async-trait = { workspace = true }
 move-binary-format = { workspace = true }
 tokio = { workspace = true }
diff --git a/aptos-move/aptos-validator-interface/src/storage_interface.rs b/aptos-move/aptos-validator-interface/src/storage_interface.rs
@@ -7,14 +7,14 @@ use aptos_config::config::{
     RocksdbConfigs, BUFFERED_STATE_TARGET_ITEMS, DEFAULT_MAX_NUM_NODES_PER_LRU_CACHE_SHARD,
     NO_OP_STORAGE_PRUNER_CONFIG,
 };
+use aptos_db::AptosDB;
 use aptos_storage_interface::{DbReader, MAX_REQUEST_LIMIT};
 use aptos_types::{
     account_address::AccountAddress,
     account_state::AccountState,
     state_store::{state_key::StateKey, state_key_prefix::StateKeyPrefix, state_value::StateValue},
     transaction::{Transaction, Version},
 };
-use aptosdb::AptosDB;
 use std::{path::Path, sync::Arc};
 
 pub struct DBDebuggerInterface(Arc<dyn DbReader>);

diff --git a/aptos-move/aptos-vm/Cargo.toml b/aptos-move/aptos-vm/Cargo.toml
@@ -23,6 +23,7 @@ aptos-gas = { workspace = true }
 aptos-logger = { workspace = true }
 aptos-metrics-core = { workspace = true }
 aptos-module-verifier = { workspace = true }
+aptos-mvhashmap = { workspace = true }
 aptos-state-view = { workspace = true }
 aptos-types = { workspace = true }
 bcs = { workspace = true }
@@ -38,7 +39,6 @@ move-unit-test = { workspace = true, optional = true }
 move-vm-runtime = { workspace = true }
 move-vm-test-utils = { workspace = true }
 move-vm-types = { workspace = true }
-mvhashmap = { workspace = true }
 num_cpus = { workspace = true }
 once_cell = { workspace = true }
 rayon = { workspace = true }

diff --git a/aptos-move/block-executor/Cargo.toml b/aptos-move/block-executor/Cargo.toml
@@ -17,6 +17,7 @@ anyhow = { workspace = true }
 aptos-aggregator = { workspace = true }
 aptos-infallible = { workspace = true }
 aptos-metrics-core = { workspace = true }
+aptos-mvhashmap = { workspace = true }
 aptos-state-view = { workspace = true }
 aptos-types = { workspace = true }
 arc-swap = { workspace = true }
@@ -25,7 +26,6 @@ criterion = { workspace = true, optional = true }
 crossbeam = { workspace = true }
 crossbeam-queue = { workspace = true }
 dashmap = { workspace = true }
-mvhashmap = { workspace = true }
 num_cpus = { workspace = true }
 once_cell = { workspace = true }
 proptest = { workspace = true, optional = true }

diff --git a/aptos-move/block-executor/src/executor.rs b/aptos-move/block-executor/src/executor.rs
@@ -11,8 +11,8 @@ use crate::{
 };
 use aptos_aggregator::delta_change_set::DeltaOp;
 use aptos_infallible::Mutex;
+use aptos_mvhashmap::{MVHashMap, MVHashMapError, MVHashMapOutput};
 use aptos_types::write_set::TransactionWrite;
-use mvhashmap::{MVHashMap, MVHashMapError, MVHashMapOutput};
 use num_cpus;
 use once_cell::sync::Lazy;
 use std::{collections::btree_map::BTreeMap, hash::Hash, marker::PhantomData, sync::Arc};

diff --git a/aptos-move/block-executor/src/output_delta_resolver.rs b/aptos-move/block-executor/src/output_delta_resolver.rs
@@ -2,8 +2,8 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use aptos_aggregator::delta_change_set::{deserialize, serialize};
+use aptos_mvhashmap::{EntryCell, MVHashMap};
 use aptos_types::write_set::{TransactionWrite, WriteOp};
-use mvhashmap::{EntryCell, MVHashMap};
 use std::{hash::Hash, thread::spawn};
 
 /// Resolved and serialized data for WriteOps, None means deletion.

diff --git a/aptos-move/e2e-move-tests/Cargo.toml b/aptos-move/e2e-move-tests/Cargo.toml
@@ -23,6 +23,7 @@ aptos-gas = { workspace = true, features = ["testing"] }
 aptos-keygen = { workspace = true }
 aptos-language-e2e-tests = { workspace = true }
 aptos-logger = { workspace = true }
+aptos-package-builder = { workspace = true }
 aptos-state-view = { workspace = true }
 aptos-types = { workspace = true }
 aptos-vm = { workspace = true }
@@ -34,7 +35,6 @@ itertools = { workspace = true }
 move-core-types = { workspace = true }
 move-package = { workspace = true }
 move-symbol-pool = { workspace = true }
-package-builder = { workspace = true }
 project-root = { workspace = true }
 proptest = { workspace = true }
 rand = { workspace = true }

diff --git a/aptos-move/e2e-move-tests/src/tests/code_publishing.rs b/aptos-move/e2e-move-tests/src/tests/code_publishing.rs
@@ -3,11 +3,11 @@
 
 use crate::{assert_abort, assert_success, assert_vm_status, tests::common, MoveHarness};
 use aptos_framework::natives::code::{PackageRegistry, UpgradePolicy};
+use aptos_package_builder::PackageBuilder;
 use aptos_types::account_address::{create_resource_address, AccountAddress};
 use aptos_types::on_chain_config::FeatureFlag;
 use move_core_types::parser::parse_struct_tag;
 use move_core_types::vm_status::StatusCode;
-use package_builder::PackageBuilder;
 use rstest::rstest;
 use serde::{Deserialize, Serialize};
 

diff --git a/aptos-move/e2e-move-tests/src/tests/generate_upgrade_script.rs b/aptos-move/e2e-move-tests/src/tests/generate_upgrade_script.rs
@@ -3,9 +3,9 @@
 
 use crate::{tests::common, MoveHarness};
 use aptos_framework::{BuildOptions, BuiltPackage, ReleasePackage};
+use aptos_package_builder::PackageBuilder;
 use aptos_types::account_address::AccountAddress;
 use move_package::compilation::package_layout::CompiledPackageLayout;
-use package_builder::PackageBuilder;
 
 #[test]
 fn generate_upgrade_script() {

diff --git a/aptos-move/e2e-move-tests/src/tests/init_module.rs b/aptos-move/e2e-move-tests/src/tests/init_module.rs
@@ -2,9 +2,9 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use crate::{assert_abort, assert_success, tests::common, MoveHarness};
+use aptos_package_builder::PackageBuilder;
 use aptos_types::account_address::AccountAddress;
 use move_core_types::parser::parse_struct_tag;
-use package_builder::PackageBuilder;
 use serde::{Deserialize, Serialize};
 
 /// Mimics `0xcafe::test::ModuleData`

diff --git a/aptos-move/e2e-move-tests/src/tests/lazy_natives.rs b/aptos-move/e2e-move-tests/src/tests/lazy_natives.rs
@@ -2,9 +2,9 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use crate::{assert_success, assert_vm_status, MoveHarness};
+use aptos_package_builder::PackageBuilder;
 use aptos_types::account_address::AccountAddress;
 use move_core_types::vm_status::StatusCode;
-use package_builder::PackageBuilder;
 
 #[test]
 fn lazy_natives() {

diff --git a/aptos-move/e2e-move-tests/src/tests/new_integer_types.rs b/aptos-move/e2e-move-tests/src/tests/new_integer_types.rs
@@ -2,9 +2,9 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use crate::{assert_success, MoveHarness};
+use aptos_package_builder::PackageBuilder;
 use aptos_types::account_address::AccountAddress;
 use move_core_types::{u256::U256, value::MoveValue};
-use package_builder::PackageBuilder;
 
 #[test]
 fn use_new_integer_types() {

diff --git a/aptos-move/e2e-move-tests/src/tests/vector_numeric_address.rs b/aptos-move/e2e-move-tests/src/tests/vector_numeric_address.rs
@@ -3,8 +3,8 @@
 
 use crate::tests::common;
 use crate::{assert_success, MoveHarness};
+use aptos_package_builder::PackageBuilder;
 use aptos_types::account_address::AccountAddress;
-use package_builder::PackageBuilder;
 
 /// Test whether `0x1::vector` (and not just `std::vector`) works as expected.
 #[test]

diff --git a/aptos-move/move-examples/Cargo.toml b/aptos-move/move-examples/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "move-examples"
+name = "aptos-move-examples"
 description = "Move examples"
 version = "0.1.0"
 

diff --git a/aptos-move/mvhashmap/Cargo.toml b/aptos-move/mvhashmap/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "mvhashmap"
+name = "aptos-mvhashmap"
 description = "Move hash map"
 version = "0.1.0"
 

diff --git a/aptos-move/package-builder/Cargo.toml b/aptos-move/package-builder/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "package-builder"
+name = "aptos-package-builder"
 description = "Helper for building Move packages for tests"
 version = "0.1.0"
 

diff --git a/aptos-node/Cargo.toml b/aptos-node/Cargo.toml
@@ -25,6 +25,7 @@ aptos-crash-handler = { workspace = true }
 aptos-crypto = { workspace = true }
 aptos-data-client = { workspace = true }
 aptos-data-streaming-service = { workspace = true }
+aptos-db = { workspace = true }
 aptos-event-notifications = { workspace = true }
 aptos-executor = { workspace = true }
 aptos-executor-types = { workspace = true }
@@ -35,6 +36,9 @@ aptos-infallible = { workspace = true }
 aptos-inspection-service = { workspace = true }
 aptos-logger = { workspace = true }
 aptos-mempool = { workspace = true }
+aptos-mempool-notifications = { workspace = true }
+aptos-network = { workspace = true }
+aptos-network-builder = { workspace = true }
 aptos-secure-storage = { workspace = true }
 aptos-state-sync-driver = { workspace = true }
 aptos-state-view = { workspace = true }
@@ -46,15 +50,11 @@ aptos-temppath = { workspace = true }
 aptos-time-service = { workspace = true }
 aptos-types = { workspace = true }
 aptos-vm = { workspace = true }
-aptosdb = { workspace = true }
 bcs = { workspace = true }
 clap = { workspace = true }
 fail = { workspace = true }
 futures = { workspace = true }
 hex = { workspace = true }
-mempool-notifications = { workspace = true }
-network = { workspace = true }
-network-builder = { workspace = true }
 rand = { workspace = true }
 rayon = { workspace = true }
 tokio = { workspace = true }