add ending_verison for sdk processor diff tests

aptos-labs · Feb 8, 2025 · 3151105 · 3151105
1 parent 6b94d0e
commit 3151105
Show file tree

Hide file tree

Showing 11 changed files with 73 additions and 62 deletions.
diff --git a/rust/integration-tests/src/sdk_tests/account_restoration_processor_tests.rs b/rust/integration-tests/src/sdk_tests/account_restoration_processor_tests.rs
@@ -2,7 +2,7 @@ use ahash::AHashMap;
 use aptos_indexer_testing_framework::sdk_test_context::SdkTestContext;
 use sdk_processor::config::{
     db_config::{DbConfig, PostgresConfig},
-    indexer_processor_config::{IndexerProcessorConfig, BootStrapConfig, ProcessorMode},
+    indexer_processor_config::{IndexerProcessorConfig, TestingConfig, ProcessorMode},
     processor_config::{DefaultProcessorConfig, ProcessorConfig},
 };
 use std::collections::HashSet;
@@ -24,22 +24,23 @@ pub fn setup_account_restoration_processor_config(
         deprecated_tables: HashSet::new(),
     };
 
-    let bootstrap_config = BootStrapConfig {
-        initial_starting_version: test_context.get_request_start_version(),
-    };
-
     let processor_config = ProcessorConfig::AccountRestorationProcessor(default_processor_config);
 
+    let testing_config: TestingConfig = TestingConfig {
+        override_starting_version: transaction_stream_config.starting_version.unwrap(),
+        ending_version: transaction_stream_config.request_ending_version.unwrap(),
+    };
+
     let processor_name = processor_config.name();
     (
         IndexerProcessorConfig {
             processor_config,
             transaction_stream_config,
             db_config,
             backfill_config: None,
-            bootstrap_config: Some(bootstrap_config),
-            testing_config: None,
-            mode: ProcessorMode::Default,
+            bootstrap_config: None,
+            testing_config: Some(testing_config),
+            mode: ProcessorMode::Testing,
         },
         processor_name,
     )

diff --git a/rust/integration-tests/src/sdk_tests/account_transaction_processor_tests.rs b/rust/integration-tests/src/sdk_tests/account_transaction_processor_tests.rs
@@ -2,7 +2,7 @@ use ahash::AHashMap;
 use aptos_indexer_testing_framework::sdk_test_context::SdkTestContext;
 use sdk_processor::config::{
     db_config::{DbConfig, PostgresConfig},
-    indexer_processor_config::{IndexerProcessorConfig, ProcessorMode, BootStrapConfig},
+    indexer_processor_config::{IndexerProcessorConfig, ProcessorMode, TestingConfig},
     processor_config::{DefaultProcessorConfig, ProcessorConfig},
 };
 use std::collections::HashSet;
@@ -27,8 +27,9 @@ pub fn setup_acc_txn_processor_config(
     let processor_config = ProcessorConfig::AccountTransactionsProcessor(default_processor_config);
     let processor_name = processor_config.name();
 
-    let bootstrap_config = BootStrapConfig {
-        initial_starting_version: test_context.get_request_start_version(),
+    let testing_config: TestingConfig = TestingConfig {
+        override_starting_version: transaction_stream_config.starting_version.unwrap(),
+        ending_version: transaction_stream_config.request_ending_version.unwrap(),
     };
 
     (
@@ -37,9 +38,9 @@ pub fn setup_acc_txn_processor_config(
             transaction_stream_config,
             db_config,
             backfill_config: None,
-            bootstrap_config: Some(bootstrap_config),
-            testing_config: None,
-            mode: ProcessorMode::Default,
+            bootstrap_config: None,
+            testing_config: Some(testing_config),
+            mode: ProcessorMode::Testing,
         },
         processor_name,
     )

diff --git a/rust/integration-tests/src/sdk_tests/ans_processor_tests.rs b/rust/integration-tests/src/sdk_tests/ans_processor_tests.rs
@@ -3,7 +3,7 @@ use aptos_indexer_testing_framework::sdk_test_context::SdkTestContext;
 use sdk_processor::{
     config::{
         db_config::{DbConfig, PostgresConfig},
-        indexer_processor_config::{IndexerProcessorConfig, ProcessorMode, BootStrapConfig},
+        indexer_processor_config::{IndexerProcessorConfig, ProcessorMode, TestingConfig},
         processor_config::{DefaultProcessorConfig, ProcessorConfig},
     },
     processors::ans_processor::AnsProcessorConfig,
@@ -39,8 +39,9 @@ pub fn setup_ans_processor_config(
     let processor_config = ProcessorConfig::AnsProcessor(ans_processor_config);
     let processor_name = processor_config.name();
 
-    let bootstrap_config = BootStrapConfig {
-        initial_starting_version: test_context.get_request_start_version(),
+    let testing_config: TestingConfig = TestingConfig {
+        override_starting_version: transaction_stream_config.starting_version.unwrap(),
+        ending_version: transaction_stream_config.request_ending_version.unwrap(),
     };
 
     (
@@ -49,9 +50,9 @@ pub fn setup_ans_processor_config(
             transaction_stream_config,
             db_config,
             backfill_config: None,
-            bootstrap_config: Some(bootstrap_config),
-            testing_config: None,
-            mode: ProcessorMode::Default,
+            bootstrap_config: None,
+            testing_config: Some(testing_config),
+            mode: ProcessorMode::Testing,
         },
         processor_name,
     )

diff --git a/rust/integration-tests/src/sdk_tests/default_processor_tests.rs b/rust/integration-tests/src/sdk_tests/default_processor_tests.rs
@@ -2,7 +2,7 @@ use ahash::AHashMap;
 use aptos_indexer_testing_framework::sdk_test_context::SdkTestContext;
 use sdk_processor::config::{
     db_config::{DbConfig, PostgresConfig},
-    indexer_processor_config::{IndexerProcessorConfig, ProcessorMode, BootStrapConfig},
+    indexer_processor_config::{IndexerProcessorConfig, ProcessorMode, TestingConfig},
     processor_config::{DefaultProcessorConfig, ProcessorConfig},
 };
 use std::collections::HashSet;
@@ -27,8 +27,9 @@ pub fn setup_default_processor_config(
     let processor_config = ProcessorConfig::DefaultProcessor(default_processor_config);
     let processor_name = processor_config.name();
 
-    let bootstrap_config = BootStrapConfig {
-        initial_starting_version: test_context.get_request_start_version(),
+    let testing_config: TestingConfig = TestingConfig {
+        override_starting_version: transaction_stream_config.starting_version.unwrap(),
+        ending_version: transaction_stream_config.request_ending_version.unwrap(),
     };
 
     (
@@ -37,9 +38,9 @@ pub fn setup_default_processor_config(
             transaction_stream_config,
             db_config,
             backfill_config: None,
-            bootstrap_config: Some(bootstrap_config),
-            testing_config: None,
-            mode: ProcessorMode::Default,
+            bootstrap_config: None,
+            testing_config: Some(testing_config),
+            mode: ProcessorMode::Testing,
         },
         processor_name,
     )

diff --git a/rust/integration-tests/src/sdk_tests/events_processor_tests.rs b/rust/integration-tests/src/sdk_tests/events_processor_tests.rs
@@ -2,7 +2,7 @@ use ahash::AHashMap;
 use aptos_indexer_testing_framework::sdk_test_context::SdkTestContext;
 use sdk_processor::config::{
     db_config::{DbConfig, PostgresConfig},
-    indexer_processor_config::{IndexerProcessorConfig, ProcessorMode, BootStrapConfig},
+    indexer_processor_config::{IndexerProcessorConfig, ProcessorMode, TestingConfig},
     processor_config::{DefaultProcessorConfig, ProcessorConfig},
 };
 use std::collections::HashSet;
@@ -26,8 +26,9 @@ pub fn setup_events_processor_config(
 
     let processor_config = ProcessorConfig::EventsProcessor(default_processor_config);
     let processor_name = processor_config.name();
-    let bootstrap_config = BootStrapConfig {
-        initial_starting_version: test_context.get_request_start_version(),
+    let testing_config: TestingConfig = TestingConfig {
+        override_starting_version: transaction_stream_config.starting_version.unwrap(),
+        ending_version: transaction_stream_config.request_ending_version.unwrap(),
     };
 
     (
@@ -36,9 +37,9 @@ pub fn setup_events_processor_config(
             transaction_stream_config,
             db_config,
             backfill_config: None,
-            bootstrap_config: Some(bootstrap_config),
-            testing_config: None,
-            mode: ProcessorMode::Default,
+            bootstrap_config: None,
+            testing_config: Some(testing_config),
+            mode: ProcessorMode::Testing,
         },
         processor_name,
     )

diff --git a/rust/integration-tests/src/sdk_tests/fungible_asset_processor_tests.rs b/rust/integration-tests/src/sdk_tests/fungible_asset_processor_tests.rs
@@ -2,7 +2,7 @@ use ahash::AHashMap;
 use aptos_indexer_testing_framework::sdk_test_context::SdkTestContext;
 use sdk_processor::config::{
     db_config::{DbConfig, PostgresConfig},
-    indexer_processor_config::{IndexerProcessorConfig, ProcessorMode, BootStrapConfig},
+    indexer_processor_config::{IndexerProcessorConfig, ProcessorMode, TestingConfig},
     processor_config::{DefaultProcessorConfig, ProcessorConfig},
 };
 use std::collections::HashSet;
@@ -27,8 +27,9 @@ pub fn setup_fa_processor_config(
     let processor_config = ProcessorConfig::FungibleAssetProcessor(default_processor_config);
 
     let processor_name = processor_config.name();
-    let bootstrap_config = BootStrapConfig {
-        initial_starting_version: test_context.get_request_start_version(),
+    let testing_config: TestingConfig = TestingConfig {
+        override_starting_version: transaction_stream_config.starting_version.unwrap(),
+        ending_version: transaction_stream_config.request_ending_version.unwrap(),
     };
 
     (
@@ -37,9 +38,9 @@ pub fn setup_fa_processor_config(
             transaction_stream_config,
             db_config,
             backfill_config: None,
-            bootstrap_config: Some(bootstrap_config),
-            testing_config: None,
-            mode: ProcessorMode::Default,
+            bootstrap_config: None,
+            testing_config: Some(testing_config),
+            mode: ProcessorMode::Testing,
         },
         processor_name,
     )

diff --git a/rust/integration-tests/src/sdk_tests/objects_processor_tests.rs b/rust/integration-tests/src/sdk_tests/objects_processor_tests.rs
@@ -3,7 +3,7 @@ use aptos_indexer_testing_framework::sdk_test_context::SdkTestContext;
 use sdk_processor::{
     config::{
         db_config::{DbConfig, PostgresConfig},
-        indexer_processor_config::{IndexerProcessorConfig, ProcessorMode, BootStrapConfig},
+        indexer_processor_config::{IndexerProcessorConfig, ProcessorMode, TestingConfig},
         processor_config::{DefaultProcessorConfig, ProcessorConfig},
     },
     processors::objects_processor::ObjectsProcessorConfig,
@@ -37,8 +37,9 @@ pub fn setup_objects_processor_config(
     let processor_config = ProcessorConfig::ObjectsProcessor(objects_processor_config);
 
     let processor_name = processor_config.name();
-    let bootstrap_config = BootStrapConfig {
-        initial_starting_version: test_context.get_request_start_version(),
+    let testing_config: TestingConfig = TestingConfig {
+        override_starting_version: transaction_stream_config.starting_version.unwrap(),
+        ending_version: transaction_stream_config.request_ending_version.unwrap(),
     };
 
     (
@@ -47,9 +48,9 @@ pub fn setup_objects_processor_config(
             transaction_stream_config,
             db_config,
             backfill_config: None,
-            bootstrap_config: Some(bootstrap_config),
-            testing_config: None,
-            mode: ProcessorMode::Default,
+            bootstrap_config: None,
+            testing_config: Some(testing_config),
+            mode: ProcessorMode::Testing,
         },
         processor_name,
     )

diff --git a/rust/integration-tests/src/sdk_tests/stake_processor_tests.rs b/rust/integration-tests/src/sdk_tests/stake_processor_tests.rs
@@ -3,7 +3,7 @@ use aptos_indexer_testing_framework::sdk_test_context::SdkTestContext;
 use sdk_processor::{
     config::{
         db_config::{DbConfig, PostgresConfig},
-        indexer_processor_config::{IndexerProcessorConfig, ProcessorMode, BootStrapConfig},
+        indexer_processor_config::{IndexerProcessorConfig, ProcessorMode, TestingConfig},
         processor_config::{DefaultProcessorConfig, ProcessorConfig},
     },
     processors::stake_processor::StakeProcessorConfig,
@@ -34,8 +34,9 @@ pub fn setup_stake_processor_config(
 
     let processor_config = ProcessorConfig::StakeProcessor(default_processor_config);
     let processor_name = processor_config.name();
-    let bootstrap_config = BootStrapConfig {
-        initial_starting_version: test_context.get_request_start_version(),
+    let testing_config: TestingConfig = TestingConfig {
+        override_starting_version: transaction_stream_config.starting_version.unwrap(),
+        ending_version: transaction_stream_config.request_ending_version.unwrap(),
     };
 
     (
@@ -44,9 +45,9 @@ pub fn setup_stake_processor_config(
             transaction_stream_config,
             db_config,
             backfill_config: None,
-            bootstrap_config: Some(bootstrap_config),
-            testing_config: None,
-            mode: ProcessorMode::Default,
+            bootstrap_config: None,
+            testing_config: Some(testing_config),
+            mode: ProcessorMode::Testing,
         },
         processor_name,
     )

diff --git a/rust/integration-tests/src/sdk_tests/token_v2_processor_tests.rs b/rust/integration-tests/src/sdk_tests/token_v2_processor_tests.rs
@@ -3,7 +3,7 @@ use aptos_indexer_testing_framework::sdk_test_context::SdkTestContext;
 use sdk_processor::{
     config::{
         db_config::{DbConfig, PostgresConfig},
-        indexer_processor_config::{IndexerProcessorConfig, ProcessorMode, BootStrapConfig},
+        indexer_processor_config::{IndexerProcessorConfig, ProcessorMode, TestingConfig},
         processor_config::{DefaultProcessorConfig, ProcessorConfig},
     },
     processors::token_v2_processor::TokenV2ProcessorConfig,
@@ -36,8 +36,9 @@ pub fn setup_token_v2_processor_config(
     let processor_config = ProcessorConfig::TokenV2Processor(token_v2_processor_config);
 
     let processor_name = processor_config.name();
-    let bootstrap_config = BootStrapConfig {
-        initial_starting_version: test_context.get_request_start_version(),
+    let testing_config: TestingConfig = TestingConfig {
+        override_starting_version: transaction_stream_config.starting_version.unwrap(),
+        ending_version: transaction_stream_config.request_ending_version.unwrap(),
     };
 
     (
@@ -46,9 +47,9 @@ pub fn setup_token_v2_processor_config(
             transaction_stream_config,
             db_config,
             backfill_config: None,
-            bootstrap_config: Some(bootstrap_config),
-            testing_config: None,
-            mode: ProcessorMode::Default,
+            bootstrap_config: None,
+            testing_config: Some(testing_config),
+            mode: ProcessorMode::Testing,
         },
         processor_name,
     )

diff --git a/rust/integration-tests/src/sdk_tests/user_transaction_processor_tests.rs b/rust/integration-tests/src/sdk_tests/user_transaction_processor_tests.rs
@@ -2,7 +2,7 @@ use ahash::AHashMap;
 use aptos_indexer_testing_framework::sdk_test_context::SdkTestContext;
 use sdk_processor::config::{
     db_config::{DbConfig, PostgresConfig},
-    indexer_processor_config::{IndexerProcessorConfig, ProcessorMode, BootStrapConfig},
+    indexer_processor_config::{IndexerProcessorConfig, ProcessorMode, TestingConfig},
     processor_config::{DefaultProcessorConfig, ProcessorConfig},
 };
 use std::collections::HashSet;
@@ -27,8 +27,9 @@ pub fn setup_user_txn_processor_config(
     let processor_config = ProcessorConfig::UserTransactionProcessor(default_processor_config);
 
     let processor_name = processor_config.name();
-    let bootstrap_config = BootStrapConfig {
-        initial_starting_version: test_context.get_request_start_version(),
+    let testing_config: TestingConfig = TestingConfig {
+        override_starting_version: transaction_stream_config.starting_version.unwrap(),
+        ending_version: transaction_stream_config.request_ending_version.unwrap(),
     };
 
     (
@@ -37,9 +38,9 @@ pub fn setup_user_txn_processor_config(
             transaction_stream_config,
             db_config,
             backfill_config: None,
-            bootstrap_config: Some(bootstrap_config),
-            testing_config: None,
-            mode: ProcessorMode::Default,
+            bootstrap_config: None,
+            testing_config: Some(testing_config),
+            mode: ProcessorMode::Testing,
         },
         processor_name,
     )

diff --git a/rust/sdk-processor/README.md b/rust/sdk-processor/README.md
@@ -53,6 +53,7 @@ If you want to index a custom contract, we recommend using the [Quickstart Guide
 
 - `bootstrap_config` (optional) used for regular, non-backfill, processors
     - `initial_starting_version`: processor starts here unless there is a greater checkpointed version. 
+    Note: no ending version for bootstrap config since its meant to keep running at HEAD. 
 
 - `mode`: (optional) `default`, `testing` or `backfill`. Set to `default` if no mode specified. If backfill/testing/bootstrap configs are not specified, processor will start from 0 or the last successfully processed version.