Skip to content

Commit

Permalink
update tests to pass starting_ver to processor config
Browse files Browse the repository at this point in the history
  • Loading branch information
@dermanyang
dermanyang committed Feb 8, 2025
1 parent 895aced commit 485d805
Show file tree
Hide file tree
Showing 11 changed files with 64 additions and 21 deletions.
8 changes: 6 additions & 2 deletions rust/integration-tests/src/sdk_tests/account_restoration_processor_tests.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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},
indexer_processor_config::{IndexerProcessorConfig, BootStrapConfig, ProcessorMode},
processor_config::{DefaultProcessorConfig, ProcessorConfig},
};
use std::collections::HashSet;
Expand All @@ -24,6 +24,10 @@ 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 processor_name = processor_config.name();
Expand All @@ -33,7 +37,7 @@ pub fn setup_account_restoration_processor_config(
transaction_stream_config,
db_config,
backfill_config: None,
bootstrap_config: None,
bootstrap_config: Some(bootstrap_config),
testing_config: None,
mode: ProcessorMode::Default,
},
Expand Down
9 changes: 7 additions & 2 deletions rust/integration-tests/src/sdk_tests/account_transaction_processor_tests.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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},
indexer_processor_config::{IndexerProcessorConfig, ProcessorMode, BootStrapConfig},
processor_config::{DefaultProcessorConfig, ProcessorConfig},
};
use std::collections::HashSet;
Expand All @@ -26,13 +26,18 @@ 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(),
};

(
IndexerProcessorConfig {
processor_config,
transaction_stream_config,
db_config,
backfill_config: None,
bootstrap_config: None,
bootstrap_config: Some(bootstrap_config),
testing_config: None,
mode: ProcessorMode::Default,
},
Expand Down
9 changes: 7 additions & 2 deletions rust/integration-tests/src/sdk_tests/ans_processor_tests.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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},
indexer_processor_config::{IndexerProcessorConfig, ProcessorMode, BootStrapConfig},
processor_config::{DefaultProcessorConfig, ProcessorConfig},
},
processors::ans_processor::AnsProcessorConfig,
Expand Down Expand Up @@ -38,13 +38,18 @@ 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(),
};

(
IndexerProcessorConfig {
processor_config,
transaction_stream_config,
db_config,
backfill_config: None,
bootstrap_config: None,
bootstrap_config: Some(bootstrap_config),
testing_config: None,
mode: ProcessorMode::Default,
},
Expand Down
9 changes: 7 additions & 2 deletions rust/integration-tests/src/sdk_tests/default_processor_tests.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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},
indexer_processor_config::{IndexerProcessorConfig, ProcessorMode, BootStrapConfig},
processor_config::{DefaultProcessorConfig, ProcessorConfig},
};
use std::collections::HashSet;
Expand All @@ -26,13 +26,18 @@ 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(),
};

(
IndexerProcessorConfig {
processor_config,
transaction_stream_config,
db_config,
backfill_config: None,
bootstrap_config: None,
bootstrap_config: Some(bootstrap_config),
testing_config: None,
mode: ProcessorMode::Default,
},
Expand Down
8 changes: 6 additions & 2 deletions rust/integration-tests/src/sdk_tests/events_processor_tests.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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},
indexer_processor_config::{IndexerProcessorConfig, ProcessorMode, BootStrapConfig},
processor_config::{DefaultProcessorConfig, ProcessorConfig},
};
use std::collections::HashSet;
Expand All @@ -26,13 +26,17 @@ 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(),
};

(
IndexerProcessorConfig {
processor_config,
transaction_stream_config,
db_config,
backfill_config: None,
bootstrap_config: None,
bootstrap_config: Some(bootstrap_config),
testing_config: None,
mode: ProcessorMode::Default,
},
Expand Down
8 changes: 6 additions & 2 deletions rust/integration-tests/src/sdk_tests/fungible_asset_processor_tests.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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},
indexer_processor_config::{IndexerProcessorConfig, ProcessorMode, BootStrapConfig},
processor_config::{DefaultProcessorConfig, ProcessorConfig},
};
use std::collections::HashSet;
Expand All @@ -27,13 +27,17 @@ 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(),
};

(
IndexerProcessorConfig {
processor_config,
transaction_stream_config,
db_config,
backfill_config: None,
bootstrap_config: None,
bootstrap_config: Some(bootstrap_config),
testing_config: None,
mode: ProcessorMode::Default,
},
Expand Down
8 changes: 6 additions & 2 deletions rust/integration-tests/src/sdk_tests/objects_processor_tests.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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},
indexer_processor_config::{IndexerProcessorConfig, ProcessorMode, BootStrapConfig},
processor_config::{DefaultProcessorConfig, ProcessorConfig},
},
processors::objects_processor::ObjectsProcessorConfig,
Expand Down Expand Up @@ -37,13 +37,17 @@ 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(),
};

(
IndexerProcessorConfig {
processor_config,
transaction_stream_config,
db_config,
backfill_config: None,
bootstrap_config: None,
bootstrap_config: Some(bootstrap_config),
testing_config: None,
mode: ProcessorMode::Default,
},
Expand Down
8 changes: 6 additions & 2 deletions rust/integration-tests/src/sdk_tests/stake_processor_tests.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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},
indexer_processor_config::{IndexerProcessorConfig, ProcessorMode, BootStrapConfig},
processor_config::{DefaultProcessorConfig, ProcessorConfig},
},
processors::stake_processor::StakeProcessorConfig,
Expand Down Expand Up @@ -34,13 +34,17 @@ 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(),
};

(
IndexerProcessorConfig {
processor_config,
transaction_stream_config,
db_config,
backfill_config: None,
bootstrap_config: None,
bootstrap_config: Some(bootstrap_config),
testing_config: None,
mode: ProcessorMode::Default,
},
Expand Down
8 changes: 6 additions & 2 deletions rust/integration-tests/src/sdk_tests/token_v2_processor_tests.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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},
indexer_processor_config::{IndexerProcessorConfig, ProcessorMode, BootStrapConfig},
processor_config::{DefaultProcessorConfig, ProcessorConfig},
},
processors::token_v2_processor::TokenV2ProcessorConfig,
Expand Down Expand Up @@ -36,13 +36,17 @@ 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(),
};

(
IndexerProcessorConfig {
processor_config,
transaction_stream_config,
db_config,
backfill_config: None,
bootstrap_config: None,
bootstrap_config: Some(bootstrap_config),
testing_config: None,
mode: ProcessorMode::Default,
},
Expand Down
8 changes: 6 additions & 2 deletions rust/integration-tests/src/sdk_tests/user_transaction_processor_tests.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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},
indexer_processor_config::{IndexerProcessorConfig, ProcessorMode, BootStrapConfig},
processor_config::{DefaultProcessorConfig, ProcessorConfig},
};
use std::collections::HashSet;
Expand All @@ -27,13 +27,17 @@ 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(),
};

(
IndexerProcessorConfig {
processor_config,
transaction_stream_config,
db_config,
backfill_config: None,
bootstrap_config: None,
bootstrap_config: Some(bootstrap_config),
testing_config: None,
mode: ProcessorMode::Default,
},
Expand Down
2 changes: 1 addition & 1 deletion rust/sdk-processor/src/utils/starting_version.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ use processor::schema::backfill_processor_status;
/// the checkpointed version + 1.
///
/// If this is a backfill processor and there is not an in-progress backfill (i.e., no checkpoint or
/// backfill status is COMPLETE), this will return `intial_starting_version` from the backfill config, or 0 if not set.
/// backfill status is COMPLETE), this will return `intial_starting_version` from the backfill config.
///
/// If the backfill status is IN_PROGRESS, and `backfill_config.overwrite_checkpoint` is `true`, this will return
/// `initial_starting_version` from the backfill config, or 0 if not set. This allows users to restart a
Expand Down

0 comments on commit 485d805

Please sign in to comment.