Clean up unused config

Author: jakeloo

cmd/root.go

@@ -65,7 +65,6 @@ func init() {
 	rootCmd.PersistentFlags().Int("poller-s3-maxConcurrentDownloads", 3, "Max concurrent downloads for poller archive source")
 	rootCmd.PersistentFlags().Bool("committer-enabled", true, "Toggle committer")
 	rootCmd.PersistentFlags().Int("committer-blocks-per-commit", 10, "How many blocks to commit each interval")
-	rootCmd.PersistentFlags().Int("committer-interval", 1000, "How often to commit blocks in milliseconds")
 	rootCmd.PersistentFlags().Int("committer-from-block", 0, "From which block to start committing")
 	rootCmd.PersistentFlags().Int("committer-to-block", 0, "To which block to commit")
 	rootCmd.PersistentFlags().Bool("reorgHandler-enabled", true, "Toggle reorg handler")
@@ -191,8 +190,6 @@ func init() {
 	rootCmd.PersistentFlags().String("publisher-events-topicName", "", "Kafka topic name for events")
 	rootCmd.PersistentFlags().String("publisher-events-addressFilter", "", "Filter events by address")
 	rootCmd.PersistentFlags().String("publisher-events-topic0Filter", "", "Filter events by topic0")
-	rootCmd.PersistentFlags().Int("workMode-checkIntervalMinutes", 10, "How often to check work mode in minutes")
-	rootCmd.PersistentFlags().Int64("workMode-liveModeThreshold", 500, "How many blocks the indexer can be behind before switching to live mode")
 	rootCmd.PersistentFlags().String("validation-mode", "strict", "Validation mode. Strict will validate logsBloom and transactionsRoot. Minimal will validate transaction count and logs existence.")
 	rootCmd.PersistentFlags().String("migrator-destination-type", "auto", "Storage type for migrator destination (auto, clickhouse, postgres, kafka, badger, pebble, s3)")
 	rootCmd.PersistentFlags().String("migrator-destination-clickhouse-host", "", "Clickhouse host for migrator destination")
@@ -263,7 +260,6 @@ func init() {
 	viper.BindPFlag("poller.s3.maxConcurrentDownloads", rootCmd.PersistentFlags().Lookup("poller-s3-maxConcurrentDownloads"))
 	viper.BindPFlag("committer.enabled", rootCmd.PersistentFlags().Lookup("committer-enabled"))
 	viper.BindPFlag("committer.blocksPerCommit", rootCmd.PersistentFlags().Lookup("committer-blocks-per-commit"))
-	viper.BindPFlag("committer.interval", rootCmd.PersistentFlags().Lookup("committer-interval"))
 	viper.BindPFlag("committer.fromBlock", rootCmd.PersistentFlags().Lookup("committer-from-block"))
 	viper.BindPFlag("committer.toBlock", rootCmd.PersistentFlags().Lookup("committer-to-block"))
 	viper.BindPFlag("reorgHandler.enabled", rootCmd.PersistentFlags().Lookup("reorgHandler-enabled"))
@@ -389,8 +385,6 @@ func init() {
 	viper.BindPFlag("publisher.events.topicName", rootCmd.PersistentFlags().Lookup("publisher-events-topicName"))
 	viper.BindPFlag("publisher.events.addressFilter", rootCmd.PersistentFlags().Lookup("publisher-events-addressFilter"))
 	viper.BindPFlag("publisher.events.topic0Filter", rootCmd.PersistentFlags().Lookup("publisher-events-topic0Filter"))
-	viper.BindPFlag("workMode.checkIntervalMinutes", rootCmd.PersistentFlags().Lookup("workMode-checkIntervalMinutes"))
-	viper.BindPFlag("workMode.liveModeThreshold", rootCmd.PersistentFlags().Lookup("workMode-liveModeThreshold"))
 	viper.BindPFlag("validation.mode", rootCmd.PersistentFlags().Lookup("validation-mode"))
 	// Migrator viper bindings
 	viper.BindPFlag("migrator.destination.type", rootCmd.PersistentFlags().Lookup("migrator-destination-type"))

configs/config.go

@@ -24,7 +24,6 @@ type PollerConfig struct {
 
 type CommitterConfig struct {
 	Enabled         bool `mapstructure:"enabled"`
-	Interval        int  `mapstructure:"interval"`
 	BlocksPerCommit int  `mapstructure:"blocksPerCommit"`
 	FromBlock       int  `mapstructure:"fromBlock"`
 	ToBlock         int  `mapstructure:"toBlock"`
@@ -38,12 +37,6 @@ type ReorgHandlerConfig struct {
 	ForceFromBlock bool `mapstructure:"forceFromBlock"`
 }
 
-type FailureRecovererConfig struct {
-	Enabled      bool `mapstructure:"enabled"`
-	Interval     int  `mapstructure:"interval"`
-	BlocksPerRun int  `mapstructure:"blocksPerRun"`
-}
-
 type StorageConfig struct {
 	Orchestrator StorageOrchestratorConfig `mapstructure:"orchestrator"`
 	Staging      StorageStagingConfig      `mapstructure:"staging"`
@@ -254,11 +247,6 @@ type S3SourceConfig struct {
 	MaxConcurrentDownloads int           `mapstructure:"maxConcurrentDownloads"`
 }
 
-type WorkModeConfig struct {
-	CheckIntervalMinutes int   `mapstructure:"checkIntervalMinutes"`
-	LiveModeThreshold    int64 `mapstructure:"liveModeThreshold"`
-}
-
 type ValidationConfig struct {
 	Mode string `mapstructure:"mode"` // "disabled", "minimal", "strict"
 }
@@ -272,18 +260,16 @@ type MigratorConfig struct {
 }
 
 type Config struct {
-	RPC              RPCConfig              `mapstructure:"rpc"`
-	Log              LogConfig              `mapstructure:"log"`
-	Poller           PollerConfig           `mapstructure:"poller"`
-	Committer        CommitterConfig        `mapstructure:"committer"`
-	FailureRecoverer FailureRecovererConfig `mapstructure:"failureRecoverer"`
-	ReorgHandler     ReorgHandlerConfig     `mapstructure:"reorgHandler"`
-	Storage          StorageConfig          `mapstructure:"storage"`
-	API              APIConfig              `mapstructure:"api"`
-	Publisher        PublisherConfig        `mapstructure:"publisher"`
-	WorkMode         WorkModeConfig         `mapstructure:"workMode"`
-	Validation       ValidationConfig       `mapstructure:"validation"`
-	Migrator         MigratorConfig         `mapstructure:"migrator"`
+	RPC          RPCConfig          `mapstructure:"rpc"`
+	Log          LogConfig          `mapstructure:"log"`
+	Poller       PollerConfig       `mapstructure:"poller"`
+	Committer    CommitterConfig    `mapstructure:"committer"`
+	ReorgHandler ReorgHandlerConfig `mapstructure:"reorgHandler"`
+	Storage      StorageConfig      `mapstructure:"storage"`
+	API          APIConfig          `mapstructure:"api"`
+	Publisher    PublisherConfig    `mapstructure:"publisher"`
+	Validation   ValidationConfig   `mapstructure:"validation"`
+	Migrator     MigratorConfig     `mapstructure:"migrator"`
 }
 
 var Cfg Config

internal/orchestrator/work_mode_monitor.go

@@ -7,7 +7,6 @@ import (
 	"time"
 
 	"github.com/rs/zerolog/log"
-	config "github.com/thirdweb-dev/indexer/configs"
 	"github.com/thirdweb-dev/indexer/internal/metrics"
 	"github.com/thirdweb-dev/indexer/internal/rpc"
 	"github.com/thirdweb-dev/indexer/internal/storage"
@@ -33,22 +32,16 @@ type WorkModeMonitor struct {
 }
 
 func NewWorkModeMonitor(rpc rpc.IRPCClient, storage storage.IStorage) *WorkModeMonitor {
-	checkInterval := config.Cfg.WorkMode.CheckIntervalMinutes
-	if checkInterval < 1 {
-		checkInterval = DEFAULT_WORK_MODE_CHECK_INTERVAL
-	}
-	liveModeThreshold := config.Cfg.WorkMode.LiveModeThreshold
-	if liveModeThreshold < 1 {
-		liveModeThreshold = DEFAULT_LIVE_MODE_THRESHOLD
-	}
+	checkInterval := DEFAULT_WORK_MODE_CHECK_INTERVAL
+	liveModeThreshold := DEFAULT_LIVE_MODE_THRESHOLD
 	log.Info().Msgf("Work mode monitor initialized with check interval %d and live mode threshold %d", checkInterval, liveModeThreshold)
 	return &WorkModeMonitor{
 		rpc:               rpc,
 		storage:           storage,
 		workModeChannels:  make(map[chan WorkMode]struct{}),
 		currentMode:       "",
 		checkInterval:     time.Duration(checkInterval) * time.Minute,
-		liveModeThreshold: big.NewInt(liveModeThreshold),
+		liveModeThreshold: big.NewInt(int64(liveModeThreshold)),
 	}
 }