Merge changes to remove watched addresses fill service code

pkg/serve/config.go

@@ -55,9 +55,6 @@ const (
 
 	VALIDATOR_ENABLED         = "VALIDATOR_ENABLED"
 	VALIDATOR_EVERY_NTH_BLOCK = "VALIDATOR_EVERY_NTH_BLOCK"
-
-	WATCHED_ADDRESS_GAP_FILLER_ENABLED  = "WATCHED_ADDRESS_GAP_FILLER_ENABLED"
-	WATCHED_ADDRESS_GAP_FILLER_INTERVAL = "WATCHED_ADDRESS_GAP_FILLER_INTERVAL"
 )
 
 // Config struct
@@ -98,9 +95,6 @@ type Config struct {
 
 	StateValidationEnabled       bool
 	StateValidationEveryNthBlock uint64
-
-	WatchedAddressGapFillerEnabled bool
-	WatchedAddressGapFillInterval  int
 }
 
 // NewConfig is used to initialize a watcher config from a .toml file
@@ -237,8 +231,6 @@ func NewConfig() (*Config, error) {
 
 	c.loadValidatorConfig()
 
-	c.loadWatchedAddressGapFillerConfig()
-
 	return c, err
 }
 
@@ -301,11 +293,3 @@ func (c *Config) loadValidatorConfig() {
 	c.StateValidationEnabled = viper.GetBool("validator.enabled")
 	c.StateValidationEveryNthBlock = viper.GetUint64("validator.everyNthBlock")
 }
-
-func (c *Config) loadWatchedAddressGapFillerConfig() {
-	viper.BindEnv("watch.fill.enabled", WATCHED_ADDRESS_GAP_FILLER_ENABLED)
-	viper.BindEnv("watch.fill.interval", WATCHED_ADDRESS_GAP_FILLER_INTERVAL)
-
-	c.WatchedAddressGapFillerEnabled = viper.GetBool("watch.fill.enabled")
-	c.WatchedAddressGapFillInterval = viper.GetInt("watch.fill.interval")
-}