From 895aced5b7a31d8158e34509ecb7afac0a797fd7 Mon Sep 17 00:00:00 2001 From: Sean Derman Yang Date: Thu, 6 Feb 2025 21:00:05 -0800 Subject: [PATCH] format --- .../parquet_account_transactions_processor.rs | 15 ++++++++++++--- .../parquet_processors/parquet_ans_processor.rs | 12 ++++++++++-- .../parquet_default_processor.rs | 15 ++++++++++++--- .../parquet_events_processor.rs | 15 ++++++++++++--- .../parquet_fungible_asset_processor.rs | 15 ++++++++++++--- .../parquet_objects_processor.rs | 15 ++++++++++++--- .../parquet_processors/parquet_stake_processor.rs | 15 ++++++++++++--- .../parquet_token_v2_processor.rs | 15 ++++++++++++--- .../parquet_transaction_metadata_processor.rs | 15 ++++++++++++--- .../parquet_user_transaction_processor.rs | 15 ++++++++++++--- .../processors/account_restoration_processor.rs | 15 ++++++++++++--- .../processors/account_transactions_processor.rs | 15 ++++++++++++--- .../sdk-processor/src/processors/ans_processor.rs | 12 ++++++++++-- .../src/processors/default_processor.rs | 15 ++++++++++++--- .../src/processors/events_processor.rs | 15 ++++++++++++--- .../src/processors/fungible_asset_processor.rs | 15 ++++++++++++--- .../src/processors/monitoring_processor.rs | 15 ++++++++++++--- .../src/processors/objects_processor.rs | 15 ++++++++++++--- .../src/processors/stake_processor.rs | 15 ++++++++++++--- .../src/processors/token_v2_processor.rs | 15 ++++++++++++--- .../src/processors/user_transaction_processor.rs | 15 ++++++++++++--- rust/sdk-processor/src/utils/starting_version.rs | 13 ++++++------- 22 files changed, 254 insertions(+), 68 deletions(-) diff --git a/rust/sdk-processor/src/parquet_processors/parquet_account_transactions_processor.rs b/rust/sdk-processor/src/parquet_processors/parquet_account_transactions_processor.rs index a4c77a3a4..87206fac5 100644 --- a/rust/sdk-processor/src/parquet_processors/parquet_account_transactions_processor.rs +++ b/rust/sdk-processor/src/parquet_processors/parquet_account_transactions_processor.rs @@ -1,6 +1,7 @@ use crate::{ config::{ - db_config::DbConfig, indexer_processor_config::{IndexerProcessorConfig, ProcessorMode}, + db_config::DbConfig, + indexer_processor_config::{IndexerProcessorConfig, ProcessorMode}, processor_config::ProcessorConfig, }, parquet_processors::{ @@ -110,8 +111,16 @@ impl ProcessorTrait for ParquetAccountTransactionsProcessor { starting_version: Some(starting_version), request_ending_version: match self.config.mode { ProcessorMode::Default => None, - ProcessorMode::Backfill => self.config.backfill_config.as_ref().map(|c| c.ending_version), - ProcessorMode::Testing => self.config.testing_config.as_ref().map(|c| c.ending_version), + ProcessorMode::Backfill => self + .config + .backfill_config + .as_ref() + .map(|c| c.ending_version), + ProcessorMode::Testing => self + .config + .testing_config + .as_ref() + .map(|c| c.ending_version), }, ..self.config.transaction_stream_config.clone() }) diff --git a/rust/sdk-processor/src/parquet_processors/parquet_ans_processor.rs b/rust/sdk-processor/src/parquet_processors/parquet_ans_processor.rs index b7ffd2e3b..ef93388ec 100644 --- a/rust/sdk-processor/src/parquet_processors/parquet_ans_processor.rs +++ b/rust/sdk-processor/src/parquet_processors/parquet_ans_processor.rs @@ -123,8 +123,16 @@ impl ProcessorTrait for ParquetAnsProcessor { starting_version: Some(starting_version), request_ending_version: match self.config.mode { ProcessorMode::Default => None, - ProcessorMode::Backfill => self.config.backfill_config.as_ref().map(|c| c.ending_version), - ProcessorMode::Testing => self.config.testing_config.as_ref().map(|c| c.ending_version), + ProcessorMode::Backfill => self + .config + .backfill_config + .as_ref() + .map(|c| c.ending_version), + ProcessorMode::Testing => self + .config + .testing_config + .as_ref() + .map(|c| c.ending_version), }, ..self.config.transaction_stream_config.clone() }) diff --git a/rust/sdk-processor/src/parquet_processors/parquet_default_processor.rs b/rust/sdk-processor/src/parquet_processors/parquet_default_processor.rs index a7d7ffc27..5ebaa1fa0 100644 --- a/rust/sdk-processor/src/parquet_processors/parquet_default_processor.rs +++ b/rust/sdk-processor/src/parquet_processors/parquet_default_processor.rs @@ -1,6 +1,7 @@ use crate::{ config::{ - db_config::DbConfig, indexer_processor_config::{IndexerProcessorConfig, ProcessorMode}, + db_config::DbConfig, + indexer_processor_config::{IndexerProcessorConfig, ProcessorMode}, processor_config::ProcessorConfig, }, parquet_processors::{ @@ -117,8 +118,16 @@ impl ProcessorTrait for ParquetDefaultProcessor { starting_version: Some(starting_version), request_ending_version: match self.config.mode { ProcessorMode::Default => None, - ProcessorMode::Backfill => self.config.backfill_config.as_ref().map(|c| c.ending_version), - ProcessorMode::Testing => self.config.testing_config.as_ref().map(|c| c.ending_version), + ProcessorMode::Backfill => self + .config + .backfill_config + .as_ref() + .map(|c| c.ending_version), + ProcessorMode::Testing => self + .config + .testing_config + .as_ref() + .map(|c| c.ending_version), }, ..self.config.transaction_stream_config.clone() }) diff --git a/rust/sdk-processor/src/parquet_processors/parquet_events_processor.rs b/rust/sdk-processor/src/parquet_processors/parquet_events_processor.rs index 932f857ca..25aa61c92 100644 --- a/rust/sdk-processor/src/parquet_processors/parquet_events_processor.rs +++ b/rust/sdk-processor/src/parquet_processors/parquet_events_processor.rs @@ -1,6 +1,7 @@ use crate::{ config::{ - db_config::DbConfig, indexer_processor_config::{IndexerProcessorConfig, ProcessorMode}, + db_config::DbConfig, + indexer_processor_config::{IndexerProcessorConfig, ProcessorMode}, processor_config::ProcessorConfig, }, parquet_processors::{ @@ -108,8 +109,16 @@ impl ProcessorTrait for ParquetEventsProcessor { starting_version: Some(starting_version), request_ending_version: match self.config.mode { ProcessorMode::Default => None, - ProcessorMode::Backfill => self.config.backfill_config.as_ref().map(|c| c.ending_version), - ProcessorMode::Testing => self.config.testing_config.as_ref().map(|c| c.ending_version), + ProcessorMode::Backfill => self + .config + .backfill_config + .as_ref() + .map(|c| c.ending_version), + ProcessorMode::Testing => self + .config + .testing_config + .as_ref() + .map(|c| c.ending_version), }, ..self.config.transaction_stream_config.clone() }) diff --git a/rust/sdk-processor/src/parquet_processors/parquet_fungible_asset_processor.rs b/rust/sdk-processor/src/parquet_processors/parquet_fungible_asset_processor.rs index ffa12dd71..b88851ed2 100644 --- a/rust/sdk-processor/src/parquet_processors/parquet_fungible_asset_processor.rs +++ b/rust/sdk-processor/src/parquet_processors/parquet_fungible_asset_processor.rs @@ -1,6 +1,7 @@ use crate::{ config::{ - db_config::DbConfig, indexer_processor_config::{IndexerProcessorConfig, ProcessorMode}, + db_config::DbConfig, + indexer_processor_config::{IndexerProcessorConfig, ProcessorMode}, processor_config::ProcessorConfig, }, parquet_processors::{ @@ -115,8 +116,16 @@ impl ProcessorTrait for ParquetFungibleAssetProcessor { starting_version: Some(starting_version), request_ending_version: match self.config.mode { ProcessorMode::Default => None, - ProcessorMode::Backfill => self.config.backfill_config.as_ref().map(|c| c.ending_version), - ProcessorMode::Testing => self.config.testing_config.as_ref().map(|c| c.ending_version), + ProcessorMode::Backfill => self + .config + .backfill_config + .as_ref() + .map(|c| c.ending_version), + ProcessorMode::Testing => self + .config + .testing_config + .as_ref() + .map(|c| c.ending_version), }, ..self.config.transaction_stream_config.clone() }) diff --git a/rust/sdk-processor/src/parquet_processors/parquet_objects_processor.rs b/rust/sdk-processor/src/parquet_processors/parquet_objects_processor.rs index 1e207e432..cf2b24680 100644 --- a/rust/sdk-processor/src/parquet_processors/parquet_objects_processor.rs +++ b/rust/sdk-processor/src/parquet_processors/parquet_objects_processor.rs @@ -1,6 +1,7 @@ use crate::{ config::{ - db_config::DbConfig, indexer_processor_config::{IndexerProcessorConfig, ProcessorMode}, + db_config::DbConfig, + indexer_processor_config::{IndexerProcessorConfig, ProcessorMode}, processor_config::ProcessorConfig, }, parquet_processors::{ @@ -108,8 +109,16 @@ impl ProcessorTrait for ParquetObjectsProcessor { starting_version: Some(starting_version), request_ending_version: match self.config.mode { ProcessorMode::Default => None, - ProcessorMode::Backfill => self.config.backfill_config.as_ref().map(|c| c.ending_version), - ProcessorMode::Testing => self.config.testing_config.as_ref().map(|c| c.ending_version), + ProcessorMode::Backfill => self + .config + .backfill_config + .as_ref() + .map(|c| c.ending_version), + ProcessorMode::Testing => self + .config + .testing_config + .as_ref() + .map(|c| c.ending_version), }, ..self.config.transaction_stream_config.clone() }) diff --git a/rust/sdk-processor/src/parquet_processors/parquet_stake_processor.rs b/rust/sdk-processor/src/parquet_processors/parquet_stake_processor.rs index 14caffe0b..cb6ebe673 100644 --- a/rust/sdk-processor/src/parquet_processors/parquet_stake_processor.rs +++ b/rust/sdk-processor/src/parquet_processors/parquet_stake_processor.rs @@ -1,6 +1,7 @@ use crate::{ config::{ - db_config::DbConfig, indexer_processor_config::{IndexerProcessorConfig, ProcessorMode}, + db_config::DbConfig, + indexer_processor_config::{IndexerProcessorConfig, ProcessorMode}, processor_config::ProcessorConfig, }, parquet_processors::{ @@ -113,8 +114,16 @@ impl ProcessorTrait for ParquetStakeProcessor { starting_version: Some(starting_version), request_ending_version: match self.config.mode { ProcessorMode::Default => None, - ProcessorMode::Backfill => self.config.backfill_config.as_ref().map(|c| c.ending_version), - ProcessorMode::Testing => self.config.testing_config.as_ref().map(|c| c.ending_version), + ProcessorMode::Backfill => self + .config + .backfill_config + .as_ref() + .map(|c| c.ending_version), + ProcessorMode::Testing => self + .config + .testing_config + .as_ref() + .map(|c| c.ending_version), }, ..self.config.transaction_stream_config.clone() }) diff --git a/rust/sdk-processor/src/parquet_processors/parquet_token_v2_processor.rs b/rust/sdk-processor/src/parquet_processors/parquet_token_v2_processor.rs index dc2dbea42..bb62aec24 100644 --- a/rust/sdk-processor/src/parquet_processors/parquet_token_v2_processor.rs +++ b/rust/sdk-processor/src/parquet_processors/parquet_token_v2_processor.rs @@ -1,6 +1,7 @@ use crate::{ config::{ - db_config::DbConfig, indexer_processor_config::{IndexerProcessorConfig, ProcessorMode}, + db_config::DbConfig, + indexer_processor_config::{IndexerProcessorConfig, ProcessorMode}, processor_config::ProcessorConfig, }, parquet_processors::{ @@ -117,8 +118,16 @@ impl ProcessorTrait for ParquetTokenV2Processor { starting_version: Some(starting_version), request_ending_version: match self.config.mode { ProcessorMode::Default => None, - ProcessorMode::Backfill => self.config.backfill_config.as_ref().map(|c| c.ending_version), - ProcessorMode::Testing => self.config.testing_config.as_ref().map(|c| c.ending_version), + ProcessorMode::Backfill => self + .config + .backfill_config + .as_ref() + .map(|c| c.ending_version), + ProcessorMode::Testing => self + .config + .testing_config + .as_ref() + .map(|c| c.ending_version), }, ..self.config.transaction_stream_config.clone() }) diff --git a/rust/sdk-processor/src/parquet_processors/parquet_transaction_metadata_processor.rs b/rust/sdk-processor/src/parquet_processors/parquet_transaction_metadata_processor.rs index 32f6d8a45..a0cff63b0 100644 --- a/rust/sdk-processor/src/parquet_processors/parquet_transaction_metadata_processor.rs +++ b/rust/sdk-processor/src/parquet_processors/parquet_transaction_metadata_processor.rs @@ -1,6 +1,7 @@ use crate::{ config::{ - db_config::DbConfig, indexer_processor_config::{IndexerProcessorConfig, ProcessorMode}, + db_config::DbConfig, + indexer_processor_config::{IndexerProcessorConfig, ProcessorMode}, processor_config::ProcessorConfig, }, parquet_processors::{ @@ -109,8 +110,16 @@ impl ProcessorTrait for ParquetTransactionMetadataProcessor { starting_version: Some(starting_version), request_ending_version: match self.config.mode { ProcessorMode::Default => None, - ProcessorMode::Backfill => self.config.backfill_config.as_ref().map(|c| c.ending_version), - ProcessorMode::Testing => self.config.testing_config.as_ref().map(|c| c.ending_version), + ProcessorMode::Backfill => self + .config + .backfill_config + .as_ref() + .map(|c| c.ending_version), + ProcessorMode::Testing => self + .config + .testing_config + .as_ref() + .map(|c| c.ending_version), }, ..self.config.transaction_stream_config.clone() }) diff --git a/rust/sdk-processor/src/parquet_processors/parquet_user_transaction_processor.rs b/rust/sdk-processor/src/parquet_processors/parquet_user_transaction_processor.rs index 9e5d665c5..d59989956 100644 --- a/rust/sdk-processor/src/parquet_processors/parquet_user_transaction_processor.rs +++ b/rust/sdk-processor/src/parquet_processors/parquet_user_transaction_processor.rs @@ -1,6 +1,7 @@ use crate::{ config::{ - db_config::DbConfig, indexer_processor_config::{IndexerProcessorConfig, ProcessorMode}, + db_config::DbConfig, + indexer_processor_config::{IndexerProcessorConfig, ProcessorMode}, processor_config::ProcessorConfig, }, parquet_processors::{ @@ -109,8 +110,16 @@ impl ProcessorTrait for ParquetUserTransactionsProcessor { starting_version: Some(starting_version), request_ending_version: match self.config.mode { ProcessorMode::Default => None, - ProcessorMode::Backfill => self.config.backfill_config.as_ref().map(|c| c.ending_version), - ProcessorMode::Testing => self.config.testing_config.as_ref().map(|c| c.ending_version), + ProcessorMode::Backfill => self + .config + .backfill_config + .as_ref() + .map(|c| c.ending_version), + ProcessorMode::Testing => self + .config + .testing_config + .as_ref() + .map(|c| c.ending_version), }, ..self.config.transaction_stream_config.clone() }) diff --git a/rust/sdk-processor/src/processors/account_restoration_processor.rs b/rust/sdk-processor/src/processors/account_restoration_processor.rs index bd159a236..cd86053ea 100644 --- a/rust/sdk-processor/src/processors/account_restoration_processor.rs +++ b/rust/sdk-processor/src/processors/account_restoration_processor.rs @@ -1,6 +1,7 @@ use crate::{ config::{ - db_config::DbConfig, indexer_processor_config::{IndexerProcessorConfig, ProcessorMode}, + db_config::DbConfig, + indexer_processor_config::{IndexerProcessorConfig, ProcessorMode}, processor_config::ProcessorConfig, }, steps::{ @@ -101,8 +102,16 @@ impl ProcessorTrait for AccountRestorationProcessor { starting_version: Some(starting_version), request_ending_version: match self.config.mode { ProcessorMode::Default => None, - ProcessorMode::Backfill => self.config.backfill_config.as_ref().map(|c| c.ending_version), - ProcessorMode::Testing => self.config.testing_config.as_ref().map(|c| c.ending_version), + ProcessorMode::Backfill => self + .config + .backfill_config + .as_ref() + .map(|c| c.ending_version), + ProcessorMode::Testing => self + .config + .testing_config + .as_ref() + .map(|c| c.ending_version), }, ..self.config.transaction_stream_config.clone() }) diff --git a/rust/sdk-processor/src/processors/account_transactions_processor.rs b/rust/sdk-processor/src/processors/account_transactions_processor.rs index 80222cd0c..b18854114 100644 --- a/rust/sdk-processor/src/processors/account_transactions_processor.rs +++ b/rust/sdk-processor/src/processors/account_transactions_processor.rs @@ -1,6 +1,7 @@ use crate::{ config::{ - db_config::DbConfig, indexer_processor_config::{IndexerProcessorConfig, ProcessorMode}, + db_config::DbConfig, + indexer_processor_config::{IndexerProcessorConfig, ProcessorMode}, processor_config::ProcessorConfig, }, steps::{ @@ -100,8 +101,16 @@ impl ProcessorTrait for AccountTransactionsProcessor { starting_version: Some(starting_version), request_ending_version: match self.config.mode { ProcessorMode::Default => None, - ProcessorMode::Backfill => self.config.backfill_config.as_ref().map(|c| c.ending_version), - ProcessorMode::Testing => self.config.testing_config.as_ref().map(|c| c.ending_version), + ProcessorMode::Backfill => self + .config + .backfill_config + .as_ref() + .map(|c| c.ending_version), + ProcessorMode::Testing => self + .config + .testing_config + .as_ref() + .map(|c| c.ending_version), }, ..self.config.transaction_stream_config.clone() }) diff --git a/rust/sdk-processor/src/processors/ans_processor.rs b/rust/sdk-processor/src/processors/ans_processor.rs index 0c78ec6f7..0dbbeced4 100644 --- a/rust/sdk-processor/src/processors/ans_processor.rs +++ b/rust/sdk-processor/src/processors/ans_processor.rs @@ -115,8 +115,16 @@ impl ProcessorTrait for AnsProcessor { starting_version: Some(starting_version), request_ending_version: match self.config.mode { ProcessorMode::Default => None, - ProcessorMode::Backfill => self.config.backfill_config.as_ref().map(|c| c.ending_version), - ProcessorMode::Testing => self.config.testing_config.as_ref().map(|c| c.ending_version), + ProcessorMode::Backfill => self + .config + .backfill_config + .as_ref() + .map(|c| c.ending_version), + ProcessorMode::Testing => self + .config + .testing_config + .as_ref() + .map(|c| c.ending_version), }, ..self.config.transaction_stream_config.clone() }) diff --git a/rust/sdk-processor/src/processors/default_processor.rs b/rust/sdk-processor/src/processors/default_processor.rs index c3f9d0761..a0dd4b827 100644 --- a/rust/sdk-processor/src/processors/default_processor.rs +++ b/rust/sdk-processor/src/processors/default_processor.rs @@ -1,6 +1,7 @@ use crate::{ config::{ - db_config::DbConfig, indexer_processor_config::{IndexerProcessorConfig, ProcessorMode}, + db_config::DbConfig, + indexer_processor_config::{IndexerProcessorConfig, ProcessorMode}, processor_config::ProcessorConfig, }, steps::{ @@ -103,8 +104,16 @@ impl ProcessorTrait for DefaultProcessor { starting_version: Some(starting_version), request_ending_version: match self.config.mode { ProcessorMode::Default => None, - ProcessorMode::Backfill => self.config.backfill_config.as_ref().map(|c| c.ending_version), - ProcessorMode::Testing => self.config.testing_config.as_ref().map(|c| c.ending_version), + ProcessorMode::Backfill => self + .config + .backfill_config + .as_ref() + .map(|c| c.ending_version), + ProcessorMode::Testing => self + .config + .testing_config + .as_ref() + .map(|c| c.ending_version), }, ..self.config.transaction_stream_config.clone() }) diff --git a/rust/sdk-processor/src/processors/events_processor.rs b/rust/sdk-processor/src/processors/events_processor.rs index bd403372b..2f2c1e33e 100644 --- a/rust/sdk-processor/src/processors/events_processor.rs +++ b/rust/sdk-processor/src/processors/events_processor.rs @@ -1,6 +1,7 @@ use crate::{ config::{ - db_config::DbConfig, indexer_processor_config::{IndexerProcessorConfig, ProcessorMode}, + db_config::DbConfig, + indexer_processor_config::{IndexerProcessorConfig, ProcessorMode}, processor_config::ProcessorConfig, }, steps::{ @@ -100,8 +101,16 @@ impl ProcessorTrait for EventsProcessor { starting_version: Some(starting_version), request_ending_version: match self.config.mode { ProcessorMode::Default => None, - ProcessorMode::Backfill => self.config.backfill_config.as_ref().map(|c| c.ending_version), - ProcessorMode::Testing => self.config.testing_config.as_ref().map(|c| c.ending_version), + ProcessorMode::Backfill => self + .config + .backfill_config + .as_ref() + .map(|c| c.ending_version), + ProcessorMode::Testing => self + .config + .testing_config + .as_ref() + .map(|c| c.ending_version), }, ..self.config.transaction_stream_config.clone() }) diff --git a/rust/sdk-processor/src/processors/fungible_asset_processor.rs b/rust/sdk-processor/src/processors/fungible_asset_processor.rs index 70991366e..0a168cf8d 100644 --- a/rust/sdk-processor/src/processors/fungible_asset_processor.rs +++ b/rust/sdk-processor/src/processors/fungible_asset_processor.rs @@ -1,6 +1,7 @@ use crate::{ config::{ - db_config::DbConfig, indexer_processor_config::{IndexerProcessorConfig, ProcessorMode}, + db_config::DbConfig, + indexer_processor_config::{IndexerProcessorConfig, ProcessorMode}, processor_config::ProcessorConfig, }, steps::{ @@ -100,8 +101,16 @@ impl ProcessorTrait for FungibleAssetProcessor { starting_version: Some(starting_version), request_ending_version: match self.config.mode { ProcessorMode::Default => None, - ProcessorMode::Backfill => self.config.backfill_config.as_ref().map(|c| c.ending_version), - ProcessorMode::Testing => self.config.testing_config.as_ref().map(|c| c.ending_version), + ProcessorMode::Backfill => self + .config + .backfill_config + .as_ref() + .map(|c| c.ending_version), + ProcessorMode::Testing => self + .config + .testing_config + .as_ref() + .map(|c| c.ending_version), }, ..self.config.transaction_stream_config.clone() }) diff --git a/rust/sdk-processor/src/processors/monitoring_processor.rs b/rust/sdk-processor/src/processors/monitoring_processor.rs index 61ec3ad89..1d4d2c02c 100644 --- a/rust/sdk-processor/src/processors/monitoring_processor.rs +++ b/rust/sdk-processor/src/processors/monitoring_processor.rs @@ -1,6 +1,7 @@ use crate::{ config::{ - db_config::DbConfig, indexer_processor_config::{IndexerProcessorConfig, ProcessorMode}, + db_config::DbConfig, + indexer_processor_config::{IndexerProcessorConfig, ProcessorMode}, processor_config::ProcessorConfig, }, steps::common::get_processor_status_saver, @@ -98,8 +99,16 @@ impl ProcessorTrait for MonitoringProcessor { starting_version: Some(starting_version), request_ending_version: match self.config.mode { ProcessorMode::Default => None, - ProcessorMode::Backfill => self.config.backfill_config.as_ref().map(|c| c.ending_version), - ProcessorMode::Testing => self.config.testing_config.as_ref().map(|c| c.ending_version), + ProcessorMode::Backfill => self + .config + .backfill_config + .as_ref() + .map(|c| c.ending_version), + ProcessorMode::Testing => self + .config + .testing_config + .as_ref() + .map(|c| c.ending_version), }, ..self.config.transaction_stream_config.clone() }) diff --git a/rust/sdk-processor/src/processors/objects_processor.rs b/rust/sdk-processor/src/processors/objects_processor.rs index e48b0388b..bc7ae981d 100644 --- a/rust/sdk-processor/src/processors/objects_processor.rs +++ b/rust/sdk-processor/src/processors/objects_processor.rs @@ -2,7 +2,8 @@ use crate::{ config::{ db_config::DbConfig, indexer_processor_config::{ - IndexerProcessorConfig, ProcessorMode, QUERY_DEFAULT_RETRIES, QUERY_DEFAULT_RETRY_DELAY_MS + IndexerProcessorConfig, ProcessorMode, QUERY_DEFAULT_RETRIES, + QUERY_DEFAULT_RETRY_DELAY_MS, }, processor_config::{DefaultProcessorConfig, ProcessorConfig}, }, @@ -122,8 +123,16 @@ impl ProcessorTrait for ObjectsProcessor { starting_version: Some(starting_version), request_ending_version: match self.config.mode { ProcessorMode::Default => None, - ProcessorMode::Backfill => self.config.backfill_config.as_ref().map(|c| c.ending_version), - ProcessorMode::Testing => self.config.testing_config.as_ref().map(|c| c.ending_version), + ProcessorMode::Backfill => self + .config + .backfill_config + .as_ref() + .map(|c| c.ending_version), + ProcessorMode::Testing => self + .config + .testing_config + .as_ref() + .map(|c| c.ending_version), }, ..self.config.transaction_stream_config.clone() }) diff --git a/rust/sdk-processor/src/processors/stake_processor.rs b/rust/sdk-processor/src/processors/stake_processor.rs index d31eb5a1b..7d8edb146 100644 --- a/rust/sdk-processor/src/processors/stake_processor.rs +++ b/rust/sdk-processor/src/processors/stake_processor.rs @@ -2,7 +2,8 @@ use crate::{ config::{ db_config::DbConfig, indexer_processor_config::{ - IndexerProcessorConfig, ProcessorMode, QUERY_DEFAULT_RETRIES, QUERY_DEFAULT_RETRY_DELAY_MS + IndexerProcessorConfig, ProcessorMode, QUERY_DEFAULT_RETRIES, + QUERY_DEFAULT_RETRY_DELAY_MS, }, processor_config::{DefaultProcessorConfig, ProcessorConfig}, }, @@ -124,8 +125,16 @@ impl ProcessorTrait for StakeProcessor { starting_version: Some(starting_version), request_ending_version: match self.config.mode { ProcessorMode::Default => None, - ProcessorMode::Backfill => self.config.backfill_config.as_ref().map(|c| c.ending_version), - ProcessorMode::Testing => self.config.testing_config.as_ref().map(|c| c.ending_version), + ProcessorMode::Backfill => self + .config + .backfill_config + .as_ref() + .map(|c| c.ending_version), + ProcessorMode::Testing => self + .config + .testing_config + .as_ref() + .map(|c| c.ending_version), }, ..self.config.transaction_stream_config.clone() }) diff --git a/rust/sdk-processor/src/processors/token_v2_processor.rs b/rust/sdk-processor/src/processors/token_v2_processor.rs index 27ad62400..16d73faee 100644 --- a/rust/sdk-processor/src/processors/token_v2_processor.rs +++ b/rust/sdk-processor/src/processors/token_v2_processor.rs @@ -2,7 +2,8 @@ use crate::{ config::{ db_config::DbConfig, indexer_processor_config::{ - IndexerProcessorConfig, ProcessorMode, QUERY_DEFAULT_RETRIES, QUERY_DEFAULT_RETRY_DELAY_MS + IndexerProcessorConfig, ProcessorMode, QUERY_DEFAULT_RETRIES, + QUERY_DEFAULT_RETRY_DELAY_MS, }, processor_config::{DefaultProcessorConfig, ProcessorConfig}, }, @@ -121,8 +122,16 @@ impl ProcessorTrait for TokenV2Processor { starting_version: Some(starting_version), request_ending_version: match self.config.mode { ProcessorMode::Default => None, - ProcessorMode::Backfill => self.config.backfill_config.as_ref().map(|c| c.ending_version), - ProcessorMode::Testing => self.config.testing_config.as_ref().map(|c| c.ending_version), + ProcessorMode::Backfill => self + .config + .backfill_config + .as_ref() + .map(|c| c.ending_version), + ProcessorMode::Testing => self + .config + .testing_config + .as_ref() + .map(|c| c.ending_version), }, ..self.config.transaction_stream_config.clone() }) diff --git a/rust/sdk-processor/src/processors/user_transaction_processor.rs b/rust/sdk-processor/src/processors/user_transaction_processor.rs index dc2c0e331..f39af893f 100644 --- a/rust/sdk-processor/src/processors/user_transaction_processor.rs +++ b/rust/sdk-processor/src/processors/user_transaction_processor.rs @@ -1,6 +1,7 @@ use crate::{ config::{ - db_config::DbConfig, indexer_processor_config::{IndexerProcessorConfig, ProcessorMode}, + db_config::DbConfig, + indexer_processor_config::{IndexerProcessorConfig, ProcessorMode}, processor_config::ProcessorConfig, }, steps::{ @@ -102,8 +103,16 @@ impl ProcessorTrait for UserTransactionProcessor { starting_version: Some(starting_version), request_ending_version: match self.config.mode { ProcessorMode::Default => None, - ProcessorMode::Backfill => self.config.backfill_config.as_ref().map(|c| c.ending_version), - ProcessorMode::Testing => self.config.testing_config.as_ref().map(|c| c.ending_version), + ProcessorMode::Backfill => self + .config + .backfill_config + .as_ref() + .map(|c| c.ending_version), + ProcessorMode::Testing => self + .config + .testing_config + .as_ref() + .map(|c| c.ending_version), }, ..self.config.transaction_stream_config.clone() }) diff --git a/rust/sdk-processor/src/utils/starting_version.rs b/rust/sdk-processor/src/utils/starting_version.rs index 76786e31a..bf01c68af 100644 --- a/rust/sdk-processor/src/utils/starting_version.rs +++ b/rust/sdk-processor/src/utils/starting_version.rs @@ -47,14 +47,14 @@ pub async fn get_starting_version( // Return None if there is no checkpoint, if the backfill is old (complete), or if overwrite_checkpoint is true. // Otherwise, return the checkpointed version + 1. if let Some(status) = backfill_status_option { - // If the backfill is complete and overwrite_checkpoint is false, return the ending_version to end the backfill. - if status.backfill_status == BackfillStatus::Complete && !backfill_config.overwrite_checkpoint { + if status.backfill_status == BackfillStatus::Complete + && !backfill_config.overwrite_checkpoint + { return Ok(backfill_config.ending_version); } // If status is Complete or overwrite_checkpoint is true, this is the start of a new backfill job. - if backfill_config.overwrite_checkpoint - { + if backfill_config.overwrite_checkpoint { let backfill_alias = status.backfill_alias.clone(); let status = BackfillProcessorStatus { backfill_alias, @@ -90,14 +90,13 @@ pub async fn get_starting_version( ) .await?; return Ok(backfill_config.initial_starting_version); - } - + } + // `backfill_config.initial_starting_version` is NOT respected. // Return the last success version + 1. let starting_version = status.last_success_version as u64 + 1; log_ascii_warning(starting_version); Ok(starting_version) - } else { Ok(backfill_config.initial_starting_version) }