fix(hubble): improve reorg handling - modules

hubble/src/cli.rs

@@ -79,9 +79,9 @@ pub enum IndexerConfig {
     #[serde(rename = "scroll")]
     Scroll(crate::scroll::Config),
     #[serde(rename = "dummy-fetcher")]
-    DummyFetcher(crate::fetcher::dummy::config::Config),
+    DummyFetcher(crate::indexer::dummy::config::Config),
     #[serde(rename = "eth-fetcher")]
-    EthFetcher(crate::fetcher::eth::config::Config),
+    EthFetcher(crate::indexer::eth::config::Config),
 }
 
 impl IndexerConfig {

hubble/src/fetcher/dummy/config.rs → hubble/src/indexer/dummy/config.rs

@@ -3,7 +3,7 @@ use sqlx::PgPool;
 use unionlabs::aptos::block_info::BlockHeight;
 
 use super::dummy::{DummyContext, DummyFetcherClient};
-use crate::fetcher::{api::IndexerId, indexer::Indexer};
+use crate::indexer::{api::IndexerId, Indexer};
 
 #[derive(Clone, Debug, serde::Deserialize)]
 pub struct Config {

hubble/src/fetcher/dummy/dummy.rs → hubble/src/indexer/dummy/dummy.rs

@@ -7,7 +7,7 @@ use time::OffsetDateTime;
 use tokio::{sync::mpsc::Sender, task::JoinSet};
 use tracing::{debug, info, info_span, warn, Instrument};
 
-use crate::fetcher::api::{
+use crate::indexer::api::{
     BlockHandle, BlockHash, BlockHeight, BlockRange, BlockReference, BlockTimestamp, FetchMessage,
     FetcherClient, FetcherError,
 };

hubble/src/fetcher/dummy/mod.rs → hubble/src/indexer/dummy/mod.rs

@@ -1,2 +1,2 @@
 pub mod config;
-pub mod dummy;
+mod dummy;

hubble/src/fetcher/eth/block_handle.rs → hubble/src/indexer/eth/block_handle.rs

@@ -17,7 +17,7 @@ use tracing::{debug, info, trace, warn};
 use super::fetcher_client::EthFetcherClient;
 use crate::{
     eth::{BlockInsert, EventInsert, FromProviderError, ToLowerHex, TransactionInsert},
-    fetcher::{
+    indexer::{
         api::{
             BlockHandle, BlockHash, BlockHeight, BlockRange, BlockReference, BlockTimestamp,
             FetchMessage, FetcherError,

hubble/src/fetcher/eth/config.rs → hubble/src/indexer/eth/config.rs

@@ -3,9 +3,9 @@ use sqlx::PgPool;
 use url::Url;
 
 use super::{context::EthContext, fetcher_client::EthFetcherClient};
-use crate::fetcher::{
+use crate::indexer::{
     api::{BlockHeight, IndexerId},
-    indexer::Indexer,
+    Indexer,
 };
 
 const DEFAULT_CHUNK_SIZE: usize = 200;

hubble/src/fetcher/eth/fetcher_client.rs → hubble/src/indexer/eth/fetcher_client.rs

@@ -14,7 +14,7 @@ use tracing::{debug, info, info_span, warn, Instrument};
 
 use super::{block_handle::EthBlockHandle, context::EthContext};
 use crate::{
-    fetcher::{
+    indexer::{
         api::{BlockReference, FetcherClient},
         eth::create_client_tracker::schedule_create_client_checker,
     },

hubble/src/indexer/eth/mod.rs

@@ -0,0 +1,6 @@
+pub mod config;
+mod block_handle;
+mod context;
+mod create_client_tracker;
+mod fetcher_client;
+mod postgres;

hubble/src/fetcher/eth/postgres.rs → hubble/src/indexer/eth/postgres.rs

@@ -1,6 +1,6 @@
 use sqlx::{Postgres, Transaction};
 
-use crate::fetcher::api::BlockHeight;
+use crate::indexer::api::BlockHeight;
 
 pub async fn delete_eth_log(
     tx: &mut Transaction<'_, Postgres>,

hubble/src/fetcher/fetcher.rs → hubble/src/indexer/fetcher.rs

@@ -9,9 +9,9 @@ use tracing::{debug, error, info, info_span, Instrument};
 
 use super::{
     api::{BlockHeight, FetchMessage, FetcherClient},
-    indexer::Indexer,
+    Indexer,
 };
-use crate::fetcher::{
+use crate::indexer::{
     api::{BlockHandle, BlockRange, BlockReference, FetcherError},
     postgres::{get_current_height, update_block_status, update_current_height},
 };

hubble/src/fetcher/finalizer.rs → hubble/src/indexer/finalizer.rs

@@ -9,10 +9,10 @@ use tracing::{debug, error, info, info_span, trace, warn, Instrument};
 
 use super::{
     api::{BlockRange, FetcherClient},
-    indexer::Indexer,
+    Indexer,
     postgres::get_next_block_to_refresh,
 };
-use crate::fetcher::{
+use crate::indexer::{
     api::{BlockHandle, BlockHeight, BlockReference, FetchMessage, FetcherError},
     postgres::{
         delete_block_status, get_block_range_to_finalize, get_block_status_hash,

hubble/src/fetcher/fixer.rs → hubble/src/indexer/fixer.rs

@@ -9,10 +9,9 @@ use tracing::{debug, error, info, info_span, trace, Instrument};
 
 use super::{
     api::{BlockRange, FetcherClient},
-    indexer::Indexer,
-    postgres::{get_block_range_to_fix, update_block_range_to_fix},
+    postgres::{get_block_range_to_fix, update_block_range_to_fix}, Indexer,
 };
-use crate::fetcher::api::{BlockHandle, BlockHeight, BlockReference, FetchMessage, FetcherError};
+use crate::indexer::api::{BlockHandle, BlockHeight, BlockReference, FetchMessage, FetcherError};
 
 impl<T: FetcherClient> Indexer<T> {
     pub async fn run_fixer(&self, fetcher_client: T) -> Result<(), Report> {

hubble/src/fetcher/indexer.rs → hubble/src/indexer/mod.rs

@@ -1,10 +1,18 @@
+pub mod api;
+pub mod dummy;
+pub mod eth;
+mod fetcher;
+mod finalizer;
+mod fixer;
+mod postgres;
+
 use std::time::Duration;
 
 use color_eyre::eyre::Report;
 use tokio::{task::JoinSet, time::sleep};
 use tracing::{error, info};
 
-use super::api::{BlockHeight, FetcherClient, IndexerId};
+use api::{BlockHeight, FetcherClient, IndexerId};
 
 enum EndOfRunResult {
     Exit,

hubble/src/fetcher/postgres.rs → hubble/src/indexer/postgres.rs

@@ -4,7 +4,7 @@ use std::ops::Range;
 use sqlx::Postgres;
 use time::OffsetDateTime;
 
-use crate::fetcher::api::{BlockHash, BlockHeight, BlockRange, IndexerId};
+use crate::indexer::api::{BlockHash, BlockHeight, BlockRange, IndexerId};
 
 pub async fn get_current_height(
     tx: &mut sqlx::Transaction<'_, Postgres>,

hubble/src/main.rs

@@ -19,7 +19,7 @@ mod chain_id_query;
 mod cli;
 mod consensus;
 mod eth;
-mod fetcher;
+mod indexer;
 mod healthz;
 mod logging;
 mod metrics;