remove aptos consensus from aptos deps (#204)

Author: so-schen

Cargo.lock

@@ -14,7 +14,7 @@ rust-version = { workspace = true }
 
 [dependencies]
 anyhow = { workspace = true }
-aptos-consensus = { workspace = true }
+# aptos-consensus = { workspace = true }
 aptos-crypto = { workspace = true }
 aptos-gas-profiling = { workspace = true }
 aptos-logger = { workspace = true }

aptos-move/aptos-debugger/Cargo.toml

@@ -67,17 +67,19 @@ impl Command {
             info!("GET {url:?}...");
             let body = reqwest::get(url).await?.bytes().await?;
             bcs::from_bytes(&body)?
-        } else if let Some(consensus_db_path) = self.consensus_db_path {
-            info!(
-                "Getting block {:?} from {consensus_db_path:?}.",
-                self.block_id
-            );
-            let cmd = aptos_consensus::util::db_tool::Command {
-                db_dir: consensus_db_path,
-                block_id: self.block_id,
-            };
-            cmd.dump_pending_txns()?
-        } else {
+        } 
+        // else if let Some(consensus_db_path) = self.consensus_db_path {
+        //     info!(
+        //         "Getting block {:?} from {consensus_db_path:?}.",
+        //         self.block_id
+        //     );
+            // let cmd = aptos_consensus::util::db_tool::Command {
+            //     db_dir: consensus_db_path,
+            //     block_id: self.block_id,
+            // };
+            // cmd.dump_pending_txns()?
+        // }
+         else {
             unreachable!("Must provide one target.");
         };
 

aptos-move/aptos-debugger/src/execute_pending_block.rs

@@ -29,19 +29,19 @@ aptos-gas-schedule = { workspace = true }
 aptos-genesis = { workspace = true }
 aptos-github-client = { workspace = true }
 aptos-global-constants = { workspace = true }
-aptos-indexer-grpc-server-framework = { workspace = true }
-aptos-indexer-grpc-utils = { workspace = true }
+# aptos-indexer-grpc-server-framework = { workspace = true }
+# aptos-indexer-grpc-utils = { workspace = true }
 aptos-keygen = { workspace = true }
 aptos-ledger = { workspace = true }
 aptos-logger = { workspace = true }
 aptos-move-debugger = { workspace = true }
 aptos-network-checker = { workspace = true }
-aptos-node = { workspace = true }
+# aptos-node = { workspace = true }
 aptos-protos = { workspace = true }
 aptos-rest-client = { workspace = true }
 aptos-sdk = { workspace = true }
 aptos-storage-interface = { workspace = true }
-aptos-telemetry = { workspace = true }
+# aptos-telemetry = { workspace = true }
 aptos-temppath = { workspace = true }
 aptos-types = { workspace = true }
 aptos-vm = { workspace = true, features = ["testing"] }
@@ -83,14 +83,14 @@ pathsearch = { workspace = true }
 poem = { workspace = true }
 # We set default-features to false so we don't onboard the libpq dep. See more here:
 # https://github.com/aptos-labs/aptos-core/pull/12568
-processor = { git = "https://github.com/aptos-labs/aptos-indexer-processors.git", rev = "5244b84fa5ed872e5280dc8df032d744d62ad29d", default-features = false }
+# processor = { git = "https://github.com/aptos-labs/aptos-indexer-processors.git", rev = "5244b84fa5ed872e5280dc8df032d744d62ad29d", default-features = false }
 rand = { workspace = true }
 reqwest = { workspace = true }
 self_update = { git = "https://github.com/banool/self_update.git", rev = "8306158ad0fd5b9d4766a3c6bf967e7ef0ea5c4b", features = ["archive-zip", "compression-zip-deflate"] }
 serde = { workspace = true }
 serde_json = { workspace = true }
 serde_yaml = { workspace = true }
-server-framework = { git = "https://github.com/aptos-labs/aptos-indexer-processors.git", rev = "5244b84fa5ed872e5280dc8df032d744d62ad29d" }
+# server-framework = { git = "https://github.com/aptos-labs/aptos-indexer-processors.git", rev = "5244b84fa5ed872e5280dc8df032d744d62ad29d" }
 tempfile = { workspace = true }
 thiserror = { workspace = true }
 tokio = { workspace = true }
@@ -109,7 +109,7 @@ jemallocator = { workspace = true }
 default = []
 fuzzing = []
 no-upload-proposal = []
-indexer = ["aptos-node/indexer"]
+# indexer = ["aptos-node/indexer"]
 cli-framework-test-move = []
 
 [build-dependencies]

crates/aptos/Cargo.toml

@@ -14,7 +14,7 @@ use aptos_crypto::ed25519::{Ed25519PrivateKey, Ed25519PublicKey};
 use aptos_keygen::KeyGen;
 use aptos_logger::{debug, Level};
 use aptos_rest_client::{aptos_api_types::HashValue, Account, Client, FaucetClient, State};
-use aptos_telemetry::service::telemetry_is_disabled;
+// use aptos_telemetry::service::telemetry_is_disabled;
 use aptos_types::{
     account_address::create_multisig_account_address,
     chain_id::ChainId,
@@ -85,23 +85,23 @@ pub async fn to_common_result<T: Serialize>(
 ) -> CliResult {
     let latency = start_time.elapsed();
 
-    if !telemetry_is_disabled() {
-        let error = if let Err(ref error) = result {
-            // Only print the error type
-            Some(error.to_str())
-        } else {
-            None
-        };
-
-        if let Err(err) = timeout(
-            Duration::from_millis(2000),
-            send_telemetry_event(command, latency, error),
-        )
-        .await
-        {
-            debug!("send_telemetry_event timeout from CLI: {}", err.to_string())
-        }
-    }
+    // if !telemetry_is_disabled() {
+    //     let error = if let Err(ref error) = result {
+    //         // Only print the error type
+    //         Some(error.to_str())
+    //     } else {
+    //         None
+    //     };
+
+    //     if let Err(err) = timeout(
+    //         Duration::from_millis(2000),
+    //         send_telemetry_event(command, latency, error),
+    //     )
+    //     .await
+    //     {
+    //         debug!("send_telemetry_event timeout from CLI: {}", err.to_string())
+    //     }
+    // }
 
     // Return early with a non JSON error if requested.
     if let Err(err) = &result {
@@ -130,14 +130,14 @@ async fn send_telemetry_event(command: &str, latency: Duration, error: Option<&s
     let build_information = cli_build_information();
 
     // Send the event
-    aptos_telemetry::cli_metrics::send_cli_telemetry_event(
-        build_information,
-        command.into(),
-        latency,
-        error.is_none(),
-        error,
-    )
-    .await;
+    // aptos_telemetry::cli_metrics::send_cli_telemetry_event(
+    //     build_information,
+    //     command.into(),
+    //     latency,
+    //     error.is_none(),
+    //     error,
+    // )
+    // .await;
 }
 
 /// A result wrapper for displaying either a correct execution result or an error.

crates/aptos/src/common/utils.rs

@@ -46,12 +46,12 @@ pub enum Tool {
     Move(move_tool::MoveTool),
     #[clap(subcommand)]
     Multisig(account::MultisigAccountTool),
-    #[clap(subcommand)]
-    Node(node::NodeTool),
+    // #[clap(subcommand)]
+    // Node(node::NodeTool),
     #[clap(subcommand)]
     Stake(stake::StakeTool),
-    #[clap(subcommand)]
-    Update(update::UpdateTool),
+    // #[clap(subcommand)]
+    // Update(update::UpdateTool),
 }
 
 impl Tool {
@@ -68,9 +68,9 @@ impl Tool {
             Key(tool) => tool.execute().await,
             Move(tool) => tool.execute().await,
             Multisig(tool) => tool.execute().await,
-            Node(tool) => tool.execute().await,
+            // Node(tool) => tool.execute().await,
             Stake(tool) => tool.execute().await,
-            Update(tool) => tool.execute().await,
+            // Update(tool) => tool.execute().await,
         }
     }
 }

crates/aptos/src/lib.rs

@@ -56,25 +56,25 @@ impl HealthChecker {
                 Ok(())
             },
             HealthChecker::DataServiceGrpc(url) => {
-                let mut client = aptos_indexer_grpc_utils::create_data_service_grpc_client(
-                    url.clone(),
-                    Some(Duration::from_secs(5)),
-                )
-                .await?;
-                let request = tonic::Request::new(GetTransactionsRequest {
-                    starting_version: Some(0),
-                    ..Default::default()
-                });
-                // Make sure we can stream the first message from the stream.
-                client
-                    .get_transactions(request)
-                    .await
-                    .context("GRPC connection error")?
-                    .into_inner()
-                    .next()
-                    .await
-                    .context("Did not receive init signal from data service GRPC stream")?
-                    .context("Error processing first message from GRPC stream")?;
+                // let mut client = aptos_indexer_grpc_utils::create_data_service_grpc_client(
+                //     url.clone(),
+                //     Some(Duration::from_secs(5)),
+                // )
+                // .await?;
+                // let request = tonic::Request::new(GetTransactionsRequest {
+                //     starting_version: Some(0),
+                //     ..Default::default()
+                // });
+                // // Make sure we can stream the first message from the stream.
+                // client
+                //     .get_transactions(request)
+                //     .await
+                //     .context("GRPC connection error")?
+                //     .into_inner()
+                //     .next()
+                //     .await
+                //     .context("Did not receive init signal from data service GRPC stream")?
+                //     .context("Error processing first message from GRPC stream")?;
                 Ok(())
             },
             HealthChecker::Postgres(connection_string) => {

crates/aptos/src/node/local_testnet/health_checker.rs

@@ -36,7 +36,7 @@ use crate::{
     },
 };
 use anyhow::{Context, Result};
-use aptos_indexer_grpc_server_framework::setup_logging;
+// use aptos_indexer_grpc_server_framework::setup_logging;
 use async_trait::async_trait;
 use clap::Parser;
 use std::{
@@ -186,9 +186,9 @@ impl CliCommand<()> for RunLocalnet {
     }
 
     async fn execute(mut self) -> CliTypedResult<()> {
-        if self.log_to_stdout {
-            setup_logging(None);
-        }
+        // if self.log_to_stdout {
+        //     setup_logging(None);
+        // }
 
         let global_config = GlobalConfig::load().context("Failed to load global config")?;
         let test_dir = match &self.test_dir {

crates/aptos/src/node/local_testnet/mod.rs

@@ -2,9 +2,9 @@
 // SPDX-License-Identifier: Apache-2.0
 
 pub mod analyze;
-pub mod local_testnet;
+// pub mod local_testnet;
 
-use self::local_testnet::RunLocalnet;
+// use self::local_testnet::RunLocalnet;
 use crate::{
     common::{
         types::{
@@ -76,8 +76,8 @@ pub enum NodeTool {
     ShowValidatorConfig(ShowValidatorConfig),
     ShowValidatorSet(ShowValidatorSet),
     ShowValidatorStake(ShowValidatorStake),
-    #[clap(aliases = &["run-local-testnet"])]
-    RunLocalnet(RunLocalnet),
+    // #[clap(aliases = &["run-local-testnet"])]
+    // RunLocalnet(RunLocalnet),
     UpdateConsensusKey(UpdateConsensusKey),
     UpdateValidatorNetworkAddresses(UpdateValidatorNetworkAddresses),
 }
@@ -101,10 +101,10 @@ impl NodeTool {
             ShowValidatorSet(tool) => tool.execute_serialized().await,
             ShowValidatorStake(tool) => tool.execute_serialized().await,
             ShowValidatorConfig(tool) => tool.execute_serialized().await,
-            RunLocalnet(tool) => tool
-                .execute_serialized_without_logger()
-                .await
-                .map(|_| "".to_string()),
+            // RunLocalnet(tool) => tool
+            //     .execute_serialized_without_logger()
+            //     .await
+            //     .map(|_| "".to_string()),
             UpdateConsensusKey(tool) => tool.execute_serialized().await,
             UpdateValidatorNetworkAddresses(tool) => tool.execute_serialized().await,
         }