[node] Start aptos-framework on test mode

Aptos-framework will be our default moving forward. Closes: aptos-labs#120
OlPanche · Mar 10, 2022 · 3787d72 · 3787d72
1 parent 10a9dcf
commit 3787d72
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 13 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/aptos-node/Cargo.toml b/aptos-node/Cargo.toml
@@ -20,22 +20,13 @@ structopt = "0.3.21"
 tokio = { version = "1.8.1", features = ["full"] }
 tokio-stream = "0.1.4"
 
-backup-service = { path = "../storage/backup/backup-service" }
-consensus = { path = "../consensus" }
-consensus-notifications = { path = "../state-sync/inter-component/consensus-notifications" }
-crash-handler = { path = "../crates/crash-handler" }
-data-streaming-service = { path = "../state-sync/state-sync-v2/data-streaming-service" }
-aptos-infallible = { path = "../crates/aptos-infallible" }
-debug-interface = { path = "../crates/debug-interface" }
-event-notifications = { path = "../state-sync/inter-component/event-notifications" }
-executor = { path = "../execution/executor" }
-executor-types = { path = "../execution/executor-types" }
 aptos-api = { path = "../api" }
 aptos-config = { path = "../config" }
 aptos-crypto = { path = "../crates/aptos-crypto" }
 aptos-data-client = { path = "../state-sync/aptos-data-client" }
-diem-framework-releases = { path = "../aptos-move/framework/DPN/releases" }
+aptos-framework-releases = { path = "../aptos-move/framework/aptos-framework/releases" }
 aptos-genesis-tool = {path = "../config/management/genesis", features = ["testing"] }
+aptos-infallible = { path = "../crates/aptos-infallible" }
 aptos-logger = { path = "../crates/aptos-logger" }
 aptos-mempool = { path = "../mempool" }
 aptos-metrics = { path = "../crates/aptos-metrics" }
@@ -46,6 +37,16 @@ aptos-types = { path = "../types" }
 aptos-vm = { path = "../aptos-move/aptos-vm" }
 aptos-workspace-hack = { version = "0.1", path = "../crates/aptos-workspace-hack" }
 aptosdb = { path = "../storage/aptosdb" }
+backup-service = { path = "../storage/backup/backup-service" }
+consensus = { path = "../consensus" }
+consensus-notifications = { path = "../state-sync/inter-component/consensus-notifications" }
+crash-handler = { path = "../crates/crash-handler" }
+data-streaming-service = { path = "../state-sync/state-sync-v2/data-streaming-service" }
+diem-framework-releases = { path = "../aptos-move/framework/DPN/releases" }
+debug-interface = { path = "../crates/debug-interface" }
+event-notifications = { path = "../state-sync/inter-component/event-notifications" }
+executor = { path = "../execution/executor" }
+executor-types = { path = "../execution/executor-types" }
 mempool-notifications = { path = "../state-sync/inter-component/mempool-notifications" }
 network = { path = "../network" }
 network-builder = { path = "../network/builder" }

diff --git a/aptos-node/src/main.rs b/aptos-node/src/main.rs
@@ -75,7 +75,7 @@ fn main() {
         let genesis_modules = if let Some(module_paths) = args.genesis_modules {
             diem_framework_releases::load_modules_from_paths(&module_paths)
         } else {
-            diem_framework_releases::current_module_blobs().to_vec()
+            aptos_framework_releases::current_module_blobs().to_vec()
         };
         aptos_node::load_test_environment(
             args.config,

diff --git a/x.toml b/x.toml
@@ -166,7 +166,6 @@ members = [
 
     "testcases",
     "aptos-e2e-tests-replay",
-    "aptos-framework-releases",
     "aptos-fuzz",
     "aptos-fuzzer",
     "aptos-keygen",