Merge branch 'develop' into tooling-general/use-action-gh-release-action

iotaledger · Nov 27, 2024 · b89a718 · b89a718
2 parents 5c163fc + 207bfa0
commit b89a718
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 10 deletions.
diff --git a/crates/iota-cluster-test/src/cluster.rs b/crates/iota-cluster-test/src/cluster.rs
@@ -264,7 +264,7 @@ impl Cluster for LocalNewCluster {
                 Some(pg_address.clone()),
                 fullnode_url.clone(),
                 ReaderWriterConfig::writer_mode(None),
-                data_ingestion_path.clone(),
+                Some(data_ingestion_path.clone()),
                 None,
             )
             .await;
@@ -274,7 +274,7 @@ impl Cluster for LocalNewCluster {
                 Some(pg_address),
                 fullnode_url.clone(),
                 ReaderWriterConfig::reader_mode(indexer_address.to_string()),
-                data_ingestion_path,
+                Some(data_ingestion_path),
                 None,
             )
             .await;

diff --git a/crates/iota-indexer/src/test_utils.rs b/crates/iota-indexer/src/test_utils.rs
@@ -44,7 +44,7 @@ pub async fn start_test_indexer<T: R2D2Connection + Send + 'static>(
     db_url: Option<String>,
     rpc_url: String,
     reader_writer_config: ReaderWriterConfig,
-    data_ingestion_path: PathBuf,
+    data_ingestion_path: Option<PathBuf>,
     new_database: Option<&str>,
 ) -> (PgIndexerStore<T>, JoinHandle<Result<(), IndexerError>>) {
     start_test_indexer_impl(
@@ -53,7 +53,7 @@ pub async fn start_test_indexer<T: R2D2Connection + Send + 'static>(
         reader_writer_config,
         // reset_database
         false,
-        Some(data_ingestion_path),
+        data_ingestion_path,
         CancellationToken::new(),
         new_database,
     )
@@ -86,11 +86,14 @@ pub async fn start_test_indexer_impl<T: R2D2Connection + 'static>(
 
     let mut config = IndexerConfig {
         db_url: Some(db_url.clone().into()),
+        // As fallback sync mechanism enable Rest Api if `data_ingestion_path` was not provided
+        remote_store_url: data_ingestion_path
+            .is_none()
+            .then_some(format!("{rpc_url}/api/v1")),
         rpc_client_url: rpc_url,
         reset_db: true,
         fullnode_sync_worker: true,
         rpc_server_worker: false,
-        remote_store_url: None,
         data_ingestion_path,
         ..Default::default()
     };

diff --git a/crates/iota-indexer/tests/common/mod.rs b/crates/iota-indexer/tests/common/mod.rs
@@ -114,7 +114,7 @@ pub async fn start_test_cluster_with_read_write_indexer(
     builder_modifier: Option<Box<dyn FnOnce(TestClusterBuilder) -> TestClusterBuilder>>,
 ) -> (TestCluster, PgIndexerStore<PgConnection>, HttpClient) {
     let temp = tempdir().unwrap().into_path();
-    let mut builder = TestClusterBuilder::new().with_data_ingestion_dir(temp.clone());
+    let mut builder = TestClusterBuilder::new();
 
     if let Some(builder_modifier) = builder_modifier {
         builder = builder_modifier(builder);
@@ -127,7 +127,7 @@ pub async fn start_test_cluster_with_read_write_indexer(
         Some(get_indexer_db_url(None)),
         cluster.rpc_url().to_string(),
         ReaderWriterConfig::writer_mode(None),
-        temp.clone(),
+        None,
         database_name,
     )
     .await;
@@ -305,7 +305,7 @@ pub async fn start_simulacrum_rest_api_with_write_indexer(
         Some(get_indexer_db_url(None)),
         format!("http://{}", server_url),
         ReaderWriterConfig::writer_mode(None),
-        data_ingestion_path,
+        Some(data_ingestion_path),
         database_name,
     )
     .await;

diff --git a/crates/iota-indexer/tests/rpc-tests/read_api.rs b/crates/iota-indexer/tests/rpc-tests/read_api.rs
@@ -1158,6 +1158,7 @@ fn get_total_transaction_blocks() {
 
     runtime.block_on(async move {
         indexer_wait_for_checkpoint(store, checkpoint).await;
+
         let total_transaction_blocks = client.get_total_transaction_blocks().await.unwrap();
 
         let fullnode_checkpoint = cluster

diff --git a/crates/iota/src/iota_commands.rs b/crates/iota/src/iota_commands.rs
@@ -755,7 +755,7 @@ async fn start(
             Some(pg_address.clone()),
             fullnode_url.clone(),
             ReaderWriterConfig::writer_mode(None),
-            data_ingestion_path.clone(),
+            Some(data_ingestion_path.clone()),
             None,
         )
         .await;
@@ -766,7 +766,7 @@ async fn start(
             Some(pg_address.clone()),
             fullnode_url.clone(),
             ReaderWriterConfig::reader_mode(indexer_address.to_string()),
-            data_ingestion_path,
+            Some(data_ingestion_path),
             None,
         )
         .await;