indexer-alt: IngestionArgs -> ClientArgs

MystenLabs · Nov 29, 2024 · 53e9470 · 53e9470
1 parent 17a463e
commit 53e9470
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 15 deletions.
diff --git a/crates/sui-indexer-alt/src/args.rs b/crates/sui-indexer-alt/src/args.rs
@@ -6,7 +6,7 @@ use std::path::PathBuf;
 #[cfg(feature = "benchmark")]
 use crate::benchmark::BenchmarkArgs;
 use crate::db::DbArgs;
-use crate::ingestion::IngestionArgs;
+use crate::ingestion::ClientArgs;
 use crate::IndexerArgs;
 use clap::Subcommand;
 
@@ -25,7 +25,7 @@ pub enum Command {
     /// Run the indexer.
     Indexer {
         #[command(flatten)]
-        ingestion_args: IngestionArgs,
+        client_args: ClientArgs,
 
         #[command(flatten)]
         indexer_args: IndexerArgs,

diff --git a/crates/sui-indexer-alt/src/benchmark.rs b/crates/sui-indexer-alt/src/benchmark.rs
@@ -5,7 +5,7 @@ use std::{path::PathBuf, time::Instant};
 
 use crate::{
     db::{reset_database, DbArgs},
-    ingestion::IngestionArgs,
+    ingestion::ClientArgs,
     start_indexer, IndexerArgs, IndexerConfig,
 };
 use sui_synthetic_ingestion::synthetic_ingestion::read_ingestion_data;
@@ -37,7 +37,7 @@ pub async fn run_benchmark(
         ..Default::default()
     };
 
-    let ingestion_args = IngestionArgs {
+    let client_args = ClientArgs {
         remote_store_url: None,
         local_ingestion_path: Some(ingestion_path.clone()),
     };
@@ -47,7 +47,7 @@ pub async fn run_benchmark(
     start_indexer(
         db_args,
         indexer_args,
-        ingestion_args,
+        client_args,
         indexer_config,
         false, /* with_genesis */
     )

diff --git a/crates/sui-indexer-alt/src/ingestion/mod.rs b/crates/sui-indexer-alt/src/ingestion/mod.rs
@@ -30,7 +30,7 @@ mod remote_client;
 mod test_utils;
 
 #[derive(clap::Args, Clone, Debug)]
-pub struct IngestionArgs {
+pub struct ClientArgs {
     /// Remote Store to fetch checkpoints from.
     #[clap(long, required = true, group = "source")]
     pub remote_store_url: Option<Url>,
@@ -71,7 +71,7 @@ impl IngestionConfig {
 
 impl IngestionService {
     pub fn new(
-        args: IngestionArgs,
+        args: ClientArgs,
         config: IngestionConfig,
         metrics: Arc<IndexerMetrics>,
         cancel: CancellationToken,
@@ -201,7 +201,7 @@ mod tests {
         cancel: CancellationToken,
     ) -> IngestionService {
         IngestionService::new(
-            IngestionArgs {
+            ClientArgs {
                 remote_store_url: Some(Url::parse(&uri).unwrap()),
                 local_ingestion_path: None,
             },

diff --git a/crates/sui-indexer-alt/src/lib.rs b/crates/sui-indexer-alt/src/lib.rs
@@ -17,7 +17,7 @@ use handlers::{
     tx_balance_changes::TxBalanceChanges, tx_calls::TxCalls, tx_digests::TxDigests,
     tx_kinds::TxKinds, wal_coin_balances::WalCoinBalances, wal_obj_types::WalObjTypes,
 };
-use ingestion::{client::IngestionClient, IngestionArgs, IngestionConfig, IngestionService};
+use ingestion::{client::IngestionClient, ClientArgs, IngestionConfig, IngestionService};
 use metrics::{IndexerMetrics, MetricsService};
 use models::watermarks::CommitterWatermark;
 use pipeline::{
@@ -110,7 +110,7 @@ impl Indexer {
     pub async fn new(
         db_args: DbArgs,
         indexer_args: IndexerArgs,
-        ingestion_args: IngestionArgs,
+        client_args: ClientArgs,
         ingestion_config: IngestionConfig,
         cancel: CancellationToken,
     ) -> Result<Self> {
@@ -134,7 +134,7 @@ impl Indexer {
             MetricsService::new(metrics_address, db.clone(), cancel.clone())?;
 
         let ingestion_service = IngestionService::new(
-            ingestion_args,
+            client_args,
             ingestion_config,
             metrics.clone(),
             cancel.clone(),
@@ -358,7 +358,7 @@ impl Default for IndexerArgs {
 pub async fn start_indexer(
     db_args: DbArgs,
     indexer_args: IndexerArgs,
-    ingestion_args: IngestionArgs,
+    client_args: ClientArgs,
     indexer_config: IndexerConfig,
     // If true, the indexer will bootstrap from genesis.
     // Otherwise it will skip the pipelines that rely on genesis data.
@@ -427,7 +427,7 @@ pub async fn start_indexer(
     let mut indexer = Indexer::new(
         db_args,
         indexer_args,
-        ingestion_args,
+        client_args,
         ingestion,
         cancel.clone(),
     )

diff --git a/crates/sui-indexer-alt/src/main.rs b/crates/sui-indexer-alt/src/main.rs
@@ -22,7 +22,7 @@ async fn main() -> Result<()> {
 
     match args.command {
         Command::Indexer {
-            ingestion_args,
+            client_args,
             indexer_args,
             config,
         } => {
@@ -36,7 +36,7 @@ async fn main() -> Result<()> {
             start_indexer(
                 args.db_args,
                 indexer_args,
-                ingestion_args,
+                client_args,
                 indexer_config,
                 true,
             )