Skip to content

Commit

Permalink
[cleanup][indexer] Clean up unused protos and add new proto for grpc (#…
Browse files Browse the repository at this point in the history
…5761)

* add the Datastream proto v1.

* add the Datastream proto v1.
  • Loading branch information
larry-aptos authored Dec 4, 2022
1 parent 60ee595 commit 2a23246
Show file tree
Hide file tree
Showing 36 changed files with 1,648 additions and 19,259 deletions.
2 changes: 0 additions & 2 deletions .dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@
!crates/aptos/src/move_tool/*.bpl
!api/doc/
!crates/indexer/migrations/**/*.sql
!ecosystem/sf-indexer/aptos-sf-indexer/migrations/**/*.sql
!ecosystem/sf-indexer/aptos-substreams/*.spkg
!terraform/helm/aptos-node/
!terraform/helm/genesis/
!testsuite/forge/src/backend/k8s/
175 changes: 67 additions & 108 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 2 additions & 4 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,6 @@ members = [
"crates/transaction-emitter-lib",
"ecosystem/node-checker",
"ecosystem/node-checker/fn-check-client",
"ecosystem/sf-indexer/firehose-stream",
"execution/db-bootstrapper",
"execution/executor",
"execution/executor-benchmark",
Expand Down Expand Up @@ -183,7 +182,6 @@ aptos-crypto-derive = { path = "crates/aptos-crypto-derive" }
aptos-data-client = { path = "state-sync/aptos-data-client" }
aptosdb-indexer = { path = "storage/indexer" }
aptos-debugger = { path = "aptos-move/aptos-debugger" }
aptos-fh-stream = { path = "ecosystem/sf-indexer/firehose-stream" }
aptos-faucet = { path = "crates/aptos-faucet" }
aptos-fuzzer = { path = "testsuite/aptos-fuzzer" }
aptos-gas = { path = "aptos-move/aptos-gas" }
Expand Down Expand Up @@ -387,7 +385,7 @@ prometheus-http-query = "0.5.2"
prometheus-parse = "0.2.2"
proptest = "1.0.0"
proptest-derive = "0.3.0"
prost = "0.10.4"
prost = "0.11.3"
prost-types = "0.10.1"
quanta = "0.10.1"
quote = "1.0.18"
Expand Down Expand Up @@ -440,7 +438,7 @@ tokio-stream = "0.1.8"
tokio-test = "0.4.1"
tokio-util = { version = "0.7.2", features = ["compat", "codec"] }
toml = "0.5.9"
tonic = { version = "0.7.2", features = ["tls-roots", "transport", "prost", "compression", "codegen"] }
tonic = { version = "0.8.3", features = ["tls-roots", "transport", "prost", "gzip", "codegen"] }
ureq = { version = "1.5.4", features = ["json", "native-tls"], default_features = false }
url = { version = "2.2.2", features = ["serde"] }
uuid = { version = "1.0.0", features = ["v4", "serde"] }
Expand Down
1 change: 0 additions & 1 deletion aptos-node/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ aptos-build-info = { workspace = true }
aptos-config = { workspace = true }
aptos-crypto = { workspace = true }
aptos-data-client = { workspace = true }
aptos-fh-stream = { workspace = true }
aptos-genesis = { workspace = true }
aptos-indexer = { workspace = true, optional = true }
aptos-infallible = { workspace = true }
Expand Down
12 changes: 0 additions & 12 deletions aptos-node/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ use aptos_config::{
utils::get_genesis_txn,
};
use aptos_data_client::aptosnet::AptosNetDataClient;
use aptos_fh_stream::runtime::bootstrap as bootstrap_fh_stream;
use aptos_infallible::RwLock;
use aptos_logger::{prelude::*, telemetry_log_writer::TelemetryLog, Level, LoggerFilterUpdater};
use aptos_state_view::account_with_state_view::AsAccountWithStateView;
Expand Down Expand Up @@ -170,7 +169,6 @@ pub struct AptosHandle {
_consensus_runtime: Option<Runtime>,
_mempool: Runtime,
_network_runtimes: Vec<Runtime>,
_fh_stream: Option<Runtime>,
_index_runtime: Option<Runtime>,
_state_sync_runtimes: StateSyncRuntimes,
_telemetry_runtime: Option<Runtime>,
Expand Down Expand Up @@ -811,15 +809,6 @@ pub fn setup_environment(
} else {
None
};
let sf_runtime = match bootstrap_fh_stream(
&node_config,
chain_id,
aptos_db.clone(),
mp_client_sender.clone(),
) {
None => None,
Some(res) => Some(res?),
};

let index_runtime = bootstrap_indexer(&node_config, chain_id, aptos_db, mp_client_sender)?;

Expand Down Expand Up @@ -885,7 +874,6 @@ pub fn setup_environment(
_mempool: mempool,
_network_runtimes: network_runtimes,
_index_runtime: index_runtime,
_fh_stream: sf_runtime,
_state_sync_runtimes: state_sync_runtimes,
_telemetry_runtime: telemetry_runtime,
})
Expand Down
Loading

0 comments on commit 2a23246

Please sign in to comment.