[Cargo.toml] Clean up move deps.

Closes: aptos-labs#952
sonic7077 · May 12, 2022 · 09c8b36 · 09c8b36
1 parent ff3ead7
commit 09c8b36
Show file tree

Hide file tree

Showing 107 changed files with 244 additions and 340 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/api/Cargo.toml b/api/Cargo.toml
@@ -17,8 +17,6 @@ fail = "0.5.0"
 futures = "0.3.12"
 hex = "0.4.3"
 hyper = "0.14.18"
-move-core-types = { git = "https://github.com/move-language/move", rev = "f2e7585b1ed5bd2810163d6bdebafe5a388881d3", features = ["address32"] }
-move-resource-viewer = { git = "https://github.com/move-language/move", rev = "f2e7585b1ed5bd2810163d6bdebafe5a388881d3" }
 once_cell = "1.10.0"
 percent-encoding = "2.1.0"
 serde = { version = "1.0.137", features = ["derive"], default-features = false }
@@ -36,11 +34,11 @@ aptos-state-view = { path = "../storage/state-view" }
 aptos-types = { path = "../types" }
 aptos-vm = { path = "../aptos-move/aptos-vm" }
 aptos-workspace-hack = { path = "../crates/aptos-workspace-hack" }
+move-deps = { path = "../aptos-move/move-deps", features = ["address32"] }
 storage-interface = { path = "../storage/storage-interface" }
 
 [dev-dependencies]
 goldenfile = "1.1.0"
-move-package = { git = "https://github.com/move-language/move", rev = "f2e7585b1ed5bd2810163d6bdebafe5a388881d3" }
 rand = "0.8.3"
 regex = "1.5.5"
 reqwest = { version = "0.11.10", features = ["blocking", "json"], default_features = false }
@@ -58,6 +56,7 @@ cached-framework-packages = { path = "../aptos-move/framework/cached-packages" }
 executor = { path = "../execution/executor" }
 executor-types = { path = "../execution/executor-types" }
 mempool-notifications = { path = "../state-sync/inter-component/mempool-notifications" }
+move-deps = { path = "../aptos-move/move-deps" }
 vm-validator = { path = "../vm-validator" }
 
 [features]

diff --git a/api/src/accounts.rs b/api/src/accounts.rs
@@ -21,7 +21,7 @@ use aptos_types::{
 
 use anyhow::Result;
 use aptos_types::{access_path::AccessPath, state_store::state_key::StateKey};
-use move_core_types::{
+use move_deps::move_core_types::{
     identifier::Identifier,
     language_storage::{ResourceKey, StructTag},
     move_resource::MoveStructType,

diff --git a/api/src/param.rs b/api/src/param.rs
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use aptos_api_types::{Address, Error, EventKey, MoveStructTag, TransactionId};
-use move_core_types::identifier::Identifier;
+use move_deps::move_core_types::identifier::Identifier;
 use percent_encoding::percent_decode_str;
 use serde::{Deserialize, Deserializer};